From 234fedd2d3f7bb618e1b640ca29ad73545c2129b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 28 May 2006 20:08:39 +0000
Subject: [PATCH] added support for CMYK JPEGs loading (patch 1476078)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/changes.txt        |   1 +
 samples/image/cmyk.jpg  | Bin 0 -> 22701 bytes
 samples/image/image.bkl |   2 +-
 samples/image/image.cpp |  29 ++++++++++++--------
 src/common/imagjpeg.cpp |  59 ++++++++++++++++++++++++++++++++++------
 5 files changed, 70 insertions(+), 21 deletions(-)
 create mode 100644 samples/image/cmyk.jpg

diff --git a/docs/changes.txt b/docs/changes.txt
index f92c2afc87..b97abcd600 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -89,6 +89,7 @@ All (GUI):
 - Added wxHyperlinkCtrl (Francesco Montorsi)
 - Added clipboard events (wxEVT_COMMAND_TEXT_COPY/CUT/PASTE)
 - Added wxRadioBox::SetItemToolTip()
+- Added support for CMYK JPEG images loading (Robert Wruck)
 - Added wxListCtrl::GetSubItemRect() and subitem hit testing (Agron Selimaj)
 - Added wxKeyEvent::GetModifiers()
 - Added wxDialog::SetEscapeId().
diff --git a/samples/image/cmyk.jpg b/samples/image/cmyk.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ff86ed1c814a10594aee7e100c13dac24939afdc
GIT binary patch
literal 22701
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
Tg>236RJ3e%@T{2tZsh*}ZOHNO

literal 0
HcmV?d00001

diff --git a/samples/image/image.bkl b/samples/image/image.bkl
index 31dd7ab998..46dabe387f 100644
--- a/samples/image/image.bkl
+++ b/samples/image/image.bkl
@@ -16,7 +16,7 @@
         <files>
             horse.png horse.jpg horse.bmp horse.gif horse.pcx horse.pnm horse_ag.pnm horse_rg.pnm
             horse.tif horse.xpm horse.cur horse.ico horse3.ani
-            smile.xbm toucan.png
+            smile.xbm toucan.png cmyk.jpg
         </files>
     </wx-data>
 
diff --git a/samples/image/image.cpp b/samples/image/image.cpp
index b8d131102a..edb79dd9da 100644
--- a/samples/image/image.cpp
+++ b/samples/image/image.cpp
@@ -83,6 +83,7 @@ public:
     wxBitmap  my_horse_rawgrey_pnm;
 
     wxBitmap  colorized_horse_jpeg;
+    wxBitmap  my_cmyk_jpeg;
 
     wxBitmap my_toucan;
     wxBitmap my_toucan_flipped_horiz;
@@ -484,12 +485,18 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
     else
     {
         my_horse_jpeg = wxBitmap( image );
+
         // Colorize by rotating green hue to red
         wxImage::HSVValue greenHSV = wxImage::RGBtoHSV(wxImage::RGBValue(0, 255, 0));
         wxImage::HSVValue redHSV = wxImage::RGBtoHSV(wxImage::RGBValue(255, 0, 0));
         image.RotateHue(redHSV.hue - greenHSV.hue);
         colorized_horse_jpeg = wxBitmap( image );
     }
+
+    if ( !image.LoadFile( dir + _T("cmyk.jpg")) )
+        wxLogError(_T("Can't load CMYK JPG image"));
+    else
+        my_cmyk_jpeg = wxBitmap(image);
 #endif // wxUSE_LIBJPEG
 
 #if wxUSE_GIF
@@ -685,6 +692,14 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     if (my_horse_jpeg.Ok())
         dc.DrawBitmap( my_horse_jpeg, 30, 380 );
 
+    dc.DrawText( _T("Green rotated to red"), 280, 365 );
+    if (colorized_horse_jpeg.Ok())
+        dc.DrawBitmap( colorized_horse_jpeg, 280, 380 );
+
+    dc.DrawText( _T("CMYK JPEG image"), 530, 365 );
+    if (my_cmyk_jpeg.Ok())
+        dc.DrawBitmap( my_cmyk_jpeg, 530, 380 );
+
     dc.DrawText( _T("GIF handler"), 30, 595 );
     if (my_horse_gif.Ok())
         dc.DrawBitmap( my_horse_gif, 30, 610 );
@@ -721,8 +736,9 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
     if (my_horse_xpm.Ok())
         dc.DrawBitmap( my_horse_xpm, 30, 1760 );
 
+    // toucans
     {
-        int x = 200, y = 300, yy = 170;;
+        int x = 750, y = 10, yy = 170;
 
         dc.DrawText(wxT("Original toucan"), x+50, y);
         dc.DrawBitmap(my_toucan, x, y+15);
@@ -871,15 +887,6 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
             dc.DrawBitmap( my_horse_ani[i], 230 + i * 2 * my_horse_ani[i].GetWidth() , 2420, true );
         }
     }
-
-#if wxUSE_LIBJPEG
-    if (colorized_horse_jpeg.Ok())
-    {
-        dc.DrawText( _T("Colorize image by rotating green hue to red"), 30, 2490 );
-        dc.DrawBitmap( colorized_horse_jpeg, 30, 2520 );
-    }
-#endif // wxUSE_LIBJPEG
-
 }
 
 void MyCanvas::CreateAntiAliasedBitmap()
@@ -959,7 +966,7 @@ END_EVENT_TABLE()
 
 MyFrame::MyFrame()
        : wxFrame( (wxFrame *)NULL, wxID_ANY, _T("wxImage sample"),
-                  wxPoint(20,20), wxSize(470,360) )
+                  wxPoint(20, 20), wxSize(950, 700) )
 {
   wxMenuBar *menu_bar = new wxMenuBar();
 
diff --git a/src/common/imagjpeg.cpp b/src/common/imagjpeg.cpp
index 829dc4c796..c10f764da4 100644
--- a/src/common/imagjpeg.cpp
+++ b/src/common/imagjpeg.cpp
@@ -202,6 +202,21 @@ void wx_jpeg_io_src( j_decompress_ptr cinfo, wxInputStream& infile )
     src->pub.term_source = wx_term_source;
 }
 
+static inline void wx_cmyk_to_rgb(unsigned char* rgb, const unsigned char* cmyk)
+{
+    register int k = 255 - cmyk[3];
+    register int k2 = cmyk[3];
+    register int c;
+
+    c = k + k2 * (255 - cmyk[0]) / 255;
+    rgb[0] = (c > 255) ? 0 : (255 - c);
+
+    c = k + k2 * (255 - cmyk[1]) / 255;
+    rgb[1] = (c > 255) ? 0 : (255 - c);
+
+    c = k + k2 * (255 - cmyk[2]) / 255;
+    rgb[2] = (c > 255) ? 0 : (255 - c);
+}
 
 // temporarily disable the warning C4611 (interaction between '_setjmp' and
 // C++ object destruction is non-portable) - I don't see any dtors here
@@ -213,9 +228,7 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
 {
     struct jpeg_decompress_struct cinfo;
     struct wx_error_mgr jerr;
-    JSAMPARRAY tempbuf;
     unsigned char *ptr;
-    unsigned stride;
 
     image->Destroy();
     cinfo.err = jpeg_std_error( &jerr.pub );
@@ -240,7 +253,19 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
     jpeg_create_decompress( &cinfo );
     wx_jpeg_io_src( &cinfo, stream );
     jpeg_read_header( &cinfo, TRUE );
-    cinfo.out_color_space = JCS_RGB;
+
+    int bytesPerPixel;
+    if ((cinfo.out_color_space == JCS_CMYK) || (cinfo.out_color_space == JCS_YCCK))
+    {
+        cinfo.out_color_space = JCS_CMYK;
+        bytesPerPixel = 4;
+    }
+    else // all the rest is treated as RGB
+    {
+        cinfo.out_color_space = JCS_RGB;
+        bytesPerPixel = 3;
+    }
+
     jpeg_start_decompress( &cinfo );
 
     image->Create( cinfo.image_width, cinfo.image_height );
@@ -251,15 +276,31 @@ bool wxJPEGHandler::LoadFile( wxImage *image, wxInputStream& stream, bool verbos
     }
     image->SetMask( false );
     ptr = image->GetData();
-    stride = cinfo.output_width * 3;
-    tempbuf = (*cinfo.mem->alloc_sarray)
-        ((j_common_ptr) &cinfo, JPOOL_IMAGE, stride, 1 );
 
-    while ( cinfo.output_scanline < cinfo.output_height ) {
+    unsigned stride = cinfo.output_width * bytesPerPixel;
+    JSAMPARRAY tempbuf = (*cinfo.mem->alloc_sarray)
+                            ((j_common_ptr) &cinfo, JPOOL_IMAGE, stride, 1 );
+
+    while ( cinfo.output_scanline < cinfo.output_height )
+    {
         jpeg_read_scanlines( &cinfo, tempbuf, 1 );
-        memcpy( ptr, tempbuf[0], stride );
-        ptr += stride;
+        if (cinfo.out_color_space == JCS_RGB)
+        {
+            memcpy( ptr, tempbuf[0], stride );
+            ptr += stride;
+        }
+        else // CMYK
+        {
+            const unsigned char* inptr = (const unsigned char*) tempbuf[0];
+            for (size_t i = 0; i < cinfo.output_width; i++)
+            {
+                wx_cmyk_to_rgb(ptr, inptr);
+                ptr += 3;
+                inptr += 4;
+            }
+        }
     }
+
     jpeg_finish_decompress( &cinfo );
     jpeg_destroy_decompress( &cinfo );
     return true;
-- 
2.50.0