% November 1997 %
% %
% %
-% Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization %
% dedicated to making software imaging solutions freely available. %
% %
% You may not use this file except in compliance with the License. You may %
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/artifact.h"
-#include "magick/attribute.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/colorspace-private.h"
-#include "magick/constitute.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/histogram.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/layer.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/quantum-private.h"
-#include "magick/profile.h"
-#include "magick/property.h"
-#include "magick/resource_.h"
-#include "magick/semaphore.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/channel.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/colorspace-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/histogram.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/layer.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/MagickCore.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
#if defined(MAGICKCORE_PNG_DELEGATE)
/* Suppress libpng pedantic warnings that were added in
#endif
/* Macros for left-bit-replication to ensure that pixels
- * and PixelPackets all have the same image->depth, and for use
+ * and PixelInfos all have the same image->depth, and for use
* in PNG8 quantization.
*/
(pixelpacket).blue=(ScaleQuantumToChar((pixelpacket).blue) < 0x10 ? \
0 : QuantumRange);
-#define LBR01PacketOpacity(pixelpacket) \
- (pixelpacket).opacity=(ScaleQuantumToChar((pixelpacket).opacity) < 0x10 ? \
+#define LBR01PacketAlpha(pixelpacket) \
+ (pixelpacket).alpha=(ScaleQuantumToChar((pixelpacket).alpha) < 0x10 ? \
0 : QuantumRange);
#define LBR01PacketRGB(pixelpacket) \
#define LBR01PacketRGBO(pixelpacket) \
{ \
LBR01PacketRGB((pixelpacket)); \
- LBR01PacketOpacity((pixelpacket)); \
+ LBR01PacketAlpha((pixelpacket)); \
}
#define LBR01PixelRed(pixel) \
- (ScaleQuantumToChar(GetPixelRed((pixel))) < 0x10 ? \
- 0 : QuantumRange);
+ (SetPixelRed(image, \
+ ScaleQuantumToChar(GetPixelRed(image,(pixel))) < 0x10 ? \
+ 0 : QuantumRange,(pixel)));
#define LBR01PixelGreen(pixel) \
- (ScaleQuantumToChar(GetPixelGreen((pixel))) < 0x10 ? \
- 0 : QuantumRange);
+ (SetPixelGreen(image, \
+ ScaleQuantumToChar(GetPixelGreen(image,(pixel))) < 0x10 ? \
+ 0 : QuantumRange,(pixel)));
#define LBR01PixelBlue(pixel) \
- (ScaleQuantumToChar(GetPixelBlue((pixel))) < 0x10 ? \
- 0 : QuantumRange);
+ (SetPixelBlue(image, \
+ ScaleQuantumToChar(GetPixelBlue(image,(pixel))) < 0x10 ? \
+ 0 : QuantumRange,(pixel)));
-#define LBR01PixelOpacity(pixel) \
- (ScaleQuantumToChar(GetPixelOpacity((pixel))) < 0x10 ? \
- 0 : QuantumRange);
+#define LBR01PixelAlpha(pixel) \
+ (SetPixelAlpha(image, \
+ ScaleQuantumToChar(GetPixelAlpha(image,(pixel))) < 0x10 ? \
+ 0 : QuantumRange,(pixel)));
#define LBR01PixelRGB(pixel) \
{ \
LBR01PixelBlue((pixel)); \
}
-#define LBR01PixelRGBO(pixel) \
+#define LBR01PixelRGBA(pixel) \
{ \
LBR01PixelRGB((pixel)); \
- LBR01PixelOpacity((pixel)); \
+ LBR01PixelAlpha((pixel)); \
}
/* LBR02: Replicate top 2 bits */
(pixelpacket).blue=ScaleCharToQuantum( \
(lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6))); \
}
-#define LBR02PacketOpacity(pixelpacket) \
+#define LBR02PacketAlpha(pixelpacket) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).opacity) & 0xc0; \
- (pixelpacket).opacity=ScaleCharToQuantum( \
+ unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).alpha) & 0xc0; \
+ (pixelpacket).alpha=ScaleCharToQuantum( \
(lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6))); \
}
#define LBR02PacketRGBO(pixelpacket) \
{ \
LBR02PacketRGB((pixelpacket)); \
- LBR02PacketOpacity((pixelpacket)); \
+ LBR02PacketAlpha((pixelpacket)); \
}
#define LBR02PixelRed(pixel) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar(GetPixelRed((pixel))) \
+ unsigned char lbr_bits=ScaleQuantumToChar(GetPixelRed(image,(pixel))) \
& 0xc0; \
- SetPixelRed((pixel), ScaleCharToQuantum( \
- (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6)))); \
+ SetPixelRed(image, ScaleCharToQuantum( \
+ (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6))), \
+ (pixel)); \
}
#define LBR02PixelGreen(pixel) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar(GetPixelGreen((pixel)))\
+ unsigned char lbr_bits=ScaleQuantumToChar(GetPixelGreen(image,(pixel)))\
& 0xc0; \
- SetPixelGreen((pixel), ScaleCharToQuantum( \
- (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6)))); \
+ SetPixelGreen(image, ScaleCharToQuantum( \
+ (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6))), \
+ (pixel)); \
}
#define LBR02PixelBlue(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelBlue((pixel))) & 0xc0; \
- SetPixelBlue((pixel), ScaleCharToQuantum( \
- (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6)))); \
+ ScaleQuantumToChar(GetPixelBlue(image,(pixel))) & 0xc0; \
+ SetPixelBlue(image, ScaleCharToQuantum( \
+ (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6))), \
+ (pixel)); \
}
-#define LBR02Opacity(pixel) \
+#define LBR02PixelAlpha(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelOpacity((pixel))) & 0xc0; \
- SetPixelOpacity((pixel), ScaleCharToQuantum( \
- (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6)))); \
+ ScaleQuantumToChar(GetPixelAlpha(image,(pixel))) & 0xc0; \
+ SetPixelAlpha(image, ScaleCharToQuantum( \
+ (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6))), \
+ (pixel) ); \
}
#define LBR02PixelRGB(pixel) \
LBR02PixelBlue((pixel)); \
}
-#define LBR02PixelRGBO(pixel) \
+#define LBR02PixelRGBA(pixel) \
{ \
LBR02PixelRGB((pixel)); \
- LBR02Opacity((pixel)); \
+ LBR02PixelAlpha((pixel)); \
}
/* LBR03: Replicate top 3 bits (only used with opaque pixels during
#define LBR03PixelRed(pixel) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar(GetPixelRed((pixel))) \
+ unsigned char lbr_bits=ScaleQuantumToChar(GetPixelRed(image,(pixel))) \
& 0xe0; \
- SetPixelRed((pixel), ScaleCharToQuantum( \
- (lbr_bits | (lbr_bits >> 3) | (lbr_bits >> 6)))); \
+ SetPixelRed(image, ScaleCharToQuantum( \
+ (lbr_bits | (lbr_bits >> 3) | (lbr_bits >> 6))), (pixel)); \
}
-#define LBR03PixelGreen(pixel) \
+#define LBR03Green(pixel) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar(GetPixelGreen((pixel)))\
+ unsigned char lbr_bits=ScaleQuantumToChar(GetPixelGreen(image,(pixel)))\
& 0xe0; \
- SetPixelGreen((pixel), ScaleCharToQuantum( \
- (lbr_bits | (lbr_bits >> 3) | (lbr_bits >> 6)))); \
+ SetPixelGreen(image, ScaleCharToQuantum( \
+ (lbr_bits | (lbr_bits >> 3) | (lbr_bits >> 6))), (pixel)); \
}
-#define LBR03PixelBlue(pixel) \
+#define LBR03Blue(pixel) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar(GetPixelBlue((pixel))) \
+ unsigned char lbr_bits=ScaleQuantumToChar(GetPixelBlue(image,(pixel))) \
& 0xe0; \
- SetPixelBlue((pixel), ScaleCharToQuantum( \
- (lbr_bits | (lbr_bits >> 3) | (lbr_bits >> 6)))); \
+ SetPixelBlue(image, ScaleCharToQuantum( \
+ (lbr_bits | (lbr_bits >> 3) | (lbr_bits >> 6))), (pixel)); \
}
-#define LBR03PixelRGB(pixel) \
+#define LBR03RGB(pixel) \
{ \
LBR03PixelRed((pixel)); \
- LBR03PixelGreen((pixel)); \
- LBR03PixelBlue((pixel)); \
+ LBR03Green((pixel)); \
+ LBR03Blue((pixel)); \
}
/* LBR04: Replicate top 4 bits */
unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).blue) & 0xf0; \
(pixelpacket).blue=ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))); \
}
-#define LBR04PacketOpacity(pixelpacket) \
+#define LBR04PacketAlpha(pixelpacket) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).opacity) & 0xf0; \
- (pixelpacket).opacity=ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))); \
+ unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).alpha) & 0xf0; \
+ (pixelpacket).alpha=ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))); \
}
#define LBR04PacketRGB(pixelpacket) \
#define LBR04PacketRGBO(pixelpacket) \
{ \
LBR04PacketRGB((pixelpacket)); \
- LBR04PacketOpacity((pixelpacket)); \
+ LBR04PacketAlpha((pixelpacket)); \
}
#define LBR04PixelRed(pixel) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar(GetPixelRed((pixel))) \
+ unsigned char lbr_bits=ScaleQuantumToChar(GetPixelRed(image,(pixel))) \
& 0xf0; \
- SetPixelRed((pixel),\
- ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4)))); \
+ SetPixelRed(image,\
+ ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))), (pixel)); \
}
#define LBR04PixelGreen(pixel) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar(GetPixelGreen((pixel)))\
+ unsigned char lbr_bits=ScaleQuantumToChar(GetPixelGreen(image,(pixel)))\
& 0xf0; \
- SetPixelGreen((pixel),\
- ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4)))); \
+ SetPixelGreen(image,\
+ ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))), (pixel)); \
}
#define LBR04PixelBlue(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelBlue((pixel))) & 0xf0; \
- SetPixelBlue((pixel),\
- ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4)))); \
+ ScaleQuantumToChar(GetPixelBlue(image,(pixel))) & 0xf0; \
+ SetPixelBlue(image,\
+ ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))), (pixel)); \
}
-#define LBR04PixelOpacity(pixel) \
+#define LBR04PixelAlpha(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelOpacity((pixel))) & 0xf0; \
- SetPixelOpacity((pixel),\
- ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4)))); \
+ ScaleQuantumToChar(GetPixelAlpha(image,(pixel))) & 0xf0; \
+ SetPixelAlpha(image,\
+ ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))), (pixel)); \
}
#define LBR04PixelRGB(pixel) \
LBR04PixelBlue((pixel)); \
}
-#define LBR04PixelRGBO(pixel) \
+#define LBR04PixelRGBA(pixel) \
{ \
LBR04PixelRGB((pixel)); \
- LBR04PixelOpacity((pixel)); \
+ LBR04PixelAlpha((pixel)); \
}
+#if MAGICKCORE_QUANTUM_DEPTH > 8
/* LBR08: Replicate top 8 bits */
#define LBR08PacketRed(pixelpacket) \
unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).blue); \
(pixelpacket).blue=ScaleCharToQuantum((lbr_bits)); \
}
-#define LBR08PacketOpacity(pixelpacket) \
+#define LBR08PacketAlpha(pixelpacket) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).opacity); \
- (pixelpacket).opacity=ScaleCharToQuantum((lbr_bits)); \
+ unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).alpha); \
+ (pixelpacket).alpha=ScaleCharToQuantum((lbr_bits)); \
}
#define LBR08PacketRGB(pixelpacket) \
#define LBR08PacketRGBO(pixelpacket) \
{ \
LBR08PacketRGB((pixelpacket)); \
- LBR08PacketOpacity((pixelpacket)); \
+ LBR08PacketAlpha((pixelpacket)); \
}
#define LBR08PixelRed(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelRed((pixel))); \
- SetPixelRed((pixel),\
- ScaleCharToQuantum((lbr_bits))); \
+ ScaleQuantumToChar(GetPixelRed(image,(pixel))); \
+ SetPixelRed(image,\
+ ScaleCharToQuantum((lbr_bits)), (pixel)); \
}
#define LBR08PixelGreen(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelGreen((pixel))); \
- SetPixelGreen((pixel),\
- ScaleCharToQuantum((lbr_bits))); \
+ ScaleQuantumToChar(GetPixelGreen(image,(pixel))); \
+ SetPixelGreen(image,\
+ ScaleCharToQuantum((lbr_bits)), (pixel)); \
}
#define LBR08PixelBlue(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelBlue((pixel))); \
- SetPixelBlue((pixel),\
- ScaleCharToQuantum((lbr_bits))); \
+ ScaleQuantumToChar(GetPixelBlue(image,(pixel))); \
+ SetPixelBlue(image,\
+ ScaleCharToQuantum((lbr_bits)), (pixel)); \
}
-#define LBR08PixelOpacity(pixel) \
+#define LBR08PixelAlpha(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelOpacity((pixel))); \
- SetPixelOpacity((pixel),\
- ScaleCharToQuantum((lbr_bits))); \
+ ScaleQuantumToChar(GetPixelAlpha(image,(pixel))); \
+ SetPixelAlpha(image,\
+ ScaleCharToQuantum((lbr_bits)), (pixel)); \
}
#define LBR08PixelRGB(pixel) \
LBR08PixelBlue((pixel)); \
}
-#define LBR08PixelRGBO(pixel) \
+#define LBR08PixelRGBA(pixel) \
{ \
LBR08PixelRGB((pixel)); \
- LBR08PixelOpacity((pixel)); \
+ LBR08PixelAlpha((pixel)); \
}
+#endif /* MAGICKCORE_QUANTUM_DEPTH > 8 */
+#if MAGICKCORE_QUANTUM_DEPTH > 16
/* LBR16: Replicate top 16 bits */
#define LBR16PacketRed(pixelpacket) \
unsigned short lbr_bits=ScaleQuantumToShort((pixelpacket).blue); \
(pixelpacket).blue=ScaleShortToQuantum((lbr_bits)); \
}
-#define LBR16PacketOpacity(pixelpacket) \
+#define LBR16PacketAlpha(pixelpacket) \
{ \
- unsigned short lbr_bits=ScaleQuantumToShort((pixelpacket).opacity); \
- (pixelpacket).opacity=ScaleShortToQuantum((lbr_bits)); \
+ unsigned short lbr_bits=ScaleQuantumToShort((pixelpacket).alpha); \
+ (pixelpacket).alpha=ScaleShortToQuantum((lbr_bits)); \
}
#define LBR16PacketRGB(pixelpacket) \
#define LBR16PacketRGBO(pixelpacket) \
{ \
LBR16PacketRGB((pixelpacket)); \
- LBR16PacketOpacity((pixelpacket)); \
+ LBR16PacketAlpha((pixelpacket)); \
}
#define LBR16PixelRed(pixel) \
{ \
unsigned short lbr_bits= \
- ScaleQuantumToShort(GetPixelRed((pixel))); \
- SetPixelRed((pixel),\
- ScaleShortToQuantum((lbr_bits))); \
+ ScaleQuantumToShort(GetPixelRed(image,(pixel))); \
+ SetPixelRed(image,\
+ ScaleShortToQuantum((lbr_bits)),(pixel)); \
}
#define LBR16PixelGreen(pixel) \
{ \
unsigned short lbr_bits= \
- ScaleQuantumToShort(GetPixelGreen((pixel))); \
- SetPixelGreen((pixel),\
- ScaleShortToQuantum((lbr_bits))); \
+ ScaleQuantumToShort(GetPixelGreen(image,(pixel))); \
+ SetPixelGreen(image,\
+ ScaleShortToQuantum((lbr_bits)),(pixel)); \
}
#define LBR16PixelBlue(pixel) \
{ \
unsigned short lbr_bits= \
- ScaleQuantumToShort(GetPixelBlue((pixel))); \
- SetPixelBlue((pixel),\
- ScaleShortToQuantum((lbr_bits))); \
+ ScaleQuantumToShort(GetPixelBlue(image,(pixel))); \
+ SetPixelBlue(image,\
+ ScaleShortToQuantum((lbr_bits)),(pixel)); \
}
-#define LBR16PixelOpacity(pixel) \
+#define LBR16PixelAlpha(pixel) \
{ \
unsigned short lbr_bits= \
- ScaleQuantumToShort(GetPixelOpacity((pixel))); \
- SetPixelOpacity((pixel),\
- ScaleShortToQuantum((lbr_bits))); \
+ ScaleQuantumToShort(GetPixelAlpha(image,(pixel))); \
+ SetPixelAlpha(image,\
+ ScaleShortToQuantum((lbr_bits)),(pixel)); \
}
#define LBR16PixelRGB(pixel) \
LBR16PixelBlue((pixel)); \
}
-#define LBR16PixelRGBO(pixel) \
+#define LBR16PixelRGBA(pixel) \
{ \
LBR16PixelRGB((pixel)); \
- LBR16PixelOpacity((pixel)); \
+ LBR16PixelAlpha((pixel)); \
}
+#endif /* MAGICKCORE_QUANTUM_DEPTH > 16 */
/*
Establish thread safety.
#define PNG_SETJMP_NOT_THREAD_SAFE
#endif
-#if defined(PNG_SETJMP_NOT_THREAD_SAFE)
+#ifdef PNG_SETJMP_NOT_THREAD_SAFE
static SemaphoreInfo
*ping_semaphore = (SemaphoreInfo *) NULL;
#endif
write_png_compression_filter,
write_png8,
write_png24,
- write_png32;
+ write_png32,
+ write_png48,
+ write_png64;
#ifdef MNG_BASI_SUPPORTED
size_t
magn_methx,
magn_methy;
- PixelPacket
+ PixelInfo
mng_global_bkgd;
/* Added at version 6.6.6-7 */
Forward declarations.
*/
static MagickBooleanType
- WritePNGImage(const ImageInfo *,Image *);
+ WritePNGImage(const ImageInfo *,Image *,ExceptionInfo *);
static MagickBooleanType
- WriteMNGImage(const ImageInfo *,Image *);
+ WriteMNGImage(const ImageInfo *,Image *,ExceptionInfo *);
#if defined(JNG_SUPPORTED)
static MagickBooleanType
- WriteJNGImage(const ImageInfo *,Image *);
+ WriteJNGImage(const ImageInfo *,Image *,ExceptionInfo *);
#endif
#if PNG_LIBPNG_VER > 10011
#if (MAGICKCORE_QUANTUM_DEPTH >= 16)
static MagickBooleanType
-LosslessReduceDepthOK(Image *image)
+LosslessReduceDepthOK(Image *image,ExceptionInfo *exception)
{
/* Reduce bit depth if it can be reduced losslessly from 16+ to 8.
*
if (image->depth >= 16)
{
- const PixelPacket
+ const Quantum
*p;
ok_to_reduce=
for (y=0; y < (ssize_t) image->rows; y++)
{
- p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
+ p=GetVirtualPixels(image,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
{
ok_to_reduce = MagickFalse;
break;
for (x=(ssize_t) image->columns-1; x >= 0; x--)
{
ok_to_reduce=
- QuantumToCharToQuantumEqQuantum(GetPixelRed(p)) &&
- QuantumToCharToQuantumEqQuantum(GetPixelGreen(p)) &&
- QuantumToCharToQuantumEqQuantum(GetPixelBlue(p)) ?
+ QuantumToCharToQuantumEqQuantum(GetPixelRed(image,p)) &&
+ QuantumToCharToQuantumEqQuantum(GetPixelGreen(image,p)) &&
+ QuantumToCharToQuantumEqQuantum(GetPixelBlue(image,p)) ?
MagickTrue : MagickFalse;
if (ok_to_reduce == MagickFalse)
break;
- p++;
+ p+=GetPixelChannels(image);
}
if (x >= 0)
break;
}
#endif /* MAGICKCORE_QUANTUM_DEPTH >= 16 */
+static const char* PngColorTypeToString(const unsigned int color_type)
+{
+ const char
+ *result = "Unknown";
+
+ switch (color_type)
+ {
+ case PNG_COLOR_TYPE_GRAY:
+ result = "Gray";
+ break;
+ case PNG_COLOR_TYPE_GRAY_ALPHA:
+ result = "Gray+Alpha";
+ break;
+ case PNG_COLOR_TYPE_PALETTE:
+ result = "Palette";
+ break;
+ case PNG_COLOR_TYPE_RGB:
+ result = "RGB";
+ break;
+ case PNG_COLOR_TYPE_RGB_ALPHA:
+ result = "RGB+Alpha";
+ break;
+ }
+
+ return result;
+}
+
static int
Magick_RenderingIntent_to_PNG_RenderingIntent(const RenderingIntent intent)
{
}
}
-static inline ssize_t MagickMax(const ssize_t x,const ssize_t y)
+static const char *
+Magick_RenderingIntentString_from_PNG_RenderingIntent(const int ping_intent)
{
- if (x > y)
- return(x);
+ switch (ping_intent)
+ {
+ case 0:
+ return "Perceptual Intent";
- return(y);
+ case 1:
+ return "Relative Intent";
+
+ case 2:
+ return "Saturation Intent";
+
+ case 3:
+ return "Absolute Intent";
+
+ default:
+ return "Undefined Intent";
+ }
}
-static inline ssize_t MagickMin(const ssize_t x,const ssize_t y)
+static inline ssize_t MagickMax(const ssize_t x,const ssize_t y)
{
- if (x < y)
+ if (x > y)
return(x);
return(y);
}
-\f
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% I m a g e I s G r a y %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% Like IsGrayImage except does not change DirectClass to PseudoClass %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-*/
-static MagickBooleanType ImageIsGray(Image *image)
+static const char *
+Magick_ColorType_from_PNG_ColorType(const int ping_colortype)
{
- register const PixelPacket
- *p;
+ switch (ping_colortype)
+ {
+ case 0:
+ return "Grayscale";
- register ssize_t
- i,
- x,
- y;
+ case 2:
+ return "Truecolor";
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+ case 3:
+ return "Indexed";
- if (image->storage_class == PseudoClass)
- {
- for (i=0; i < (ssize_t) image->colors; i++)
- if (IsGray(image->colormap+i) == MagickFalse)
- return(MagickFalse);
- return(MagickTrue);
- }
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
- return(MagickFalse);
- for (x=(ssize_t) image->columns-1; x >= 0; x--)
- {
- if (IsGray(p) == MagickFalse)
- return(MagickFalse);
- p++;
+ case 4:
+ return "GrayAlpha";
+
+ case 6:
+ return "RGBA";
+
+ default:
+ return "UndefinedColorType";
}
- }
- return(MagickTrue);
+}
+
+
+static inline ssize_t MagickMin(const ssize_t x,const ssize_t y)
+{
+ if (x < y)
+ return(x);
+
+ return(y);
}
#endif /* PNG_LIBPNG_VER > 10011 */
#endif /* MAGICKCORE_PNG_DELEGATE */
return((long) ((p[0] << 24) | (p[1] << 16) | (p[2] << 8) | p[3]));
}
+typedef struct _PNGErrorInfo
+{
+ Image
+ *image;
+
+ ExceptionInfo
+ *exception;
+} PNGErrorInfo;
+
static void MagickPNGErrorHandler(png_struct *ping,png_const_charp message)
{
+ ExceptionInfo
+ *exception;
+
Image
*image;
- image=(Image *) png_get_error_ptr(ping);
+ PNGErrorInfo
+ *error_info;
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " libpng-%s error: %s", PNG_LIBPNG_VER_STRING,message);
+ error_info=(PNGErrorInfo *) png_get_error_ptr(ping);
+ image=error_info->image;
+ exception=error_info->exception;
- (void) ThrowMagickException(&image->exception,GetMagickModule(),CoderError,
- message,"`%s'",image->filename);
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " libpng-%s error: %s", PNG_LIBPNG_VER_STRING,message);
+
+ (void) ThrowMagickException(exception,GetMagickModule(),CoderError,message,
+ "`%s'",image->filename);
#if (PNG_LIBPNG_VER < 10500)
/* A warning about deprecated use of jmpbuf here is unavoidable if you
static void MagickPNGWarningHandler(png_struct *ping,png_const_charp message)
{
+ ExceptionInfo
+ *exception;
+
Image
*image;
+ PNGErrorInfo
+ *error_info;
+
if (LocaleCompare(message, "Missing PLTE before tRNS") == 0)
png_error(ping, message);
- image=(Image *) png_get_error_ptr(ping);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " libpng-%s warning: %s", PNG_LIBPNG_VER_STRING,message);
+ error_info=(PNGErrorInfo *) png_get_error_ptr(ping);
+ image=error_info->image;
+ exception=error_info->exception;
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " libpng-%s warning: %s", PNG_LIBPNG_VER_STRING,message);
- (void) ThrowMagickException(&image->exception,GetMagickModule(),CoderWarning,
+ (void) ThrowMagickException(exception,GetMagickModule(),CoderWarning,
message,"`%s'",image->filename);
}
#ifdef PNG_USER_MEM_SUPPORTED
-static png_voidp Magick_png_malloc(png_structp png_ptr,png_uint_32 size)
+#if PNG_LIBPNG_VER >= 14000
+static png_voidp Magick_png_malloc(png_structp png_ptr,png_alloc_size_t size)
+#else
+static png_voidp Magick_png_malloc(png_structp png_ptr,png_size_t size)
+#endif
{
(void) png_ptr;
return((png_voidp) AcquireMagickMemory((size_t) size));
#endif
static int
-Magick_png_read_raw_profile(Image *image, const ImageInfo *image_info,
- png_textp text,int ii)
+Magick_png_read_raw_profile(png_struct *ping,Image *image,
+ const ImageInfo *image_info, png_textp text,int ii,ExceptionInfo *exception)
{
register ssize_t
i;
/* allocate space */
if (length == 0)
{
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
- CoderWarning,"UnableToCopyProfile","`%s'","invalid profile length");
+ png_warning(ping,"invalid profile length");
return(MagickFalse);
}
if (profile == (StringInfo *) NULL)
{
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
- ResourceLimitError,"MemoryAllocationFailed","`%s'",
- "unable to copy profile");
+ png_warning(ping, "unable to copy profile");
return(MagickFalse);
}
{
if (*sp == '\0')
{
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
- CoderWarning,"UnableToCopyProfile","`%s'","ran out of data");
+ png_warning(ping, "ran out of profile data");
profile=DestroyStringInfo(profile);
return(MagickFalse);
}
/*
We have already read "Raw profile type.
*/
- (void) SetImageProfile(image,&text[ii].key[17],profile);
+ (void) SetImageProfile(image,&text[ii].key[17],profile,exception);
profile=DestroyStringInfo(profile);
if (image_info->verbose)
*image;
int
- intent,
+ intent, /* "PNG Rendering intent", which is ICC intent + 1 */
num_raw_profiles,
num_text,
num_text_total,
num_passes,
+ number_colors,
pass,
ping_bit_depth,
ping_color_type,
+ ping_file_depth,
ping_interlace_method,
ping_compression_method,
ping_filter_method,
double
file_gamma;
- LongPixelPacket
- transparent_color;
-
MagickBooleanType
logging,
+ ping_found_cHRM,
+ ping_found_gAMA,
+ ping_found_iCCP,
+ ping_found_sRGB,
status;
+ PixelInfo
+ transparent_color;
+
+ PNGErrorInfo
+ error_info;
+
png_bytep
ping_trans_alpha;
x_resolution,
y_resolution;
- unsigned char
- *ping_pixels;
+ QuantumInfo
+ *quantum_info;
ssize_t
ping_rowbytes,
register unsigned char
*p;
- register IndexPacket
- *indexes;
-
register ssize_t
i,
x;
- register PixelPacket
+ register Quantum
*q;
size_t
ssize_t
j;
-#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+ unsigned char
+ *volatile ping_pixels;
+
+#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
png_byte unused_chunks[]=
{
104, 73, 83, 84, (png_byte) '\0', /* hIST */
115, 67, 65, 76, (png_byte) '\0', /* sCAL */
115, 80, 76, 84, (png_byte) '\0', /* sPLT */
116, 73, 77, 69, (png_byte) '\0', /* tIME */
+#ifdef PNG_APNG_SUPPORTED /* libpng was built with APNG patch; */
+ /* ignore the APNG chunks */
+ 97, 99, 84, 76, (png_byte) '\0', /* acTL */
+ 102, 99, 84, 76, (png_byte) '\0', /* fcTL */
+ 102, 100, 65, 84, (png_byte) '\0', /* fdAT */
+#endif
};
#endif
logging=LogMagickEvent(CoderEvent,GetMagickModule(),
" Enter ReadOnePNGImage()");
-#if defined(PNG_SETJMP_NOT_THREAD_SAFE)
- LockSemaphoreInfo(ping_semaphore);
-#endif
-
#if (PNG_LIBPNG_VER < 10200)
if (image_info->verbose)
printf("Your PNG library (libpng-%s) is rather old.\n",
# endif
#endif
+
+ quantum_info = (QuantumInfo *) NULL;
image=mng_info->image;
if (logging != MagickFalse)
+ {
+ (void)LogMagickEvent(CoderEvent,GetMagickModule(),
+ " image->alpha_trait=%d",(int) image->alpha_trait);
+
+ (void)LogMagickEvent(CoderEvent,GetMagickModule(),
+ " image->rendering_intent=%d",(int) image->rendering_intent);
+
(void)LogMagickEvent(CoderEvent,GetMagickModule(),
- " image->matte=%d",(int) image->matte);
+ " image->colorspace=%d",(int) image->colorspace);
+ }
+ intent=Magick_RenderingIntent_to_PNG_RenderingIntent(image->rendering_intent);
/* Set to an out-of-range color unless tRNS chunk is present */
transparent_color.red=65537;
transparent_color.green=65537;
transparent_color.blue=65537;
- transparent_color.opacity=65537;
+ transparent_color.alpha=65537;
+ number_colors=0;
num_text = 0;
num_text_total = 0;
num_raw_profiles = 0;
+ ping_found_cHRM = MagickFalse;
+ ping_found_gAMA = MagickFalse;
+ ping_found_iCCP = MagickFalse;
+ ping_found_sRGB = MagickFalse;
+
/*
Allocate the PNG structures
*/
#ifdef PNG_USER_MEM_SUPPORTED
- ping=png_create_read_struct_2(PNG_LIBPNG_VER_STRING, image,
+ error_info.image=image;
+ error_info.exception=exception;
+ ping=png_create_read_struct_2(PNG_LIBPNG_VER_STRING,&error_info,
MagickPNGErrorHandler,MagickPNGWarningHandler, NULL,
(png_malloc_ptr) Magick_png_malloc,(png_free_ptr) Magick_png_free);
#else
- ping=png_create_read_struct(PNG_LIBPNG_VER_STRING,image,
+ ping=png_create_read_struct(PNG_LIBPNG_VER_STRING,&error_info,
MagickPNGErrorHandler,MagickPNGWarningHandler);
#endif
if (ping == (png_struct *) NULL)
PNG image is corrupt.
*/
png_destroy_read_struct(&ping,&ping_info,&end_info);
-#if defined(PNG_SETJMP_NOT_THREAD_SAFE)
+
+#ifdef PNG_SETJMP_NOT_THREAD_SAFE
UnlockSemaphoreInfo(ping_semaphore);
#endif
+
+ if (ping_pixels != (unsigned char *) NULL)
+ ping_pixels=(unsigned char *) RelinquishMagickMemory(ping_pixels);
+
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" exit ReadOnePNGImage() with error.");
if (image != (Image *) NULL)
{
- InheritException(exception,&image->exception);
+ InheritException(exception,exception);
image->columns=0;
}
return(GetFirstImageInList(image));
}
+
+ /* { For navigation to end of SETJMP-protected block. Within this
+ * block, use png_error() instead of Throwing an Exception, to ensure
+ * that libpng is able to clean up, and that the semaphore is unlocked.
+ */
+
+#ifdef PNG_SETJMP_NOT_THREAD_SAFE
+ LockSemaphoreInfo(ping_semaphore);
+#endif
+
/*
Prepare PNG for reading.
*/
png_set_read_user_chunk_fn(ping, image, read_vpag_chunk_callback);
#endif
+#ifdef PNG_SET_USER_LIMITS_SUPPORTED
+# if (PNG_LIBPNG_VER >= 10400)
+ /* Limit the size of the chunk storage cache used for sPLT, text,
+ * and unknown chunks.
+ */
+ png_set_chunk_cache_max(ping, 32767);
+# endif
+#endif
+
+#ifdef PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
+ /* Disable new libpng-1.5.10 feature */
+ png_set_check_for_invalid_index (ping, 0);
+#endif
+
#if (PNG_LIBPNG_VER < 10400)
# if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) && \
(PNG_LIBPNG_VER >= 10200) && (PNG_LIBPNG_VER < 10220) && defined(__i386__)
&ping_interlace_method,&ping_compression_method,
&ping_filter_method);
+ ping_file_depth = ping_bit_depth;
+
+ /* Save bit-depth and color-type in case we later want to write a PNG00 */
+ {
+ char
+ msg[MaxTextExtent];
+
+ (void) FormatLocaleString(msg,MaxTextExtent,"%d",(int) ping_color_type);
+ (void) SetImageProperty(image,"png:IHDR.color-type-orig ",msg,exception);
+
+ (void) FormatLocaleString(msg,MaxTextExtent,"%d",(int) ping_bit_depth);
+ (void) SetImageProperty(image,"png:IHDR.bit-depth-orig ",msg,exception);
+ }
+
(void) png_get_tRNS(ping, ping_info, &ping_trans_alpha, &ping_num_trans,
&ping_trans_color);
if (ping_bit_depth < 8)
{
- if (((int) ping_color_type == PNG_COLOR_TYPE_PALETTE))
- {
- png_set_packing(ping);
- ping_bit_depth = 8;
- }
+ png_set_packing(ping);
+ ping_bit_depth = 8;
}
image->depth=ping_bit_depth;
image->depth=GetImageQuantumDepth(image,MagickFalse);
image->interlace=ping_interlace_method != 0 ? PNGInterlace : NoInterlace;
+
+ if (((int) ping_color_type == PNG_COLOR_TYPE_GRAY) ||
+ ((int) ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
+ {
+ image->rendering_intent=UndefinedIntent;
+ intent=Magick_RenderingIntent_to_PNG_RenderingIntent(UndefinedIntent);
+ image->gamma=1.000;
+ (void) ResetMagickMemory(&image->chromaticity,0,
+ sizeof(image->chromaticity));
+ }
+
if (logging != MagickFalse)
{
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
ping_interlace_method,ping_filter_method);
}
+ if (png_get_valid(ping,ping_info,PNG_INFO_gAMA))
+ {
+ ping_found_gAMA=MagickTrue;
+ if (logging != MagickFalse)
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " Found PNG gAMA chunk.");
+ }
+
+ if (png_get_valid(ping,ping_info,PNG_INFO_cHRM))
+ {
+ ping_found_cHRM=MagickTrue;
+ if (logging != MagickFalse)
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " Found PNG cHRM chunk.");
+ }
+
+ if (png_get_valid(ping,ping_info,PNG_INFO_iCCP))
+ {
+ ping_found_iCCP=MagickTrue;
+ if (logging != MagickFalse)
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " Found PNG iCCP chunk.");
+ }
+
+ if (png_get_valid(ping,ping_info,PNG_INFO_sRGB))
+ {
+ ping_found_sRGB=MagickTrue;
+ if (logging != MagickFalse)
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " Found PNG sRGB chunk.");
+ }
+
#ifdef PNG_READ_iCCP_SUPPORTED
if (png_get_valid(ping,ping_info,PNG_INFO_iCCP))
{
" Reading PNG iCCP chunk.");
profile=BlobToStringInfo(info,profile_length);
if (profile == (StringInfo *) NULL)
- {
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
- ResourceLimitError,"MemoryAllocationFailed","`%s'",
- "unable to copy profile");
- return((Image *) NULL);
- }
- (void) SetImageProfile(image,"icc",profile);
- profile=DestroyStringInfo(profile);
+ {
+ png_warning(ping, "ICC profile is NULL");
+ profile=DestroyStringInfo(profile);
+ }
+ else
+ {
+ (void) SetImageProfile(image,"icc",profile,exception);
+ profile=DestroyStringInfo(profile);
+ }
}
}
#endif
" Reading PNG gAMA chunk: gamma: %f",file_gamma);
}
}
+
if (!png_get_valid(ping,ping_info,PNG_INFO_cHRM))
{
if (mng_info->have_global_chrm != MagickFalse)
&image->chromaticity.blue_primary.x,
&image->chromaticity.blue_primary.y);
- if (logging != MagickFalse)
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " Reading PNG cHRM chunk.");
+ ping_found_cHRM=MagickTrue;
}
if (image->rendering_intent != UndefinedIntent)
{
- png_set_sRGB(ping,ping_info,
- Magick_RenderingIntent_to_PNG_RenderingIntent
- (image->rendering_intent));
- png_set_gAMA(ping,ping_info,0.45455f);
- file_gamma=0.45455;
- png_set_cHRM(ping,ping_info,
- 0.6400f, 0.3300f, 0.3000f, 0.6000f,
- 0.1500f, 0.0600f, 0.3127f, 0.3290f);
+ if (ping_found_sRGB != MagickTrue)
+ {
+ png_set_sRGB(ping,ping_info,
+ Magick_RenderingIntent_to_PNG_RenderingIntent
+ (image->rendering_intent));
+ png_set_gAMA(ping,ping_info,1.000f/2.200f);
+ file_gamma=1.000f/2.200f;
+ ping_found_sRGB=MagickTrue;
+ ping_found_cHRM=MagickTrue;
+ }
}
+
#if defined(PNG_oFFs_SUPPORTED)
if (png_get_valid(ping,ping_info,PNG_INFO_oFFs))
{
*/
(void) png_get_pHYs(ping,ping_info,&x_resolution,&y_resolution,
&unit_type);
- image->x_resolution=(double) x_resolution;
- image->y_resolution=(double) y_resolution;
+ image->resolution.x=(double) x_resolution;
+ image->resolution.y=(double) y_resolution;
if (unit_type == PNG_RESOLUTION_METER)
{
image->units=PixelsPerCentimeterResolution;
- image->x_resolution=(double) x_resolution/100.0;
- image->y_resolution=(double) y_resolution/100.0;
+ image->resolution.x=(double) x_resolution/100.0;
+ image->resolution.y=(double) y_resolution/100.0;
}
if (logging != MagickFalse)
if (png_get_valid(ping,ping_info,PNG_INFO_PLTE))
{
- int
- number_colors;
-
png_colorp
palette;
(int) mng_info->global_plte_length);
if (!png_get_valid(ping,ping_info,PNG_INFO_tRNS))
+ {
if (mng_info->global_trns_length)
{
- if (mng_info->global_trns_length >
- mng_info->global_plte_length)
- (void) ThrowMagickException(&image->exception,
- GetMagickModule(),CoderError,
- "global tRNS has more entries than global PLTE",
- "`%s'",image_info->filename);
- png_set_tRNS(ping,ping_info,mng_info->global_trns,
- (int) mng_info->global_trns_length,NULL);
+ png_warning(ping,
+ "global tRNS has more entries than global PLTE");
+ }
+ else
+ {
+ png_set_tRNS(ping,ping_info,mng_info->global_trns,
+ (int) mng_info->global_trns_length,NULL);
}
+ }
#ifdef PNG_READ_bKGD_SUPPORTED
if (
#ifndef PNG_READ_EMPTY_PLTE_SUPPORTED
#endif
}
else
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
- CoderError,"No global PLTE in file","`%s'",
- image_info->filename);
+ png_error(ping,"No global PLTE in file");
}
}
bkgd_scale = 1;
- if (ping_bit_depth == 1)
+ if (ping_file_depth == 1)
bkgd_scale = 255;
- else if (ping_bit_depth == 2)
+ else if (ping_file_depth == 2)
bkgd_scale = 85;
- else if (ping_bit_depth == 4)
+ else if (ping_file_depth == 4)
bkgd_scale = 17;
- if (ping_bit_depth <= 8)
+ if (ping_file_depth <= 8)
bkgd_scale *= 257;
ping_background->red *= bkgd_scale;
image->background_color.blue=
ScaleShortToQuantum(ping_background->blue);
- image->background_color.opacity=OpaqueOpacity;
+ image->background_color.alpha=OpaqueAlpha;
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Reading PNG tRNS chunk.");
- max_sample = (int) ((one << ping_bit_depth) - 1);
+ max_sample = (int) ((one << ping_file_depth) - 1);
if ((ping_color_type == PNG_COLOR_TYPE_GRAY &&
(int)ping_trans_color->gray > max_sample) ||
" Ignoring PNG tRNS chunk with out-of-range sample.");
png_free_data(ping, ping_info, PNG_FREE_TRNS, 0);
png_set_invalid(ping,ping_info,PNG_INFO_tRNS);
- image->matte=MagickFalse;
+ image->alpha_trait=UndefinedPixelTrait;
}
else
{
int
scale_to_short;
- scale_to_short = 65535L/((1UL << ping_bit_depth)-1);
+ scale_to_short = 65535L/((1UL << ping_file_depth)-1);
/* Scale transparent_color to short */
transparent_color.red= scale_to_short*ping_trans_color->red;
transparent_color.green= scale_to_short*ping_trans_color->green;
transparent_color.blue= scale_to_short*ping_trans_color->blue;
- transparent_color.opacity= scale_to_short*ping_trans_color->gray;
+ transparent_color.alpha= scale_to_short*ping_trans_color->gray;
if (ping_color_type == PNG_COLOR_TYPE_GRAY)
{
" Raw tRNS graylevel is %d.",ping_trans_color->gray);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " scaled graylevel is %d.",transparent_color.opacity);
+ " scaled graylevel is %.20g.",transparent_color.alpha);
}
- transparent_color.red=transparent_color.opacity;
- transparent_color.green=transparent_color.opacity;
- transparent_color.blue=transparent_color.opacity;
+ transparent_color.red=transparent_color.alpha;
+ transparent_color.green=transparent_color.alpha;
+ transparent_color.blue=transparent_color.alpha;
}
}
}
image->compression=ZipCompression;
image->columns=ping_width;
image->rows=ping_height;
+
+ if (((int) ping_color_type == PNG_COLOR_TYPE_GRAY) ||
+ ((int) ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
+ {
+ if ((!png_get_valid(ping,ping_info,PNG_INFO_gAMA) ||
+ image->gamma == 1.0) &&
+ ping_found_cHRM != MagickTrue && ping_found_sRGB != MagickTrue)
+ {
+ /* Set image->gamma to 1.0, image->rendering_intent to Undefined,
+ * image->colorspace to GRAY, and reset image->chromaticity.
+ */
+ SetImageColorspace(image,GRAYColorspace,exception);
+ }
+ }
+
+ (void)LogMagickEvent(CoderEvent,GetMagickModule(),
+ " image->colorspace=%d",(int) image->colorspace);
+
if (((int) ping_color_type == PNG_COLOR_TYPE_PALETTE) ||
- ((int) ping_color_type == PNG_COLOR_TYPE_GRAY))
+ ((int) ping_bit_depth < 16 &&
+ (int) ping_color_type == PNG_COLOR_TYPE_GRAY))
{
size_t
one;
image->storage_class=PseudoClass;
one=1;
- image->colors=one << ping_bit_depth;
+ image->colors=one << ping_file_depth;
#if (MAGICKCORE_QUANTUM_DEPTH == 8)
if (image->colors > 256)
image->colors=256;
#endif
if ((int) ping_color_type == PNG_COLOR_TYPE_PALETTE)
{
- int
- number_colors;
-
png_colorp
palette;
/*
Initialize image colormap.
*/
- if (AcquireImageColormap(image,image->colors) == MagickFalse)
- ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+ if (AcquireImageColormap(image,image->colors,exception) == MagickFalse)
+ png_error(ping,"Memory allocation failed");
if ((int) ping_color_type == PNG_COLOR_TYPE_PALETTE)
{
- int
- number_colors;
-
png_colorp
palette;
size_t
scale;
- scale=(QuantumRange/((1UL << ping_bit_depth)-1));
+ scale=(QuantumRange/((1UL << ping_file_depth)-1));
if (scale < 1)
scale=1;
char
msg[MaxTextExtent];
- /* encode ping_width, ping_height, ping_bit_depth, ping_color_type,
+ /* encode ping_width, ping_height, ping_file_depth, ping_color_type,
ping_interlace_method in value */
(void) FormatLocaleString(msg,MaxTextExtent,
"%d, %d",(int) ping_width, (int) ping_height);
- (void) SetImageProperty(image,"png:IHDR.width,height ",msg);
+ (void) SetImageProperty(image,"png:IHDR.width,height ",msg,exception);
+
+ (void) FormatLocaleString(msg,MaxTextExtent,"%d",(int) ping_file_depth);
+ (void) SetImageProperty(image,"png:IHDR.bit_depth ",msg,exception);
- (void) FormatLocaleString(msg,MaxTextExtent,"%d",(int) ping_bit_depth);
- (void) SetImageProperty(image,"png:IHDR.bit_depth ",msg);
+ (void) FormatLocaleString(msg,MaxTextExtent,"%d (%s)",
+ (int) ping_color_type,
+ Magick_ColorType_from_PNG_ColorType((int)ping_color_type));
+ (void) SetImageProperty(image,"png:IHDR.color_type ",msg,exception);
- (void) FormatLocaleString(msg,MaxTextExtent,"%d",(int) ping_color_type);
- (void) SetImageProperty(image,"png:IHDR.color_type ",msg);
+ if (ping_interlace_method == 0)
+ {
+ (void) FormatLocaleString(msg,MaxTextExtent,"%d (Not interlaced)",
+ (int) ping_interlace_method);
+ }
+ else if (ping_interlace_method == 1)
+ {
+ (void) FormatLocaleString(msg,MaxTextExtent,"%d (Adam7 method)",
+ (int) ping_interlace_method);
+ }
+ else
+ {
+ (void) FormatLocaleString(msg,MaxTextExtent,"%d (Unknown method)",
+ (int) ping_interlace_method);
+ }
+ (void) SetImageProperty(image,"png:IHDR.interlace_method",msg,exception);
- (void) FormatLocaleString(msg,MaxTextExtent,"%d",
- (int) ping_interlace_method);
- (void) SetImageProperty(image,"png:IHDR.interlace_method",msg);
+ if (number_colors != 0)
+ {
+ (void) FormatLocaleString(msg,MaxTextExtent,"%d",
+ (int) number_colors);
+ (void) SetImageProperty(image,"png:PLTE.number_colors ",msg,
+ exception);
+ }
}
/*
" Skipping PNG image data for scene %.20g",(double)
mng_info->scenes_found-1);
png_destroy_read_struct(&ping,&ping_info,&end_info);
-#if defined(PNG_SETJMP_NOT_THREAD_SAFE)
+
+#ifdef PNG_SETJMP_NOT_THREAD_SAFE
UnlockSemaphoreInfo(ping_semaphore);
#endif
+
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" exit ReadOnePNGImage().");
sizeof(*ping_pixels));
if (ping_pixels == (unsigned char *) NULL)
- ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+ png_error(ping,"Memory allocation failed");
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
/*
Convert PNG pixels to pixel packets.
*/
- if (setjmp(png_jmpbuf(ping)))
- {
- /*
- PNG image is corrupt.
- */
- png_destroy_read_struct(&ping,&ping_info,&end_info);
-#if defined(PNG_SETJMP_NOT_THREAD_SAFE)
- UnlockSemaphoreInfo(ping_semaphore);
-#endif
-
- if (ping_pixels != (unsigned char *) NULL)
- ping_pixels=(unsigned char *) RelinquishMagickMemory(ping_pixels);
-
- if (logging != MagickFalse)
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " exit ReadOnePNGImage() with error.");
-
- if (image != (Image *) NULL)
- {
- InheritException(exception,&image->exception);
- image->columns=0;
- }
+ quantum_info=AcquireQuantumInfo(image_info,image);
- return(GetFirstImageInList(image));
- }
+ if (quantum_info == (QuantumInfo *) NULL)
+ png_error(ping,"Failed to allocate quantum_info");
+ (void) SetQuantumEndian(image,quantum_info,MSBEndian);
{
/*
Convert image to DirectClass pixel packets.
*/
-#if (MAGICKCORE_QUANTUM_DEPTH == 8)
- int
- depth;
-
- depth=(ssize_t) ping_bit_depth;
-#endif
- image->matte=(((int) ping_color_type == PNG_COLOR_TYPE_RGB_ALPHA) ||
+ image->alpha_trait=(((int) ping_color_type == PNG_COLOR_TYPE_RGB_ALPHA) ||
((int) ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA) ||
(png_get_valid(ping,ping_info,PNG_INFO_tRNS))) ?
- MagickTrue : MagickFalse;
+ BlendPixelTrait : UndefinedPixelTrait;
for (y=0; y < (ssize_t) image->rows; y++)
{
-
if (num_passes > 1)
row_offset=ping_rowbytes*y;
row_offset=0;
png_read_row(ping,ping_pixels+row_offset,NULL);
- q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
-
- if (q == (PixelPacket *) NULL)
- break;
-
- else
- {
- QuantumInfo
- *quantum_info;
- quantum_info=AcquireQuantumInfo(image_info,image);
+ if (pass < num_passes-1)
+ continue;
- if (quantum_info == (QuantumInfo *) NULL)
- ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+ q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if ((int) ping_color_type == PNG_COLOR_TYPE_GRAY)
- (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
- GrayQuantum,ping_pixels+row_offset,exception);
+ if (q == (Quantum *) NULL)
+ break;
- else if ((int) ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
- (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
- GrayAlphaQuantum,ping_pixels+row_offset,exception);
+ if ((int) ping_color_type == PNG_COLOR_TYPE_GRAY)
+ (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ GrayQuantum,ping_pixels+row_offset,exception);
- else if ((int) ping_color_type == PNG_COLOR_TYPE_RGB_ALPHA)
- (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
- RGBAQuantum,ping_pixels+row_offset,exception);
+ else if ((int) ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+ (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ GrayAlphaQuantum,ping_pixels+row_offset,exception);
- else if ((int) ping_color_type == PNG_COLOR_TYPE_PALETTE)
- (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
- IndexQuantum,ping_pixels+row_offset,exception);
+ else if ((int) ping_color_type == PNG_COLOR_TYPE_RGB_ALPHA)
+ (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ RGBAQuantum,ping_pixels+row_offset,exception);
- else /* ping_color_type == PNG_COLOR_TYPE_RGB */
- (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
- RGBQuantum,ping_pixels+row_offset,exception);
+ else if ((int) ping_color_type == PNG_COLOR_TYPE_PALETTE)
+ (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ IndexQuantum,ping_pixels+row_offset,exception);
- quantum_info=DestroyQuantumInfo(quantum_info);
- }
+ else /* ping_color_type == PNG_COLOR_TYPE_RGB */
+ (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ RGBQuantum,ping_pixels+row_offset,exception);
if (found_transparent_pixel == MagickFalse)
{
{
if ((ping_color_type == PNG_COLOR_TYPE_RGBA ||
ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA) &&
- (GetPixelOpacity(q) != OpaqueOpacity))
+ (GetPixelAlpha(image,q) != OpaqueAlpha))
{
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
}
if ((ping_color_type == PNG_COLOR_TYPE_RGB ||
ping_color_type == PNG_COLOR_TYPE_GRAY) &&
- (ScaleQuantumToShort(GetPixelRed(q))
- == transparent_color.red &&
- ScaleQuantumToShort(GetPixelGreen(q))
- == transparent_color.green &&
- ScaleQuantumToShort(GetPixelBlue(q))
- == transparent_color.blue))
+ (ScaleQuantumToShort(GetPixelRed(image,q)) ==
+ transparent_color.red &&
+ ScaleQuantumToShort(GetPixelGreen(image,q)) ==
+ transparent_color.green &&
+ ScaleQuantumToShort(GetPixelBlue(image,q)) ==
+ transparent_color.blue))
{
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
found_transparent_pixel = MagickTrue;
break;
}
- q++;
+ q+=GetPixelChannels(image);
}
}
/*
Convert grayscale image to PseudoClass pixel packets.
*/
-
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Converting grayscale pixels to pixel packets");
- image->matte=ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA ?
- MagickTrue : MagickFalse;
+
+ image->alpha_trait=ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA ?
+ BlendPixelTrait : UndefinedPixelTrait;
quantum_scanline=(Quantum *) AcquireQuantumMemory(image->columns,
- (image->matte ? 2 : 1)*sizeof(*quantum_scanline));
+ (image->alpha_trait == BlendPixelTrait? 2 : 1)*
+ sizeof(*quantum_scanline));
if (quantum_scanline == (Quantum *) NULL)
- ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+ png_error(ping,"Memory allocation failed");
for (y=0; y < (ssize_t) image->rows; y++)
{
+ Quantum
+ alpha;
+
if (num_passes > 1)
row_offset=ping_rowbytes*y;
row_offset=0;
png_read_row(ping,ping_pixels+row_offset,NULL);
- q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (pass < num_passes-1)
+ continue;
+
+ q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
+
+ if (q == (Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
p=ping_pixels+row_offset;
r=quantum_scanline;
switch (ping_bit_depth)
{
- case 1:
- {
- register ssize_t
- bit;
-
- for (x=(ssize_t) image->columns-7; x > 0; x-=8)
- {
- for (bit=7; bit >= 0; bit--)
- *r++=(Quantum) ((*p) & (0x01 << bit) ? 0x01 : 0x00);
- p++;
- }
-
- if ((image->columns % 8) != 0)
- {
- for (bit=7; bit >= (ssize_t) (8-(image->columns % 8)); bit--)
- *r++=(Quantum) ((*p) & (0x01 << bit) ? 0x01 : 0x00);
- }
-
- break;
- }
-
- case 2:
- {
- for (x=(ssize_t) image->columns-3; x > 0; x-=4)
- {
- *r++=(*p >> 6) & 0x03;
- *r++=(*p >> 4) & 0x03;
- *r++=(*p >> 2) & 0x03;
- *r++=(*p++) & 0x03;
- }
-
- if ((image->columns % 4) != 0)
- {
- for (i=3; i >= (ssize_t) (4-(image->columns % 4)); i--)
- *r++=(Quantum) ((*p >> (i*2)) & 0x03);
- }
-
- break;
- }
-
- case 4:
- {
- for (x=(ssize_t) image->columns-1; x > 0; x-=2)
- {
- *r++=(*p >> 4) & 0x0f;
- *r++=(*p++) & 0x0f;
- }
-
- if ((image->columns % 2) != 0)
- *r++=(*p++ >> 4) & 0x0f;
-
- break;
- }
-
case 8:
{
+
if (ping_color_type == 4)
for (x=(ssize_t) image->columns-1; x >= 0; x--)
{
*r++=*p++;
- /* In image.h, OpaqueOpacity is 0
- * TransparentOpacity is QuantumRange
- * In a PNG datastream, Opaque is QuantumRange
- * and Transparent is 0.
- */
- SetPixelAlpha(q,ScaleCharToQuantum((unsigned char)
- *p++));
- if (GetPixelOpacity(q) != OpaqueOpacity)
+
+ alpha=ScaleCharToQuantum((unsigned char)*p++);
+
+ SetPixelAlpha(image,alpha,q);
+
+ if (alpha != OpaqueAlpha)
found_transparent_pixel = MagickTrue;
- q++;
+
+ q+=GetPixelChannels(image);
}
else
quantum=0;
quantum|=(*p++);
-
*r=ScaleShortToQuantum(quantum);
r++;
quantum=0;
quantum|=(*p++);
- SetPixelAlpha(q,ScaleShortToQuantum(quantum));
- if (GetPixelOpacity(q) != OpaqueOpacity)
+
+ alpha=ScaleShortToQuantum(quantum);
+ SetPixelAlpha(image,alpha,q);
+
+ if (alpha != OpaqueAlpha)
found_transparent_pixel = MagickTrue;
- q++;
+
+ q+=GetPixelChannels(image);
}
#else /* MAGICKCORE_QUANTUM_DEPTH == 8 */
if (ping_color_type == 4)
{
- SetPixelAlpha(q,*p++);
- if (GetPixelOpacity(q) != OpaqueOpacity)
+ SetPixelAlpha(image,*p++,q);
+
+ if (GetPixelAlpha(image,q) != OpaqueAlpha)
found_transparent_pixel = MagickTrue;
+
p++;
- q++;
+ q+=GetPixelChannels(image);
}
#endif
}
*/
r=quantum_scanline;
+ q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
+
+ if (q == (Quantum *) NULL)
+ break;
for (x=0; x < (ssize_t) image->columns; x++)
- SetPixelIndex(indexes+x,*r++);
+ {
+ SetPixelIndex(image,*r++,q);
+ q+=GetPixelChannels(image);
+ }
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
quantum_scanline=(Quantum *) RelinquishMagickMemory(quantum_scanline);
}
- image->matte=found_transparent_pixel;
+ image->alpha_trait=found_transparent_pixel ? BlendPixelTrait :
+ UndefinedPixelTrait;
if (logging != MagickFalse)
{
}
}
+ if (quantum_info != (QuantumInfo *) NULL)
+ quantum_info=DestroyQuantumInfo(quantum_info);
+
if (image->storage_class == PseudoClass)
{
- MagickBooleanType
- matte;
+ PixelTrait
+ alpha_trait;
- matte=image->matte;
- image->matte=MagickFalse;
- (void) SyncImage(image);
- image->matte=matte;
+ alpha_trait=image->alpha_trait;
+ image->alpha_trait=UndefinedPixelTrait;
+ (void) SyncImage(image,exception);
+ image->alpha_trait=alpha_trait;
}
png_read_end(ping,end_info);
png_destroy_read_struct(&ping,&ping_info,&end_info);
ping_pixels=(unsigned char *) RelinquishMagickMemory(ping_pixels);
image->colors=2;
- (void) SetImageBackgroundColor(image);
-#if defined(PNG_SETJMP_NOT_THREAD_SAFE)
+ (void) SetImageBackgroundColor(image,exception);
+#ifdef PNG_SETJMP_NOT_THREAD_SAFE
UnlockSemaphoreInfo(ping_semaphore);
#endif
if (logging != MagickFalse)
Image has a transparent background.
*/
storage_class=image->storage_class;
- image->matte=MagickTrue;
+ image->alpha_trait=BlendPixelTrait;
/* Balfour fix from imagemagick discourse server, 5 Feb 2010 */
{
for (x=0; x < ping_num_trans; x++)
{
- image->colormap[x].opacity =
- ScaleCharToQuantum((unsigned char)(255-ping_trans_alpha[x]));
+ image->colormap[x].alpha_trait=BlendPixelTrait;
+ image->colormap[x].alpha =
+ ScaleCharToQuantum((unsigned char)ping_trans_alpha[x]);
}
}
for (x=0; x < (int) image->colors; x++)
{
if (ScaleQuantumToShort(image->colormap[x].red) ==
- transparent_color.opacity)
+ transparent_color.alpha)
{
- image->colormap[x].opacity = (Quantum) TransparentOpacity;
+ image->colormap[x].alpha_trait=BlendPixelTrait;
+ image->colormap[x].alpha = (Quantum) TransparentAlpha;
}
}
}
- (void) SyncImage(image);
+ (void) SyncImage(image,exception);
}
#if 1 /* Should have already been done above, but glennrp problem P10
image->storage_class=storage_class;
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
/* Caution: on a Q8 build, this does not distinguish between
* 16-bit colors that differ only in the low byte
*/
for (x=(ssize_t) image->columns-1; x >= 0; x--)
{
- if (ScaleQuantumToShort(GetPixelRed(q))
- == transparent_color.red &&
- ScaleQuantumToShort(GetPixelGreen(q))
- == transparent_color.green &&
- ScaleQuantumToShort(GetPixelBlue(q))
- == transparent_color.blue)
+ if (ScaleQuantumToShort(GetPixelRed(image,q)) ==
+ transparent_color.red &&
+ ScaleQuantumToShort(GetPixelGreen(image,q)) ==
+ transparent_color.green &&
+ ScaleQuantumToShort(GetPixelBlue(image,q)) ==
+ transparent_color.blue)
{
- SetPixelOpacity(q,TransparentOpacity);
+ SetPixelAlpha(image,TransparentAlpha,q);
}
#if 0 /* I have not found a case where this is needed. */
else
{
- SetPixelOpacity(q)=(Quantum) OpaqueOpacity;
+ SetPixelAlpha(image,q)=(Quantum) OpaqueAlpha;
}
#endif
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
image->storage_class=DirectClass;
}
- if ((ping_color_type == PNG_COLOR_TYPE_GRAY) ||
- (ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA))
- image->colorspace=GRAYColorspace;
-
for (j = 0; j < 2; j++)
{
if (j == 0)
if (memcmp(text[i].key, "Raw profile type ",17) == 0)
{
- (void) Magick_png_read_raw_profile(image,image_info,text,(int) i);
+ (void) Magick_png_read_raw_profile(ping,image,image_info,text,
+ (int) i,exception);
num_raw_profiles++;
}
sizeof(*value));
if (value == (char *) NULL)
{
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
- ResourceLimitError,"MemoryAllocationFailed","`%s'",
- image->filename);
+ png_error(ping,"Memory allocation failed");
break;
}
*value='\0';
if (!png_get_valid(ping,ping_info,PNG_INFO_pHYs) ||
(LocaleCompare(text[i].key,"density") != 0 &&
LocaleCompare(text[i].key,"units") != 0))
- (void) SetImageProperty(image,text[i].key,value);
+ (void) SetImageProperty(image,text[i].key,value,exception);
if (logging != MagickFalse)
{
mng_info->ob[object_id]->frozen)
{
if (mng_info->ob[object_id] == (MngBuffer *) NULL)
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
- ResourceLimitError,"MemoryAllocationFailed","`%s'",
- image->filename);
+ png_error(ping,"Memory allocation failed");
if (mng_info->ob[object_id]->frozen)
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
- ResourceLimitError,"Cannot overwrite frozen MNG object buffer",
- "`%s'",image->filename);
+ png_error(ping,"Cannot overwrite frozen MNG object buffer");
}
else
(mng_info->ob[object_id]->image);
mng_info->ob[object_id]->image=CloneImage(image,0,0,MagickTrue,
- &image->exception);
+ exception);
if (mng_info->ob[object_id]->image != (Image *) NULL)
mng_info->ob[object_id]->image->file=(FILE *) NULL;
else
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
- ResourceLimitError,"Cloning image for object buffer failed",
- "`%s'",image->filename);
+ png_error(ping, "Cloning image for object buffer failed");
if (ping_width > 250000L || ping_height > 250000L)
png_error(ping,"PNG Image dimensions are too large.");
if (png_get_valid(ping,ping_info,PNG_INFO_PLTE))
{
- int
- number_colors;
-
png_colorp
plte;
}
#endif
- /* Set image->matte to MagickTrue if the input colortype supports
+ /* Set image->alpha_trait to MagickTrue if the input colortype supports
* alpha or if a valid tRNS chunk is present, no matter whether there
* is actual transparency present.
*/
- image->matte=(((int) ping_color_type == PNG_COLOR_TYPE_RGB_ALPHA) ||
+ image->alpha_trait=(((int) ping_color_type == PNG_COLOR_TYPE_RGB_ALPHA) ||
((int) ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA) ||
(png_get_valid(ping,ping_info,PNG_INFO_tRNS))) ?
- MagickTrue : MagickFalse;
+ BlendPixelTrait : UndefinedPixelTrait;
+
+#if 0 /* I'm not sure what's wrong here but it does not work. */
+ if (image->alpha_trait == BlendPixelTrait)
+ {
+ if (ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+ (void) SetImageType(image,GrayscaleMatteType,exception);
+
+ else if (ping_color_type == PNG_COLOR_TYPE_PALETTE)
+ (void) SetImageType(image,PaletteMatteType,exception);
+
+ else
+ (void) SetImageType(image,TrueColorMatteType,exception);
+ }
+
+ else
+ {
+ if (ping_color_type == PNG_COLOR_TYPE_GRAY)
+ (void) SetImageType(image,GrayscaleType,exception);
+
+ else if (ping_color_type == PNG_COLOR_TYPE_PALETTE)
+ (void) SetImageType(image,PaletteType,exception);
+
+ else
+ (void) SetImageType(image,TrueColorType,exception);
+ }
+#endif
/* Set more properties for identify to retrieve */
{
/* 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);
}
if (num_raw_profiles != 0)
{
(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);
}
- if (png_get_valid(ping,ping_info,PNG_INFO_cHRM))
+ if (ping_found_cHRM != MagickFalse)
{
(void) FormatLocaleString(msg,MaxTextExtent,"%s",
"chunk was found (see Chromaticity, above)");
- (void) SetImageProperty(image,"png:cHRM ",msg);
+ (void) SetImageProperty(image,"png:cHRM ",msg,
+ exception);
}
if (png_get_valid(ping,ping_info,PNG_INFO_bKGD))
{
(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);
}
(void) FormatLocaleString(msg,MaxTextExtent,"%s",
"chunk was found");
- if (png_get_valid(ping,ping_info,PNG_INFO_iCCP))
- (void) SetImageProperty(image,"png:iCCP ",msg);
+#if defined(PNG_iCCP_SUPPORTED)
+ if (ping_found_iCCP != MagickFalse)
+ (void) SetImageProperty(image,"png:iCCP ",msg,
+ exception);
+#endif
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)
- if (png_get_valid(ping,ping_info,PNG_INFO_sRGB))
+ if (ping_found_sRGB != MagickFalse)
{
(void) FormatLocaleString(msg,MaxTextExtent,
- "intent=%d (See Rendering intent)",
- (int) intent);
- (void) SetImageProperty(image,"png:sRGB ",msg);
+ "intent=%d (%s)",
+ (int) intent,
+ Magick_RenderingIntentString_from_PNG_RenderingIntent(intent));
+ (void) SetImageProperty(image,"png:sRGB ",msg,
+ exception);
}
#endif
- if (png_get_valid(ping,ping_info,PNG_INFO_gAMA))
+ if (ping_found_gAMA != MagickFalse)
{
(void) FormatLocaleString(msg,MaxTextExtent,
- "gamma=%.8g (See Gamma, above)", file_gamma);
- (void) SetImageProperty(image,"png:gAMA ",msg);
+ "gamma=%.8g (See Gamma, above)",
+ file_gamma);
+ (void) SetImageProperty(image,"png:gAMA ",msg,
+ exception);
}
#if defined(PNG_pHYs_SUPPORTED)
(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
{
(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
(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);
}
}
png_destroy_read_struct(&ping,&ping_info,&end_info);
ping_pixels=(unsigned char *) RelinquishMagickMemory(ping_pixels);
-#if defined(PNG_SETJMP_NOT_THREAD_SAFE)
- UnlockSemaphoreInfo(ping_semaphore);
-#endif
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" exit ReadOnePNGImage()");
+#ifdef PNG_SETJMP_NOT_THREAD_SAFE
+ UnlockSemaphoreInfo(ping_semaphore);
+#endif
+
+ /* } for navigation to beginning of SETJMP-protected block, revert to
+ * Throwing an Exception when an error occurs.
+ */
+
return(image);
/* end of reading one PNG image */
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
logging=LogMagickEvent(CoderEvent,GetMagickModule(),"Enter ReadPNGImage()");
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
mng_info=(MngInfo *) NULL;
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
ThrowReaderException(CorruptImageError,"CorruptImage");
}
- if (LocaleCompare(image_info->magick,"PNG24") == 0)
- {
- (void) SetImageType(image,TrueColorType);
- image->matte=MagickFalse;
- }
-
- if (LocaleCompare(image_info->magick,"PNG32") == 0)
- (void) SetImageType(image,TrueColorMatteType);
+ if ((IssRGBColorspace(image->colorspace) != MagickFalse) &&
+ ((image->gamma < .45) || (image->gamma > .46)))
+ SetImageColorspace(image,RGBColorspace,exception);
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
jng_alpha_filter_method,
jng_alpha_interlace_method;
- register const PixelPacket
+ register const Quantum
*s;
register ssize_t
i,
x;
- register PixelPacket
+ register Quantum
*q;
register unsigned char
image=mng_info->image;
- if (GetAuthenticPixelQueue(image) != (PixelPacket *) NULL)
+ if (GetAuthenticPixelQueue(image) != (Quantum *) NULL)
{
/*
Allocate next image structure.
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" AcquireNextImage()");
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
return((Image *) NULL);
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
GetImageInfo(color_image_info);
- color_image=AcquireImage(color_image_info);
+ color_image=AcquireImage(color_image_info,exception);
if (color_image == (Image *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
GetImageInfo(alpha_image_info);
- alpha_image=AcquireImage(alpha_image_info);
+ alpha_image=AcquireImage(alpha_image_info,exception);
if (alpha_image == (Image *) NULL)
{
{
image->rendering_intent=
Magick_RenderingIntent_from_PNG_RenderingIntent(p[0]);
- image->gamma=0.45455f;
+ image->gamma=1.000f/2.200f;
image->chromaticity.red_primary.x=0.6400f;
image->chromaticity.red_primary.y=0.3300f;
image->chromaticity.green_primary.x=0.3000f;
{
if (length > 8)
{
- image->x_resolution=(double) mng_get_long(p);
- image->y_resolution=(double) mng_get_long(&p[4]);
+ image->resolution.x=(double) mng_get_long(p);
+ image->resolution.y=(double) mng_get_long(&p[4]);
if ((int) p[8] == PNG_RESOLUTION_METER)
{
image->units=PixelsPerCentimeterResolution;
- image->x_resolution=image->x_resolution/100.0f;
- image->y_resolution=image->y_resolution/100.0f;
+ image->resolution.x=image->resolution.x/100.0f;
+ image->resolution.y=image->resolution.y/100.0f;
}
}
o close alpha_blob.
o copy intensity of secondary image into
- opacity samples of main image.
+ alpha samples of main image.
o destroy the secondary image.
*/
image->rows=jng_height;
image->columns=jng_width;
- length=image->columns*sizeof(PixelPacket);
for (y=0; y < (ssize_t) image->rows; y++)
{
- s=GetVirtualPixels(jng_image,0,y,image->columns,1,&image->exception);
+ s=GetVirtualPixels(jng_image,0,y,image->columns,1,exception);
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- (void) CopyMagickMemory(q,s,length);
+ for (x=(ssize_t) image->columns; x != 0; x--)
+ {
+ SetPixelRed(image,GetPixelRed(jng_image,s),q);
+ SetPixelGreen(image,GetPixelGreen(jng_image,s),q);
+ SetPixelBlue(image,GetPixelBlue(jng_image,s),q);
+ q+=GetPixelChannels(image);
+ s+=GetPixelChannels(jng_image);
+ }
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " Reading opacity from alpha_blob.");
+ " Reading alpha from alpha_blob.");
(void) FormatLocaleString(alpha_image_info->filename,MaxTextExtent,
"%s",alpha_image->filename);
for (y=0; y < (ssize_t) image->rows; y++)
{
s=GetVirtualPixels(jng_image,0,y,image->columns,1,
- &image->exception);
+ exception);
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (image->matte != MagickFalse)
- for (x=(ssize_t) image->columns; x != 0; x--,q++,s++)
- SetPixelOpacity(q,(Quantum) QuantumRange-
- GetPixelRed(s));
+ if (image->alpha_trait == BlendPixelTrait)
+ for (x=(ssize_t) image->columns; x != 0; x--)
+ {
+ SetPixelAlpha(image,GetPixelRed(jng_image,s),q);
+ q+=GetPixelChannels(image);
+ s+=GetPixelChannels(jng_image);
+ }
else
- for (x=(ssize_t) image->columns; x != 0; x--,q++,s++)
+ for (x=(ssize_t) image->columns; x != 0; x--)
{
- SetPixelAlpha(q,GetPixelRed(s));
- if (GetPixelOpacity(q) != OpaqueOpacity)
- image->matte=MagickTrue;
+ SetPixelAlpha(image,GetPixelRed(jng_image,s),q);
+ if (GetPixelAlpha(image,q) != OpaqueAlpha)
+ image->alpha_trait=BlendPixelTrait;
+ q+=GetPixelChannels(image);
+ s+=GetPixelChannels(jng_image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
logging=LogMagickEvent(CoderEvent,GetMagickModule(),"Enter ReadJNGImage()");
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
mng_info=(MngInfo *) NULL;
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
previous_fb;
#if defined(MNG_INSERT_LAYERS)
- PixelPacket
+ PixelInfo
mng_background_color;
#endif
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
logging=LogMagickEvent(CoderEvent,GetMagickModule(),"Enter ReadMNGImage()");
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
mng_info=(MngInfo *) NULL;
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
skip_to_iend=MagickTrue;
if (mng_info->jhdr_warning == 0)
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
+ (void) ThrowMagickException(exception,GetMagickModule(),
CoderError,"JNGCompressNotSupported","`%s'",image->filename);
mng_info->jhdr_warning++;
skip_to_iend=MagickTrue;
if (mng_info->dhdr_warning == 0)
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
+ (void) ThrowMagickException(exception,GetMagickModule(),
CoderError,"DeltaPNGNotSupported","`%s'",image->filename);
mng_info->dhdr_warning++;
if (mng_type != 3)
insert_layers=MagickTrue;
#endif
- if (GetAuthenticPixelQueue(image) != (PixelPacket *) NULL)
+ if (GetAuthenticPixelQueue(image) != (Quantum *) NULL)
{
/* Allocate next image structure. */
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
return((Image *) NULL);
if (memcmp(type,mng_DEFI,4) == 0)
{
if (mng_type == 3)
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
+ (void) ThrowMagickException(exception,GetMagickModule(),
CoderError,"DEFI chunk found in MNG-VLC datastream","`%s'",
image->filename);
object_id=(p[0] << 8) | p[1];
if (mng_type == 2 && object_id != 0)
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
+ (void) ThrowMagickException(exception,GetMagickModule(),
CoderError,"Nonzero object_id in MNG-LC datastream","`%s'",
image->filename);
if (object_id > MNG_MAX_OBJECTS)
{
/*
- Instead ofsuing a warning we should allocate a larger
+ Instead of using a warning we should allocate a larger
MngInfo structure and continue.
*/
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
+ (void) ThrowMagickException(exception,GetMagickModule(),
CoderError,"object id too large","`%s'",image->filename);
object_id=MNG_MAX_OBJECTS;
}
if (mng_info->frozen[object_id])
{
chunk=(unsigned char *) RelinquishMagickMemory(chunk);
- (void) ThrowMagickException(&image->exception,
+ (void) ThrowMagickException(exception,
GetMagickModule(),CoderError,
"DEFI cannot redefine a frozen MNG object","`%s'",
image->filename);
mng_background_color.blue=
ScaleShortToQuantum((unsigned short) ((p[4] << 8) | p[5]));
- mng_background_color.opacity=OpaqueOpacity;
+ mng_background_color.alpha=OpaqueAlpha;
}
#ifdef MNG_OBJECT_BUFFERS
if (memcmp(type,mng_FRAM,4) == 0)
{
if (mng_type == 3)
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
+ (void) ThrowMagickException(exception,GetMagickModule(),
CoderError,"FRAM chunk found in MNG-VLC datastream","`%s'",
image->filename);
(subframe_width) && (subframe_height))
{
/* Allocate next image structure. */
- if (GetAuthenticPixelQueue(image) != (PixelPacket *) NULL)
+ if (GetAuthenticPixelQueue(image) != (Quantum *) NULL)
{
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image->page.x=mng_info->clip.left;
image->page.y=mng_info->clip.top;
image->background_color=mng_background_color;
- image->matte=MagickFalse;
+ image->alpha_trait=UndefinedPixelTrait;
image->delay=0;
- (void) SetImageBackgroundColor(image);
+ (void) SetImageBackgroundColor(image,exception);
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
if (memcmp(type,mng_CLON,4) == 0)
{
if (mng_info->clon_warning == 0)
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
+ (void) ThrowMagickException(exception,GetMagickModule(),
CoderError,"CLON is not implemented yet","`%s'",
image->filename);
if (magn_first || magn_last)
if (mng_info->magn_warning == 0)
{
- (void) ThrowMagickException(&image->exception,
+ (void) ThrowMagickException(exception,
GetMagickModule(),CoderError,
"MAGN is not implemented yet for nonzero objects",
"`%s'",image->filename);
if (magn_methx > 5 || magn_methy > 5)
if (mng_info->magn_warning == 0)
{
- (void) ThrowMagickException(&image->exception,
+ (void) ThrowMagickException(exception,
GetMagickModule(),CoderError,
"Unknown MAGN method in MNG datastream","`%s'",
image->filename);
if (memcmp(type,mng_PAST,4) == 0)
{
if (mng_info->past_warning == 0)
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
+ (void) ThrowMagickException(exception,GetMagickModule(),
CoderError,"PAST is not implemented yet","`%s'",
image->filename);
if (memcmp(type,mng_SHOW,4) == 0)
{
if (mng_info->show_warning == 0)
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
+ (void) ThrowMagickException(exception,GetMagickModule(),
CoderError,"SHOW is not implemented yet","`%s'",
image->filename);
if (memcmp(type,mng_pHYg,4) == 0)
{
if (mng_info->phyg_warning == 0)
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
+ (void) ThrowMagickException(exception,GetMagickModule(),
CoderError,"pHYg is not implemented.","`%s'",image->filename);
mng_info->phyg_warning++;
skip_to_iend=MagickTrue;
if (mng_info->basi_warning == 0)
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
+ (void) ThrowMagickException(exception,GetMagickModule(),
CoderError,"BASI is not implemented yet","`%s'",
image->filename);
(image_height < mng_info->mng_height) ||
(mng_info->clip.bottom < (ssize_t) mng_info->mng_height))
{
- if (GetAuthenticPixelQueue(image) != (PixelPacket *) NULL)
+ if (GetAuthenticPixelQueue(image) != (Quantum *) NULL)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image->page.x=0;
image->page.y=0;
image->background_color=mng_background_color;
- (void) SetImageBackgroundColor(image);
+ (void) SetImageBackgroundColor(image,exception);
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Inserted transparent background layer, W=%.20g, H=%.20g",
(subframe_width) && (subframe_height) && (simplicity == 0 ||
(simplicity & 0x08)))
{
- if (GetAuthenticPixelQueue(image) != (PixelPacket *) NULL)
+ if (GetAuthenticPixelQueue(image) != (Quantum *) NULL)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image->page.x=mng_info->clip.left;
image->page.y=mng_info->clip.top;
image->background_color=mng_background_color;
- image->matte=MagickFalse;
- (void) SetImageBackgroundColor(image);
+ image->alpha_trait=UndefinedPixelTrait;
+ (void) SetImageBackgroundColor(image,exception);
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
#endif /* MNG_INSERT_LAYERS */
first_mng_object=MagickFalse;
- if (GetAuthenticPixelQueue(image) != (PixelPacket *) NULL)
+ if (GetAuthenticPixelQueue(image) != (Quantum *) NULL)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
int
yy;
+ Quantum
+ *next,
+ *prev;
+
+ png_uint_16
+ magn_methx,
+ magn_methy;
+
ssize_t
m,
y;
- register ssize_t
- x;
-
- register PixelPacket
+ register Quantum
*n,
*q;
- PixelPacket
- *next,
- *prev;
-
- png_uint_16
- magn_methx,
- magn_methy;
+ register ssize_t
+ x;
/* Allocate next image structure. */
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Allocate magnified image");
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
for (x=(ssize_t) image->columns-1; x >= 0; x--)
{
- SetPixelRed(q,ScaleQuantumToShort(
- GetPixelRed(q)));
- SetPixelGreen(q,ScaleQuantumToShort(
- GetPixelGreen(q)));
- SetPixelBlue(q,ScaleQuantumToShort(
- GetPixelBlue(q)));
- SetPixelOpacity(q,ScaleQuantumToShort(
- GetPixelOpacity(q)));
- q++;
+ SetPixelRed(image,ScaleQuantumToShort(
+ GetPixelRed(image,q)),q);
+ SetPixelGreen(image,ScaleQuantumToShort(
+ GetPixelGreen(image,q)),q);
+ SetPixelBlue(image,ScaleQuantumToShort(
+ GetPixelBlue(image,q)),q);
+ SetPixelAlpha(image,ScaleQuantumToShort(
+ GetPixelAlpha(image,q)),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
#define QM Quantum
#endif
- if (image->matte != MagickFalse)
- (void) SetImageBackgroundColor(large_image);
+ if (image->alpha_trait == BlendPixelTrait)
+ (void) SetImageBackgroundColor(large_image,exception);
else
{
- large_image->background_color.opacity=OpaqueOpacity;
- (void) SetImageBackgroundColor(large_image);
+ large_image->background_color.alpha=OpaqueAlpha;
+ (void) SetImageBackgroundColor(large_image,exception);
if (magn_methx == 4)
magn_methx=2;
" Magnify the rows to %.20g",(double) large_image->rows);
m=(ssize_t) mng_info->magn_mt;
yy=0;
- length=(size_t) image->columns;
- next=(PixelPacket *) AcquireQuantumMemory(length,sizeof(*next));
- prev=(PixelPacket *) AcquireQuantumMemory(length,sizeof(*prev));
+ length=(size_t) image->columns*GetPixelChannels(image);
+ next=(Quantum *) AcquireQuantumMemory(length,sizeof(*next));
+ prev=(Quantum *) AcquireQuantumMemory(length,sizeof(*prev));
- if ((prev == (PixelPacket *) NULL) ||
- (next == (PixelPacket *) NULL))
+ if ((prev == (Quantum *) NULL) ||
+ (next == (Quantum *) NULL))
{
image=DestroyImageList(image);
MngInfoFreeStruct(mng_info,&have_mng_structure);
for (i=0; i < m; i++, yy++)
{
- register PixelPacket
+ register Quantum
*pixels;
assert(yy < (ssize_t) large_image->rows);
n=next;
q=GetAuthenticPixels(large_image,0,yy,large_image->columns,
1,exception);
- q+=(large_image->columns-image->columns);
+ q+=(large_image->columns-image->columns)*
+ GetPixelChannels(large_image);
for (x=(ssize_t) image->columns-1; x >= 0; x--)
{
if (magn_methy <= 1)
{
/* replicate previous */
- SetPixelRGBO(q,(pixels));
+ SetPixelRed(large_image,GetPixelRed(image,pixels),q);
+ SetPixelGreen(large_image,GetPixelGreen(image,
+ pixels),q);
+ SetPixelBlue(large_image,GetPixelBlue(image,
+ pixels),q);
+ SetPixelAlpha(large_image,GetPixelAlpha(image,
+ pixels),q);
}
else if (magn_methy == 2 || magn_methy == 4)
{
if (i == 0)
{
- SetPixelRGBO(q,(pixels));
+ SetPixelRed(large_image,GetPixelRed(image,
+ pixels),q);
+ SetPixelGreen(large_image,GetPixelGreen(image,
+ pixels),q);
+ SetPixelBlue(large_image,GetPixelBlue(image,
+ pixels),q);
+ SetPixelAlpha(large_image,GetPixelAlpha(image,
+ pixels),q);
}
else
{
/* Interpolate */
- SetPixelRed(q,
- ((QM) (((ssize_t)
- (2*i*(GetPixelRed(n)
- -GetPixelRed(pixels)+m))/
+ SetPixelRed(large_image,((QM) (((ssize_t)
+ (2*i*(GetPixelRed(image,n)
+ -GetPixelRed(image,pixels)+m))/
((ssize_t) (m*2))
- +GetPixelRed(pixels)))));
- SetPixelGreen(q,
- ((QM) (((ssize_t)
- (2*i*(GetPixelGreen(n)
- -GetPixelGreen(pixels)+m))/
+ +GetPixelRed(image,pixels)))),q);
+ SetPixelGreen(large_image,((QM) (((ssize_t)
+ (2*i*(GetPixelGreen(image,n)
+ -GetPixelGreen(image,pixels)+m))/
((ssize_t) (m*2))
- +GetPixelGreen(pixels)))));
- SetPixelBlue(q,
- ((QM) (((ssize_t)
- (2*i*(GetPixelBlue(n)
- -GetPixelBlue(pixels)+m))/
+ +GetPixelGreen(image,pixels)))),q);
+ SetPixelBlue(large_image,((QM) (((ssize_t)
+ (2*i*(GetPixelBlue(image,n)
+ -GetPixelBlue(image,pixels)+m))/
((ssize_t) (m*2))
- +GetPixelBlue(pixels)))));
+ +GetPixelBlue(image,pixels)))),q);
- if (image->matte != MagickFalse)
- SetPixelOpacity(q,
- ((QM) (((ssize_t)
- (2*i*(GetPixelOpacity(n)
- -GetPixelOpacity(pixels)+m))
+ if (image->alpha_trait == BlendPixelTrait)
+ SetPixelAlpha(large_image, ((QM) (((ssize_t)
+ (2*i*(GetPixelAlpha(image,n)
+ -GetPixelAlpha(image,pixels)+m))
/((ssize_t) (m*2))+
- GetPixelOpacity(pixels)))));
+ GetPixelAlpha(image,pixels)))),q);
}
if (magn_methy == 4)
{
/* Replicate nearest */
if (i <= ((m+1) << 1))
- SetPixelOpacity(q,
- (*pixels).opacity+0);
+ SetPixelAlpha(large_image,GetPixelAlpha(image,
+ pixels),q);
else
- SetPixelOpacity(q,
- (*n).opacity+0);
+ SetPixelAlpha(large_image,GetPixelAlpha(image,
+ n),q);
}
}
/* Replicate nearest */
if (i <= ((m+1) << 1))
{
- SetPixelRGBO(q,(pixels));
+ SetPixelRed(large_image,GetPixelRed(image,
+ pixels),q);
+ SetPixelGreen(large_image,GetPixelGreen(image,
+ pixels),q);
+ SetPixelBlue(large_image,GetPixelBlue(image,
+ pixels),q);
+ SetPixelAlpha(large_image,GetPixelAlpha(image,
+ pixels),q);
}
else
{
- SetPixelRGBO(q,(n));
+ SetPixelRed(large_image,GetPixelRed(image,n),q);
+ SetPixelGreen(large_image,GetPixelGreen(image,n),
+ q);
+ SetPixelBlue(large_image,GetPixelBlue(image,n),
+ q);
+ SetPixelAlpha(large_image,GetPixelAlpha(image,n),
+ q);
}
if (magn_methy == 5)
{
- SetPixelOpacity(q,
- (QM) (((ssize_t) (2*i*
- (GetPixelOpacity(n)
- -GetPixelOpacity(pixels))
+ SetPixelAlpha(large_image,(QM) (((ssize_t) (2*i*
+ (GetPixelAlpha(image,n)
+ -GetPixelAlpha(image,pixels))
+m))/((ssize_t) (m*2))
- +GetPixelOpacity(pixels)));
+ +GetPixelAlpha(image,pixels)),q);
}
}
- n++;
- q++;
- pixels++;
+ n+=GetPixelChannels(image);
+ q+=GetPixelChannels(large_image);
+ pixels+=GetPixelChannels(image);
} /* x */
if (SyncAuthenticPixels(large_image,exception) == 0)
} /* i */
} /* y */
- prev=(PixelPacket *) RelinquishMagickMemory(prev);
- next=(PixelPacket *) RelinquishMagickMemory(next);
+ prev=(Quantum *) RelinquishMagickMemory(prev);
+ next=(Quantum *) RelinquishMagickMemory(next);
length=image->columns;
for (y=0; y < (ssize_t) image->rows; y++)
{
- register PixelPacket
+ register Quantum
*pixels;
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- pixels=q+(image->columns-length);
- n=pixels+1;
+ pixels=q+(image->columns-length)*GetPixelChannels(image);
+ n=pixels+GetPixelChannels(image);
for (x=(ssize_t) (image->columns-length);
x < (ssize_t) image->columns; x++)
{
- /* To do: Rewrite using Get/Set***PixelComponent() */
+ /* To do: Rewrite using Get/Set***PixelChannel() */
if (x == (ssize_t) (image->columns-length))
m=(ssize_t) mng_info->magn_ml;
if (magn_methx <= 1)
{
/* replicate previous */
- SetPixelRGBO(q,(pixels));
+ SetPixelRed(image,GetPixelRed(image,pixels),q);
+ SetPixelGreen(image,GetPixelGreen(image,pixels),q);
+ SetPixelBlue(image,GetPixelBlue(image,pixels),q);
+ SetPixelAlpha(image,GetPixelAlpha(image,pixels),q);
}
else if (magn_methx == 2 || magn_methx == 4)
{
if (i == 0)
{
- SetPixelRGBO(q,(pixels));
+ SetPixelRed(image,GetPixelRed(image,pixels),q);
+ SetPixelGreen(image,GetPixelGreen(image,pixels),q);
+ SetPixelBlue(image,GetPixelBlue(image,pixels),q);
+ SetPixelAlpha(image,GetPixelAlpha(image,pixels),q);
}
- /* To do: Rewrite using Get/Set***PixelComponent() */
+ /* To do: Rewrite using Get/Set***PixelChannel() */
else
{
/* Interpolate */
- SetPixelRed(q,
- (QM) ((2*i*(
- GetPixelRed(n)
- -GetPixelRed(pixels))+m)
+ SetPixelRed(image,(QM) ((2*i*(
+ GetPixelRed(image,n)
+ -GetPixelRed(image,pixels))+m)
/((ssize_t) (m*2))+
- GetPixelRed(pixels)));
+ GetPixelRed(image,pixels)),q);
- SetPixelGreen(q,
- (QM) ((2*i*(
- GetPixelGreen(n)
- -GetPixelGreen(pixels))+m)
+ SetPixelGreen(image,(QM) ((2*i*(
+ GetPixelGreen(image,n)
+ -GetPixelGreen(image,pixels))+m)
/((ssize_t) (m*2))+
- GetPixelGreen(pixels)));
+ GetPixelGreen(image,pixels)),q);
- SetPixelBlue(q,
- (QM) ((2*i*(
- GetPixelBlue(n)
- -GetPixelBlue(pixels))+m)
+ SetPixelBlue(image,(QM) ((2*i*(
+ GetPixelBlue(image,n)
+ -GetPixelBlue(image,pixels))+m)
/((ssize_t) (m*2))+
- GetPixelBlue(pixels)));
- if (image->matte != MagickFalse)
- SetPixelOpacity(q,
- (QM) ((2*i*(
- GetPixelOpacity(n)
- -GetPixelOpacity(pixels))+m)
+ GetPixelBlue(image,pixels)),q);
+ if (image->alpha_trait == BlendPixelTrait)
+ SetPixelAlpha(image,(QM) ((2*i*(
+ GetPixelAlpha(image,n)
+ -GetPixelAlpha(image,pixels))+m)
/((ssize_t) (m*2))+
- GetPixelOpacity(pixels)));
+ GetPixelAlpha(image,pixels)),q);
}
if (magn_methx == 4)
/* Replicate nearest */
if (i <= ((m+1) << 1))
{
- SetPixelOpacity(q,
- GetPixelOpacity(pixels)+0);
+ SetPixelAlpha(image,
+ GetPixelAlpha(image,pixels)+0,q);
}
else
{
- SetPixelOpacity(q,
- GetPixelOpacity(n)+0);
+ SetPixelAlpha(image,
+ GetPixelAlpha(image,n)+0,q);
}
}
}
/* Replicate nearest */
if (i <= ((m+1) << 1))
{
- SetPixelRGBO(q,(pixels));
+ SetPixelRed(image,GetPixelRed(image,pixels),q);
+ SetPixelGreen(image,GetPixelGreen(image,pixels),q);
+ SetPixelBlue(image,GetPixelBlue(image,pixels),q);
+ SetPixelAlpha(image,GetPixelAlpha(image,pixels),q);
}
else
{
- SetPixelRGBO(q,(n));
+ SetPixelRed(image,GetPixelRed(image,n),q);
+ SetPixelGreen(image,GetPixelGreen(image,n),q);
+ SetPixelBlue(image,GetPixelBlue(image,n),q);
+ SetPixelAlpha(image,GetPixelAlpha(image,n),q);
}
if (magn_methx == 5)
{
/* Interpolate */
- SetPixelOpacity(q,
- (QM) ((2*i*( GetPixelOpacity(n)
- -GetPixelOpacity(pixels))+m)/
+ SetPixelAlpha(image,
+ (QM) ((2*i*( GetPixelAlpha(image,n)
+ -GetPixelAlpha(image,pixels))+m)/
((ssize_t) (m*2))
- +GetPixelOpacity(pixels)));
+ +GetPixelAlpha(image,pixels)),q);
}
}
- q++;
+ q+=GetPixelChannels(image);
}
- n++;
- p++;
+ n+=GetPixelChannels(image);
+ p+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
for (x=(ssize_t) image->columns-1; x >= 0; x--)
{
- SetPixelRed(q,ScaleShortToQuantum(
- GetPixelRed(q)));
- SetPixelGreen(q,ScaleShortToQuantum(
- GetPixelGreen(q)));
- SetPixelBlue(q,ScaleShortToQuantum(
- GetPixelBlue(q)));
- SetPixelOpacity(q,ScaleShortToQuantum(
- GetPixelOpacity(q)));
- q++;
+ SetPixelRed(image,ScaleShortToQuantum(
+ GetPixelRed(image,q)),q);
+ SetPixelGreen(image,ScaleShortToQuantum(
+ GetPixelGreen(image,q)),q);
+ SetPixelBlue(image,ScaleShortToQuantum(
+ GetPixelBlue(image,q)),q);
+ SetPixelAlpha(image,ScaleShortToQuantum(
+ GetPixelAlpha(image,q)),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
image->columns=1;
image->rows=1;
image->colors=2;
- (void) SetImageBackgroundColor(image);
+ (void) SetImageBackgroundColor(image,exception);
image->page.width=1;
image->page.height=1;
image->page.x=0;
#if (MAGICKCORE_QUANTUM_DEPTH > 16)
/* PNG does not handle depths greater than 16 so reduce it even
- * if lossy, and promote any depths > 8 to 16.
+ * if lossy.
*/
if (image->depth > 16)
image->depth=16;
image->depth=16;
}
- if (LosslessReduceDepthOK(image) != MagickFalse)
+ if (LosslessReduceDepthOK(image,exception) != MagickFalse)
image->depth = 8;
#endif
- GetImageException(image,exception);
-
if (image_info->number_scenes != 0)
{
if (mng_info->scenes_found >
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" No images found. Inserting a background layer.");
- if (GetAuthenticPixelQueue(image) != (PixelPacket *) NULL)
+ if (GetAuthenticPixelQueue(image) != (Quantum *) NULL)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
image->page.x=0;
image->page.y=0;
image->background_color=mng_background_color;
- image->matte=MagickFalse;
+ image->alpha_trait=UndefinedPixelTrait;
if (image_info->ping == MagickFalse)
- (void) SetImageBackgroundColor(image);
+ (void) SetImageBackgroundColor(image,exception);
mng_info->image_found++;
}
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule()," No beginning");
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
+ (void) ThrowMagickException(exception,GetMagickModule(),
CoderError,"Linked list is corrupted, beginning of list not found",
"`%s'",image_info->filename);
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule()," Corrupt list");
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
+ (void) ThrowMagickException(exception,GetMagickModule(),
CoderError,"Linked list is corrupted; next_image is NULL","`%s'",
image_info->filename);
}
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" First image null");
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
+ (void) ThrowMagickException(exception,GetMagickModule(),
CoderError,"image->next for first image is NULL but shouldn't be.",
"`%s'",image_info->filename);
}
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" No visible images found.");
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
+ (void) ThrowMagickException(exception,GetMagickModule(),
CoderError,"No visible images in file","`%s'",image_info->filename);
if (image != (Image *) NULL)
(void) LogMagickEvent(CoderEvent,GetMagickModule()," Coalesce Images");
scene=image->scene;
- next_image=CoalesceImages(image,&image->exception);
+ next_image=CoalesceImages(image,exception);
if (next_image == (Image *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
entry->magick=(IsImageFormatHandler *) IsPNG;
entry->adjoin=MagickFalse;
- entry->description=ConstantString("opaque 24-bit RGB");
+ entry->description=ConstantString("opaque or binary transparent 24-bit RGB");
entry->module=ConstantString("PNG");
(void) RegisterMagickInfo(entry);
entry->module=ConstantString("PNG");
(void) RegisterMagickInfo(entry);
+ entry=SetMagickInfo("PNG48");
+
+#if defined(MAGICKCORE_PNG_DELEGATE)
+ entry->decoder=(DecodeImageHandler *) ReadPNGImage;
+ entry->encoder=(EncodeImageHandler *) WritePNGImage;
+#endif
+
+ entry->magick=(IsImageFormatHandler *) IsPNG;
+ entry->adjoin=MagickFalse;
+ entry->description=ConstantString("opaque or binary transparent 48-bit RGB");
+ entry->module=ConstantString("PNG");
+ (void) RegisterMagickInfo(entry);
+
+ entry=SetMagickInfo("PNG64");
+
+#if defined(MAGICKCORE_PNG_DELEGATE)
+ entry->decoder=(DecodeImageHandler *) ReadPNGImage;
+ entry->encoder=(EncodeImageHandler *) WritePNGImage;
+#endif
+
+ entry->magick=(IsImageFormatHandler *) IsPNG;
+ entry->adjoin=MagickFalse;
+ entry->description=ConstantString("opaque or transparent 64-bit RGBA");
+ entry->module=ConstantString("PNG");
+ (void) RegisterMagickInfo(entry);
+
+ entry=SetMagickInfo("PNG00");
+
+#if defined(MAGICKCORE_PNG_DELEGATE)
+ entry->decoder=(DecodeImageHandler *) ReadPNGImage;
+ entry->encoder=(EncodeImageHandler *) WritePNGImage;
+#endif
+
+ entry->magick=(IsImageFormatHandler *) IsPNG;
+ entry->adjoin=MagickFalse;
+ entry->description=ConstantString("PNG inheriting subformat from original");
+ entry->module=ConstantString("PNG");
+ (void) RegisterMagickInfo(entry);
+
entry=SetMagickInfo("JNG");
#if defined(JNG_SUPPORTED)
entry->note=ConstantString(JNGNote);
(void) RegisterMagickInfo(entry);
-#if defined(PNG_SETJMP_NOT_THREAD_SAFE)
+#ifdef PNG_SETJMP_NOT_THREAD_SAFE
ping_semaphore=AllocateSemaphoreInfo();
#endif
(void) UnregisterMagickInfo("PNG8");
(void) UnregisterMagickInfo("PNG24");
(void) UnregisterMagickInfo("PNG32");
+ (void) UnregisterMagickInfo("PNG48");
+ (void) UnregisterMagickInfo("PNG64");
+ (void) UnregisterMagickInfo("PNG00");
(void) UnregisterMagickInfo("JNG");
-#if defined(PNG_SETJMP_NOT_THREAD_SAFE)
+#ifdef PNG_SETJMP_NOT_THREAD_SAFE
if (ping_semaphore != (SemaphoreInfo *) NULL)
DestroySemaphoreInfo(&ping_semaphore);
#endif
%
% The format of the WriteMNGImage method is:
%
-% MagickBooleanType WriteMNGImage(const ImageInfo *image_info,Image *image)
+% MagickBooleanType WriteMNGImage(const ImageInfo *image_info,
+% Image *image,ExceptionInfo *exception)
%
% A description of each parameter follows.
%
%
% o image: The image.
%
+% o exception: return any errors or warnings in this structure.
%
% To do (as of version 5.5.2, November 26, 2002 -- glennrp -- see also
% "To do" under ReadPNGImage):
(char *) profile_type, (double) length);
}
- text=(png_textp) png_malloc(ping,(png_uint_32) sizeof(png_text));
+#if PNG_LIBPNG_VER >= 14000
+ text=(png_textp) png_malloc(ping,(png_alloc_size_t) sizeof(png_text));
+#else
+ text=(png_textp) png_malloc(ping,(png_size_t) sizeof(png_text));
+#endif
description_length=(png_uint_32) strlen((const char *) profile_description);
allocated_length=(png_uint_32) (length*2 + (length >> 5) + 20
+ description_length);
- text[0].text=(png_charp) png_malloc(ping,allocated_length);
- text[0].key=(png_charp) png_malloc(ping, (png_uint_32) 80);
+#if PNG_LIBPNG_VER >= 14000
+ text[0].text=(png_charp) png_malloc(ping,
+ (png_alloc_size_t) allocated_length);
+ text[0].key=(png_charp) png_malloc(ping, (png_alloc_size_t) 80);
+#else
+ text[0].text=(png_charp) png_malloc(ping, (png_size_t) allocated_length);
+ text[0].key=(png_charp) png_malloc(ping, (png_size_t) 80);
+#endif
text[0].key[0]='\0';
(void) ConcatenateMagickString(text[0].key,
"Raw profile type ",MaxTextExtent);
/* Write one PNG image */
static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
- const ImageInfo *image_info,Image *image)
+ const ImageInfo *IMimage_info,Image *IMimage,ExceptionInfo *exception)
{
+ Image
+ *image;
+
+ ImageInfo
+ *image_info;
+
char
s[2];
QuantumInfo
*quantum_info;
+ PNGErrorInfo
+ error_info;
+
register ssize_t
i,
x;
unsigned char
- *ping_pixels;
+ *volatile ping_pixels;
volatile int
image_colors,
logging=LogMagickEvent(CoderEvent,GetMagickModule(),
" Enter WriteOnePNGImage()");
-#if 0
- if (image_info->type == PaletteMatteType)
- {
- (void) SetImageType(image,TrueColorMatteType);
- (void) SyncImage(image);
- }
-#endif
-
-#if defined(PNG_SETJMP_NOT_THREAD_SAFE)
- LockSemaphoreInfo(ping_semaphore);
-#endif
+ image = CloneImage(IMimage,0,0,MagickFalse,exception);
+ image_info=(ImageInfo *) CloneImageInfo(IMimage_info);
+ if (image_info == (ImageInfo *) NULL)
+ ThrowWriterException(ResourceLimitError, "MemoryAllocationFailed");
/* Initialize some stuff */
ping_bit_depth=0,
* Note that this will not involve any changes to the actual pixels
* but merely passes information to applications that read the resulting
* PNG image.
- *
- * To do: recognize other variants of the sRGB profile, using the CRC to
- * verify all recognized variants including the 3 already known.
- *
- * Use something other than image->rendering_intent to record the fact
- * that the sRGB profile was found.
- *
- * Record the ICC version (currently v2 or v4) of the incoming sRGB ICC
- * profile. Record the Blackpoint Compensation, if any.
*/
if (ping_exclude_sRGB == MagickFalse)
{
if (profile != (StringInfo *) NULL)
{
if ((LocaleCompare(name,"ICC") == 0) ||
- (LocaleCompare(name,"ICM") == 0))
-
- {
+ (LocaleCompare(name,"ICM") == 0))
+ {
int
icheck;
" storage_class=PseudoClass");
}
- if (image->storage_class == PseudoClass &&
+ if (image->storage_class == PseudoClass &&
(mng_info->write_png8 || mng_info->write_png24 || mng_info->write_png32 ||
- (mng_info->write_png_colortype != 0 &&
- mng_info->write_png_colortype != 4)))
+ mng_info->write_png48 || mng_info->write_png64 ||
+ (mng_info->write_png_colortype != 1 &&
+ mng_info->write_png_colortype != 5)))
{
- (void) SyncImage(image);
+ (void) SyncImage(image,exception);
image->storage_class = DirectClass;
}
}
}
- if (IsRGBColorspace(image->colorspace) == MagickFalse)
- (void) TransformImageColorspace(image,sRGBColorspace);
+ if (IssRGBCompatibleColorspace(image->colorspace) == MagickFalse)
+ (void) TransformImageColorspace(image,sRGBColorspace,exception);
/*
Sometimes we get PseudoClass images whose RGB values don't match
the colors in the colormap. This code syncs the RGB values.
*/
if (image->depth <= 8 && image->taint && image->storage_class == PseudoClass)
- (void) SyncImage(image);
+ (void) SyncImage(image,exception);
#if (MAGICKCORE_QUANTUM_DEPTH == 8)
if (image->depth > 8)
/* Respect the -depth option */
if (image->depth < MAGICKCORE_QUANTUM_DEPTH)
{
- register PixelPacket
+ register Quantum
*r;
- ExceptionInfo
- *exception;
-
- exception=(&image->exception);
-
if (image->depth > 8)
{
#if MAGICKCORE_QUANTUM_DEPTH > 16
for (y=0; y < (ssize_t) image->rows; y++)
{
- r=GetAuthenticPixels(image,0,y,image->columns,1,
- exception);
+ r=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- LBR16PixelRGBO(r);
- r++;
+ LBR16PixelRGBA(r);
+ r+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
for (y=0; y < (ssize_t) image->rows; y++)
{
- r=GetAuthenticPixels(image,0,y,image->columns,1,
- exception);
+ r=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- LBR08PixelRGBO(r);
- r++;
+ LBR08PixelRGBA(r);
+ r+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
for (y=0; y < (ssize_t) image->rows; y++)
{
- r=GetAuthenticPixels(image,0,y,image->columns,1,
- exception);
+ r=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- LBR04PixelRGBO(r);
- r++;
+ LBR04PixelRGBA(r);
+ r+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
for (y=0; y < (ssize_t) image->rows; y++)
{
- r=GetAuthenticPixels(image,0,y,image->columns,1,
- exception);
+ r=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- LBR02PixelRGBO(r);
- r++;
+ LBR02PixelRGBA(r);
+ r+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
for (y=0; y < (ssize_t) image->rows; y++)
{
- r=GetAuthenticPixels(image,0,y,image->columns,1,
- exception);
+ r=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- LBR01PixelRGBO(r);
- r++;
+ LBR01PixelRGBA(r);
+ r+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
}
if (image->depth == 16 && mng_info->write_png_depth != 16)
- if (mng_info->write_png8 || LosslessReduceDepthOK(image) != MagickFalse)
+ if (mng_info->write_png8 || LosslessReduceDepthOK(image,exception) != MagickFalse)
image->depth = 8;
#endif
- /* Normally we run this just once, but in the case of writing PNG8
+ if (image->storage_class != PseudoClass && mng_info->write_png_colortype &&
+ (mng_info->write_png_colortype > 4 || (mng_info->write_png_depth >= 8 &&
+ mng_info->write_png_colortype < 4 &&
+ image->alpha_trait != BlendPixelTrait)))
+ {
+ /* Avoid the expensive BUILD_PALETTE operation if we're sure that we
+ * are not going to need the result.
+ */
+ image_colors = (int) image->colors;
+ number_opaque = (int) image->colors;
+ if (mng_info->write_png_colortype == 1 ||
+ mng_info->write_png_colortype == 5)
+ ping_have_color=MagickFalse;
+ else
+ ping_have_color=MagickTrue;
+ ping_have_non_bw=MagickFalse;
+
+ if (image->alpha_trait == BlendPixelTrait)
+ {
+ number_transparent = 2;
+ number_semitransparent = 1;
+ }
+
+ else
+ {
+ number_transparent = 0;
+ number_semitransparent = 0;
+ }
+ }
+
+ else
+ {
+ /* BUILD_PALETTE
+ *
+ * Normally we run this just once, but in the case of writing PNG8
* we reduce the transparency to binary and run again, then if there
* are still too many colors we reduce to a simple 4-4-4-1, then 3-3-3-1
* RGBA palette and run again, and then to a simple 3-3-2-1 RGBA
for (j=0; j<6; j++)
{
- /* BUILD_PALETTE
- *
+ /*
* Sometimes we get DirectClass images that have 256 colors or fewer.
* This code will build a colormap.
*
* This code will delete the colormap and change the image to
* DirectClass.
*
- * If image->matte is MagickFalse, we ignore the opacity channel
+ * If image->alpha_trait is MagickFalse, we ignore the alpha channel
* even though it sometimes contains left-over non-opaque values.
*
* Also we gather some information (number of opaque, transparent,
* we need to check for bogus non-opaque values, at least.
*/
- ExceptionInfo
- *exception;
-
int
n;
- PixelPacket
+ PixelInfo
opaque[260],
semitransparent[260],
transparent[260];
- register IndexPacket
- *indexes;
-
- register const PixelPacket
- *s,
- *q;
+ register const Quantum
+ *s;
- register PixelPacket
+ register Quantum
+ *q,
*r;
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" image->rows=%.20g",(double) image->rows);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " image->matte=%.20g",(double) image->matte);
+ " image->alpha_trait=%.20g",(double) image->alpha_trait);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" image->depth=%.20g",(double) image->depth);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Original colormap:");
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " i (red,green,blue,opacity)");
+ " i (red,green,blue,alpha)");
for (i=0; i < 256; i++)
{
(int) image->colormap[i].red,
(int) image->colormap[i].green,
(int) image->colormap[i].blue,
- (int) image->colormap[i].opacity);
+ (int) image->colormap[i].alpha);
}
for (i=image->colors - 10; i < (ssize_t) image->colors; i++)
(int) image->colormap[i].red,
(int) image->colormap[i].green,
(int) image->colormap[i].blue,
- (int) image->colormap[i].opacity);
+ (int) image->colormap[i].alpha);
}
}
}
" image->colors=%d",(int) image->colors);
if (image->colors == 0)
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " (zero means unknown)");
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " (zero means unknown)");
if (ping_preserve_colormap == MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Regenerate the colormap");
}
- exception=(&image->exception);
-
image_colors=0;
number_opaque = 0;
number_semitransparent = 0;
{
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (image->matte == MagickFalse ||
- GetPixelOpacity(q) == OpaqueOpacity)
+ if (image->alpha_trait != BlendPixelTrait ||
+ GetPixelAlpha(image,q) == OpaqueAlpha)
{
if (number_opaque < 259)
{
if (number_opaque == 0)
{
- GetPixelRGB(q, opaque);
- opaque[0].opacity=OpaqueOpacity;
+ GetPixelInfoPixel(image, q, opaque);
+ opaque[0].alpha=OpaqueAlpha;
number_opaque=1;
}
for (i=0; i< (ssize_t) number_opaque; i++)
{
- if (IsColorEqual(q, opaque+i))
+ if (IsPixelEquivalent(image,q, opaque+i))
break;
}
- if (i == (ssize_t) number_opaque &&
- number_opaque < 259)
+ if (i == (ssize_t) number_opaque && number_opaque < 259)
{
number_opaque++;
- GetPixelRGB(q, opaque+i);
- opaque[i].opacity=OpaqueOpacity;
+ GetPixelInfoPixel(image, q, opaque+i);
+ opaque[i].alpha=OpaqueAlpha;
}
}
}
- else if (q->opacity == TransparentOpacity)
+ else if (GetPixelAlpha(image,q) == TransparentAlpha)
{
if (number_transparent < 259)
{
if (number_transparent == 0)
{
- GetPixelRGBO(q, transparent);
- ping_trans_color.red=
- (unsigned short) GetPixelRed(q);
- ping_trans_color.green=
- (unsigned short) GetPixelGreen(q);
- ping_trans_color.blue=
- (unsigned short) GetPixelBlue(q);
- ping_trans_color.gray=
- (unsigned short) GetPixelRed(q);
+ GetPixelInfoPixel(image, q, transparent);
+ ping_trans_color.red=(unsigned short)
+ GetPixelRed(image,q);
+ ping_trans_color.green=(unsigned short)
+ GetPixelGreen(image,q);
+ ping_trans_color.blue=(unsigned short)
+ GetPixelBlue(image,q);
+ ping_trans_color.gray=(unsigned short)
+ GetPixelGray(image,q);
number_transparent = 1;
}
for (i=0; i< (ssize_t) number_transparent; i++)
{
- if (IsColorEqual(q, transparent+i))
+ if (IsPixelEquivalent(image,q, transparent+i))
break;
}
number_transparent < 259)
{
number_transparent++;
- GetPixelRGBO(q, transparent+i);
+ GetPixelInfoPixel(image,q,transparent+i);
}
}
}
{
if (number_semitransparent == 0)
{
- GetPixelRGBO(q, semitransparent);
+ GetPixelInfoPixel(image,q,semitransparent);
number_semitransparent = 1;
}
for (i=0; i< (ssize_t) number_semitransparent; i++)
{
- if (IsColorEqual(q, semitransparent+i)
- && GetPixelOpacity(q) ==
- semitransparent[i].opacity)
+ if (IsPixelEquivalent(image,q, semitransparent+i)
+ && GetPixelAlpha(image,q) ==
+ semitransparent[i].alpha)
break;
}
number_semitransparent < 259)
{
number_semitransparent++;
- GetPixelRGBO(q, semitransparent+i);
+ GetPixelInfoPixel(image, q, semitransparent+i);
}
}
}
- q++;
+ q+=GetPixelChannels(image);
}
}
{
opaque[i] = image->background_color;
ping_background.index = i;
+ number_opaque++;
if (logging != MagickFalse)
{
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
ping_have_color=MagickFalse;
ping_have_non_bw=MagickFalse;
+ if ((IssRGBCompatibleColorspace(image->colorspace) == MagickFalse) ||
+ (IssRGBColorspace(image->colorspace) != MagickFalse))
+ {
+ ping_have_color=MagickTrue;
+ ping_have_non_bw=MagickTrue;
+ }
+
if(image_colors > 256)
{
for (y=0; y < (ssize_t) image->rows; y++)
{
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
s=q;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelRed(s) != GetPixelGreen(s) ||
- GetPixelRed(s) != GetPixelBlue(s))
+ if (GetPixelRed(image,s) != GetPixelGreen(image,s) ||
+ GetPixelRed(image,s) != GetPixelBlue(image,s))
{
ping_have_color=MagickTrue;
ping_have_non_bw=MagickTrue;
break;
}
- s++;
+ s+=GetPixelChannels(image);
}
if (ping_have_color != MagickFalse)
s=q;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelRed(s) != 0 &&
- GetPixelRed(s) != QuantumRange)
+ if (GetPixelRed(image,s) != 0 &&
+ GetPixelRed(image,s) != QuantumRange)
{
ping_have_non_bw=MagickTrue;
break;
}
- s++;
+ s+=GetPixelChannels(image);
}
}
}
if (image_colors < 257)
{
- PixelPacket
+ PixelInfo
colormap[260];
/*
image->colors = image_colors;
- if (AcquireImageColormap(image,image_colors) ==
+ if (AcquireImageColormap(image,image_colors,exception) ==
MagickFalse)
ThrowWriterException(ResourceLimitError,
"MemoryAllocationFailed");
for (y=0; y < (ssize_t) image->rows; y++)
{
- q=GetAuthenticPixels(image,0,y,image->columns,1,
- exception);
+ q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
-
for (x=0; x < (ssize_t) image->columns; x++)
{
for (i=0; i< (ssize_t) image_colors; i++)
{
- if ((image->matte == MagickFalse ||
- image->colormap[i].opacity ==
- GetPixelOpacity(q)) &&
- image->colormap[i].red ==
- GetPixelRed(q) &&
- image->colormap[i].green ==
- GetPixelGreen(q) &&
- image->colormap[i].blue ==
- GetPixelBlue(q))
+ if ((image->alpha_trait != BlendPixelTrait ||
+ image->colormap[i].alpha == GetPixelAlpha(image,q)) &&
+ image->colormap[i].red == GetPixelRed(image,q) &&
+ image->colormap[i].green == GetPixelGreen(image,q) &&
+ image->colormap[i].blue == GetPixelBlue(image,q))
{
- SetPixelIndex(indexes+x,i);
+ SetPixelIndex(image,i,q);
break;
}
}
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
if (image->colormap != NULL)
{
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " i (red,green,blue,opacity)");
+ " i (red,green,blue,alpha)");
for (i=0; i < (ssize_t) image->colors; i++)
{
(int) image->colormap[i].red,
(int) image->colormap[i].green,
(int) image->colormap[i].blue,
- (int) image->colormap[i].opacity);
+ (int) image->colormap[i].alpha);
}
}
}
for (y=0; y < (ssize_t) image->rows; y++)
{
- r=GetAuthenticPixels(image,0,y,image->columns,1,
- exception);
+ r=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelOpacity(r) > TransparentOpacity/2)
+ if (GetPixelAlpha(image,r) < OpaqueAlpha/2)
{
- SetPixelOpacity(r,TransparentOpacity);
- SetPixelRgb(r,&image->background_color);
+ SetPixelInfoPixel(image,&image->background_color,r);
+ SetPixelAlpha(image,TransparentAlpha,r);
}
else
- SetPixelOpacity(r,OpaqueOpacity);
- r++;
+ SetPixelAlpha(image,OpaqueAlpha,r);
+ r+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
if (image_colors != 0 && image_colors <= 256 &&
image->colormap != NULL)
for (i=0; i<image_colors; i++)
- image->colormap[i].opacity =
- (image->colormap[i].opacity > TransparentOpacity/2 ?
- TransparentOpacity : OpaqueOpacity);
+ image->colormap[i].alpha =
+ (image->colormap[i].alpha > TransparentAlpha/2 ?
+ TransparentAlpha : OpaqueAlpha);
}
continue;
}
{
for (y=0; y < (ssize_t) image->rows; y++)
{
- r=GetAuthenticPixels(image,0,y,image->columns,1,
- exception);
+ r=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelOpacity(r) == OpaqueOpacity)
+ if (GetPixelAlpha(image,r) == OpaqueAlpha)
LBR04PixelRGB(r);
- r++;
+ r+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
{
for (y=0; y < (ssize_t) image->rows; y++)
{
- r=GetAuthenticPixels(image,0,y,image->columns,1,
- exception);
+ r=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelOpacity(r) == OpaqueOpacity)
- LBR03PixelRGB(r);
- r++;
+ if (GetPixelAlpha(image,r) == OpaqueAlpha)
+ LBR03RGB(r);
+ r+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
{
for (y=0; y < (ssize_t) image->rows; y++)
{
- r=GetAuthenticPixels(image,0,y,image->columns,1,
- exception);
+ r=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelOpacity(r) == OpaqueOpacity)
+ if (GetPixelAlpha(image,r) == OpaqueAlpha)
LBR02PixelBlue(r);
- r++;
+ r+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
{
for (y=0; y < (ssize_t) image->rows; y++)
{
- r=GetAuthenticPixels(image,0,y,image->columns,1,
- exception);
+ r=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (ScaleQuantumToChar(GetPixelRed(r)) == 0x49 &&
- ScaleQuantumToChar(GetPixelGreen(r)) == 0x00 &&
- ScaleQuantumToChar(GetPixelBlue(r)) == 0x00 &&
- GetPixelOpacity(r) == OpaqueOpacity)
+ if (ScaleQuantumToChar(GetPixelRed(image,r)) == 0x49 &&
+ ScaleQuantumToChar(GetPixelGreen(image,r)) == 0x00 &&
+ ScaleQuantumToChar(GetPixelBlue(image,r)) == 0x00 &&
+ GetPixelAlpha(image,r) == OpaqueAlpha)
{
- SetPixelRed(r,ScaleCharToQuantum(0x24));
+ SetPixelRed(image,ScaleCharToQuantum(0x24),r);
}
- r++;
+ r+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
}
}
}
+ }
/* END OF BUILD_PALETTE */
/* If we are excluding the tRNS chunk and there is transparency,
else if (image_colors == 0 || image_colors > 256 ||
image->colormap == NULL)
{
- ExceptionInfo
- *exception;
-
- register const PixelPacket
+ register const Quantum
*q;
- exception=(&image->exception);
-
for (y=0; y < (ssize_t) image->rows; y++)
{
q=GetVirtualPixels(image,0,y,image->columns,1, exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (q->opacity != TransparentOpacity &&
- (unsigned short) GetPixelRed(q) ==
- ping_trans_color.red &&
- (unsigned short) GetPixelGreen(q) ==
- ping_trans_color.green &&
- (unsigned short) GetPixelBlue(q) ==
- ping_trans_color.blue)
+ if (GetPixelAlpha(image,q) != TransparentAlpha &&
+ (unsigned short) GetPixelRed(image,q) ==
+ ping_trans_color.red &&
+ (unsigned short) GetPixelGreen(image,q) ==
+ ping_trans_color.green &&
+ (unsigned short) GetPixelBlue(image,q) ==
+ ping_trans_color.blue)
{
ping_have_cheap_transparency = MagickFalse;
break;
}
- q++;
+ q+=GetPixelChannels(image);
}
if (ping_have_cheap_transparency == MagickFalse)
quantum_info = (QuantumInfo *) NULL;
number_colors=0;
image_colors=(int) image->colors;
- image_matte=image->matte;
+ image_matte=image->alpha_trait == BlendPixelTrait ? MagickTrue : MagickFalse;
mng_info->IsPalette=image->storage_class == PseudoClass &&
image_colors <= 256 && image->colormap != NULL;
if ((mng_info->write_png_colortype == 4 || mng_info->write_png8) &&
(image->colors == 0 || image->colormap == NULL))
{
- (void) ThrowMagickException(&image->exception,
- GetMagickModule(),CoderError,
+ image_info=DestroyImageInfo(image_info);
+ image=DestroyImage(image);
+ (void) ThrowMagickException(exception,GetMagickModule(),CoderError,
"Cannot write PNG8 or color-type 3; colormap is NULL",
- "`%s'",image->filename);
-#if defined(PNG_SETJMP_NOT_THREAD_SAFE)
- UnlockSemaphoreInfo(ping_semaphore);
-#endif
+ "`%s'",IMimage->filename);
return(MagickFalse);
}
Allocate the PNG structures
*/
#ifdef PNG_USER_MEM_SUPPORTED
- ping=png_create_write_struct_2(PNG_LIBPNG_VER_STRING,image,
+ error_info.image=image;
+ error_info.exception=exception;
+ ping=png_create_write_struct_2(PNG_LIBPNG_VER_STRING,&error_info,
MagickPNGErrorHandler,MagickPNGWarningHandler,(void *) NULL,
(png_malloc_ptr) Magick_png_malloc,(png_free_ptr) Magick_png_free);
#else
- ping=png_create_write_struct(PNG_LIBPNG_VER_STRING,image,
+ ping=png_create_write_struct(PNG_LIBPNG_VER_STRING,&error_info,
MagickPNGErrorHandler,MagickPNGWarningHandler);
#endif
(void) printf("PNG write has failed.\n");
#endif
png_destroy_write_struct(&ping,&ping_info);
-#if defined(PNG_SETJMP_NOT_THREAD_SAFE)
+#ifdef PNG_SETJMP_NOT_THREAD_SAFE
UnlockSemaphoreInfo(ping_semaphore);
#endif
+
+ if (ping_pixels != (unsigned char *) NULL)
+ ping_pixels=(unsigned char *) RelinquishMagickMemory(ping_pixels);
+
+ if (quantum_info != (QuantumInfo *) NULL)
+ quantum_info=DestroyQuantumInfo(quantum_info);
+
+ if (ping_have_blob != MagickFalse)
+ (void) CloseBlob(image);
+ image_info=DestroyImageInfo(image_info);
+ image=DestroyImage(image);
return(MagickFalse);
}
+
+ /* { For navigation to end of SETJMP-protected block. Within this
+ * block, use png_error() instead of Throwing an Exception, to ensure
+ * that libpng is able to clean up, and that the semaphore is unlocked.
+ */
+
+#ifdef PNG_SETJMP_NOT_THREAD_SAFE
+ LockSemaphoreInfo(ping_semaphore);
+#endif
+
/*
Prepare PNG for writing.
*/
+
#if defined(PNG_MNG_FEATURES_SUPPORTED)
if (mng_info->write_mng)
+ {
(void) png_permit_mng_features(ping,PNG_ALL_MNG_FEATURES);
+# ifdef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
+ /* Disable new libpng-1.5.10 feature when writing a MNG because
+ * zero-length PLTE is OK
+ */
+ png_set_check_for_invalid_index (ping, 0);
+# endif
+ }
#else
# ifdef PNG_WRITE_EMPTY_PLTE_SUPPORTED
if (mng_info->write_png8 || mng_info->write_png24 || mng_info->write_png32)
image_depth=8;
+ if (mng_info->write_png48 || mng_info->write_png64)
+ image_depth=16;
+
if (mng_info->write_png_depth != 0)
image_depth=mng_info->write_png_depth;
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" height=%.20g",(double) ping_height);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " image_matte=%.20g",(double) image->matte);
+ " image_matte=%.20g",(double) image->alpha_trait);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" image->depth=%.20g",(double) image->depth);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
#if defined(PNG_pHYs_SUPPORTED)
if (ping_exclude_pHYs == MagickFalse)
{
- if ((image->x_resolution != 0) && (image->y_resolution != 0) &&
+ if ((image->resolution.x != 0) && (image->resolution.y != 0) &&
(!mng_info->write_mng || !mng_info->equal_physs))
{
if (logging != MagickFalse)
{
ping_pHYs_unit_type=PNG_RESOLUTION_METER;
ping_pHYs_x_resolution=
- (png_uint_32) ((100.0*image->x_resolution+0.5)/2.54);
+ (png_uint_32) ((100.0*image->resolution.x+0.5)/2.54);
ping_pHYs_y_resolution=
- (png_uint_32) ((100.0*image->y_resolution+0.5)/2.54);
+ (png_uint_32) ((100.0*image->resolution.y+0.5)/2.54);
}
else if (image->units == PixelsPerCentimeterResolution)
{
ping_pHYs_unit_type=PNG_RESOLUTION_METER;
- ping_pHYs_x_resolution=(png_uint_32) (100.0*image->x_resolution+0.5);
- ping_pHYs_y_resolution=(png_uint_32) (100.0*image->y_resolution+0.5);
+ ping_pHYs_x_resolution=(png_uint_32) (100.0*image->resolution.x+0.5);
+ ping_pHYs_y_resolution=(png_uint_32) (100.0*image->resolution.y+0.5);
}
else
{
ping_pHYs_unit_type=PNG_RESOLUTION_UNKNOWN;
- ping_pHYs_x_resolution=(png_uint_32) image->x_resolution;
- ping_pHYs_y_resolution=(png_uint_32) image->y_resolution;
+ ping_pHYs_x_resolution=(png_uint_32) image->resolution.x;
+ ping_pHYs_y_resolution=(png_uint_32) image->resolution.y;
}
if (logging != MagickFalse)
}
} /* end of write_png8 */
- else if (mng_info->write_png24 || mng_info->write_png_colortype == 3)
+ else if (mng_info->write_png_colortype == 1)
+ {
+ image_matte=MagickFalse;
+ ping_color_type=(png_byte) PNG_COLOR_TYPE_GRAY;
+ }
+
+ else if (mng_info->write_png24 || mng_info->write_png48 ||
+ mng_info->write_png_colortype == 3)
{
image_matte=MagickFalse;
ping_color_type=(png_byte) PNG_COLOR_TYPE_RGB;
}
- else if (mng_info->write_png32 || mng_info->write_png_colortype == 7)
+ else if (mng_info->write_png32 || mng_info->write_png64 ||
+ mng_info->write_png_colortype == 7)
{
image_matte=MagickTrue;
ping_color_type=(png_byte) PNG_COLOR_TYPE_RGB_ALPHA;
if (ping_color_type == PNG_COLOR_TYPE_GRAY)
{
- if (image->matte == MagickFalse && ping_have_non_bw == MagickFalse)
+ if (image->alpha_trait != BlendPixelTrait && ping_have_non_bw == MagickFalse)
ping_bit_depth=1;
}
if (image->colors == 0)
{
/* DO SOMETHING */
- (void) ThrowMagickException(&image->exception,
- GetMagickModule(),CoderError,
- "image has 0 colors", "`%s'","");
+ png_error(ping,"image has 0 colors");
}
while ((int) (one << ping_bit_depth) < (ssize_t) image_colors)
if (logging != MagickFalse)
{
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " Tentative PNG color type: %.20g",(double) ping_color_type);
+ " Tentative PNG color type: %s (%.20g)",
+ PngColorTypeToString(ping_color_type),
+ (double) ping_color_type);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" image_info->type: %.20g",(double) image_info->type);
(ScaleQuantumToShort(image->colormap[0].blue) & mask);
ping_trans_color.gray=(png_uint_16)
- (ScaleQuantumToShort(PixelIntensityToQuantum(
+ (ScaleQuantumToShort(GetPixelInfoIntensity(
image->colormap)) & mask);
ping_trans_color.index=(png_byte) 0;
ping_bit_depth=1;
one=1;
- while ((one << ping_bit_depth) < (ssize_t) number_colors)
+ while ((one << ping_bit_depth) < (size_t) number_colors)
ping_bit_depth <<= 1;
}
for (i=0; i < ping_num_trans; i++)
{
- ping_trans_alpha[i]= (png_byte) (255-
- ScaleQuantumToChar(image->colormap[i].opacity));
+ ping_trans_alpha[i]= (png_byte)
+ ScaleQuantumToChar(image->colormap[i].alpha);
}
}
}
if (ping_exclude_bKGD == MagickFalse)
{
- ping_background.gray=(png_uint_16)
- ((maxval/65535.)*(ScaleQuantumToShort(
- PixelIntensity(&image->background_color)))+.5);
+ ping_background.gray=(png_uint_16) ((maxval/65535.)*
+ (ScaleQuantumToShort(((GetPixelInfoIntensity(
+ &image->background_color))) +.5)));
+
if (logging != MagickFalse)
- {
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " Setting up bKGD chunk (2)");
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " ping_background.index is %d",
- (int) ping_background.index);
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " ping_background.gray is %d",
- (int) ping_background.gray);
- }
+ " Setting up bKGD chunk (2)");
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " background_color index is %d",
+ (int) ping_background.index);
ping_have_bKGD = MagickTrue;
}
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " PNG color type: %d",ping_color_type);
+ " PNG color type: %s (%d)", PngColorTypeToString(ping_color_type),
+ ping_color_type);
/*
Initialize compression level and filtering.
*/
5: libpng adaptive filtering if compression level > 5
libpng filter type "none" if compression level <= 5
or if image is grayscale or palette
-
+
6: libpng adaptive filtering
7: "LOCO" filtering (intrapixel differing) if writing
Note that using the -quality option, not all combinations of
PNG filter type, zlib compression level, and zlib compression
- strategy are possible. This is addressed by using
- "-define png:compression-strategy", etc., which takes precedence
- over -quality.
+ strategy are possible. This will be addressed soon in a
+ release that accomodates "-define png:compression-strategy", etc.
*/
if (mng_info->write_png_compression_strategy == 0)
mng_info->write_png_compression_strategy = Z_HUFFMAN_ONLY+1;
}
-
+
else if (mng_info->write_png_compression_level == 0)
{
int
if (mng_info->write_png_compression_strategy == 0)
{
if ((quality %10) == 8 || (quality %10) == 9)
- mng_info->write_png_compression_strategy=Z_RLE;
+#ifdef Z_RLE /* Z_RLE was added to zlib-1.2.0 */
+ mng_info->write_png_compression_strategy=Z_RLE+1;
+#else
+ mng_info->write_png_compression_strategy = Z_DEFAULT_STRATEGY+1;
+#endif
}
if (mng_info->write_png_compression_filter == 0)
else
png_set_filter(ping,PNG_FILTER_TYPE_BASE,PNG_ALL_FILTERS);
}
-
else if (mng_info->write_png_compression_filter == 7 ||
mng_info->write_png_compression_filter == 10)
png_set_filter(ping,PNG_FILTER_TYPE_BASE,PNG_ALL_FILTERS);
if (ping_exclude_iCCP == MagickFalse)
{
- png_set_iCCP(ping,ping_info,(const png_charp) name,0,
+ png_set_iCCP(ping,ping_info,(png_charp) name,0,
#if (PNG_LIBPNG_VER < 10500)
(png_charp) GetStringInfoDatum(profile),
#else
#if defined(PNG_WRITE_sRGB_SUPPORTED)
if ((mng_info->have_write_global_srgb == 0) &&
- ((image->rendering_intent != UndefinedIntent) ||
- (image->colorspace == sRGBColorspace)))
+ (image->rendering_intent != UndefinedIntent))
{
if (ping_exclude_sRGB == MagickFalse)
{
"Cannot write image with defined png:bit-depth or png:color-type.");
}
- if (image_matte != MagickFalse && image->matte == MagickFalse)
+ if (image_matte != MagickFalse && image->alpha_trait != BlendPixelTrait)
{
/* Add an opaque matte channel */
- image->matte = MagickTrue;
- (void) SetImageOpacity(image,0);
+ image->alpha_trait = BlendPixelTrait;
+ (void) SetImageAlpha(image,OpaqueAlpha,exception);
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
if (mng_info->need_blob != MagickFalse)
{
- if (OpenBlob(image_info,image,WriteBinaryBlobMode,&image->exception) ==
+ if (OpenBlob(image_info,image,WriteBinaryBlobMode,exception) ==
MagickFalse)
png_error(ping,"WriteBlob Failed");
sizeof(*ping_pixels));
if (ping_pixels == (unsigned char *) NULL)
- ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
+ png_error(ping,"Allocation of memory for pixels failed");
/*
Initialize image scanlines.
*/
- if (setjmp(png_jmpbuf(ping)))
- {
- /*
- PNG write failed.
- */
-#ifdef PNG_DEBUG
- if (image_info->verbose)
- (void) printf("PNG write has failed.\n");
-#endif
- png_destroy_write_struct(&ping,&ping_info);
- if (quantum_info != (QuantumInfo *) NULL)
- quantum_info=DestroyQuantumInfo(quantum_info);
- if (ping_pixels != (unsigned char *) NULL)
- ping_pixels=(unsigned char *) RelinquishMagickMemory(ping_pixels);
-#if defined(PNG_SETJMP_NOT_THREAD_SAFE)
- UnlockSemaphoreInfo(ping_semaphore);
-#endif
- return(MagickFalse);
- }
quantum_info=AcquireQuantumInfo(image_info,image);
if (quantum_info == (QuantumInfo *) NULL)
- ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
+ png_error(ping,"Memory allocation for quantum_info failed");
quantum_info->format=UndefinedQuantumFormat;
quantum_info->depth=image_depth;
+ (void) SetQuantumEndian(image,quantum_info,MSBEndian);
num_passes=png_set_interlace_handling(ping);
if ((!mng_info->write_png8 && !mng_info->write_png24 &&
+ !mng_info->write_png48 && !mng_info->write_png64 &&
!mng_info->write_png32) &&
(mng_info->IsPalette ||
(image_info->type == BilevelType)) &&
ping_have_non_bw == MagickFalse)
{
/* Palette, Bilevel, or Opaque Monochrome */
- register const PixelPacket
+ register const Quantum
*p;
quantum_info->depth=8;
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Writing row of pixels (0)");
- p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
+ p=GetVirtualPixels(image,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
if (mng_info->IsPalette)
{
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,GrayQuantum,ping_pixels,&image->exception);
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
+ quantum_info,GrayQuantum,ping_pixels,exception);
if (mng_info->write_png_colortype-1 == PNG_COLOR_TYPE_PALETTE &&
mng_info->write_png_depth &&
mng_info->write_png_depth != old_bit_depth)
else
{
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,RedQuantum,ping_pixels,&image->exception);
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
+ quantum_info,RedQuantum,ping_pixels,exception);
}
if (mng_info->write_png_colortype-1 != PNG_COLOR_TYPE_PALETTE)
else /* Not Palette, Bilevel, or Opaque Monochrome */
{
if ((!mng_info->write_png8 && !mng_info->write_png24 &&
- !mng_info->write_png32) &&
- (image_matte != MagickFalse ||
- (ping_bit_depth >= MAGICKCORE_QUANTUM_DEPTH)) &&
- (mng_info->IsPalette) && ping_have_color == MagickFalse)
+ !mng_info->write_png48 && !mng_info->write_png64 &&
+ !mng_info->write_png32) && (image_matte != MagickFalse ||
+ (ping_bit_depth >= MAGICKCORE_QUANTUM_DEPTH)) &&
+ (mng_info->IsPalette) && ping_have_color == MagickFalse)
{
- register const PixelPacket
+ register const Quantum
*p;
for (pass=0; pass < num_passes; pass++)
for (y=0; y < (ssize_t) image->rows; y++)
{
- p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
+ p=GetVirtualPixels(image,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
if (ping_color_type == PNG_COLOR_TYPE_GRAY)
{
if (mng_info->IsPalette)
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,GrayQuantum,ping_pixels,&image->exception);
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
+ quantum_info,GrayQuantum,ping_pixels,exception);
else
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,RedQuantum,ping_pixels,&image->exception);
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
+ quantum_info,RedQuantum,ping_pixels,exception);
if (logging != MagickFalse && y == 0)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Writing GRAY_ALPHA PNG pixels (2)");
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,GrayAlphaQuantum,ping_pixels,&image->exception);
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
+ quantum_info,GrayAlphaQuantum,ping_pixels,exception);
}
if (logging != MagickFalse && y == 0)
else
{
- register const PixelPacket
+ register const Quantum
*p;
for (pass=0; pass < num_passes; pass++)
{
- if ((image_depth > 8) || (mng_info->write_png24 ||
+ if ((image_depth > 8) ||
+ mng_info->write_png24 ||
mng_info->write_png32 ||
- (!mng_info->write_png8 && !mng_info->IsPalette)))
+ mng_info->write_png48 ||
+ mng_info->write_png64 ||
+ (!mng_info->write_png8 && !mng_info->IsPalette))
{
for (y=0; y < (ssize_t) image->rows; y++)
{
- p=GetVirtualPixels(image,0,y,image->columns,1,
- &image->exception);
+ p=GetVirtualPixels(image,0,y,image->columns,1, exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
if (ping_color_type == PNG_COLOR_TYPE_GRAY)
{
if (image->storage_class == DirectClass)
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,RedQuantum,ping_pixels,&image->exception);
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
+ quantum_info,RedQuantum,ping_pixels,exception);
else
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,GrayQuantum,ping_pixels,&image->exception);
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
+ quantum_info,GrayQuantum,ping_pixels,exception);
}
else if (ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
{
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
quantum_info,GrayAlphaQuantum,ping_pixels,
- &image->exception);
+ exception);
if (logging != MagickFalse && y == 0)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
}
else if (image_matte != MagickFalse)
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,RGBAQuantum,ping_pixels,&image->exception);
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
+ quantum_info,RGBAQuantum,ping_pixels,exception);
else
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,RGBQuantum,ping_pixels,&image->exception);
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
+ quantum_info,RGBQuantum,ping_pixels,exception);
if (logging != MagickFalse && y == 0)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
}
else
- /* not ((image_depth > 8) || (mng_info->write_png24 ||
- mng_info->write_png32 ||
- (!mng_info->write_png8 && !mng_info->IsPalette))) */
+ /* not ((image_depth > 8) ||
+ mng_info->write_png24 || mng_info->write_png32 ||
+ mng_info->write_png48 || mng_info->write_png64 ||
+ (!mng_info->write_png8 && !mng_info->IsPalette))
+ */
{
if ((ping_color_type != PNG_COLOR_TYPE_GRAY) &&
(ping_color_type != PNG_COLOR_TYPE_GRAY_ALPHA))
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" pass %d, Image Is RGB, 16-bit GRAY, or GRAY_ALPHA",pass);
- p=GetVirtualPixels(image,0,y,image->columns,1,
- &image->exception);
+ p=GetVirtualPixels(image,0,y,image->columns,1, exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
if (ping_color_type == PNG_COLOR_TYPE_GRAY)
{
quantum_info->depth=image->depth;
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,GrayQuantum,ping_pixels,&image->exception);
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
+ quantum_info,GrayQuantum,ping_pixels,exception);
}
else if (ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Writing GRAY_ALPHA PNG pixels (4)");
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
quantum_info,GrayAlphaQuantum,ping_pixels,
- &image->exception);
+ exception);
}
else
{
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,IndexQuantum,ping_pixels,&image->exception);
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
+ quantum_info,IndexQuantum,ping_pixels,exception);
if (logging != MagickFalse && y <= 2)
{
png_textp
text;
- value=GetImageProperty(image,property);
+ value=GetImageProperty(image,property,exception);
/* Don't write any "png:" properties; those are just for "identify" */
if (LocaleNCompare(property,"png:",4) != 0 &&
{
if (value != (const char *) NULL)
{
- text=(png_textp) png_malloc(ping,(png_uint_32) sizeof(png_text));
+
+#if PNG_LIBPNG_VER >= 14000
+ text=(png_textp) png_malloc(ping,
+ (png_alloc_size_t) sizeof(png_text));
+#else
+ text=(png_textp) png_malloc(ping,(png_size_t) sizeof(png_text));
+#endif
text[0].key=(char *) property;
text[0].text=(char *) value;
text[0].text_length=strlen(value);
" Setting up text chunk");
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " keyword: %s",text[0].key);
+ " keyword: '%s'",text[0].key);
}
png_set_text(ping,ping_info,text,1);
}
if (mng_info->write_mng && !mng_info->need_fram &&
((int) image->dispose == 3))
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
- CoderError,"Cannot convert GIF with disposal method 3 to MNG-LC",
- "`%s'",image->filename);
+ png_error(ping, "Cannot convert GIF with disposal method 3 to MNG-LC");
/*
Free PNG resources.
ping_pixels=(unsigned char *) RelinquishMagickMemory(ping_pixels);
-#if defined(PNG_SETJMP_NOT_THREAD_SAFE)
- UnlockSemaphoreInfo(ping_semaphore);
-#endif
+ if (ping_have_blob != MagickFalse)
+ (void) CloseBlob(image);
+
+ image_info=DestroyImageInfo(image_info);
+ image=DestroyImage(image);
/* Store bit depth actually written */
s[0]=(char) ping_bit_depth;
s[1]='\0';
- (void) SetImageProperty(image,"png:bit-depth-written",s);
+ (void) SetImageProperty(IMimage,"png:bit-depth-written",s,exception);
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" exit WriteOnePNGImage()");
+#ifdef PNG_SETJMP_NOT_THREAD_SAFE
+ UnlockSemaphoreInfo(ping_semaphore);
+#endif
+
+ /* } for navigation to beginning of SETJMP-protected block. Revert to
+ * Throwing an Exception when an error occurs.
+ */
+
return(MagickTrue);
/* End write one PNG image */
+
}
/*
%
% The format of the WritePNGImage method is:
%
-% MagickBooleanType WritePNGImage(const ImageInfo *image_info,Image *image)
+% MagickBooleanType WritePNGImage(const ImageInfo *image_info,
+% Image *image,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
%
% o image: The image.
%
+% o exception: return any errors or warnings in this structure.
+%
% Returns MagickTrue on success, MagickFalse on failure.
%
% Communicating with the PNG encoder:
% The only loss in data is the reduction of the sample depth
% to 8.
%
+% o PNG48: A 16-bit per sample RGB PNG datastream is written. The tRNS
+% chunk can be present to convey binary transparency by naming
+% one of the colors as transparent. If the image has more
+% than one transparent color, has semitransparent pixels, or
+% has an opaque pixel with the same RGB components as the
+% transparent color, an image is not written.
+%
+% o PNG64: A 16-bit per sample RGBA PNG is written. Partial
+% transparency is permitted, i.e., the alpha sample for
+% each pixel can have any value from 0 to 65535. The alpha
+% channel is present even if the image is fully opaque.
+%
+% o PNG00: A PNG that inherits its colortype and bit-depth from the input
+% image, if the input was a PNG, is written. If these values
+% cannot be found, then "PNG00" falls back to the regular "PNG"
+% format.
+%
% o -define: For more precise control of the PNG output, you can use the
% Image options "png:bit-depth" and "png:color-type". These
% can be set from the commandline with "-define" and also
% When png:color-type is 4 (Gray-Matte) or 6 (RGB-Matte),
% png:bit-depth can be 8 or 16.
%
-% If the image cannot be written without loss with the requested bit-depth
-% and color-type, a PNG file will not be written, and the encoder will
-% return MagickFalse.
+% If the image cannot be written without loss with the
+% requested bit-depth and color-type, a PNG file will not
+% be written, a warning will be issued, and the encoder will
+% return MagickFalse.
%
% Since image encoders should not be responsible for the "heavy lifting",
% the user should make sure that ImageMagick has already reduced the
% image depth and number of colors and limit transparency to binary
% transparency prior to attempting to write the image with depth, color,
-% or transparency limitations.
-%
-% To do: Enforce the previous paragraph.
+% or transparency limitations.
%
% Note that another definition, "png:bit-depth-written" exists, but it
% is not intended for external use. It is only used internally by the
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/
static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
- Image *image)
+ Image *image,ExceptionInfo *exception)
{
MagickBooleanType
excluding,
mng_info->write_png8=LocaleCompare(image_info->magick,"PNG8") == 0;
mng_info->write_png24=LocaleCompare(image_info->magick,"PNG24") == 0;
mng_info->write_png32=LocaleCompare(image_info->magick,"PNG32") == 0;
+ mng_info->write_png48=LocaleCompare(image_info->magick,"PNG48") == 0;
+ mng_info->write_png64=LocaleCompare(image_info->magick,"PNG64") == 0;
value=GetImageOption(image_info,"png:format");
if (value != (char *) NULL)
{
+ mng_info->write_png8 = MagickFalse;
+ mng_info->write_png24 = MagickFalse;
+ mng_info->write_png32 = MagickFalse;
+ mng_info->write_png48 = MagickFalse;
+ mng_info->write_png64 = MagickFalse;
+
if (LocaleCompare(value,"png8") == 0)
- {
mng_info->write_png8 = MagickTrue;
- mng_info->write_png24 = MagickFalse;
- mng_info->write_png32 = MagickFalse;
- }
else if (LocaleCompare(value,"png24") == 0)
- {
- mng_info->write_png8 = MagickFalse;
mng_info->write_png24 = MagickTrue;
- mng_info->write_png32 = MagickFalse;
- }
else if (LocaleCompare(value,"png32") == 0)
- {
- mng_info->write_png8 = MagickFalse;
- mng_info->write_png24 = MagickFalse;
mng_info->write_png32 = MagickTrue;
+
+ else if (LocaleCompare(value,"png48") == 0)
+ mng_info->write_png48 = MagickTrue;
+
+ else if (LocaleCompare(value,"png64") == 0)
+ mng_info->write_png64 = MagickTrue;
+ }
+
+ if (LocaleCompare(value,"png00") == 0)
+ {
+ /* Retrieve png:IHDR.bit-depth-orig and png:IHDR.color-type-orig
+ Note that whitespace at the end of the property names must match
+ that in the corresponding SetImageProperty() calls.
+ */
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " Format=%s",value);
+
+ value=GetImageProperty(image,"png:IHDR.bit-depth-orig ",exception);
+
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " png00 inherited bit depth=%s",value);
+
+ if (value != (char *) NULL)
+ {
+ if (LocaleCompare(value,"1") == 0)
+ mng_info->write_png_depth = 1;
+
+ else if (LocaleCompare(value,"1") == 0)
+ mng_info->write_png_depth = 2;
+
+ else if (LocaleCompare(value,"2") == 0)
+ mng_info->write_png_depth = 4;
+
+ else if (LocaleCompare(value,"8") == 0)
+ mng_info->write_png_depth = 8;
+
+ else if (LocaleCompare(value,"16") == 0)
+ mng_info->write_png_depth = 16;
+ }
+
+ value=GetImageProperty(image,"png:IHDR.color-type-orig ",exception);
+
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " png00 inherited color type=%s",value);
+
+ if (value != (char *) NULL)
+ {
+ if (LocaleCompare(value,"0") == 0)
+ mng_info->write_png_colortype = 1;
+
+ else if (LocaleCompare(value,"2") == 0)
+ mng_info->write_png_colortype = 3;
+
+ else if (LocaleCompare(value,"3") == 0)
+ mng_info->write_png_colortype = 4;
+
+ else if (LocaleCompare(value,"4") == 0)
+ mng_info->write_png_colortype = 5;
+
+ else if (LocaleCompare(value,"6") == 0)
+ mng_info->write_png_colortype = 7;
}
}
mng_info->write_png_depth = 8;
image->depth = 8;
- if (image->matte == MagickTrue)
- (void) SetImageType(image,TrueColorMatteType);
+ if (image->alpha_trait == BlendPixelTrait)
+ (void) SetImageType(image,TrueColorMatteType,exception);
else
- (void) SetImageType(image,TrueColorType);
+ (void) SetImageType(image,TrueColorType,exception);
- (void) SyncImage(image);
+ (void) SyncImage(image,exception);
}
if (mng_info->write_png32)
mng_info->write_png_depth = 8;
image->depth = 8;
- if (image->matte == MagickTrue)
- (void) SetImageType(image,TrueColorMatteType);
+ if (image->alpha_trait == BlendPixelTrait)
+ (void) SetImageType(image,TrueColorMatteType,exception);
+
+ else
+ (void) SetImageType(image,TrueColorType,exception);
+
+ (void) SyncImage(image,exception);
+ }
+
+ if (mng_info->write_png48)
+ {
+ mng_info->write_png_colortype = /* 2 */ 3;
+ mng_info->write_png_depth = 16;
+ image->depth = 16;
+
+ if (image->alpha_trait == BlendPixelTrait)
+ (void) SetImageType(image,TrueColorMatteType,exception);
+
+ else
+ (void) SetImageType(image,TrueColorType,exception);
+
+ (void) SyncImage(image,exception);
+ }
+
+ if (mng_info->write_png64)
+ {
+ mng_info->write_png_colortype = /* 6 */ 7;
+ mng_info->write_png_depth = 16;
+ image->depth = 16;
+
+ if (image->alpha_trait == BlendPixelTrait)
+ (void) SetImageType(image,TrueColorMatteType,exception);
else
- (void) SetImageType(image,TrueColorType);
+ (void) SetImageType(image,TrueColorType,exception);
- (void) SyncImage(image);
+ (void) SyncImage(image,exception);
}
value=GetImageOption(image_info,"png:bit-depth");
mng_info->write_png_depth = 16;
else
- (void) ThrowMagickException(&image->exception,
+ (void) ThrowMagickException(exception,
GetMagickModule(),CoderWarning,
"ignoring invalid defined png:bit-depth",
"=%s",value);
if (LocaleCompare(value,"0") == 0)
mng_info->write_png_colortype = 1;
+ else if (LocaleCompare(value,"1") == 0)
+ mng_info->write_png_colortype = 2;
+
else if (LocaleCompare(value,"2") == 0)
mng_info->write_png_colortype = 3;
mng_info->write_png_colortype = 7;
else
- (void) ThrowMagickException(&image->exception,
+ (void) ThrowMagickException(exception,
GetMagickModule(),CoderWarning,
"ignoring invalid defined png:color-type",
"=%s",value);
value=GetImageOption(image_info,"png:compression-level");
if (value != NULL)
{
- /* To do: use a "LocaleInteger:()" function here. */
-
/* We have to add 1 to everything because 0 is a valid input,
* and we want to use 0 (the default) to mean undefined.
*/
mng_info->write_png_compression_level = 10;
else
- (void) ThrowMagickException(&image->exception,
+ (void) ThrowMagickException(exception,
GetMagickModule(),CoderWarning,
"ignoring invalid defined png:compression-level",
"=%s",value);
#endif
else
- (void) ThrowMagickException(&image->exception,
+ (void) ThrowMagickException(exception,
GetMagickModule(),CoderWarning,
"ignoring invalid defined png:compression-strategy",
"=%s",value);
if (LocaleCompare(value,"0") == 0)
mng_info->write_png_compression_filter = 1;
- if (LocaleCompare(value,"1") == 0)
+ else if (LocaleCompare(value,"1") == 0)
mng_info->write_png_compression_filter = 2;
else if (LocaleCompare(value,"2") == 0)
else if (LocaleCompare(value,"5") == 0)
mng_info->write_png_compression_filter = 6;
-
else
- (void) ThrowMagickException(&image->exception,
+ (void) ThrowMagickException(exception,
GetMagickModule(),CoderWarning,
"ignoring invalid defined png:compression-filter",
"=%s",value);
mng_info->need_blob = MagickTrue;
- status=WriteOnePNGImage(mng_info,image_info,image);
-
- (void) CloseBlob(image);
+ status=WriteOnePNGImage(mng_info,image_info,image,exception);
MngInfoFreeStruct(mng_info,&have_mng_structure);
/* Write one JNG image */
static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info,
- const ImageInfo *image_info,Image *image)
+ const ImageInfo *image_info,Image *image,ExceptionInfo *exception)
{
Image
*jpeg_image;
status=MagickTrue;
transparent=image_info->type==GrayscaleMatteType ||
- image_info->type==TrueColorMatteType || image->matte != MagickFalse;
+ image_info->type==TrueColorMatteType || image->alpha_trait == BlendPixelTrait;
jng_quality=image_info->quality == 0UL ? 75UL : image_info->quality%1000;
jng_alpha_compression_method=image->compression==JPEGCompression? 8 : 0;
- jng_alpha_quality=image_info->quality == 0UL ? 75UL :
+ jng_alpha_quality=image_info->quality == 0UL ? 75UL :
image_info->quality;
if (jng_alpha_quality >= 1000)
/* Create JPEG blob, image, and image_info */
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " Creating jpeg_image_info for opacity.");
+ " Creating jpeg_image_info for alpha.");
jpeg_image_info=(ImageInfo *) CloneImageInfo(image_info);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Creating jpeg_image.");
- jpeg_image=CloneImage(image,0,0,MagickTrue,&image->exception);
-
+ jpeg_image=SeparateImage(image,AlphaChannel,exception);
if (jpeg_image == (Image *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
-
(void) CopyMagickString(jpeg_image->magick,"JPEG",MaxTextExtent);
- status=SeparateImageChannel(jpeg_image,OpacityChannel);
- status=NegateImage(jpeg_image,MagickFalse);
- jpeg_image->matte=MagickFalse;
-
- jpeg_image_info->type=GrayscaleType;
+ jpeg_image->alpha_trait=UndefinedPixelTrait;
jpeg_image->quality=jng_alpha_quality;
- (void) SetImageType(jpeg_image,GrayscaleType);
+ jpeg_image_info->type=GrayscaleType;
+ (void) SetImageType(jpeg_image,GrayscaleType,exception);
(void) AcquireUniqueFilename(jpeg_image->filename);
(void) FormatLocaleString(jpeg_image_info->filename,MaxTextExtent,
"%s",jpeg_image->filename);
/* Check if image is grayscale. */
if (image_info->type != TrueColorMatteType && image_info->type !=
- TrueColorType && ImageIsGray(image))
+ TrueColorType && IsImageGray(image,exception))
jng_color_type-=2;
if (logging != MagickFalse)
const char
*value;
- /* Encode opacity as a grayscale PNG blob */
+ /* Encode alpha as a grayscale PNG blob */
status=OpenBlob(jpeg_image_info,jpeg_image,WriteBinaryBlobMode,
- &image->exception);
+ exception);
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Creating PNG blob.");
(void) SetImageArtifact(jpeg_image,"png:exclude-chunks","all");
blob=ImageToBlob(jpeg_image_info,jpeg_image,&length,
- &image->exception);
+ exception);
/* Retrieve sample depth used */
- value=GetImageProperty(jpeg_image,"png:bit-depth-written");
+ value=GetImageProperty(jpeg_image,"png:bit-depth-written",exception);
if (value != (char *) NULL)
jng_alpha_sample_depth= (unsigned int) value[0];
}
else
{
- /* Encode opacity as a grayscale JPEG blob */
+ /* Encode alpha as a grayscale JPEG blob */
status=OpenBlob(jpeg_image_info,jpeg_image,WriteBinaryBlobMode,
- &image->exception);
+ exception);
(void) CopyMagickString(jpeg_image_info->magick,"JPEG",MaxTextExtent);
(void) CopyMagickString(jpeg_image->magick,"JPEG",MaxTextExtent);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Creating blob.");
blob=ImageToBlob(jpeg_image_info,jpeg_image,&length,
- &image->exception);
+ exception);
jng_alpha_sample_depth=8;
if (logging != MagickFalse)
}
}
- if (image->x_resolution && image->y_resolution && !mng_info->equal_physs)
+ if (image->resolution.x && image->resolution.y && !mng_info->equal_physs)
{
/*
Write JNG pHYs chunk
if (image->units == PixelsPerInchResolution)
{
PNGLong(chunk+4,(png_uint_32)
- (image->x_resolution*100.0/2.54+0.5));
+ (image->resolution.x*100.0/2.54+0.5));
PNGLong(chunk+8,(png_uint_32)
- (image->y_resolution*100.0/2.54+0.5));
+ (image->resolution.y*100.0/2.54+0.5));
chunk[12]=1;
}
if (image->units == PixelsPerCentimeterResolution)
{
PNGLong(chunk+4,(png_uint_32)
- (image->x_resolution*100.0+0.5));
+ (image->resolution.x*100.0+0.5));
PNGLong(chunk+8,(png_uint_32)
- (image->y_resolution*100.0+0.5));
+ (image->resolution.y*100.0+0.5));
chunk[12]=1;
}
else
{
- PNGLong(chunk+4,(png_uint_32) (image->x_resolution+0.5));
- PNGLong(chunk+8,(png_uint_32) (image->y_resolution+0.5));
+ PNGLong(chunk+4,(png_uint_32) (image->resolution.x+0.5));
+ PNGLong(chunk+8,(png_uint_32) (image->resolution.y+0.5));
chunk[12]=0;
}
}
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Creating jpeg_image.");
- jpeg_image=CloneImage(image,0,0,MagickTrue,&image->exception);
+ jpeg_image=CloneImage(image,0,0,MagickTrue,exception);
if (jpeg_image == (Image *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
(void) CopyMagickString(jpeg_image->magick,"JPEG",MaxTextExtent);
jpeg_image->filename);
status=OpenBlob(jpeg_image_info,jpeg_image,WriteBinaryBlobMode,
- &image->exception);
+ exception);
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Creating blob.");
- blob=ImageToBlob(jpeg_image_info,jpeg_image,&length,&image->exception);
+ blob=ImageToBlob(jpeg_image_info,jpeg_image,&length,exception);
if (logging != MagickFalse)
{
%
% The format of the WriteJNGImage method is:
%
-% MagickBooleanType WriteJNGImage(const ImageInfo *image_info,Image *image)
+% MagickBooleanType WriteJNGImage(const ImageInfo *image_info,
+% Image *image,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
%
% o image: The image.
%
+% o exception: return any errors or warnings in this structure.
+%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/
-static MagickBooleanType WriteJNGImage(const ImageInfo *image_info,Image *image)
+static MagickBooleanType WriteJNGImage(const ImageInfo *image_info,Image *image,
+ ExceptionInfo *exception)
{
MagickBooleanType
have_mng_structure,
assert(image->signature == MagickSignature);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
logging=LogMagickEvent(CoderEvent,GetMagickModule(),"Enter WriteJNGImage()");
- status=OpenBlob(image_info,image,WriteBinaryBlobMode,&image->exception);
+ status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
(void) WriteBlob(image,8,(const unsigned char *) "\213JNG\r\n\032\n");
- status=WriteOneJNGImage(mng_info,image_info,image);
+ status=WriteOneJNGImage(mng_info,image_info,image,exception);
(void) CloseBlob(image);
(void) CatchImageException(image);
}
#endif
-
-
-static MagickBooleanType WriteMNGImage(const ImageInfo *image_info,Image *image)
+static MagickBooleanType WriteMNGImage(const ImageInfo *image_info,Image *image,
+ ExceptionInfo *exception)
{
const char
*option;
assert(image->signature == MagickSignature);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
logging=LogMagickEvent(CoderEvent,GetMagickModule(),"Enter WriteMNGImage()");
- status=OpenBlob(image_info,image,WriteBinaryBlobMode,&image->exception);
+ status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Image depth: %.20g",(double) p->depth);
- if (p->matte)
+ if (p->alpha_trait == BlendPixelTrait)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Matte: True");
if (next_image->page.x || next_image->page.y)
need_defi=MagickTrue;
- if (next_image->matte)
+ if (next_image->alpha_trait == BlendPixelTrait)
need_matte=MagickTrue;
if ((int) next_image->dispose >= BackgroundDispose)
- if (next_image->matte || next_image->page.x || next_image->page.y ||
+ if ((next_image->alpha_trait == BlendPixelTrait) ||
+ next_image->page.x || next_image->page.y ||
((next_image->columns < mng_info->page.width) &&
(next_image->rows < mng_info->page.height)))
mng_info->need_fram=MagickTrue;
/*
check for global palette possibility.
*/
- if (image->matte != MagickFalse)
+ if (image->alpha_trait == BlendPixelTrait)
need_local_plte=MagickTrue;
if (need_local_plte == 0)
{
- if (ImageIsGray(image) == MagickFalse)
+ if (IsImageGray(image,exception) == MagickFalse)
all_images_are_gray=MagickFalse;
mng_info->equal_palettes=PalettesAreEqual(image,next_image);
if (use_global_plte == 0)
mng_info->equal_srgbs=MagickFalse;
if ((next_image->units != next_image->next->units) ||
- (next_image->x_resolution != next_image->next->x_resolution) ||
- (next_image->y_resolution != next_image->next->y_resolution))
+ (next_image->resolution.x != next_image->next->resolution.x) ||
+ (next_image->resolution.y != next_image->next->resolution.y))
mng_info->equal_physs=MagickFalse;
if (mng_info->equal_chrms)
if (mng_info->adjoin)
{
final_delay=10;
- (void) ThrowMagickException(&image->exception,
- GetMagickModule(),CoderWarning,
+ (void) ThrowMagickException(exception,GetMagickModule(),
+ CoderWarning,
"input has zero delay between all frames; assuming",
" 10 cs `%s'","");
}
mng_info->have_write_global_chrm=MagickTrue;
}
}
- if (image->x_resolution && image->y_resolution && mng_info->equal_physs)
+ if (image->resolution.x && image->resolution.y && mng_info->equal_physs)
{
/*
Write MNG pHYs chunk
if (image->units == PixelsPerInchResolution)
{
PNGLong(chunk+4,(png_uint_32)
- (image->x_resolution*100.0/2.54+0.5));
+ (image->resolution.x*100.0/2.54+0.5));
PNGLong(chunk+8,(png_uint_32)
- (image->y_resolution*100.0/2.54+0.5));
+ (image->resolution.y*100.0/2.54+0.5));
chunk[12]=1;
}
if (image->units == PixelsPerCentimeterResolution)
{
PNGLong(chunk+4,(png_uint_32)
- (image->x_resolution*100.0+0.5));
+ (image->resolution.x*100.0+0.5));
PNGLong(chunk+8,(png_uint_32)
- (image->y_resolution*100.0+0.5));
+ (image->resolution.y*100.0+0.5));
chunk[12]=1;
}
else
{
- PNGLong(chunk+4,(png_uint_32) (image->x_resolution+0.5));
- PNGLong(chunk+8,(png_uint_32) (image->y_resolution+0.5));
+ PNGLong(chunk+4,(png_uint_32) (image->resolution.x+0.5));
+ PNGLong(chunk+8,(png_uint_32) (image->resolution.y+0.5));
chunk[12]=0;
}
}
Write MNG BACK chunk and global bKGD chunk, if the image is transparent
or does not cover the entire frame.
*/
- if (write_mng && (image->matte || image->page.x > 0 ||
- image->page.y > 0 || (image->page.width &&
+ if (write_mng && ((image->alpha_trait == BlendPixelTrait) ||
+ image->page.x > 0 || image->page.y > 0 || (image->page.width &&
(image->page.width+image->page.x < mng_info->page.width))
|| (image->page.height && (image->page.height+image->page.y
< mng_info->page.height))))
for (i=0; i < (ssize_t) image->colors; i++)
{
- chunk[4+i*3]=ScaleQuantumToChar(image->colormap[i].red) & 0xff;
- chunk[5+i*3]=ScaleQuantumToChar(image->colormap[i].green) & 0xff;
- chunk[6+i*3]=ScaleQuantumToChar(image->colormap[i].blue) & 0xff;
+ chunk[4+i*3]=(unsigned char) (ScaleQuantumToChar(
+ image->colormap[i].red) & 0xff);
+ chunk[5+i*3]=(unsigned char) (ScaleQuantumToChar(
+ image->colormap[i].green) & 0xff);
+ chunk[6+i*3]=(unsigned char) (ScaleQuantumToChar(
+ image->colormap[i].blue) & 0xff);
}
(void) WriteBlob(image,data_length+4,chunk);
/* To do: specify the desired alpha compression method. */
write_info=CloneImageInfo(image_info);
write_info->compression=UndefinedCompression;
- status=WriteOneJNGImage(mng_info,write_info,image);
+ status=WriteOneJNGImage(mng_info,write_info,image,exception);
write_info=DestroyImageInfo(write_info);
}
else
mng_info->ping_exclude_zCCP=MagickTrue;
mng_info->ping_exclude_zTXt=MagickTrue;
- status=WriteOnePNGImage(mng_info,image_info,image);
+ status=WriteOnePNGImage(mng_info,image_info,image,exception);
}
if (status == MagickFalse)
projects / imagemagick / blobdiff