|
 |
75b0716 |
diff -up eog-2.19.4/src/eog-image.c.svgz eog-2.19.4/src/eog-image.c
|
|
|
75b0716 |
--- eog-2.19.4/src/eog-image.c.svgz 2007-07-09 16:20:10.000000000 -0400
|
|
|
75b0716 |
+++ eog-2.19.4/src/eog-image.c 2007-07-10 10:41:07.000000000 -0400
|
|
|
75b0716 |
@@ -480,7 +480,7 @@ eog_image_apply_transformations (EogImag
|
|
|
c241913 |
}
|
|
|
c241913 |
|
|
|
c241913 |
static GnomeVFSFileSize
|
|
|
c241913 |
-eog_image_determine_file_bytes (EogImage *img, GError **error)
|
|
|
c241913 |
+eog_image_determine_file_bytes (EogImage *img, gchar **mime_type, GError **error)
|
|
|
c241913 |
{
|
|
|
c241913 |
GnomeVFSFileInfo *info;
|
|
|
c241913 |
GnomeVFSFileSize bytes;
|
|
|
75b0716 |
@@ -491,11 +491,14 @@ eog_image_determine_file_bytes (EogImage
|
|
|
c241913 |
result = gnome_vfs_get_file_info_uri (img->priv->uri,
|
|
|
c241913 |
info,
|
|
|
c241913 |
GNOME_VFS_FILE_INFO_DEFAULT |
|
|
|
c241913 |
+ GNOME_VFS_FILE_INFO_GET_MIME_TYPE |
|
|
|
c241913 |
GNOME_VFS_FILE_INFO_FOLLOW_LINKS);
|
|
|
c241913 |
|
|
|
c241913 |
if ((result != GNOME_VFS_OK) ||
|
|
|
c241913 |
(info->valid_fields & GNOME_VFS_FILE_INFO_FIELDS_SIZE) == 0) {
|
|
|
c241913 |
bytes = 0;
|
|
|
c241913 |
+ if (mime_type)
|
|
|
c241913 |
+ *mime_type = NULL;
|
|
|
c241913 |
|
|
|
c241913 |
g_set_error (error,
|
|
|
c241913 |
EOG_IMAGE_ERROR,
|
|
|
75b0716 |
@@ -503,6 +506,8 @@ eog_image_determine_file_bytes (EogImage
|
|
|
c241913 |
gnome_vfs_result_to_string (result));
|
|
|
c241913 |
} else {
|
|
|
c241913 |
bytes = info->size;
|
|
|
c241913 |
+ if (mime_type)
|
|
|
c241913 |
+ *mime_type = g_strdup (info->mime_type);
|
|
|
c241913 |
}
|
|
|
c241913 |
|
|
|
c241913 |
gnome_vfs_file_info_unref (info);
|
|
|
75b0716 |
@@ -834,6 +839,7 @@ eog_image_real_load (EogImage *img,
|
|
|
c241913 |
GnomeVFSResult result;
|
|
|
c241913 |
EogMetadataReader *md_reader = NULL;
|
|
|
c241913 |
GdkPixbufFormat *format;
|
|
|
c241913 |
+ gchar *mime_type;
|
|
|
c241913 |
GdkPixbufLoader *loader = NULL;
|
|
|
c241913 |
guchar *buffer;
|
|
|
c241913 |
gboolean failed = FALSE;
|
|
|
75b0716 |
@@ -852,9 +858,10 @@ eog_image_real_load (EogImage *img,
|
|
|
c241913 |
priv->file_type = NULL;
|
|
|
c241913 |
}
|
|
|
c241913 |
|
|
|
c241913 |
- priv->bytes = eog_image_determine_file_bytes (img, error);
|
|
|
c241913 |
+ priv->bytes = eog_image_determine_file_bytes (img, &mime_type, error);
|
|
|
c241913 |
|
|
|
75b0716 |
if (priv->bytes == 0) {
|
|
|
75b0716 |
+ g_free (mime_type);
|
|
|
c241913 |
return FALSE;
|
|
|
c241913 |
}
|
|
|
c241913 |
|
|
|
75b0716 |
@@ -877,6 +884,7 @@ eog_image_real_load (EogImage *img,
|
|
|
c241913 |
result = gnome_vfs_open_uri (&handle, priv->uri, GNOME_VFS_OPEN_READ);
|
|
|
c241913 |
|
|
|
c241913 |
if (result != GNOME_VFS_OK) {
|
|
|
c241913 |
+ g_free (mime_type);
|
|
|
c241913 |
g_set_error (error,
|
|
|
c241913 |
EOG_IMAGE_ERROR,
|
|
|
c241913 |
EOG_IMAGE_ERROR_VFS,
|
|
|
75b0716 |
@@ -886,9 +894,12 @@ eog_image_real_load (EogImage *img,
|
|
|
c241913 |
}
|
|
|
c241913 |
|
|
|
c241913 |
buffer = g_new0 (guchar, EOG_IMAGE_READ_BUFFER_SIZE);
|
|
|
c241913 |
+ loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, NULL);
|
|
|
c241913 |
+ g_free (mime_type);
|
|
|
c241913 |
+ if (loader == NULL)
|
|
|
c241913 |
+ loader = gdk_pixbuf_loader_new ();
|
|
|
c241913 |
|
|
|
c241913 |
if (read_image_data || read_only_dimension) {
|
|
|
c241913 |
- loader = gdk_pixbuf_loader_new ();
|
|
|
c241913 |
|
|
|
c241913 |
g_signal_connect_object (G_OBJECT (loader),
|
|
|
c241913 |
"size-prepared",
|