Mercurial > hg > forks > geeqie
changeset 2220:fea4dd5c4359
Merge branch 'ke' into ke-lua
* ke:
exif autorotate for proofs
| author | Klaus Ethgen <Klaus@Ethgen.de> |
|---|---|
| date | Sun, 27 May 2012 18:41:56 +0100 |
| parents | a2c6d0d0d31c (current diff) 6e91033c7fb3 (diff) |
| children | 59b559f747a7 |
| files | |
| diffstat | 4 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/options.c Fri Jan 06 02:25:47 2012 +0100 +++ b/src/options.c Sun May 27 18:41:56 2012 +0100 @@ -66,6 +66,7 @@ options->image.dither_quality = GDK_RGB_DITHER_NORMAL; options->image.enable_read_ahead = TRUE; options->image.exif_rotate_enable = TRUE; + options->image.exif_proof_rotate_enable = TRUE; options->image.fit_window_to_image = FALSE; options->image.limit_autofit_size = FALSE; options->image.limit_window_size = TRUE;
--- a/src/options.h Fri Jan 06 02:25:47 2012 +0100 +++ b/src/options.h Sun May 27 18:41:56 2012 +0100 @@ -50,6 +50,7 @@ /* image */ struct { gboolean exif_rotate_enable; + gboolean exif_proof_rotate_enable; guint scroll_reset_method; gboolean fit_window_to_image; gboolean limit_window_size;
--- a/src/preferences.c Fri Jan 06 02:25:47 2012 +0100 +++ b/src/preferences.c Sun May 27 18:41:56 2012 +0100 @@ -285,6 +285,7 @@ options->update_on_time_change = c_options->update_on_time_change; options->image.exif_rotate_enable = c_options->image.exif_rotate_enable; + options->image.exif_proof_rotate_enable = c_options->image.exif_proof_rotate_enable; options->duplicates_similarity_threshold = c_options->duplicates_similarity_threshold; @@ -1420,6 +1421,9 @@ pref_checkbox_new_int(group, _("Auto rotate image using Exif information"), options->image.exif_rotate_enable, &c_options->image.exif_rotate_enable); + + pref_checkbox_new_int(group, _("Auto rotate proofs using Exif information"), + options->image.exif_proof_rotate_enable, &c_options->image.exif_proof_rotate_enable); } /* windows tab */
--- a/src/print.c Fri Jan 06 02:25:47 2012 +0100 +++ b/src/print.c Sun May 27 18:41:56 2012 +0100 @@ -2206,6 +2206,10 @@ pixbuf = image_loader_get_pixbuf(il); + if (options->image.exif_proof_rotate_enable == TRUE) { + pixbuf = pixbuf_apply_orientation(pixbuf, il->fd->exif_orientation); + } + w = gdk_pixbuf_get_width(pixbuf); h = gdk_pixbuf_get_height(pixbuf);