/*
Include declarations.
*/
-#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/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"
+#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"
#if defined(MAGICKCORE_PNG_DELEGATE)
/* Suppress libpng pedantic warnings that were added in
#endif
/* Macros for left-bit-replication to ensure that pixels
- * and PixelInfos all have the same image->depth, and for use
+ * and PixelPackets all have the same image->depth, and for use
* in PNG8 quantization.
*/
(pixelpacket).blue=(ScaleQuantumToChar((pixelpacket).blue) < 0x10 ? \
0 : QuantumRange);
-#define LBR01PacketAlpha(pixelpacket) \
- (pixelpacket).alpha=(ScaleQuantumToChar((pixelpacket).alpha) < 0x10 ? \
+#define LBR01PacketOpacity(pixelpacket) \
+ (pixelpacket).opacity=(ScaleQuantumToChar((pixelpacket).opacity) < 0x10 ? \
0 : QuantumRange);
#define LBR01PacketRGB(pixelpacket) \
#define LBR01PacketRGBO(pixelpacket) \
{ \
LBR01PacketRGB((pixelpacket)); \
- LBR01PacketAlpha((pixelpacket)); \
+ LBR01PacketOpacity((pixelpacket)); \
}
#define LBR01PixelRed(pixel) \
- (ScaleQuantumToChar(GetPixelRed(image,(pixel))) < 0x10 ? \
+ (ScaleQuantumToChar(GetPixelRed((pixel))) < 0x10 ? \
0 : QuantumRange);
#define LBR01PixelGreen(pixel) \
- (ScaleQuantumToChar(GetPixelGreen(image,(pixel))) < 0x10 ? \
+ (ScaleQuantumToChar(GetPixelGreen((pixel))) < 0x10 ? \
0 : QuantumRange);
#define LBR01PixelBlue(pixel) \
- (ScaleQuantumToChar(GetPixelBlue(image,(pixel))) < 0x10 ? \
+ (ScaleQuantumToChar(GetPixelBlue((pixel))) < 0x10 ? \
0 : QuantumRange);
-#define LBR01PixelAlpha(pixel) \
- (ScaleQuantumToChar(GetPixelAlpha(image,(pixel))) < 0x10 ? \
+#define LBR01PixelOpacity(pixel) \
+ (ScaleQuantumToChar(GetPixelOpacity((pixel))) < 0x10 ? \
0 : QuantumRange);
#define LBR01PixelRGB(pixel) \
LBR01PixelBlue((pixel)); \
}
-#define LBR01PixelRGBA(pixel) \
+#define LBR01PixelRGBO(pixel) \
{ \
LBR01PixelRGB((pixel)); \
- LBR01PixelAlpha((pixel)); \
+ LBR01PixelOpacity((pixel)); \
}
/* LBR02: Replicate top 2 bits */
(pixelpacket).blue=ScaleCharToQuantum( \
(lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6))); \
}
-#define LBR02PacketAlpha(pixelpacket) \
+#define LBR02PacketOpacity(pixelpacket) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).alpha) & 0xc0; \
- (pixelpacket).alpha=ScaleCharToQuantum( \
+ unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).opacity) & 0xc0; \
+ (pixelpacket).opacity=ScaleCharToQuantum( \
(lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6))); \
}
#define LBR02PacketRGBO(pixelpacket) \
{ \
LBR02PacketRGB((pixelpacket)); \
- LBR02PacketAlpha((pixelpacket)); \
+ LBR02PacketOpacity((pixelpacket)); \
}
#define LBR02PixelRed(pixel) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar(GetPixelRed(image,(pixel))) \
+ unsigned char lbr_bits=ScaleQuantumToChar(GetPixelRed((pixel))) \
& 0xc0; \
- SetPixelRed(image, ScaleCharToQuantum( \
- (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6))), \
- (pixel)); \
+ SetPixelRed((pixel), ScaleCharToQuantum( \
+ (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6)))); \
}
#define LBR02PixelGreen(pixel) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar(GetPixelGreen(image,(pixel)))\
+ unsigned char lbr_bits=ScaleQuantumToChar(GetPixelGreen((pixel)))\
& 0xc0; \
- SetPixelGreen(image, ScaleCharToQuantum( \
- (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6))), \
- (pixel)); \
+ SetPixelGreen((pixel), ScaleCharToQuantum( \
+ (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6)))); \
}
#define LBR02PixelBlue(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelBlue(image,(pixel))) & 0xc0; \
- SetPixelBlue(image, ScaleCharToQuantum( \
- (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6))), \
- (pixel)); \
+ ScaleQuantumToChar(GetPixelBlue((pixel))) & 0xc0; \
+ SetPixelBlue((pixel), ScaleCharToQuantum( \
+ (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6)))); \
}
-#define LBR02PixelAlpha(pixel) \
+#define LBR02Opacity(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelAlpha(image,(pixel))) & 0xc0; \
- SetPixelAlpha(image, ScaleCharToQuantum( \
- (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6))), \
- (pixel) ); \
+ ScaleQuantumToChar(GetPixelOpacity((pixel))) & 0xc0; \
+ SetPixelOpacity((pixel), ScaleCharToQuantum( \
+ (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6)))); \
}
#define LBR02PixelRGB(pixel) \
LBR02PixelBlue((pixel)); \
}
-#define LBR02PixelRGBA(pixel) \
+#define LBR02PixelRGBO(pixel) \
{ \
LBR02PixelRGB((pixel)); \
- LBR02PixelAlpha((pixel)); \
+ LBR02Opacity((pixel)); \
}
/* LBR03: Replicate top 3 bits (only used with opaque pixels during
#define LBR03PixelRed(pixel) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar(GetPixelRed(image,(pixel))) \
+ unsigned char lbr_bits=ScaleQuantumToChar(GetPixelRed((pixel))) \
& 0xe0; \
- SetPixelRed(image, ScaleCharToQuantum( \
- (lbr_bits | (lbr_bits >> 3) | (lbr_bits >> 6))), (pixel)); \
+ SetPixelRed((pixel), ScaleCharToQuantum( \
+ (lbr_bits | (lbr_bits >> 3) | (lbr_bits >> 6)))); \
}
-#define LBR03Green(pixel) \
+#define LBR03PixelGreen(pixel) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar(GetPixelGreen(image,(pixel)))\
+ unsigned char lbr_bits=ScaleQuantumToChar(GetPixelGreen((pixel)))\
& 0xe0; \
- SetPixelGreen(image, ScaleCharToQuantum( \
- (lbr_bits | (lbr_bits >> 3) | (lbr_bits >> 6))), (pixel)); \
+ SetPixelGreen((pixel), ScaleCharToQuantum( \
+ (lbr_bits | (lbr_bits >> 3) | (lbr_bits >> 6)))); \
}
-#define LBR03Blue(pixel) \
+#define LBR03PixelBlue(pixel) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar(GetPixelBlue(image,(pixel))) \
+ unsigned char lbr_bits=ScaleQuantumToChar(GetPixelBlue((pixel))) \
& 0xe0; \
- SetPixelBlue(image, ScaleCharToQuantum( \
- (lbr_bits | (lbr_bits >> 3) | (lbr_bits >> 6))), (pixel)); \
+ SetPixelBlue((pixel), ScaleCharToQuantum( \
+ (lbr_bits | (lbr_bits >> 3) | (lbr_bits >> 6)))); \
}
-#define LBR03RGB(pixel) \
+#define LBR03PixelRGB(pixel) \
{ \
LBR03PixelRed((pixel)); \
- LBR03Green((pixel)); \
- LBR03Blue((pixel)); \
+ LBR03PixelGreen((pixel)); \
+ LBR03PixelBlue((pixel)); \
}
/* LBR04: Replicate top 4 bits */
unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).blue) & 0xf0; \
(pixelpacket).blue=ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))); \
}
-#define LBR04PacketAlpha(pixelpacket) \
+#define LBR04PacketOpacity(pixelpacket) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).alpha) & 0xf0; \
- (pixelpacket).alpha=ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))); \
+ unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).opacity) & 0xf0; \
+ (pixelpacket).opacity=ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))); \
}
#define LBR04PacketRGB(pixelpacket) \
#define LBR04PacketRGBO(pixelpacket) \
{ \
LBR04PacketRGB((pixelpacket)); \
- LBR04PacketAlpha((pixelpacket)); \
+ LBR04PacketOpacity((pixelpacket)); \
}
#define LBR04PixelRed(pixel) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar(GetPixelRed(image,(pixel))) \
+ unsigned char lbr_bits=ScaleQuantumToChar(GetPixelRed((pixel))) \
& 0xf0; \
- SetPixelRed(image,\
- ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))), (pixel)); \
+ SetPixelRed((pixel),\
+ ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4)))); \
}
#define LBR04PixelGreen(pixel) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar(GetPixelGreen(image,(pixel)))\
+ unsigned char lbr_bits=ScaleQuantumToChar(GetPixelGreen((pixel)))\
& 0xf0; \
- SetPixelGreen(image,\
- ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))), (pixel)); \
+ SetPixelGreen((pixel),\
+ ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4)))); \
}
#define LBR04PixelBlue(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelBlue(image,(pixel))) & 0xf0; \
- SetPixelBlue(image,\
- ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))), (pixel)); \
+ ScaleQuantumToChar(GetPixelBlue((pixel))) & 0xf0; \
+ SetPixelBlue((pixel),\
+ ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4)))); \
}
-#define LBR04PixelAlpha(pixel) \
+#define LBR04PixelOpacity(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelAlpha(image,(pixel))) & 0xf0; \
- SetPixelAlpha(image,\
- ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))), (pixel)); \
+ ScaleQuantumToChar(GetPixelOpacity((pixel))) & 0xf0; \
+ SetPixelOpacity((pixel),\
+ ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4)))); \
}
#define LBR04PixelRGB(pixel) \
LBR04PixelBlue((pixel)); \
}
-#define LBR04PixelRGBA(pixel) \
+#define LBR04PixelRGBO(pixel) \
{ \
LBR04PixelRGB((pixel)); \
- LBR04PixelAlpha((pixel)); \
+ LBR04PixelOpacity((pixel)); \
}
unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).blue); \
(pixelpacket).blue=ScaleCharToQuantum((lbr_bits)); \
}
-#define LBR08PacketAlpha(pixelpacket) \
+#define LBR08PacketOpacity(pixelpacket) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).alpha); \
- (pixelpacket).alpha=ScaleCharToQuantum((lbr_bits)); \
+ unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).opacity); \
+ (pixelpacket).opacity=ScaleCharToQuantum((lbr_bits)); \
}
#define LBR08PacketRGB(pixelpacket) \
#define LBR08PacketRGBO(pixelpacket) \
{ \
LBR08PacketRGB((pixelpacket)); \
- LBR08PacketAlpha((pixelpacket)); \
+ LBR08PacketOpacity((pixelpacket)); \
}
#define LBR08PixelRed(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelRed(image,(pixel))); \
- SetPixelRed(image,\
- ScaleCharToQuantum((lbr_bits)), (pixel)); \
+ ScaleQuantumToChar(GetPixelRed((pixel))); \
+ SetPixelRed((pixel),\
+ ScaleCharToQuantum((lbr_bits))); \
}
#define LBR08PixelGreen(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelGreen(image,(pixel))); \
- SetPixelGreen(image,\
- ScaleCharToQuantum((lbr_bits)), (pixel)); \
+ ScaleQuantumToChar(GetPixelGreen((pixel))); \
+ SetPixelGreen((pixel),\
+ ScaleCharToQuantum((lbr_bits))); \
}
#define LBR08PixelBlue(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelBlue(image,(pixel))); \
- SetPixelBlue(image,\
- ScaleCharToQuantum((lbr_bits)), (pixel)); \
+ ScaleQuantumToChar(GetPixelBlue((pixel))); \
+ SetPixelBlue((pixel),\
+ ScaleCharToQuantum((lbr_bits))); \
}
-#define LBR08PixelAlpha(pixel) \
+#define LBR08PixelOpacity(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelAlpha(image,(pixel))); \
- SetPixelAlpha(image,\
- ScaleCharToQuantum((lbr_bits)), (pixel)); \
+ ScaleQuantumToChar(GetPixelOpacity((pixel))); \
+ SetPixelOpacity((pixel),\
+ ScaleCharToQuantum((lbr_bits))); \
}
#define LBR08PixelRGB(pixel) \
LBR08PixelBlue((pixel)); \
}
-#define LBR08PixelRGBA(pixel) \
+#define LBR08PixelRGBO(pixel) \
{ \
LBR08PixelRGB((pixel)); \
- LBR08PixelAlpha((pixel)); \
+ LBR08PixelOpacity((pixel)); \
}
unsigned short lbr_bits=ScaleQuantumToShort((pixelpacket).blue); \
(pixelpacket).blue=ScaleShortToQuantum((lbr_bits)); \
}
-#define LBR16PacketAlpha(pixelpacket) \
+#define LBR16PacketOpacity(pixelpacket) \
{ \
- unsigned short lbr_bits=ScaleQuantumToShort((pixelpacket).alpha); \
- (pixelpacket).alpha=ScaleShortToQuantum((lbr_bits)); \
+ unsigned short lbr_bits=ScaleQuantumToShort((pixelpacket).opacity); \
+ (pixelpacket).opacity=ScaleShortToQuantum((lbr_bits)); \
}
#define LBR16PacketRGB(pixelpacket) \
#define LBR16PacketRGBO(pixelpacket) \
{ \
LBR16PacketRGB((pixelpacket)); \
- LBR16PacketAlpha((pixelpacket)); \
+ LBR16PacketOpacity((pixelpacket)); \
}
#define LBR16PixelRed(pixel) \
{ \
unsigned short lbr_bits= \
- ScaleQuantumToShort(GetPixelRed(image,(pixel))); \
- SetPixelRed(image,\
- ScaleShortToQuantum((lbr_bits)),(pixel)); \
+ ScaleQuantumToShort(GetPixelRed((pixel))); \
+ SetPixelRed((pixel),\
+ ScaleShortToQuantum((lbr_bits))); \
}
#define LBR16PixelGreen(pixel) \
{ \
unsigned short lbr_bits= \
- ScaleQuantumToShort(GetPixelGreen(image,(pixel))); \
- SetPixelGreen(image,\
- ScaleShortToQuantum((lbr_bits)),(pixel)); \
+ ScaleQuantumToShort(GetPixelGreen((pixel))); \
+ SetPixelGreen((pixel),\
+ ScaleShortToQuantum((lbr_bits))); \
}
#define LBR16PixelBlue(pixel) \
{ \
unsigned short lbr_bits= \
- ScaleQuantumToShort(GetPixelBlue(image,(pixel))); \
- SetPixelBlue(image,\
- ScaleShortToQuantum((lbr_bits)),(pixel)); \
+ ScaleQuantumToShort(GetPixelBlue((pixel))); \
+ SetPixelBlue((pixel),\
+ ScaleShortToQuantum((lbr_bits))); \
}
-#define LBR16PixelAlpha(pixel) \
+#define LBR16PixelOpacity(pixel) \
{ \
unsigned short lbr_bits= \
- ScaleQuantumToShort(GetPixelAlpha(image,(pixel))); \
- SetPixelAlpha(image,\
- ScaleShortToQuantum((lbr_bits)),(pixel)); \
+ ScaleQuantumToShort(GetPixelOpacity((pixel))); \
+ SetPixelOpacity((pixel),\
+ ScaleShortToQuantum((lbr_bits))); \
}
#define LBR16PixelRGB(pixel) \
LBR16PixelBlue((pixel)); \
}
-#define LBR16PixelRGBA(pixel) \
+#define LBR16PixelRGBO(pixel) \
{ \
LBR16PixelRGB((pixel)); \
- LBR16PixelAlpha((pixel)); \
+ LBR16PixelOpacity((pixel)); \
}
/*
magn_methx,
magn_methy;
- PixelInfo
+ PixelPacket
mng_global_bkgd;
/* Added at version 6.6.6-7 */
Forward declarations.
*/
static MagickBooleanType
- WritePNGImage(const ImageInfo *,Image *,ExceptionInfo *);
+ WritePNGImage(const ImageInfo *,Image *);
static MagickBooleanType
- WriteMNGImage(const ImageInfo *,Image *,ExceptionInfo *);
+ WriteMNGImage(const ImageInfo *,Image *);
#if defined(JNG_SUPPORTED)
static MagickBooleanType
- WriteJNGImage(const ImageInfo *,Image *,ExceptionInfo *);
+ WriteJNGImage(const ImageInfo *,Image *);
#endif
#if PNG_LIBPNG_VER > 10011
#if (MAGICKCORE_QUANTUM_DEPTH >= 16)
static MagickBooleanType
-LosslessReduceDepthOK(Image *image,ExceptionInfo *exception)
+LosslessReduceDepthOK(Image *image)
{
/* Reduce bit depth if it can be reduced losslessly from 16+ to 8.
*
if (image->depth >= 16)
{
- const Quantum
+ const PixelPacket
*p;
ok_to_reduce=
for (y=0; y < (ssize_t) image->rows; y++)
{
- p=GetVirtualPixels(image,0,y,image->columns,1,exception);
+ p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const Quantum *) NULL)
+ if (p == (const PixelPacket *) NULL)
{
ok_to_reduce = MagickFalse;
break;
for (x=(ssize_t) image->columns-1; x >= 0; x--)
{
ok_to_reduce=
- QuantumToCharToQuantumEqQuantum(GetPixelRed(image,p)) &&
- QuantumToCharToQuantumEqQuantum(GetPixelGreen(image,p)) &&
- QuantumToCharToQuantumEqQuantum(GetPixelBlue(image,p)) ?
+ QuantumToCharToQuantumEqQuantum(GetPixelRed(p)) &&
+ QuantumToCharToQuantumEqQuantum(GetPixelGreen(p)) &&
+ QuantumToCharToQuantumEqQuantum(GetPixelBlue(p)) ?
MagickTrue : MagickFalse;
if (ok_to_reduce == MagickFalse)
break;
- p+=GetPixelChannels(image);
+ p++;
}
if (x >= 0)
break;
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
-% Like IsImageGray except does not change DirectClass to PseudoClass %
+% Like IsGrayImage except does not change DirectClass to PseudoClass %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/
-static MagickBooleanType ImageIsGray(Image *image,ExceptionInfo *exception)
+static MagickBooleanType ImageIsGray(Image *image)
{
- register const Quantum
+ register const PixelPacket
*p;
register ssize_t
if (image->storage_class == PseudoClass)
{
for (i=0; i < (ssize_t) image->colors; i++)
- if (IsPixelInfoGray(image->colormap+i) == MagickFalse)
+ 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,exception);
- if (p == (const Quantum *) NULL)
+ 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 (IsPixelGray(image,p) == MagickFalse)
+ if (IsGray(p) == MagickFalse)
return(MagickFalse);
- p+=GetPixelChannels(image);
+ p++;
}
}
return(MagickTrue);
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;
- PNGErrorInfo
- *error_info;
-
- error_info=(PNGErrorInfo *) png_get_error_ptr(ping);
- image=error_info->image;
- exception=error_info->exception;
+ image=(Image *) png_get_error_ptr(ping);
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " libpng-%s error: %s", PNG_LIBPNG_VER_STRING,message);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " libpng-%s error: %s", PNG_LIBPNG_VER_STRING,message);
- (void) ThrowMagickException(exception,GetMagickModule(),CoderError,message,
- "`%s'",image->filename);
+ (void) ThrowMagickException(&image->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);
- 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);
+ image=(Image *) png_get_error_ptr(ping);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " libpng-%s warning: %s", PNG_LIBPNG_VER_STRING,message);
- (void) ThrowMagickException(exception,GetMagickModule(),CoderWarning,
+ (void) ThrowMagickException(&image->exception,GetMagickModule(),CoderWarning,
message,"`%s'",image->filename);
}
static int
Magick_png_read_raw_profile(Image *image, const ImageInfo *image_info,
- png_textp text,int ii,ExceptionInfo *exception)
+ png_textp text,int ii)
{
register ssize_t
i;
/* allocate space */
if (length == 0)
{
- (void) ThrowMagickException(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->exception,GetMagickModule(),
CoderWarning,"UnableToCopyProfile","`%s'","invalid profile length");
return(MagickFalse);
}
if (profile == (StringInfo *) NULL)
{
- (void) ThrowMagickException(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",
"unable to copy profile");
return(MagickFalse);
{
if (*sp == '\0')
{
- (void) ThrowMagickException(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->exception,GetMagickModule(),
CoderWarning,"UnableToCopyProfile","`%s'","ran out of data");
profile=DestroyStringInfo(profile);
return(MagickFalse);
/*
We have already read "Raw profile type.
*/
- (void) SetImageProfile(image,&text[ii].key[17],profile,exception);
+ (void) SetImageProfile(image,&text[ii].key[17],profile);
profile=DestroyStringInfo(profile);
if (image_info->verbose)
double
file_gamma;
+ LongPixelPacket
+ transparent_color;
+
MagickBooleanType
logging,
status;
- PixelInfo
- transparent_color;
-
- PNGErrorInfo
- error_info;
-
png_bytep
ping_trans_alpha;
x_resolution,
y_resolution;
- QuantumInfo
- *quantum_info;
-
unsigned char
*ping_pixels;
register unsigned char
*p;
+ register IndexPacket
+ *indexes;
+
register ssize_t
i,
x;
- register Quantum
+ register PixelPacket
*q;
size_t
# endif
#endif
-
- quantum_info = (QuantumInfo *) NULL;
image=mng_info->image;
if (logging != MagickFalse)
transparent_color.red=65537;
transparent_color.green=65537;
transparent_color.blue=65537;
- transparent_color.alpha=65537;
+ transparent_color.opacity=65537;
num_text = 0;
num_text_total = 0;
Allocate the PNG structures
*/
#ifdef PNG_USER_MEM_SUPPORTED
- error_info.image=image;
- error_info.exception=exception;
- ping=png_create_read_struct_2(PNG_LIBPNG_VER_STRING,&error_info,
+ ping=png_create_read_struct_2(PNG_LIBPNG_VER_STRING, image,
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,&error_info,
+ ping=png_create_read_struct(PNG_LIBPNG_VER_STRING,image,
MagickPNGErrorHandler,MagickPNGWarningHandler);
#endif
if (ping == (png_struct *) NULL)
if (image != (Image *) NULL)
{
- InheritException(exception,exception);
+ InheritException(exception,&image->exception);
image->columns=0;
}
profile=BlobToStringInfo(info,profile_length);
if (profile == (StringInfo *) NULL)
{
- (void) ThrowMagickException(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",
"unable to copy profile");
return((Image *) NULL);
}
- SetStringInfoDatum(profile,(const unsigned char *) info);
- (void) SetImageProfile(image,"icc",profile,exception);
+ (void) SetImageProfile(image,"icc",profile);
profile=DestroyStringInfo(profile);
}
}
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);
*/
(void) png_get_pHYs(ping,ping_info,&x_resolution,&y_resolution,
&unit_type);
- image->resolution.x=(double) x_resolution;
- image->resolution.y=(double) y_resolution;
+ image->x_resolution=(double) x_resolution;
+ image->y_resolution=(double) y_resolution;
if (unit_type == PNG_RESOLUTION_METER)
{
image->units=PixelsPerCentimeterResolution;
- image->resolution.x=(double) x_resolution/100.0;
- image->resolution.y=(double) y_resolution/100.0;
+ image->x_resolution=(double) x_resolution/100.0;
+ image->y_resolution=(double) y_resolution/100.0;
}
if (logging != MagickFalse)
{
if (mng_info->global_trns_length >
mng_info->global_plte_length)
- (void) ThrowMagickException(exception,
+ (void) ThrowMagickException(&image->exception,
GetMagickModule(),CoderError,
"global tRNS has more entries than global PLTE",
"`%s'",image_info->filename);
#endif
}
else
- (void) ThrowMagickException(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->exception,GetMagickModule(),
CoderError,"No global PLTE in file","`%s'",
image_info->filename);
}
image->background_color.blue=
ScaleShortToQuantum(ping_background->blue);
- image->background_color.alpha=OpaqueAlpha;
+ image->background_color.opacity=OpaqueOpacity;
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
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.alpha= scale_to_short*ping_trans_color->gray;
+ transparent_color.opacity= 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 %.20g.",transparent_color.alpha);
+ " scaled graylevel is %d.",transparent_color.opacity);
}
- transparent_color.red=transparent_color.alpha;
- transparent_color.green=transparent_color.alpha;
- transparent_color.blue=transparent_color.alpha;
+ transparent_color.red=transparent_color.opacity;
+ transparent_color.green=transparent_color.opacity;
+ transparent_color.blue=transparent_color.opacity;
}
}
}
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))
- image->colorspace=GRAYColorspace;
if (((int) ping_color_type == PNG_COLOR_TYPE_PALETTE) ||
((int) ping_color_type == PNG_COLOR_TYPE_GRAY))
{
/*
Initialize image colormap.
*/
- if (AcquireImageColormap(image,image->colors,exception) == MagickFalse)
+ if (AcquireImageColormap(image,image->colors) == MagickFalse)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
if ((int) ping_color_type == PNG_COLOR_TYPE_PALETTE)
(void) FormatLocaleString(msg,MaxTextExtent,
"%d, %d",(int) ping_width, (int) ping_height);
- (void) SetImageProperty(image,"png:IHDR.width,height ",msg,exception);
+ (void) SetImageProperty(image,"png:IHDR.width,height ",msg);
(void) FormatLocaleString(msg,MaxTextExtent,"%d",(int) ping_bit_depth);
- (void) SetImageProperty(image,"png:IHDR.bit_depth ",msg,exception);
+ (void) SetImageProperty(image,"png:IHDR.bit_depth ",msg);
(void) FormatLocaleString(msg,MaxTextExtent,"%d",(int) ping_color_type);
- (void) SetImageProperty(image,"png:IHDR.color_type ",msg,exception);
+ (void) SetImageProperty(image,"png:IHDR.color_type ",msg);
(void) FormatLocaleString(msg,MaxTextExtent,"%d",
(int) ping_interlace_method);
- (void) SetImageProperty(image,"png:IHDR.interlace_method",msg,exception);
+ (void) SetImageProperty(image,"png:IHDR.interlace_method",msg);
}
/*
#if defined(PNG_SETJMP_NOT_THREAD_SAFE)
UnlockSemaphoreInfo(ping_semaphore);
#endif
- if (quantum_info != (QuantumInfo *) NULL)
- quantum_info = DestroyQuantumInfo(quantum_info);
if (ping_pixels != (unsigned char *) NULL)
ping_pixels=(unsigned char *) RelinquishMagickMemory(ping_pixels);
if (image != (Image *) NULL)
{
- InheritException(exception,exception);
+ InheritException(exception,&image->exception);
image->columns=0;
}
return(GetFirstImageInList(image));
}
- quantum_info=AcquireQuantumInfo(image_info,image);
-
- if (quantum_info == (QuantumInfo *) NULL)
- ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
{
for (y=0; y < (ssize_t) image->rows; y++)
{
+
if (num_passes > 1)
row_offset=ping_rowbytes*y;
png_read_row(ping,ping_pixels+row_offset,NULL);
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (Quantum *) NULL)
+ if (q == (PixelPacket *) NULL)
break;
- if ((int) ping_color_type == PNG_COLOR_TYPE_GRAY)
- (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
- GrayQuantum,ping_pixels+row_offset,exception);
+ else
+ {
+ QuantumInfo
+ *quantum_info;
+
+ quantum_info=AcquireQuantumInfo(image_info,image);
+
+ if (quantum_info == (QuantumInfo *) NULL)
+ ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+
+ 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_GRAY_ALPHA)
- (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
- GrayAlphaQuantum,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_RGB_ALPHA)
- (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
- RGBAQuantum,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_PALETTE)
- (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
- IndexQuantum,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 /* ping_color_type == PNG_COLOR_TYPE_RGB */
- (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
- RGBQuantum,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);
+
+ quantum_info=DestroyQuantumInfo(quantum_info);
+ }
if (found_transparent_pixel == MagickFalse)
{
{
if ((ping_color_type == PNG_COLOR_TYPE_RGBA ||
ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA) &&
- (GetPixelAlpha(image,q) != OpaqueAlpha))
+ (GetPixelOpacity(q) != OpaqueOpacity))
{
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
}
if ((ping_color_type == PNG_COLOR_TYPE_RGB ||
ping_color_type == PNG_COLOR_TYPE_GRAY) &&
- (ScaleQuantumToShort(GetPixelRed(image,q)) ==
- transparent_color.red &&
- ScaleQuantumToShort(GetPixelGreen(image,q)) ==
- transparent_color.green &&
- ScaleQuantumToShort(GetPixelBlue(image,q)) ==
- transparent_color.blue))
+ (ScaleQuantumToShort(GetPixelRed(q))
+ == transparent_color.red &&
+ ScaleQuantumToShort(GetPixelGreen(q))
+ == transparent_color.green &&
+ ScaleQuantumToShort(GetPixelBlue(q))
+ == transparent_color.blue))
{
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
found_transparent_pixel = MagickTrue;
break;
}
- q+=GetPixelChannels(image);
+ q++;
}
}
/*
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;
png_read_row(ping,ping_pixels+row_offset,NULL);
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (Quantum *) NULL)
+ if (q == (PixelPacket *) NULL)
break;
+ indexes=GetAuthenticIndexQueue(image);
p=ping_pixels+row_offset;
r=quantum_scanline;
for (x=(ssize_t) image->columns-1; x >= 0; x--)
{
*r++=*p++;
- SetPixelAlpha(image,ScaleCharToQuantum((unsigned char) *p++),q);
- if (GetPixelAlpha(image,q) != OpaqueAlpha)
+ /* 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)
found_transparent_pixel = MagickTrue;
- q+=GetPixelChannels(image);
+ q++;
}
else
quantum=0;
quantum|=(*p++);
+
*r=ScaleShortToQuantum(quantum);
r++;
quantum=0;
quantum|=(*p++);
- SetPixelAlpha(image,ScaleShortToQuantum(quantum),q);
- if (GetPixelAlpha(image,q) != OpaqueAlpha)
+ SetPixelAlpha(q,ScaleShortToQuantum(quantum));
+ if (GetPixelOpacity(q) != OpaqueOpacity)
found_transparent_pixel = MagickTrue;
- q+=GetPixelChannels(image);
+ q++;
}
#else /* MAGICKCORE_QUANTUM_DEPTH == 8 */
if (ping_color_type == 4)
{
- SetPixelAlpha(image,*p++,q);
- if (GetPixelAlpha(image,q) != OpaqueAlpha)
+ SetPixelAlpha(q,*p++);
+ if (GetPixelOpacity(q) != OpaqueOpacity)
found_transparent_pixel = MagickTrue;
p++;
- q+=GetPixelChannels(image);
+ q++;
}
#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(image,*r++,q);
- q+=GetPixelChannels(image);
- }
+ SetPixelIndex(indexes+x,*r++);
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
}
}
- if (quantum_info != (QuantumInfo *) NULL)
- quantum_info=DestroyQuantumInfo(quantum_info);
-
if (image->storage_class == PseudoClass)
{
MagickBooleanType
matte=image->matte;
image->matte=MagickFalse;
- (void) SyncImage(image,exception);
+ (void) SyncImage(image);
image->matte=matte;
}
png_destroy_read_struct(&ping,&ping_info,&end_info);
ping_pixels=(unsigned char *) RelinquishMagickMemory(ping_pixels);
image->colors=2;
- (void) SetImageBackgroundColor(image,exception);
+ (void) SetImageBackgroundColor(image);
#if defined(PNG_SETJMP_NOT_THREAD_SAFE)
UnlockSemaphoreInfo(ping_semaphore);
#endif
{
for (x=0; x < ping_num_trans; x++)
{
- image->colormap[x].matte=MagickTrue;
- image->colormap[x].alpha =
- ScaleCharToQuantum((unsigned char)ping_trans_alpha[x]);
+ image->colormap[x].opacity =
+ ScaleCharToQuantum((unsigned char)(255-ping_trans_alpha[x]));
}
}
for (x=0; x < (int) image->colors; x++)
{
if (ScaleQuantumToShort(image->colormap[x].red) ==
- transparent_color.alpha)
+ transparent_color.opacity)
{
- image->colormap[x].matte=MagickTrue;
- image->colormap[x].alpha = (Quantum) TransparentAlpha;
+ image->colormap[x].opacity = (Quantum) TransparentOpacity;
}
}
}
- (void) SyncImage(image,exception);
+ (void) SyncImage(image);
}
#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 == (Quantum *) NULL)
+ if (q == (PixelPacket *) 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(image,q)) ==
- transparent_color.red &&
- ScaleQuantumToShort(GetPixelGreen(image,q)) ==
- transparent_color.green &&
- ScaleQuantumToShort(GetPixelBlue(image,q)) ==
- transparent_color.blue)
+ if (ScaleQuantumToShort(GetPixelRed(q))
+ == transparent_color.red &&
+ ScaleQuantumToShort(GetPixelGreen(q))
+ == transparent_color.green &&
+ ScaleQuantumToShort(GetPixelBlue(q))
+ == transparent_color.blue)
{
- SetPixelAlpha(image,TransparentAlpha,q);
+ SetPixelOpacity(q,TransparentOpacity);
}
#if 0 /* I have not found a case where this is needed. */
else
{
- SetPixelAlpha(image,q)=(Quantum) OpaqueAlpha;
+ SetPixelOpacity(q)=(Quantum) OpaqueOpacity;
}
#endif
- q+=GetPixelChannels(image);
+ q++;
}
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,
- exception);
+ (void) Magick_png_read_raw_profile(image,image_info,text,(int) i);
num_raw_profiles++;
}
sizeof(*value));
if (value == (char *) NULL)
{
- (void) ThrowMagickException(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",
image->filename);
break;
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,exception);
+ (void) SetImageProperty(image,text[i].key,value);
if (logging != MagickFalse)
{
mng_info->ob[object_id]->frozen)
{
if (mng_info->ob[object_id] == (MngBuffer *) NULL)
- (void) ThrowMagickException(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",
image->filename);
if (mng_info->ob[object_id]->frozen)
- (void) ThrowMagickException(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->exception,GetMagickModule(),
ResourceLimitError,"Cannot overwrite frozen MNG object buffer",
"`%s'",image->filename);
}
(mng_info->ob[object_id]->image);
mng_info->ob[object_id]->image=CloneImage(image,0,0,MagickTrue,
- exception);
+ &image->exception);
if (mng_info->ob[object_id]->image != (Image *) NULL)
mng_info->ob[object_id]->image->file=(FILE *) NULL;
else
- (void) ThrowMagickException(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->exception,GetMagickModule(),
ResourceLimitError,"Cloning image for object buffer failed",
"`%s'",image->filename);
/* 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,
- exception);
+ (void) SetImageProperty(image,"png:text ",msg);
}
if (num_raw_profiles != 0)
{
(void) FormatLocaleString(msg,MaxTextExtent,
"%d were found", num_raw_profiles);
- (void) SetImageProperty(image,"png:text-encoded profiles",msg,
- exception);
+ (void) SetImageProperty(image,"png:text-encoded profiles",msg);
}
if (png_get_valid(ping,ping_info,PNG_INFO_cHRM))
{
(void) FormatLocaleString(msg,MaxTextExtent,"%s",
"chunk was found (see Chromaticity, above)");
- (void) SetImageProperty(image,"png:cHRM ",msg,
- exception);
+ (void) SetImageProperty(image,"png:cHRM ",msg);
}
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,
- exception);
+ (void) SetImageProperty(image,"png:bKGD ",msg);
}
(void) FormatLocaleString(msg,MaxTextExtent,"%s",
"chunk was found");
if (png_get_valid(ping,ping_info,PNG_INFO_iCCP))
- (void) SetImageProperty(image,"png:iCCP ",msg,
- exception);
+ (void) SetImageProperty(image,"png:iCCP ",msg);
if (png_get_valid(ping,ping_info,PNG_INFO_tRNS))
- (void) SetImageProperty(image,"png:tRNS ",msg,
- exception);
+ (void) SetImageProperty(image,"png:tRNS ",msg);
#if defined(PNG_sRGB_SUPPORTED)
if (png_get_valid(ping,ping_info,PNG_INFO_sRGB))
{
(void) FormatLocaleString(msg,MaxTextExtent,
- "intent=%d (See Rendering intent)", (int) intent);
- (void) SetImageProperty(image,"png:sRGB ",msg,
- exception);
+ "intent=%d (See Rendering intent)",
+ (int) intent);
+ (void) SetImageProperty(image,"png:sRGB ",msg);
}
#endif
if (png_get_valid(ping,ping_info,PNG_INFO_gAMA))
{
(void) FormatLocaleString(msg,MaxTextExtent,
- "gamma=%.8g (See Gamma, above)",
- file_gamma);
- (void) SetImageProperty(image,"png:gAMA ",msg,
- exception);
+ "gamma=%.8g (See Gamma, above)", file_gamma);
+ (void) SetImageProperty(image,"png:gAMA ",msg);
}
#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,
- exception);
+ (void) SetImageProperty(image,"png:pHYs ",msg);
}
#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,
- exception);
+ (void) SetImageProperty(image,"png:oFFs ",msg);
}
#endif
(void) FormatLocaleString(msg,MaxTextExtent,
"width=%.20g, height=%.20g",
(double) image->page.width,(double) image->page.height);
- (void) SetImageProperty(image,"png:vpAg ",msg,
- exception);
+ (void) SetImageProperty(image,"png:vpAg ",msg);
}
}
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
logging=LogMagickEvent(CoderEvent,GetMagickModule(),"Enter ReadPNGImage()");
- image=AcquireImage(image_info,exception);
+ image=AcquireImage(image_info);
mng_info=(MngInfo *) NULL;
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (LocaleCompare(image_info->magick,"PNG24") == 0)
{
- (void) SetImageType(image,TrueColorType,exception);
+ (void) SetImageType(image,TrueColorType);
image->matte=MagickFalse;
}
if (LocaleCompare(image_info->magick,"PNG32") == 0)
- (void) SetImageType(image,TrueColorMatteType,exception);
+ (void) SetImageType(image,TrueColorMatteType);
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
jng_alpha_filter_method,
jng_alpha_interlace_method;
- register const Quantum
+ register const PixelPacket
*s;
register ssize_t
i,
x;
- register Quantum
+ register PixelPacket
*q;
register unsigned char
image=mng_info->image;
- if (GetAuthenticPixelQueue(image) != (Quantum *) NULL)
+ if (GetAuthenticPixelQueue(image) != (PixelPacket *) NULL)
{
/*
Allocate next image structure.
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" AcquireNextImage()");
- AcquireNextImage(image_info,image,exception);
+ AcquireNextImage(image_info,image);
if (GetNextImageInList(image) == (Image *) NULL)
return((Image *) NULL);
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
GetImageInfo(color_image_info);
- color_image=AcquireImage(color_image_info,exception);
+ color_image=AcquireImage(color_image_info);
if (color_image == (Image *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
GetImageInfo(alpha_image_info);
- alpha_image=AcquireImage(alpha_image_info,exception);
+ alpha_image=AcquireImage(alpha_image_info);
if (alpha_image == (Image *) NULL)
{
{
if (length > 8)
{
- image->resolution.x=(double) mng_get_long(p);
- image->resolution.y=(double) mng_get_long(&p[4]);
+ image->x_resolution=(double) mng_get_long(p);
+ image->y_resolution=(double) mng_get_long(&p[4]);
if ((int) p[8] == PNG_RESOLUTION_METER)
{
image->units=PixelsPerCentimeterResolution;
- image->resolution.x=image->resolution.x/100.0f;
- image->resolution.y=image->resolution.y/100.0f;
+ image->x_resolution=image->x_resolution/100.0f;
+ image->y_resolution=image->y_resolution/100.0f;
}
}
o close alpha_blob.
o copy intensity of secondary image into
- alpha samples of main image.
+ opacity 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,exception);
+ s=GetVirtualPixels(jng_image,0,y,image->columns,1,&image->exception);
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- 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);
- }
+ (void) CopyMagickMemory(q,s,length);
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " Reading alpha from alpha_blob.");
+ " Reading opacity 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,
- exception);
+ &image->exception);
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
if (image->matte != MagickFalse)
- for (x=(ssize_t) image->columns; x != 0; x--)
- {
- SetPixelAlpha(image,GetPixelRed(jng_image,s),q);
- q+=GetPixelChannels(image);
- s+=GetPixelChannels(jng_image);
- }
+ for (x=(ssize_t) image->columns; x != 0; x--,q++,s++)
+ SetPixelOpacity(q,(Quantum) QuantumRange-
+ GetPixelRed(s));
else
- for (x=(ssize_t) image->columns; x != 0; x--)
+ for (x=(ssize_t) image->columns; x != 0; x--,q++,s++)
{
- SetPixelAlpha(image,GetPixelRed(jng_image,s),q);
- if (GetPixelAlpha(image,q) != OpaqueAlpha)
+ SetPixelAlpha(q,GetPixelRed(s));
+ if (GetPixelOpacity(q) != OpaqueOpacity)
image->matte=MagickTrue;
- 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,exception);
+ image=AcquireImage(image_info);
mng_info=(MngInfo *) NULL;
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
previous_fb;
#if defined(MNG_INSERT_LAYERS)
- PixelInfo
+ PixelPacket
mng_background_color;
#endif
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
logging=LogMagickEvent(CoderEvent,GetMagickModule(),"Enter ReadMNGImage()");
- image=AcquireImage(image_info,exception);
+ image=AcquireImage(image_info);
mng_info=(MngInfo *) NULL;
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
skip_to_iend=MagickTrue;
if (mng_info->jhdr_warning == 0)
- (void) ThrowMagickException(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->exception,GetMagickModule(),
CoderError,"JNGCompressNotSupported","`%s'",image->filename);
mng_info->jhdr_warning++;
skip_to_iend=MagickTrue;
if (mng_info->dhdr_warning == 0)
- (void) ThrowMagickException(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->exception,GetMagickModule(),
CoderError,"DeltaPNGNotSupported","`%s'",image->filename);
mng_info->dhdr_warning++;
if (mng_type != 3)
insert_layers=MagickTrue;
#endif
- if (GetAuthenticPixelQueue(image) != (Quantum *) NULL)
+ if (GetAuthenticPixelQueue(image) != (PixelPacket *) NULL)
{
/* Allocate next image structure. */
- AcquireNextImage(image_info,image,exception);
+ AcquireNextImage(image_info,image);
if (GetNextImageInList(image) == (Image *) NULL)
return((Image *) NULL);
if (memcmp(type,mng_DEFI,4) == 0)
{
if (mng_type == 3)
- (void) ThrowMagickException(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->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(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->exception,GetMagickModule(),
CoderError,"Nonzero object_id in MNG-LC datastream","`%s'",
image->filename);
Instead ofsuing a warning we should allocate a larger
MngInfo structure and continue.
*/
- (void) ThrowMagickException(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->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(exception,
+ (void) ThrowMagickException(&image->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.alpha=OpaqueAlpha;
+ mng_background_color.opacity=OpaqueOpacity;
}
#ifdef MNG_OBJECT_BUFFERS
if (memcmp(type,mng_FRAM,4) == 0)
{
if (mng_type == 3)
- (void) ThrowMagickException(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->exception,GetMagickModule(),
CoderError,"FRAM chunk found in MNG-VLC datastream","`%s'",
image->filename);
(subframe_width) && (subframe_height))
{
/* Allocate next image structure. */
- if (GetAuthenticPixelQueue(image) != (Quantum *) NULL)
+ if (GetAuthenticPixelQueue(image) != (PixelPacket *) NULL)
{
- AcquireNextImage(image_info,image,exception);
+ AcquireNextImage(image_info,image);
if (GetNextImageInList(image) == (Image *) NULL)
{
image->background_color=mng_background_color;
image->matte=MagickFalse;
image->delay=0;
- (void) SetImageBackgroundColor(image,exception);
+ (void) SetImageBackgroundColor(image);
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
if (memcmp(type,mng_CLON,4) == 0)
{
if (mng_info->clon_warning == 0)
- (void) ThrowMagickException(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->exception,GetMagickModule(),
CoderError,"CLON is not implemented yet","`%s'",
image->filename);
if (magn_first || magn_last)
if (mng_info->magn_warning == 0)
{
- (void) ThrowMagickException(exception,
+ (void) ThrowMagickException(&image->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(exception,
+ (void) ThrowMagickException(&image->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(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->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(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->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(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->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(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->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) != (Quantum *) NULL)
+ if (GetAuthenticPixelQueue(image) != (PixelPacket *) NULL)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image,exception);
+ AcquireNextImage(image_info,image);
if (GetNextImageInList(image) == (Image *) NULL)
{
image->page.x=0;
image->page.y=0;
image->background_color=mng_background_color;
- (void) SetImageBackgroundColor(image,exception);
+ (void) SetImageBackgroundColor(image);
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) != (Quantum *) NULL)
+ if (GetAuthenticPixelQueue(image) != (PixelPacket *) NULL)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image,exception);
+ AcquireNextImage(image_info,image);
if (GetNextImageInList(image) == (Image *) NULL)
{
image->page.y=mng_info->clip.top;
image->background_color=mng_background_color;
image->matte=MagickFalse;
- (void) SetImageBackgroundColor(image,exception);
+ (void) SetImageBackgroundColor(image);
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
#endif /* MNG_INSERT_LAYERS */
first_mng_object=MagickFalse;
- if (GetAuthenticPixelQueue(image) != (Quantum *) NULL)
+ if (GetAuthenticPixelQueue(image) != (PixelPacket *) NULL)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image,exception);
+ AcquireNextImage(image_info,image);
if (GetNextImageInList(image) == (Image *) NULL)
{
int
yy;
- Quantum
- *next,
- *prev;
-
- png_uint_16
- magn_methx,
- magn_methy;
-
ssize_t
m,
y;
- register Quantum
+ register ssize_t
+ x;
+
+ register PixelPacket
*n,
*q;
- register ssize_t
- x;
+ PixelPacket
+ *next,
+ *prev;
+
+ png_uint_16
+ magn_methx,
+ magn_methy;
/* Allocate next image structure. */
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Allocate magnified image");
- AcquireNextImage(image_info,image,exception);
+ AcquireNextImage(image_info,image);
if (GetNextImageInList(image) == (Image *) NULL)
{
for (x=(ssize_t) image->columns-1; x >= 0; x--)
{
- 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);
+ SetPixelRed(q,ScaleQuantumToShort(
+ GetPixelRed(q)));
+ SetPixelGreen(q,ScaleQuantumToShort(
+ GetPixelGreen(q)));
+ SetPixelBlue(q,ScaleQuantumToShort(
+ GetPixelBlue(q)));
+ SetPixelOpacity(q,ScaleQuantumToShort(
+ GetPixelOpacity(q)));
+ q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
#endif
if (image->matte != MagickFalse)
- (void) SetImageBackgroundColor(large_image,exception);
+ (void) SetImageBackgroundColor(large_image);
else
{
- large_image->background_color.alpha=OpaqueAlpha;
- (void) SetImageBackgroundColor(large_image,exception);
+ large_image->background_color.opacity=OpaqueOpacity;
+ (void) SetImageBackgroundColor(large_image);
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*GetPixelChannels(image);
- next=(Quantum *) AcquireQuantumMemory(length,sizeof(*next));
- prev=(Quantum *) AcquireQuantumMemory(length,sizeof(*prev));
+ length=(size_t) image->columns;
+ next=(PixelPacket *) AcquireQuantumMemory(length,sizeof(*next));
+ prev=(PixelPacket *) AcquireQuantumMemory(length,sizeof(*prev));
- if ((prev == (Quantum *) NULL) ||
- (next == (Quantum *) NULL))
+ if ((prev == (PixelPacket *) NULL) ||
+ (next == (PixelPacket *) NULL))
{
image=DestroyImageList(image);
MngInfoFreeStruct(mng_info,&have_mng_structure);
for (i=0; i < m; i++, yy++)
{
- register Quantum
+ register PixelPacket
*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)*
- GetPixelChannels(large_image);
+ q+=(large_image->columns-image->columns);
for (x=(ssize_t) image->columns-1; x >= 0; x--)
{
if (magn_methy <= 1)
{
/* replicate previous */
- 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);
+ SetPixelRGBO(q,(pixels));
}
else if (magn_methy == 2 || magn_methy == 4)
{
if (i == 0)
{
- 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);
+ SetPixelRGBO(q,(pixels));
}
else
{
/* Interpolate */
- SetPixelRed(large_image,((QM) (((ssize_t)
- (2*i*(GetPixelRed(image,n)
- -GetPixelRed(image,pixels)+m))/
+ SetPixelRed(q,
+ ((QM) (((ssize_t)
+ (2*i*(GetPixelRed(n)
+ -GetPixelRed(pixels)+m))/
((ssize_t) (m*2))
- +GetPixelRed(image,pixels)))),q);
- SetPixelGreen(large_image,((QM) (((ssize_t)
- (2*i*(GetPixelGreen(image,n)
- -GetPixelGreen(image,pixels)+m))/
+ +GetPixelRed(pixels)))));
+ SetPixelGreen(q,
+ ((QM) (((ssize_t)
+ (2*i*(GetPixelGreen(n)
+ -GetPixelGreen(pixels)+m))/
((ssize_t) (m*2))
- +GetPixelGreen(image,pixels)))),q);
- SetPixelBlue(large_image,((QM) (((ssize_t)
- (2*i*(GetPixelBlue(image,n)
- -GetPixelBlue(image,pixels)+m))/
+ +GetPixelGreen(pixels)))));
+ SetPixelBlue(q,
+ ((QM) (((ssize_t)
+ (2*i*(GetPixelBlue(n)
+ -GetPixelBlue(pixels)+m))/
((ssize_t) (m*2))
- +GetPixelBlue(image,pixels)))),q);
+ +GetPixelBlue(pixels)))));
if (image->matte != MagickFalse)
- SetPixelAlpha(large_image, ((QM) (((ssize_t)
- (2*i*(GetPixelAlpha(image,n)
- -GetPixelAlpha(image,pixels)+m))
+ SetPixelOpacity(q,
+ ((QM) (((ssize_t)
+ (2*i*(GetPixelOpacity(n)
+ -GetPixelOpacity(pixels)+m))
/((ssize_t) (m*2))+
- GetPixelAlpha(image,pixels)))),q);
+ GetPixelOpacity(pixels)))));
}
if (magn_methy == 4)
{
/* Replicate nearest */
if (i <= ((m+1) << 1))
- SetPixelAlpha(large_image,GetPixelAlpha(image,
- pixels),q);
+ SetPixelOpacity(q,
+ (*pixels).opacity+0);
else
- SetPixelAlpha(large_image,GetPixelAlpha(image,
- n),q);
+ SetPixelOpacity(q,
+ (*n).opacity+0);
}
}
/* Replicate nearest */
if (i <= ((m+1) << 1))
{
- 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);
+ SetPixelRGBO(q,(pixels));
}
else
{
- 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);
+ SetPixelRGBO(q,(n));
}
if (magn_methy == 5)
{
- SetPixelAlpha(large_image,(QM) (((ssize_t) (2*i*
- (GetPixelAlpha(image,n)
- -GetPixelAlpha(image,pixels))
+ SetPixelOpacity(q,
+ (QM) (((ssize_t) (2*i*
+ (GetPixelOpacity(n)
+ -GetPixelOpacity(pixels))
+m))/((ssize_t) (m*2))
- +GetPixelAlpha(image,pixels)),q);
+ +GetPixelOpacity(pixels)));
}
}
- n+=GetPixelChannels(image);
- q+=GetPixelChannels(large_image);
- pixels+=GetPixelChannels(image);
+ n++;
+ q++;
+ pixels++;
} /* x */
if (SyncAuthenticPixels(large_image,exception) == 0)
} /* i */
} /* y */
- prev=(Quantum *) RelinquishMagickMemory(prev);
- next=(Quantum *) RelinquishMagickMemory(next);
+ prev=(PixelPacket *) RelinquishMagickMemory(prev);
+ next=(PixelPacket *) RelinquishMagickMemory(next);
length=image->columns;
for (y=0; y < (ssize_t) image->rows; y++)
{
- register Quantum
+ register PixelPacket
*pixels;
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- pixels=q+(image->columns-length)*GetPixelChannels(image);
- n=pixels+GetPixelChannels(image);
+ pixels=q+(image->columns-length);
+ n=pixels+1;
for (x=(ssize_t) (image->columns-length);
x < (ssize_t) image->columns; x++)
{
- /* To do: Rewrite using Get/Set***PixelChannel() */
+ /* To do: Rewrite using Get/Set***PixelComponent() */
if (x == (ssize_t) (image->columns-length))
m=(ssize_t) mng_info->magn_ml;
if (magn_methx <= 1)
{
/* replicate previous */
- SetPixelRed(image,GetPixelRed(image,pixels),q);
- SetPixelGreen(image,GetPixelGreen(image,pixels),q);
- SetPixelBlue(image,GetPixelBlue(image,pixels),q);
- SetPixelAlpha(image,GetPixelAlpha(image,pixels),q);
+ SetPixelRGBO(q,(pixels));
}
else if (magn_methx == 2 || magn_methx == 4)
{
if (i == 0)
{
- SetPixelRed(image,GetPixelRed(image,pixels),q);
- SetPixelGreen(image,GetPixelGreen(image,pixels),q);
- SetPixelBlue(image,GetPixelBlue(image,pixels),q);
- SetPixelAlpha(image,GetPixelAlpha(image,pixels),q);
+ SetPixelRGBO(q,(pixels));
}
- /* To do: Rewrite using Get/Set***PixelChannel() */
+ /* To do: Rewrite using Get/Set***PixelComponent() */
else
{
/* Interpolate */
- SetPixelRed(image,(QM) ((2*i*(
- GetPixelRed(image,n)
- -GetPixelRed(image,pixels))+m)
+ SetPixelRed(q,
+ (QM) ((2*i*(
+ GetPixelRed(n)
+ -GetPixelRed(pixels))+m)
/((ssize_t) (m*2))+
- GetPixelRed(image,pixels)),q);
+ GetPixelRed(pixels)));
- SetPixelGreen(image,(QM) ((2*i*(
- GetPixelGreen(image,n)
- -GetPixelGreen(image,pixels))+m)
+ SetPixelGreen(q,
+ (QM) ((2*i*(
+ GetPixelGreen(n)
+ -GetPixelGreen(pixels))+m)
/((ssize_t) (m*2))+
- GetPixelGreen(image,pixels)),q);
+ GetPixelGreen(pixels)));
- SetPixelBlue(image,(QM) ((2*i*(
- GetPixelBlue(image,n)
- -GetPixelBlue(image,pixels))+m)
+ SetPixelBlue(q,
+ (QM) ((2*i*(
+ GetPixelBlue(n)
+ -GetPixelBlue(pixels))+m)
/((ssize_t) (m*2))+
- GetPixelBlue(image,pixels)),q);
+ GetPixelBlue(pixels)));
if (image->matte != MagickFalse)
- SetPixelAlpha(image,(QM) ((2*i*(
- GetPixelAlpha(image,n)
- -GetPixelAlpha(image,pixels))+m)
+ SetPixelOpacity(q,
+ (QM) ((2*i*(
+ GetPixelOpacity(n)
+ -GetPixelOpacity(pixels))+m)
/((ssize_t) (m*2))+
- GetPixelAlpha(image,pixels)),q);
+ GetPixelOpacity(pixels)));
}
if (magn_methx == 4)
/* Replicate nearest */
if (i <= ((m+1) << 1))
{
- SetPixelAlpha(image,
- GetPixelAlpha(image,pixels)+0,q);
+ SetPixelOpacity(q,
+ GetPixelOpacity(pixels)+0);
}
else
{
- SetPixelAlpha(image,
- GetPixelAlpha(image,n)+0,q);
+ SetPixelOpacity(q,
+ GetPixelOpacity(n)+0);
}
}
}
/* Replicate nearest */
if (i <= ((m+1) << 1))
{
- SetPixelRed(image,GetPixelRed(image,pixels),q);
- SetPixelGreen(image,GetPixelGreen(image,pixels),q);
- SetPixelBlue(image,GetPixelBlue(image,pixels),q);
- SetPixelAlpha(image,GetPixelAlpha(image,pixels),q);
+ SetPixelRGBO(q,(pixels));
}
else
{
- SetPixelRed(image,GetPixelRed(image,n),q);
- SetPixelGreen(image,GetPixelGreen(image,n),q);
- SetPixelBlue(image,GetPixelBlue(image,n),q);
- SetPixelAlpha(image,GetPixelAlpha(image,n),q);
+ SetPixelRGBO(q,(n));
}
if (magn_methx == 5)
{
/* Interpolate */
- SetPixelAlpha(image,
- (QM) ((2*i*( GetPixelAlpha(image,n)
- -GetPixelAlpha(image,pixels))+m)/
+ SetPixelOpacity(q,
+ (QM) ((2*i*( GetPixelOpacity(n)
+ -GetPixelOpacity(pixels))+m)/
((ssize_t) (m*2))
- +GetPixelAlpha(image,pixels)),q);
+ +GetPixelOpacity(pixels)));
}
}
- q+=GetPixelChannels(image);
+ q++;
}
- n+=GetPixelChannels(image);
- p+=GetPixelChannels(image);
+ n++;
+ p++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
for (x=(ssize_t) image->columns-1; x >= 0; x--)
{
- 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);
+ SetPixelRed(q,ScaleShortToQuantum(
+ GetPixelRed(q)));
+ SetPixelGreen(q,ScaleShortToQuantum(
+ GetPixelGreen(q)));
+ SetPixelBlue(q,ScaleShortToQuantum(
+ GetPixelBlue(q)));
+ SetPixelOpacity(q,ScaleShortToQuantum(
+ GetPixelOpacity(q)));
+ q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
image->columns=1;
image->rows=1;
image->colors=2;
- (void) SetImageBackgroundColor(image,exception);
+ (void) SetImageBackgroundColor(image);
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.
+ * if lossy, and promote any depths > 8 to 16.
*/
if (image->depth > 16)
image->depth=16;
image->depth=16;
}
- if (LosslessReduceDepthOK(image,exception) != MagickFalse)
+ if (LosslessReduceDepthOK(image) != 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) != (Quantum *) NULL)
+ if (GetAuthenticPixelQueue(image) != (PixelPacket *) NULL)
{
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image,exception);
+ AcquireNextImage(image_info,image);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
image->matte=MagickFalse;
if (image_info->ping == MagickFalse)
- (void) SetImageBackgroundColor(image,exception);
+ (void) SetImageBackgroundColor(image);
mng_info->image_found++;
}
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule()," No beginning");
- (void) ThrowMagickException(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->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(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->exception,GetMagickModule(),
CoderError,"Linked list is corrupted; next_image is NULL","`%s'",
image_info->filename);
}
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" First image null");
- (void) ThrowMagickException(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->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(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->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,exception);
+ next_image=CoalesceImages(image,&image->exception);
if (next_image == (Image *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
%
% The format of the WriteMNGImage method is:
%
-% MagickBooleanType WriteMNGImage(const ImageInfo *image_info,
-% Image *image,ExceptionInfo *exception)
+% MagickBooleanType WriteMNGImage(const ImageInfo *image_info,Image *image)
%
% 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):
/* Write one PNG image */
static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
- const ImageInfo *IMimage_info,Image *IMimage,ExceptionInfo *exception)
+ const ImageInfo *image_info,Image *image)
{
- Image
- *image;
-
- ImageInfo
- *image_info;
-
char
s[2];
QuantumInfo
*quantum_info;
- PNGErrorInfo
- error_info;
-
register ssize_t
i,
x;
logging=LogMagickEvent(CoderEvent,GetMagickModule(),
" Enter WriteOnePNGImage()");
- image = CloneImage(IMimage,0,0,MagickFalse,exception);
- image_info=(ImageInfo *) CloneImageInfo(IMimage_info);
- if (image_info == (ImageInfo *) NULL)
- ThrowWriterException(ResourceLimitError, "MemoryAllocationFailed");
+#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);
* 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;
(mng_info->write_png_colortype != 0 &&
mng_info->write_png_colortype != 4)))
{
- (void) SyncImage(image,exception);
+ (void) SyncImage(image);
image->storage_class = DirectClass;
}
}
if (IsRGBColorspace(image->colorspace) == MagickFalse)
- (void) TransformImageColorspace(image,sRGBColorspace,exception);
+ (void) TransformImageColorspace(image,sRGBColorspace);
/*
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,exception);
+ (void) SyncImage(image);
#if (MAGICKCORE_QUANTUM_DEPTH == 8)
if (image->depth > 8)
/* Respect the -depth option */
if (image->depth < MAGICKCORE_QUANTUM_DEPTH)
{
- register Quantum
+ register PixelPacket
*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 == (Quantum *) NULL)
+ if (r == (PixelPacket *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- LBR16PixelRGBA(r);
- r+=GetPixelChannels(image);
+ LBR16PixelRGBO(r);
+ r++;
}
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 == (Quantum *) NULL)
+ if (r == (PixelPacket *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- LBR08PixelRGBA(r);
- r+=GetPixelChannels(image);
+ LBR08PixelRGBO(r);
+ r++;
}
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 == (Quantum *) NULL)
+ if (r == (PixelPacket *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- LBR04PixelRGBA(r);
- r+=GetPixelChannels(image);
+ LBR04PixelRGBO(r);
+ r++;
}
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 == (Quantum *) NULL)
+ if (r == (PixelPacket *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- LBR02PixelRGBA(r);
- r+=GetPixelChannels(image);
+ LBR02PixelRGBO(r);
+ r++;
}
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 == (Quantum *) NULL)
+ if (r == (PixelPacket *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- LBR01PixelRGBA(r);
- r+=GetPixelChannels(image);
+ LBR01PixelRGBO(r);
+ r++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
}
if (image->depth == 16 && mng_info->write_png_depth != 16)
- if (mng_info->write_png8 || LosslessReduceDepthOK(image,exception) != MagickFalse)
+ if (mng_info->write_png8 || LosslessReduceDepthOK(image) != MagickFalse)
image->depth = 8;
#endif
* This code will delete the colormap and change the image to
* DirectClass.
*
- * If image->matte is MagickFalse, we ignore the alpha channel
+ * If image->matte is MagickFalse, we ignore the opacity 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;
- PixelInfo
+ PixelPacket
opaque[260],
semitransparent[260],
transparent[260];
- register const Quantum
- *s;
+ register IndexPacket
+ *indexes;
+
+ register const PixelPacket
+ *s,
+ *q;
- register Quantum
- *q,
+ register PixelPacket
*r;
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Original colormap:");
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " i (red,green,blue,alpha)");
+ " i (red,green,blue,opacity)");
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].alpha);
+ (int) image->colormap[i].opacity);
}
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].alpha);
+ (int) image->colormap[i].opacity);
}
}
}
" 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 == (Quantum *) NULL)
+ if (q == (PixelPacket *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
if (image->matte == MagickFalse ||
- GetPixelAlpha(image,q) == OpaqueAlpha)
+ GetPixelOpacity(q) == OpaqueOpacity)
{
if (number_opaque < 259)
{
if (number_opaque == 0)
{
- GetPixelInfoPixel(image, q, opaque);
- opaque[0].alpha=OpaqueAlpha;
+ GetPixelRGB(q, opaque);
+ opaque[0].opacity=OpaqueOpacity;
number_opaque=1;
}
for (i=0; i< (ssize_t) number_opaque; i++)
{
- if (IsPixelEquivalent(image,q, opaque+i))
+ if (IsColorEqual(q, opaque+i))
break;
}
- if (i == (ssize_t) number_opaque && number_opaque < 259)
+ if (i == (ssize_t) number_opaque &&
+ number_opaque < 259)
{
number_opaque++;
- GetPixelInfoPixel(image, q, opaque+i);
- opaque[i].alpha=OpaqueAlpha;
+ GetPixelRGB(q, opaque+i);
+ opaque[i].opacity=OpaqueOpacity;
}
}
}
- else if (GetPixelAlpha(image,q) == TransparentAlpha)
+ else if (q->opacity == TransparentOpacity)
{
if (number_transparent < 259)
{
if (number_transparent == 0)
{
- 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)
- GetPixelRed(image,q);
+ 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);
number_transparent = 1;
}
for (i=0; i< (ssize_t) number_transparent; i++)
{
- if (IsPixelEquivalent(image,q, transparent+i))
+ if (IsColorEqual(q, transparent+i))
break;
}
number_transparent < 259)
{
number_transparent++;
- GetPixelInfoPixel(image,q,transparent+i);
+ GetPixelRGBO(q, transparent+i);
}
}
}
{
if (number_semitransparent == 0)
{
- GetPixelInfoPixel(image,q,semitransparent);
+ GetPixelRGBO(q, semitransparent);
number_semitransparent = 1;
}
for (i=0; i< (ssize_t) number_semitransparent; i++)
{
- if (IsPixelEquivalent(image,q, semitransparent+i)
- && GetPixelAlpha(image,q) ==
- semitransparent[i].alpha)
+ if (IsColorEqual(q, semitransparent+i)
+ && GetPixelOpacity(q) ==
+ semitransparent[i].opacity)
break;
}
number_semitransparent < 259)
{
number_semitransparent++;
- GetPixelInfoPixel(image, q, semitransparent+i);
+ GetPixelRGBO(q, semitransparent+i);
}
}
}
- q+=GetPixelChannels(image);
+ q++;
}
}
{
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (Quantum *) NULL)
+ if (q == (PixelPacket *) NULL)
break;
s=q;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelRed(image,s) != GetPixelGreen(image,s) ||
- GetPixelRed(image,s) != GetPixelBlue(image,s))
+ if (GetPixelRed(s) != GetPixelGreen(s) ||
+ GetPixelRed(s) != GetPixelBlue(s))
{
ping_have_color=MagickTrue;
ping_have_non_bw=MagickTrue;
break;
}
- s+=GetPixelChannels(image);
+ s++;
}
if (ping_have_color != MagickFalse)
s=q;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelRed(image,s) != 0 &&
- GetPixelRed(image,s) != QuantumRange)
+ if (GetPixelRed(s) != 0 &&
+ GetPixelRed(s) != QuantumRange)
{
ping_have_non_bw=MagickTrue;
break;
}
- s+=GetPixelChannels(image);
+ s++;
}
}
}
if (image_colors < 257)
{
- PixelInfo
+ PixelPacket
colormap[260];
/*
image->colors = image_colors;
- if (AcquireImageColormap(image,image_colors,exception) ==
+ if (AcquireImageColormap(image,image_colors) ==
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 == (Quantum *) NULL)
+ if (q == (PixelPacket *) 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].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))
+ image->colormap[i].opacity ==
+ GetPixelOpacity(q)) &&
+ image->colormap[i].red ==
+ GetPixelRed(q) &&
+ image->colormap[i].green ==
+ GetPixelGreen(q) &&
+ image->colormap[i].blue ==
+ GetPixelBlue(q))
{
- SetPixelIndex(image,i,q);
+ SetPixelIndex(indexes+x,i);
break;
}
}
- q+=GetPixelChannels(image);
+ q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
if (image->colormap != NULL)
{
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " i (red,green,blue,alpha)");
+ " i (red,green,blue,opacity)");
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].alpha);
+ (int) image->colormap[i].opacity);
}
}
}
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 == (Quantum *) NULL)
+ if (r == (PixelPacket *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelAlpha(image,r) < OpaqueAlpha/2)
+ if (GetPixelOpacity(r) > TransparentOpacity/2)
{
- SetPixelInfoPixel(image,&image->background_color,r);
- SetPixelAlpha(image,TransparentAlpha,r);
+ SetPixelOpacity(r,TransparentOpacity);
+ SetPixelRgb(r,&image->background_color);
}
else
- SetPixelAlpha(image,OpaqueAlpha,r);
- r+=GetPixelChannels(image);
+ SetPixelOpacity(r,OpaqueOpacity);
+ r++;
}
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].alpha =
- (image->colormap[i].alpha > TransparentAlpha/2 ?
- TransparentAlpha : OpaqueAlpha);
+ image->colormap[i].opacity =
+ (image->colormap[i].opacity > TransparentOpacity/2 ?
+ TransparentOpacity : OpaqueOpacity);
}
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 == (Quantum *) NULL)
+ if (r == (PixelPacket *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelAlpha(image,r) == OpaqueAlpha)
+ if (GetPixelOpacity(r) == OpaqueOpacity)
LBR04PixelRGB(r);
- r+=GetPixelChannels(image);
+ r++;
}
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 == (Quantum *) NULL)
+ if (r == (PixelPacket *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelAlpha(image,r) == OpaqueAlpha)
- LBR03RGB(r);
- r+=GetPixelChannels(image);
+ if (GetPixelOpacity(r) == OpaqueOpacity)
+ LBR03PixelRGB(r);
+ r++;
}
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 == (Quantum *) NULL)
+ if (r == (PixelPacket *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelAlpha(image,r) == OpaqueAlpha)
+ if (GetPixelOpacity(r) == OpaqueOpacity)
LBR02PixelBlue(r);
- r+=GetPixelChannels(image);
+ r++;
}
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 == (Quantum *) NULL)
+ if (r == (PixelPacket *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (ScaleQuantumToChar(GetPixelRed(image,r)) == 0x49 &&
- ScaleQuantumToChar(GetPixelGreen(image,r)) == 0x00 &&
- ScaleQuantumToChar(GetPixelBlue(image,r)) == 0x00 &&
- GetPixelAlpha(image,r) == OpaqueAlpha)
+ if (ScaleQuantumToChar(GetPixelRed(r)) == 0x49 &&
+ ScaleQuantumToChar(GetPixelGreen(r)) == 0x00 &&
+ ScaleQuantumToChar(GetPixelBlue(r)) == 0x00 &&
+ GetPixelOpacity(r) == OpaqueOpacity)
{
- SetPixelRed(image,ScaleCharToQuantum(0x24),r);
+ SetPixelRed(r,ScaleCharToQuantum(0x24));
}
- r+=GetPixelChannels(image);
+ r++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
else if (image_colors == 0 || image_colors > 256 ||
image->colormap == NULL)
{
- register const Quantum
+ ExceptionInfo
+ *exception;
+
+ register const PixelPacket
*q;
+ exception=(&image->exception);
+
for (y=0; y < (ssize_t) image->rows; y++)
{
q=GetVirtualPixels(image,0,y,image->columns,1, exception);
- if (q == (Quantum *) NULL)
+ if (q == (PixelPacket *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- 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)
+ 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)
{
ping_have_cheap_transparency = MagickFalse;
break;
}
- q+=GetPixelChannels(image);
+ q++;
}
if (ping_have_cheap_transparency == MagickFalse)
if ((mng_info->write_png_colortype == 4 || mng_info->write_png8) &&
(image->colors == 0 || image->colormap == NULL))
{
- image_info=DestroyImageInfo(image_info);
- image=DestroyImage(image);
- (void) ThrowMagickException(exception,GetMagickModule(),CoderError,
+ (void) ThrowMagickException(&image->exception,
+ GetMagickModule(),CoderError,
"Cannot write PNG8 or color-type 3; colormap is NULL",
- "`%s'",IMimage->filename);
+ "`%s'",image->filename);
#if defined(PNG_SETJMP_NOT_THREAD_SAFE)
UnlockSemaphoreInfo(ping_semaphore);
#endif
Allocate the PNG structures
*/
#ifdef PNG_USER_MEM_SUPPORTED
- error_info.image=image;
- error_info.exception=exception;
- ping=png_create_write_struct_2(PNG_LIBPNG_VER_STRING,&error_info,
+ ping=png_create_write_struct_2(PNG_LIBPNG_VER_STRING,image,
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,&error_info,
+ ping=png_create_write_struct(PNG_LIBPNG_VER_STRING,image,
MagickPNGErrorHandler,MagickPNGWarningHandler);
#endif
#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);
return(MagickFalse);
}
/*
#if defined(PNG_pHYs_SUPPORTED)
if (ping_exclude_pHYs == MagickFalse)
{
- if ((image->resolution.x != 0) && (image->resolution.y != 0) &&
+ if ((image->x_resolution != 0) && (image->y_resolution != 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->resolution.x+0.5)/2.54);
+ (png_uint_32) ((100.0*image->x_resolution+0.5)/2.54);
ping_pHYs_y_resolution=
- (png_uint_32) ((100.0*image->resolution.y+0.5)/2.54);
+ (png_uint_32) ((100.0*image->y_resolution+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->resolution.x+0.5);
- ping_pHYs_y_resolution=(png_uint_32) (100.0*image->resolution.y+0.5);
+ 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);
}
else
{
ping_pHYs_unit_type=PNG_RESOLUTION_UNKNOWN;
- ping_pHYs_x_resolution=(png_uint_32) image->resolution.x;
- ping_pHYs_y_resolution=(png_uint_32) image->resolution.y;
+ ping_pHYs_x_resolution=(png_uint_32) image->x_resolution;
+ ping_pHYs_y_resolution=(png_uint_32) image->y_resolution;
}
if (logging != MagickFalse)
if (image->colors == 0)
{
/* DO SOMETHING */
- (void) ThrowMagickException(exception,
+ (void) ThrowMagickException(&image->exception,
GetMagickModule(),CoderError,
"image has 0 colors", "`%s'","");
}
(ScaleQuantumToShort(image->colormap[0].blue) & mask);
ping_trans_color.gray=(png_uint_16)
- (ScaleQuantumToShort(GetPixelInfoIntensity(
+ (ScaleQuantumToShort(PixelIntensityToQuantum(
image->colormap)) & mask);
ping_trans_color.index=(png_byte) 0;
ping_bit_depth=1;
one=1;
- while ((one << ping_bit_depth) < (size_t) number_colors)
+ while ((one << ping_bit_depth) < (ssize_t) number_colors)
ping_bit_depth <<= 1;
}
for (i=0; i < ping_num_trans; i++)
{
- ping_trans_alpha[i]= (png_byte)
- ScaleQuantumToChar(image->colormap[i].alpha);
+ ping_trans_alpha[i]= (png_byte) (255-
+ ScaleQuantumToChar(image->colormap[i].opacity));
}
}
}
if (ping_exclude_bKGD == MagickFalse)
{
- ping_background.gray=(png_uint_16) ((maxval/65535.)*
- (ScaleQuantumToShort(((GetPixelInfoIntensity(
- &image->background_color))) +.5)));
-
+ ping_background.gray=(png_uint_16)
+ ((maxval/65535.)*(ScaleQuantumToShort(
+ PixelIntensity(&image->background_color)))+.5);
if (logging != MagickFalse)
+ {
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " Setting up bKGD chunk (2)");
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " background_color index is %d",
- (int) ping_background.index);
+ " 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);
+ }
ping_have_bKGD = MagickTrue;
}
Note that using the -quality option, not all combinations of
PNG filter type, zlib compression level, and zlib compression
- strategy are possible. This will be addressed soon in a
- release that accomodates "-define png:compression-strategy", etc.
+ strategy are possible. This is addressed by using
+ "-define png:compression-strategy", etc., which takes precedence
+ over -quality.
*/
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,(png_charp) name,0,
+ png_set_iCCP(ping,ping_info,(const png_charp) name,0,
#if (PNG_LIBPNG_VER < 10500)
(png_charp) GetStringInfoDatum(profile),
#else
{
/* Add an opaque matte channel */
image->matte = MagickTrue;
- (void) SetImageAlpha(image,OpaqueAlpha,exception);
+ (void) SetImageOpacity(image,0);
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
if (mng_info->need_blob != MagickFalse)
{
- if (OpenBlob(image_info,image,WriteBinaryBlobMode,exception) ==
+ if (OpenBlob(image_info,image,WriteBinaryBlobMode,&image->exception) ==
MagickFalse)
png_error(ping,"WriteBlob Failed");
#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);
return(MagickFalse);
}
quantum_info=AcquireQuantumInfo(image_info,image);
ping_have_non_bw == MagickFalse)
{
/* Palette, Bilevel, or Opaque Monochrome */
- register const Quantum
+ register const PixelPacket
*p;
quantum_info->depth=8;
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Writing row of pixels (0)");
- p=GetVirtualPixels(image,0,y,image->columns,1,exception);
+ p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const Quantum *) NULL)
+ if (p == (const PixelPacket *) NULL)
break;
if (mng_info->IsPalette)
{
- (void) ExportQuantumPixels(image,(CacheView *) NULL,
- quantum_info,GrayQuantum,ping_pixels,exception);
+ (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ quantum_info,GrayQuantum,ping_pixels,&image->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,(CacheView *) NULL,
- quantum_info,RedQuantum,ping_pixels,exception);
+ (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ quantum_info,RedQuantum,ping_pixels,&image->exception);
}
if (mng_info->write_png_colortype-1 != PNG_COLOR_TYPE_PALETTE)
(ping_bit_depth >= MAGICKCORE_QUANTUM_DEPTH)) &&
(mng_info->IsPalette) && ping_have_color == MagickFalse)
{
- register const Quantum
+ register const PixelPacket
*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,exception);
+ p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const Quantum *) NULL)
+ if (p == (const PixelPacket *) NULL)
break;
if (ping_color_type == PNG_COLOR_TYPE_GRAY)
{
if (mng_info->IsPalette)
- (void) ExportQuantumPixels(image,(CacheView *) NULL,
- quantum_info,GrayQuantum,ping_pixels,exception);
+ (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ quantum_info,GrayQuantum,ping_pixels,&image->exception);
else
- (void) ExportQuantumPixels(image,(CacheView *) NULL,
- quantum_info,RedQuantum,ping_pixels,exception);
+ (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ quantum_info,RedQuantum,ping_pixels,&image->exception);
if (logging != MagickFalse && y == 0)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Writing GRAY_ALPHA PNG pixels (2)");
- (void) ExportQuantumPixels(image,(CacheView *) NULL,
- quantum_info,GrayAlphaQuantum,ping_pixels,exception);
+ (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ quantum_info,GrayAlphaQuantum,ping_pixels,&image->exception);
}
if (logging != MagickFalse && y == 0)
else
{
- register const Quantum
+ register const PixelPacket
*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,
- exception);
+ &image->exception);
- if (p == (const Quantum *) NULL)
+ if (p == (const PixelPacket *) NULL)
break;
if (ping_color_type == PNG_COLOR_TYPE_GRAY)
{
if (image->storage_class == DirectClass)
- (void) ExportQuantumPixels(image,(CacheView *) NULL,
- quantum_info,RedQuantum,ping_pixels,exception);
+ (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ quantum_info,RedQuantum,ping_pixels,&image->exception);
else
- (void) ExportQuantumPixels(image,(CacheView *) NULL,
- quantum_info,GrayQuantum,ping_pixels,exception);
+ (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ quantum_info,GrayQuantum,ping_pixels,&image->exception);
}
else if (ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
{
- (void) ExportQuantumPixels(image,(CacheView *) NULL,
+ (void) ExportQuantumPixels(image,(const CacheView *) NULL,
quantum_info,GrayAlphaQuantum,ping_pixels,
- exception);
+ &image->exception);
if (logging != MagickFalse && y == 0)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
}
else if (image_matte != MagickFalse)
- (void) ExportQuantumPixels(image,(CacheView *) NULL,
- quantum_info,RGBAQuantum,ping_pixels,exception);
+ (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ quantum_info,RGBAQuantum,ping_pixels,&image->exception);
else
- (void) ExportQuantumPixels(image,(CacheView *) NULL,
- quantum_info,RGBQuantum,ping_pixels,exception);
+ (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ quantum_info,RGBQuantum,ping_pixels,&image->exception);
if (logging != MagickFalse && y == 0)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" pass %d, Image Is RGB, 16-bit GRAY, or GRAY_ALPHA",pass);
- p=GetVirtualPixels(image,0,y,image->columns,1, exception);
+ p=GetVirtualPixels(image,0,y,image->columns,1,
+ &image->exception);
- if (p == (const Quantum *) NULL)
+ if (p == (const PixelPacket *) NULL)
break;
if (ping_color_type == PNG_COLOR_TYPE_GRAY)
{
quantum_info->depth=image->depth;
- (void) ExportQuantumPixels(image,(CacheView *) NULL,
- quantum_info,GrayQuantum,ping_pixels,exception);
+ (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ quantum_info,GrayQuantum,ping_pixels,&image->exception);
}
else if (ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Writing GRAY_ALPHA PNG pixels (4)");
- (void) ExportQuantumPixels(image,(CacheView *) NULL,
+ (void) ExportQuantumPixels(image,(const CacheView *) NULL,
quantum_info,GrayAlphaQuantum,ping_pixels,
- exception);
+ &image->exception);
}
else
{
- (void) ExportQuantumPixels(image,(CacheView *) NULL,
- quantum_info,IndexQuantum,ping_pixels,exception);
+ (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ quantum_info,IndexQuantum,ping_pixels,&image->exception);
if (logging != MagickFalse && y <= 2)
{
png_textp
text;
- value=GetImageProperty(image,property,exception);
+ value=GetImageProperty(image,property);
/* Don't write any "png:" properties; those are just for "identify" */
if (LocaleNCompare(property,"png:",4) != 0 &&
}
if (mng_info->write_mng && !mng_info->need_fram &&
((int) image->dispose == 3))
- (void) ThrowMagickException(exception,GetMagickModule(),
+ (void) ThrowMagickException(&image->exception,GetMagickModule(),
CoderError,"Cannot convert GIF with disposal method 3 to MNG-LC",
"`%s'",image->filename);
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(IMimage,"png:bit-depth-written",s,exception);
+ (void) SetImageProperty(image,"png:bit-depth-written",s);
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
%
% The format of the WritePNGImage method is:
%
-% MagickBooleanType WritePNGImage(const ImageInfo *image_info,
-% Image *image,ExceptionInfo *exception)
+% MagickBooleanType WritePNGImage(const ImageInfo *image_info,Image *image)
%
% 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 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.
+% or transparency limitations.
+%
+% To do: Enforce the previous paragraph.
%
% 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,ExceptionInfo *exception)
+ Image *image)
{
MagickBooleanType
excluding,
mng_info->write_png32 = MagickTrue;
}
}
+
if (mng_info->write_png8)
{
mng_info->write_png_colortype = /* 3 */ 4;
image->depth = 8;
if (image->matte == MagickTrue)
- (void) SetImageType(image,TrueColorMatteType,exception);
+ (void) SetImageType(image,TrueColorMatteType);
else
- (void) SetImageType(image,TrueColorType,exception);
+ (void) SetImageType(image,TrueColorType);
- (void) SyncImage(image,exception);
+ (void) SyncImage(image);
}
if (mng_info->write_png32)
image->depth = 8;
if (image->matte == MagickTrue)
- (void) SetImageType(image,TrueColorMatteType,exception);
+ (void) SetImageType(image,TrueColorMatteType);
else
- (void) SetImageType(image,TrueColorType,exception);
+ (void) SetImageType(image,TrueColorType);
- (void) SyncImage(image,exception);
+ (void) SyncImage(image);
}
value=GetImageOption(image_info,"png:bit-depth");
mng_info->write_png_depth = 16;
else
- (void) ThrowMagickException(exception,
+ (void) ThrowMagickException(&image->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(exception,
+ (void) ThrowMagickException(&image->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(exception,
+ (void) ThrowMagickException(&image->exception,
GetMagickModule(),CoderWarning,
"ignoring invalid defined png:compression-level",
"=%s",value);
#endif
else
- (void) ThrowMagickException(exception,
+ (void) ThrowMagickException(&image->exception,
GetMagickModule(),CoderWarning,
"ignoring invalid defined png:compression-strategy",
"=%s",value);
else if (LocaleCompare(value,"5") == 0)
mng_info->write_png_compression_filter = 6;
+
else
- (void) ThrowMagickException(exception,
+ (void) ThrowMagickException(&image->exception,
GetMagickModule(),CoderWarning,
"ignoring invalid defined png:compression-filter",
"=%s",value);
mng_info->need_blob = MagickTrue;
- status=WriteOnePNGImage(mng_info,image_info,image,exception);
+ status=WriteOnePNGImage(mng_info,image_info,image);
+
+ (void) CloseBlob(image);
MngInfoFreeStruct(mng_info,&have_mng_structure);
/* Write one JNG image */
static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info,
- const ImageInfo *image_info,Image *image,ExceptionInfo *exception)
+ const ImageInfo *image_info,Image *image)
{
Image
*jpeg_image;
/* Create JPEG blob, image, and image_info */
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " Creating jpeg_image_info for alpha.");
+ " Creating jpeg_image_info for opacity.");
jpeg_image_info=(ImageInfo *) CloneImageInfo(image_info);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Creating jpeg_image.");
- jpeg_image=SeparateImage(image,AlphaChannel,exception);
+ jpeg_image=CloneImage(image,0,0,MagickTrue,&image->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->quality=jng_alpha_quality;
+
jpeg_image_info->type=GrayscaleType;
- (void) SetImageType(jpeg_image,GrayscaleType,exception);
+ jpeg_image->quality=jng_alpha_quality;
+ (void) SetImageType(jpeg_image,GrayscaleType);
(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,exception))
+ TrueColorType && ImageIsGray(image))
jng_color_type-=2;
if (logging != MagickFalse)
const char
*value;
- /* Encode alpha as a grayscale PNG blob */
+ /* Encode opacity as a grayscale PNG blob */
status=OpenBlob(jpeg_image_info,jpeg_image,WriteBinaryBlobMode,
- exception);
+ &image->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,
- exception);
+ &image->exception);
/* Retrieve sample depth used */
- value=GetImageProperty(jpeg_image,"png:bit-depth-written",exception);
+ value=GetImageProperty(jpeg_image,"png:bit-depth-written");
if (value != (char *) NULL)
jng_alpha_sample_depth= (unsigned int) value[0];
}
else
{
- /* Encode alpha as a grayscale JPEG blob */
+ /* Encode opacity as a grayscale JPEG blob */
status=OpenBlob(jpeg_image_info,jpeg_image,WriteBinaryBlobMode,
- exception);
+ &image->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,
- exception);
+ &image->exception);
jng_alpha_sample_depth=8;
if (logging != MagickFalse)
}
}
- if (image->resolution.x && image->resolution.y && !mng_info->equal_physs)
+ if (image->x_resolution && image->y_resolution && !mng_info->equal_physs)
{
/*
Write JNG pHYs chunk
if (image->units == PixelsPerInchResolution)
{
PNGLong(chunk+4,(png_uint_32)
- (image->resolution.x*100.0/2.54+0.5));
+ (image->x_resolution*100.0/2.54+0.5));
PNGLong(chunk+8,(png_uint_32)
- (image->resolution.y*100.0/2.54+0.5));
+ (image->y_resolution*100.0/2.54+0.5));
chunk[12]=1;
}
if (image->units == PixelsPerCentimeterResolution)
{
PNGLong(chunk+4,(png_uint_32)
- (image->resolution.x*100.0+0.5));
+ (image->x_resolution*100.0+0.5));
PNGLong(chunk+8,(png_uint_32)
- (image->resolution.y*100.0+0.5));
+ (image->y_resolution*100.0+0.5));
chunk[12]=1;
}
else
{
- PNGLong(chunk+4,(png_uint_32) (image->resolution.x+0.5));
- PNGLong(chunk+8,(png_uint_32) (image->resolution.y+0.5));
+ PNGLong(chunk+4,(png_uint_32) (image->x_resolution+0.5));
+ PNGLong(chunk+8,(png_uint_32) (image->y_resolution+0.5));
chunk[12]=0;
}
}
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Creating jpeg_image.");
- jpeg_image=CloneImage(image,0,0,MagickTrue,exception);
+ jpeg_image=CloneImage(image,0,0,MagickTrue,&image->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,
- exception);
+ &image->exception);
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Creating blob.");
- blob=ImageToBlob(jpeg_image_info,jpeg_image,&length,exception);
+ blob=ImageToBlob(jpeg_image_info,jpeg_image,&length,&image->exception);
if (logging != MagickFalse)
{
%
% The format of the WriteJNGImage method is:
%
-% MagickBooleanType WriteJNGImage(const ImageInfo *image_info,
-% Image *image,ExceptionInfo *exception)
+% MagickBooleanType WriteJNGImage(const ImageInfo *image_info,Image *image)
%
% 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,
- ExceptionInfo *exception)
+static MagickBooleanType WriteJNGImage(const ImageInfo *image_info,Image *image)
{
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,exception);
+ status=OpenBlob(image_info,image,WriteBinaryBlobMode,&image->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,exception);
+ status=WriteOneJNGImage(mng_info,image_info,image);
(void) CloseBlob(image);
(void) CatchImageException(image);
}
#endif
-static MagickBooleanType WriteMNGImage(const ImageInfo *image_info,Image *image,
- ExceptionInfo *exception)
+
+
+static MagickBooleanType WriteMNGImage(const ImageInfo *image_info,Image *image)
{
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,exception);
+ status=OpenBlob(image_info,image,WriteBinaryBlobMode,&image->exception);
if (status == MagickFalse)
return(status);
if (need_local_plte == 0)
{
- if (ImageIsGray(image,exception) == MagickFalse)
+ if (ImageIsGray(image) == 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->resolution.x != next_image->next->resolution.x) ||
- (next_image->resolution.y != next_image->next->resolution.y))
+ (next_image->x_resolution != next_image->next->x_resolution) ||
+ (next_image->y_resolution != next_image->next->y_resolution))
mng_info->equal_physs=MagickFalse;
if (mng_info->equal_chrms)
if (mng_info->adjoin)
{
final_delay=10;
- (void) ThrowMagickException(exception,GetMagickModule(),
- CoderWarning,
+ (void) ThrowMagickException(&image->exception,
+ GetMagickModule(),CoderWarning,
"input has zero delay between all frames; assuming",
" 10 cs `%s'","");
}
mng_info->have_write_global_chrm=MagickTrue;
}
}
- if (image->resolution.x && image->resolution.y && mng_info->equal_physs)
+ if (image->x_resolution && image->y_resolution && mng_info->equal_physs)
{
/*
Write MNG pHYs chunk
if (image->units == PixelsPerInchResolution)
{
PNGLong(chunk+4,(png_uint_32)
- (image->resolution.x*100.0/2.54+0.5));
+ (image->x_resolution*100.0/2.54+0.5));
PNGLong(chunk+8,(png_uint_32)
- (image->resolution.y*100.0/2.54+0.5));
+ (image->y_resolution*100.0/2.54+0.5));
chunk[12]=1;
}
if (image->units == PixelsPerCentimeterResolution)
{
PNGLong(chunk+4,(png_uint_32)
- (image->resolution.x*100.0+0.5));
+ (image->x_resolution*100.0+0.5));
PNGLong(chunk+8,(png_uint_32)
- (image->resolution.y*100.0+0.5));
+ (image->y_resolution*100.0+0.5));
chunk[12]=1;
}
else
{
- PNGLong(chunk+4,(png_uint_32) (image->resolution.x+0.5));
- PNGLong(chunk+8,(png_uint_32) (image->resolution.y+0.5));
+ PNGLong(chunk+4,(png_uint_32) (image->x_resolution+0.5));
+ PNGLong(chunk+8,(png_uint_32) (image->y_resolution+0.5));
chunk[12]=0;
}
}
for (i=0; i < (ssize_t) image->colors; i++)
{
- 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);
+ 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;
}
(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,exception);
+ status=WriteOneJNGImage(mng_info,write_info,image);
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,exception);
+ status=WriteOnePNGImage(mng_info,image_info,image);
}
if (status == MagickFalse)
projects / imagemagick / commitdiff