commit c81fd0f989a5001fbe0b559be269651534516888
Author: Matthieu Gautier <matthieu.gautier@mgautier.fr>
Date:   Tue Oct 28 14:59:39 2014 +0100

    Fix loading of CMYK jpeg image without exif metadata.
    
    Jpeg image can be store in "inverted CMYK" format.
    Adobe applications set the APP14 marker to let loader load image correctly.
    
    If there is no exif metadata in a jpeg, the marker is not present and gdk-pixbuf
    may convert incorectly from CMYK to RGB.
    
    Gimp try to load CMYK color profile to use it. If fail, it always use the Adobe "format".
    This patch make gdk-pixbuf always use Adobe "format" (but do not use color profile neither).
    
    https://bugzilla.gnome.org/show_bug.cgi?id=618096

diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c
index 55a782b..1b3b463 100644
--- a/gdk-pixbuf/io-jpeg.c
+++ b/gdk-pixbuf/io-jpeg.c
@@ -190,16 +190,9 @@ convert_cmyk_to_rgb (struct jpeg_decompress_struct *cinfo,
 			m = p[1];
 			y = p[2];
 			k = p[3];
-			if (cinfo->saw_Adobe_marker) {
-				p[0] = k*c / 255;
-				p[1] = k*m / 255;
-				p[2] = k*y / 255;
-			}
-			else {
-				p[0] = (255 - k)*(255 - c) / 255;
-				p[1] = (255 - k)*(255 - m) / 255;
-				p[2] = (255 - k)*(255 - y) / 255;
-			}
+			p[0] = k*c / 255;
+			p[1] = k*m / 255;
+			p[2] = k*y / 255;
 			p[3] = 255;
 			p += 4;
 		}
