From: cristy Date: Sun, 13 May 2012 00:39:00 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~5606 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de626a2fb5f58f0f3d9676a3655c12393ed41957;p=imagemagick --- diff --git a/PerlMagick/t/write.t b/PerlMagick/t/write.t index 072aa3485..0c6a73f80 100644 --- a/PerlMagick/t/write.t +++ b/PerlMagick/t/write.t @@ -137,7 +137,7 @@ print("Portable pixmap format (color), ASCII format ...\n"); testReadWrite( 'PPM:input_p3.ppm', 'PPM:output_p3.ppm', q/compression=>'None'/, - '34f7d6043e6c578a0959b95f7b707720b5b415360cf5b8710097b4cdfbd0ade5'); + '6a4a257921582768b774aeeac549b7c0c0b51f665395eddf921cce53a0ad2a33'); print("Portable graymap format (gray scale), binary format ...\n"); ++$test; diff --git a/coders/miff.c b/coders/miff.c index bee15cb25..bb29292bd 100644 --- a/coders/miff.c +++ b/coders/miff.c @@ -431,6 +431,9 @@ static Image *ReadMIFFImage(const ImageInfo *image_info, int c; + LinkedListInfo + *profiles; + #if defined(MAGICKCORE_LZMA_DELEGATE) lzma_stream initialize_lzma = LZMA_STREAM_INIT, @@ -440,9 +443,6 @@ static Image *ReadMIFFImage(const ImageInfo *image_info, allocator; #endif - LinkedListInfo - *profiles; - MagickBooleanType status; diff --git a/coders/pnm.c b/coders/pnm.c index 609d99ef8..d4e924274 100644 --- a/coders/pnm.c +++ b/coders/pnm.c @@ -531,7 +531,6 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) /* Convert PNM image to pixel packets. */ - SetImageColorspace(image,GRAYColorspace,exception); scale=(Quantum *) NULL; if (max_value != (1U*QuantumRange)) {