dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

accept any size so we don't depend on the values of GimpThumbnailSize. We 

2002-04-29  Sven Neumann  <sven@gimp.org>

	* app/core/gimpimagefile.[ch]: accept any size so we don't depend on
	the values of GimpThumbnailSize. We might want to allow other thumbnail
	sizes than only 0, 128 or 256.
This commit is contained in:
Sven Neumann 2002-04-29 19:59:02 +00:00 committed by Sven Neumann
parent 9b6cde9da0
commit 84e768d0a2
3 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2002-04-29 Sven Neumann <sven@gimp.org>
* app/core/gimpimagefile.[ch]: accept any size so we don't depend on
the values of GimpThumbnailSize. We might want to allow other thumbnail
sizes than only 0, 128 or 256.
2002-04-29 Sven Neumann <sven@gimp.org> 2002-04-29 Sven Neumann <sven@gimp.org>
* app/core/core-enums.[ch]: added new enum GimpThumbnailSize. * app/core/core-enums.[ch]: added new enum GimpThumbnailSize.

35
app/core/gimpimagefile.c
View File

@ -74,8 +74,6 @@
#define TAG_THUMB_GIMP_LAYERS "tEXt::Thumb::X-GIMP::Layers" #define TAG_THUMB_GIMP_LAYERS "tEXt::Thumb::X-GIMP::Layers"
#define GIMP_IMAGEFILE_THUMB_SIZE_FAIL -1
enum enum
{ {
INFO_CHANGED, INFO_CHANGED,
@ -132,11 +130,13 @@ static gboolean gimp_imagefile_test (const gchar *filename,
off_t *size); off_t *size);
#define THUMB_SIZE_FAIL -1
static const ThumbnailSize thumb_sizes[] = static const ThumbnailSize thumb_sizes[] =
{ {
{ "fail", GIMP_IMAGEFILE_THUMB_SIZE_FAIL }, { "fail", THUMB_SIZE_FAIL },
{ "normal", GIMP_THUMBNAIL_SIZE_NORMAL }, { "normal", 128 },
{ "large", GIMP_THUMBNAIL_SIZE_LARGE } { "large", 256 }
}; };
static gchar *thumb_dir = NULL; static gchar *thumb_dir = NULL;
@ -260,14 +260,14 @@ gimp_imagefile_new (const gchar *uri)
} }
void void
gimp_imagefile_update (GimpImagefile *imagefile, gimp_imagefile_update (GimpImagefile *imagefile,
GimpThumbnailSize size) gint size)
{ {
const gchar *uri; const gchar *uri;
g_return_if_fail (GIMP_IS_IMAGEFILE (imagefile)); g_return_if_fail (GIMP_IS_IMAGEFILE (imagefile));
if (size == GIMP_THUMBNAIL_SIZE_NONE) if (size < 1)
return; return;
uri = gimp_object_get_name (GIMP_OBJECT (imagefile)); uri = gimp_object_get_name (GIMP_OBJECT (imagefile));
@ -276,7 +276,7 @@ gimp_imagefile_update (GimpImagefile *imagefile,
{ {
gchar *filename = NULL; gchar *filename = NULL;
gchar *thumbname = NULL; gchar *thumbname = NULL;
gint thumb_size = GIMP_IMAGEFILE_THUMB_SIZE_FAIL; gint thumb_size = THUMB_SIZE_FAIL;
off_t image_size; off_t image_size;
filename = g_filename_from_uri (uri, NULL, NULL); filename = g_filename_from_uri (uri, NULL, NULL);
@ -334,8 +334,8 @@ gimp_imagefile_update (GimpImagefile *imagefile,
} }
void void
gimp_imagefile_create_thumbnail (GimpImagefile *imagefile, gimp_imagefile_create_thumbnail (GimpImagefile *imagefile,
GimpThumbnailSize size) gint size)
{ {
const gchar *uri; const gchar *uri;
@ -419,8 +419,7 @@ gimp_imagefile_save_fail_thumb (GimpImagefile *imagefile,
uri = gimp_object_get_name (GIMP_OBJECT (imagefile)); uri = gimp_object_get_name (GIMP_OBJECT (imagefile));
thumb_name = gimp_imagefile_png_thumb_path (uri, thumb_name = gimp_imagefile_png_thumb_path (uri, THUMB_SIZE_FAIL);
GIMP_IMAGEFILE_THUMB_SIZE_FAIL);
if (!thumb_name) if (!thumb_name)
return; return;
@ -477,7 +476,7 @@ gimp_imagefile_save_thumbnail (GimpImagefile *imagefile,
thumb_size = gimage->gimp->config->thumbnail_size; thumb_size = gimage->gimp->config->thumbnail_size;
if (thumb_size == GIMP_THUMBNAIL_SIZE_NONE) if (thumb_size < 1)
return TRUE; return TRUE;
uri = gimp_object_get_name (GIMP_OBJECT (imagefile)); uri = gimp_object_get_name (GIMP_OBJECT (imagefile));
@ -761,7 +760,7 @@ gimp_imagefile_read_png_thumb (GimpImagefile *imagefile,
TempBuf *temp_buf = NULL; TempBuf *temp_buf = NULL;
GdkPixbuf *pixbuf = NULL; GdkPixbuf *pixbuf = NULL;
gchar *thumbname = NULL; gchar *thumbname = NULL;
gint thumb_size = GIMP_IMAGEFILE_THUMB_SIZE_FAIL; gint thumb_size = THUMB_SIZE_FAIL;
const gchar *option; const gchar *option;
gint width; gint width;
gint height; gint height;
@ -819,13 +818,13 @@ gimp_imagefile_read_png_thumb (GimpImagefile *imagefile,
if (thumb_image_mtime == imagefile->image_mtime && if (thumb_image_mtime == imagefile->image_mtime &&
thumb_image_size == imagefile->image_size) thumb_image_size == imagefile->image_size)
{ {
if (thumb_size == GIMP_IMAGEFILE_THUMB_SIZE_FAIL) if (thumb_size == THUMB_SIZE_FAIL)
imagefile->state = GIMP_IMAGEFILE_STATE_THUMBNAIL_FAILED; imagefile->state = GIMP_IMAGEFILE_STATE_THUMBNAIL_FAILED;
else else
imagefile->state = GIMP_IMAGEFILE_STATE_THUMBNAIL_OK; imagefile->state = GIMP_IMAGEFILE_STATE_THUMBNAIL_OK;
} }
if (thumb_size == GIMP_IMAGEFILE_THUMB_SIZE_FAIL) if (thumb_size == THUMB_SIZE_FAIL)
{ {
gimp_imagefile_set_info (imagefile, TRUE, -1, -1, -1, -1); gimp_imagefile_set_info (imagefile, TRUE, -1, -1, -1, -1);
goto cleanup; goto cleanup;
@ -1011,7 +1010,7 @@ gimp_imagefile_png_thumb_path (const gchar *uri,
name = gimp_imagefile_png_thumb_name (uri); name = gimp_imagefile_png_thumb_name (uri);
if (size == GIMP_IMAGEFILE_THUMB_SIZE_FAIL) if (size == THUMB_SIZE_FAIL)
{ {
i = 0; i = 0;
} }

16
app/core/gimpimagefile.h
View File

@ -84,14 +84,14 @@ struct _GimpImagefileClass
GType gimp_imagefile_get_type (void) G_GNUC_CONST; GType gimp_imagefile_get_type (void) G_GNUC_CONST;
GimpImagefile * gimp_imagefile_new (const gchar *uri); GimpImagefile * gimp_imagefile_new (const gchar *uri);
void gimp_imagefile_update (GimpImagefile *imagefile, void gimp_imagefile_update (GimpImagefile *imagefile,
GimpThumbnailSize size); gint size);
void gimp_imagefile_create_thumbnail (GimpImagefile *imagefile, void gimp_imagefile_create_thumbnail (GimpImagefile *imagefile,
GimpThumbnailSize size); gint size);
gboolean gimp_imagefile_save_thumbnail (GimpImagefile *imagefile, gboolean gimp_imagefile_save_thumbnail (GimpImagefile *imagefile,
GimpImage *gimage); GimpImage *gimage);
const gchar * gimp_imagefile_get_description (GimpImagefile *imagefile); const gchar * gimp_imagefile_get_description (GimpImagefile *imagefile);
#endif /* __GIMP_IMAGEFILE_H__ */ #endif /* __GIMP_IMAGEFILE_H__ */