(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Wed, 30 Oct 2013 20:25:56 +0000 (20:25 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Wed, 30 Oct 2013 20:25:56 +0000 (20:25 +0000)
MagickCore/colorspace.c
coders/dpx.c
coders/pdf.c

index 32f06dfc5781f81b260f63843c38e759360861cd..d529d0e53d8748ea5fbd06fd13c9a46e3d46019a 100644 (file)
@@ -529,7 +529,12 @@ static MagickBooleanType sRGBTransformImage(Image *image,
               break;
             }
             default:
+            {
+              X=QuantumScale*red;
+              Y=QuantumScale*green;
+              Z=QuantumScale*blue;
               break;
+            }
           }
           SetPixelRed(image,ClampToQuantum(QuantumRange*X),q);
           SetPixelGreen(image,ClampToQuantum(QuantumRange*Y),q);
@@ -1862,7 +1867,12 @@ static MagickBooleanType TransformsRGBImage(Image *image,
               break;
             }
             default:
+            {
+              red=QuantumRange*X;
+              green=QuantumRange*Y;
+              blue=QuantumRange*Z;
               break;
+            }
           }
           SetPixelRed(image,ClampToQuantum(red),q);
           SetPixelGreen(image,ClampToQuantum(green),q);
index 1da72358814833500f9b630096f2cfd666955930..8229773d07cf7ee03aa9b080e177e2535217afe8 100644 (file)
@@ -774,7 +774,7 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception)
   */
   dpx.image.orientation=ReadBlobShort(image);
   offset+=2;
-  if (dpx.image.orientation != ~0U)
+  if (dpx.image.orientation != ~0)
     (void) FormatImageProperty(image,"dpx:image.orientation","%d",
       dpx.image.orientation);
   switch (dpx.image.orientation)
index 7e509813de7f36158284d03a9843074eaa60fdbf..e777315c65a85e59e5a261aa115ec21678c575d1 100644 (file)
@@ -1100,7 +1100,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image,
     version);
   (void) WriteBlobString(image,buffer);
   if (LocaleCompare(image_info->magick,"PDFA") == 0)
-    (void) WriteBlobString(image,"%âãÏÓ\n");
+    (void) WriteBlobString(image,"%%âãÏÓ\n");
   /*
     Write Catalog object.
   */