lazarus bugtracker

Index: packages/fcl-image/src/fpreadjpeg.pas
===================================================================
--- packages/fcl-image/src/fpreadjpeg.pas	(revision 22143)
+++ packages/fcl-image/src/fpreadjpeg.pas	(working copy)
@@ -232,6 +232,7 @@
   var
     MinColor: word;
   begin
+    // accuracy not 100%
     if C.red<C.green then MinColor:=C.red
     else MinColor:= C.green;
     if C.blue<MinColor then MinColor:= C.blue;
@@ -241,6 +242,19 @@
     Result.blue:=(C.blue-MinColor) shl 8;
     Result.alpha:=alphaOpaque;
   end;
+  function CorrectYCCK(const C: TFPColor): TFPColor;
+  var
+    MinColor: word;
+  begin
+    if C.red<C.green then MinColor:=C.red
+    else MinColor:= C.green;
+    if C.blue<MinColor then MinColor:= C.blue;
+    if MinColor+ C.alpha>$FF then MinColor:=$FF-C.alpha;
+    Result.red:=(C.red-MinColor) shl 8;
+    Result.green:=(C.green-MinColor) shl 8;
+    Result.blue:=(C.blue-MinColor) shl 8;
+    Result.alpha:=alphaOpaque;
+  end;
   procedure ReadPixels;
   var
     Continue: Boolean;
@@ -275,6 +289,15 @@
           Img.Colors[x,y]:=CorrectCMYK(Color);
         end
         else
+        if (FInfo.jpeg_color_space = JCS_YCCK) then
+        for x:=0 to FInfo.output_width-1 do begin
+          Color.Red:=SampRow^[x*4+0];
+          Color.Green:=SampRow^[x*4+1];
+          Color.Blue:=SampRow^[x*4+2];
+          Color.alpha:=SampRow^[x*4+3];
+          Img.Colors[x,y]:=CorrectYCCK(Color);
+        end
+        else
         if fgrayscale then begin
          for x:=0 to FInfo.output_width-1 do begin
            c:= SampRow^[x] shl 8;