Mercurial > geeqie.yaz
diff src/image.c @ 1581:cef502852c4f
resolved conflict
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Fri, 01 May 2009 15:48:11 +0900 |
| parents | c776b1310ca6 24ef7b610ed6 |
| children | c1e22cba4003 |
line wrap: on
line diff
--- a/src/image.c Tue Apr 28 21:40:00 2009 +0000 +++ b/src/image.c Fri May 01 15:48:11 2009 +0900 @@ -363,7 +363,7 @@ } -void image_alter_orientation(ImageWindow *imd, AlterType type) +void image_alter(ImageWindow *imd, AlterType type) { static const gint rotate_90[] = {1, 6, 7, 8, 5, 2, 3, 4, 1}; static const gint rotate_90_cc[] = {1, 8, 5, 6, 7, 4, 1, 2, 3}; @@ -393,8 +393,12 @@ case ALTER_FLIP: imd->orientation = flip[imd->orientation]; break; + case ALTER_DESATURATE: + imd->desaturate = !imd->desaturate; + break; case ALTER_NONE: imd->orientation = imd->image_fd->exif_orientation ? imd->image_fd->exif_orientation : 1; + imd->desaturate = FALSE; break; default: return; @@ -433,22 +437,12 @@ } pixbuf_renderer_set_orientation((PixbufRenderer *)imd->pr, imd->orientation); -} - -void image_set_desaturate(ImageWindow *imd, gboolean desaturate) -{ - imd->desaturate = desaturate; if (imd->cm || imd->desaturate) pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, image_post_process_tile_color_cb, (gpointer) imd, (imd->cm != NULL) ); else pixbuf_renderer_set_post_process_func((PixbufRenderer *)imd->pr, NULL, NULL, TRUE); - pixbuf_renderer_set_orientation((PixbufRenderer *)imd->pr, imd->orientation); } -gboolean image_get_desaturate(ImageWindow *imd) -{ - return imd->desaturate; -} /* *-------------------------------------------------------------------