Mercurial > geeqie
comparison src/image.c @ 1251:ecfe3732f00a
fixed glib warning
| author | nadvornik |
|---|---|
| date | Sat, 24 Jan 2009 12:15:01 +0000 |
| parents | 09da3f14490d |
| children | 08b4598c7cba |
comparison
equal
deleted
inserted
replaced
| 1250:6ccad430c4cb | 1251:ecfe3732f00a |
|---|---|
| 1003 gint read_exif_for_color_profile = (imd->color_profile_enable && imd->color_profile_use_image); | 1003 gint read_exif_for_color_profile = (imd->color_profile_enable && imd->color_profile_use_image); |
| 1004 gint read_exif_for_orientation = FALSE; | 1004 gint read_exif_for_orientation = FALSE; |
| 1005 | 1005 |
| 1006 /* read_exif and similar functions can actually notice that the file has changed and triger a notification | 1006 /* read_exif and similar functions can actually notice that the file has changed and triger a notification |
| 1007 that removes the pixbuf from cache and unref it. Therefore we must ref it here before it is taken over by the renderer. */ | 1007 that removes the pixbuf from cache and unref it. Therefore we must ref it here before it is taken over by the renderer. */ |
| 1008 g_object_ref(pixbuf); | 1008 if (pixbuf) g_object_ref(pixbuf); |
| 1009 | 1009 |
| 1010 if (imd->image_fd && imd->image_fd->user_orientation) | 1010 if (imd->image_fd && imd->image_fd->user_orientation) |
| 1011 imd->orientation = imd->image_fd->user_orientation; | 1011 imd->orientation = imd->image_fd->user_orientation; |
| 1012 else if (options->image.exif_rotate_enable) | 1012 else if (options->image.exif_rotate_enable) |
| 1013 read_exif_for_orientation = TRUE; | 1013 read_exif_for_orientation = TRUE; |
| 1043 { | 1043 { |
| 1044 pixbuf_renderer_set_pixbuf((PixbufRenderer *)imd->pr, pixbuf, zoom); | 1044 pixbuf_renderer_set_pixbuf((PixbufRenderer *)imd->pr, pixbuf, zoom); |
| 1045 pixbuf_renderer_set_orientation((PixbufRenderer *)imd->pr, imd->orientation); | 1045 pixbuf_renderer_set_orientation((PixbufRenderer *)imd->pr, imd->orientation); |
| 1046 } | 1046 } |
| 1047 | 1047 |
| 1048 g_object_unref(pixbuf); | 1048 if (pixbuf) g_object_unref(pixbuf); |
| 1049 | 1049 |
| 1050 if (imd->color_profile_enable) | 1050 if (imd->color_profile_enable) |
| 1051 { | 1051 { |
| 1052 if (!image_post_process_color(imd, 0, exif, FALSE)) | 1052 if (!image_post_process_color(imd, 0, exif, FALSE)) |
| 1053 { | 1053 { |