From: cristy Date: Tue, 27 Dec 2011 03:10:42 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~6503 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d6fc9c70199232d90da3ceaf6933100fe2c25d4;p=imagemagick --- diff --git a/coders/png.c b/coders/png.c index b17fc4089..337470e1f 100644 --- a/coders/png.c +++ b/coders/png.c @@ -2794,17 +2794,17 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, (void) FormatLocaleString(msg,MaxTextExtent, "%d, %d",(int) ping_width, (int) ping_height); - (void) SetImageProperty(image,"PNG:IHDR.width,height ",msg,exception); + (void) SetImageProperty(image,"png:IHDR.width,height ",msg,exception); (void) FormatLocaleString(msg,MaxTextExtent,"%d",(int) ping_bit_depth); - (void) SetImageProperty(image,"PNG:IHDR.bit_depth ",msg,exception); + (void) SetImageProperty(image,"png:IHDR.bit_depth ",msg,exception); (void) FormatLocaleString(msg,MaxTextExtent,"%d",(int) ping_color_type); - (void) SetImageProperty(image,"PNG:IHDR.color_type ",msg,exception); + (void) SetImageProperty(image,"png:IHDR.color_type ",msg,exception); (void) FormatLocaleString(msg,MaxTextExtent,"%d", (int) ping_interlace_method); - (void) SetImageProperty(image,"PNG:IHDR.interlace_method",msg,exception); + (void) SetImageProperty(image,"png:IHDR.interlace_method",msg,exception); } /* @@ -3530,7 +3530,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, /* libpng doesn't tell us whether they were tEXt, zTXt, or iTXt */ (void) FormatLocaleString(msg,MaxTextExtent, "%d tEXt/zTXt/iTXt chunks were found", num_text_total); - (void) SetImageProperty(image,"PNG:text ",msg, + (void) SetImageProperty(image,"png:text ",msg, exception); } @@ -3538,7 +3538,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, { (void) FormatLocaleString(msg,MaxTextExtent, "%d were found", num_raw_profiles); - (void) SetImageProperty(image,"PNG:text-encoded profiles",msg, + (void) SetImageProperty(image,"png:text-encoded profiles",msg, exception); } @@ -3546,7 +3546,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, { (void) FormatLocaleString(msg,MaxTextExtent,"%s", "chunk was found (see Chromaticity, above)"); - (void) SetImageProperty(image,"PNG:cHRM ",msg, + (void) SetImageProperty(image,"png:cHRM ",msg, exception); } @@ -3554,7 +3554,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, { (void) FormatLocaleString(msg,MaxTextExtent,"%s", "chunk was found (see Background color, above)"); - (void) SetImageProperty(image,"PNG:bKGD ",msg, + (void) SetImageProperty(image,"png:bKGD ",msg, exception); } @@ -3562,11 +3562,11 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, "chunk was found"); if (png_get_valid(ping,ping_info,PNG_INFO_iCCP)) - (void) SetImageProperty(image,"PNG:iCCP ",msg, + (void) SetImageProperty(image,"png:iCCP ",msg, exception); if (png_get_valid(ping,ping_info,PNG_INFO_tRNS)) - (void) SetImageProperty(image,"PNG:tRNS ",msg, + (void) SetImageProperty(image,"png:tRNS ",msg, exception); #if defined(PNG_sRGB_SUPPORTED) @@ -3575,7 +3575,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, (void) FormatLocaleString(msg,MaxTextExtent, "intent=%d (See Rendering intent)", (int) intent); - (void) SetImageProperty(image,"PNG:sRGB ",msg, + (void) SetImageProperty(image,"png:sRGB ",msg, exception); } #endif @@ -3585,7 +3585,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, (void) FormatLocaleString(msg,MaxTextExtent, "gamma=%.8g (See Gamma, above)", file_gamma); - (void) SetImageProperty(image,"PNG:gAMA ",msg, + (void) SetImageProperty(image,"png:gAMA ",msg, exception); } @@ -3595,7 +3595,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, (void) FormatLocaleString(msg,MaxTextExtent, "x_res=%.10g, y_res=%.10g, units=%d", (double) x_resolution,(double) y_resolution, unit_type); - (void) SetImageProperty(image,"PNG:pHYs ",msg, + (void) SetImageProperty(image,"png:pHYs ",msg, exception); } #endif @@ -3605,7 +3605,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, { (void) FormatLocaleString(msg,MaxTextExtent,"x_off=%.20g, y_off=%.20g", (double) image->page.x,(double) image->page.y); - (void) SetImageProperty(image,"PNG:oFFs ",msg, + (void) SetImageProperty(image,"png:oFFs ",msg, exception); } #endif @@ -3616,7 +3616,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, (void) FormatLocaleString(msg,MaxTextExtent, "width=%.20g, height=%.20g", (double) image->page.width,(double) image->page.height); - (void) SetImageProperty(image,"PNG:vpAg ",msg, + (void) SetImageProperty(image,"png:vpAg ",msg, exception); } } @@ -7984,6 +7984,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, tried_333 = MagickFalse; tried_444 = MagickFalse; +if (0) for (j=0; j<6; j++) { /* BUILD_PALETTE @@ -9795,7 +9796,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, Note that using the -quality option, not all combinations of PNG filter type, zlib compression level, and zlib compression strategy are possible. This will be addressed soon in a - release that accomodates "-define PNG:compression-strategy", etc. + release that accomodates "-define png:compression-strategy", etc. */ @@ -10023,7 +10024,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, if (mng_info->write_mng) png_set_sig_bytes(ping,8); - /* Bail out if cannot meet defined PNG:bit-depth or PNG:color-type */ + /* Bail out if cannot meet defined png:bit-depth or png:color-type */ if (mng_info->write_png_colortype != 0) { @@ -10060,7 +10061,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, if (mng_info->write_png_depth) { (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Defined PNG:bit-depth=%u, Computed depth=%u", + " Defined png:bit-depth=%u, Computed depth=%u", mng_info->write_png_depth, ping_bit_depth); } @@ -10068,14 +10069,14 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, if (mng_info->write_png_colortype) { (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Defined PNG:color-type=%u, Computed color type=%u", + " Defined png:color-type=%u, Computed color type=%u", mng_info->write_png_colortype-1, ping_color_type); } } png_warning(ping, - "Cannot write image with defined PNG:bit-depth or PNG:color-type."); + "Cannot write image with defined png:bit-depth or png:color-type."); } if (image_matte != MagickFalse && image->matte == MagickFalse) @@ -10631,7 +10632,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, if (mng_info->write_png_depth) { (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Defined PNG:bit-depth: %d",mng_info->write_png_depth); + " Defined png:bit-depth: %d",mng_info->write_png_depth); } (void) LogMagickEvent(CoderEvent,GetMagickModule(), @@ -10640,7 +10641,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, if (mng_info->write_png_colortype) { (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Defined PNG:color-type: %d",mng_info->write_png_colortype-1); + " Defined png:color-type: %d",mng_info->write_png_colortype-1); } (void) LogMagickEvent(CoderEvent,GetMagickModule(), @@ -10833,7 +10834,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, % % While the datastream written is always in PNG format and normally would % be given the "png" file extension, this method also writes the following -% pseudo-formats which are subsets of PNG: +% pseudo-formats which are subsets of png: % % o PNG8: An 8-bit indexed PNG datastream is written. If the image has % a depth greater than 8, the depth is reduced. If transparency @@ -10936,7 +10937,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, % o Opaque matte channel is removed when writing an indexed PNG. % o Grayscale images are reduced to 1, 2, or 4 bit depth if % this can be done without loss and a larger bit depth N was not -% requested via the "-define PNG:bit-depth=N" option. +% requested via the "-define png:bit-depth=N" option. % o If matte channel is present but only one transparent color is % present, RGB+tRNS is written instead of RGBA % o Opaque matte channel is removed (or added, if color-type 4 or 6 @@ -11098,7 +11099,7 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info, * The default is to not exclude any known chunks except for any * listed in the "unused_chunks" array, above. * - * Chunks can be listed for exclusion via a "PNG:exclude-chunk" + * Chunks can be listed for exclusion via a "png:exclude-chunk" * define (in the image properties or in the image artifacts) * or via a mng_info member. For convenience, in addition * to or instead of a comma-separated list of chunks, the @@ -11106,8 +11107,8 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info, * * The exclude-chunk define takes priority over the mng_info. * - * A "PNG:include-chunk" define takes priority over both the - * mng_info and the "PNG:exclude-chunk" define. Like the + * A "png:include-chunk" define takes priority over both the + * mng_info and the "png:exclude-chunk" define. Like the * "exclude-chunk" string, it can define "all" or "none" as * well as a comma-separated list. Chunks that are unknown to * ImageMagick are always excluded, regardless of their "copy-safe" @@ -11544,7 +11545,7 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info, if (excluding != MagickFalse && logging != MagickFalse) { (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " Chunks to be excluded from the output PNG:"); + " Chunks to be excluded from the output png:"); if (mng_info->ping_exclude_bKGD != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " bKGD");