#if defined(__MINGW32__)
# define XMD_H 1 /* Avoid conflicting typedef for INT32 */
typedef unsigned char boolean;
+#define HAVE_BOOLEAN
#endif
#undef HAVE_STDLIB_H
#include "jpeglib.h"
*source;
source=(SourceManager *) cinfo->src;
- source->manager.bytes_in_buffer=(size_t)
- ReadBlob(source->image,MaxBufferExtent,source->buffer);
+ source->manager.bytes_in_buffer=(size_t) ReadBlob(source->image,
+ MaxBufferExtent,source->buffer);
if (source->manager.bytes_in_buffer == 0)
{
if (source->start_of_blob != 0)
IndexPacket
index;
- ssize_t
- y;
-
JSAMPLE
*jpeg_pixels;
precision,
units;
+ ssize_t
+ y;
+
/*
Open image file.
*/
else
pixel=(size_t) ((GETJSAMPLE(*p) ^ 0x80) << 4);
index=ConstrainColormapIndex(image,pixel);
- indexes[x]=index;
- *q++=image->colormap[(int) index];
+ SetIndexPixelComponent(indexes+x,index);
+ SetRedPixelComponent(q,image->colormap[(int) index].red);
+ SetGreenPixelComponent(q,image->colormap[(int) index].green);
+ SetBluePixelComponent(q,image->colormap[(int) index].blue);
p++;
+ q++;
}
else
if (image->colorspace != CMYKColorspace)
for (x=0; x < (ssize_t) image->columns; x++)
{
- q->red=ScaleShortToQuantum((unsigned char)
- (GETJSAMPLE(*p++) << 4));
- q->green=ScaleShortToQuantum((unsigned char)
- (GETJSAMPLE(*p++) << 4));
- q->blue=ScaleShortToQuantum((unsigned char)
- (GETJSAMPLE(*p++) << 4));
+ SetRedPixelComponent(q,ScaleShortToQuantum((unsigned char)
+ (GETJSAMPLE(*p++) << 4)));
+ SetGreenPixelComponent(q,ScaleShortToQuantum((unsigned char)
+ (GETJSAMPLE(*p++) << 4)));
+ SetBluePixelComponent(q,ScaleShortToQuantum((unsigned char)
+ (GETJSAMPLE(*p++) << 4)));
SetOpacityPixelComponent(q,OpaqueOpacity);
q++;
}
else
for (x=0; x < (ssize_t) image->columns; x++)
{
- q->red=(Quantum) QuantumRange-ScaleShortToQuantum((unsigned char)
- (GETJSAMPLE(*p++) << 4));
- q->green=(Quantum) QuantumRange-ScaleShortToQuantum(
- (unsigned char) (GETJSAMPLE(*p++) << 4));
- q->blue=(Quantum) QuantumRange-ScaleShortToQuantum((unsigned char)
- (GETJSAMPLE(*p++) << 4));
+ SetCyanPixelComponent(q,QuantumRange-ScaleShortToQuantum(
+ (unsigned char) (GETJSAMPLE(*p++) << 4)));
+ SetMagentaPixelComponent(q,QuantumRange-ScaleShortToQuantum(
+ (unsigned char) (GETJSAMPLE(*p++) << 4)));
+ SetYellowPixelComponent(q,QuantumRange-ScaleShortToQuantum(
+ (unsigned char) (GETJSAMPLE(*p++) << 4)));
+ SetBlackPixelComponent(indexes+x,QuantumRange-ScaleShortToQuantum(
+ (unsigned char) (GETJSAMPLE(*p++) << 4)));
SetOpacityPixelComponent(q,OpaqueOpacity);
- indexes[x]=(IndexPacket) QuantumRange-ScaleShortToQuantum(
- (unsigned char) (GETJSAMPLE(*p++) << 4));
q++;
}
}
for (x=0; x < (ssize_t) image->columns; x++)
{
index=ConstrainColormapIndex(image,(size_t) GETJSAMPLE(*p));
- indexes[x]=(IndexPacket) index;
- *q++=image->colormap[(int) index];
+ SetIndexPixelComponent(indexes+x,index);
+ SetRedPixelComponent(q,image->colormap[(int) index].red);
+ SetGreenPixelComponent(q,image->colormap[(int) index].green);
+ SetBluePixelComponent(q,image->colormap[(int) index].blue);
p++;
+ q++;
}
else
if (image->colorspace != CMYKColorspace)
for (x=0; x < (ssize_t) image->columns; x++)
{
- q->red=ScaleCharToQuantum((unsigned char) GETJSAMPLE(*p++));
- q->green=ScaleCharToQuantum((unsigned char) GETJSAMPLE(*p++));
- q->blue=ScaleCharToQuantum((unsigned char) GETJSAMPLE(*p++));
+ SetRedPixelComponent(q,ScaleCharToQuantum((unsigned char)
+ GETJSAMPLE(*p++)));
+ SetGreenPixelComponent(q,ScaleCharToQuantum((unsigned char)
+ GETJSAMPLE(*p++)));
+ SetBluePixelComponent(q,ScaleCharToQuantum((unsigned char)
+ GETJSAMPLE(*p++)));
SetOpacityPixelComponent(q,OpaqueOpacity);
q++;
}
else
for (x=0; x < (ssize_t) image->columns; x++)
{
- q->red=(Quantum) QuantumRange-ScaleCharToQuantum((unsigned char)
- GETJSAMPLE(*p++));
- q->green=(Quantum) QuantumRange-ScaleCharToQuantum((unsigned char)
- GETJSAMPLE(*p++));
- q->blue=(Quantum) QuantumRange-ScaleCharToQuantum((unsigned char)
- GETJSAMPLE(*p++));
+ SetCyanPixelComponent(q,QuantumRange-ScaleCharToQuantum(
+ (unsigned char) GETJSAMPLE(*p++)));
+ SetMagentaPixelComponent(q,QuantumRange-ScaleCharToQuantum(
+ (unsigned char) GETJSAMPLE(*p++)));
+ SetYellowPixelComponent(q,QuantumRange-ScaleCharToQuantum(
+ (unsigned char) GETJSAMPLE(*p++)));
+ SetBlackPixelComponent(indexes+x,QuantumRange-ScaleCharToQuantum(
+ (unsigned char) GETJSAMPLE(*p++)));
SetOpacityPixelComponent(q,OpaqueOpacity);
- indexes[x]=(IndexPacket) QuantumRange-ScaleCharToQuantum(
- (unsigned char) GETJSAMPLE(*p++));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
- if (SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,image->rows) == MagickFalse)
+ status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
+ image->rows);
+ if (status == MagickFalse)
break;
}
/*
i;
size_t
- length;
+ length,
+ tag_length;
StringInfo
*custom_profile;
- size_t
- tag_length;
-
/*
Save image profile as a APP marker.
*/
JSAMPROW
scanline[1];
- ssize_t
- y;
-
MagickBooleanType
status;
register ssize_t
i;
+ ssize_t
+ y;
+
struct jpeg_compress_struct
jpeg_info;
p++;
}
(void) jpeg_write_scanlines(&jpeg_info,scanline,1);
- if (SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows) == MagickFalse)
+ status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+ image->rows);
+ if (status == MagickFalse)
break;
}
else
p++;
}
(void) jpeg_write_scanlines(&jpeg_info,scanline,1);
- if (SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows) == MagickFalse)
+ status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+ image->rows);
+ if (status == MagickFalse)
break;
}
else
*q++=(JSAMPLE) (ScaleQuantumToChar((Quantum) (QuantumRange-
GetBluePixelComponent(p))));
*q++=(JSAMPLE) (ScaleQuantumToChar((Quantum) (QuantumRange-
- indexes[x])));
+ GetIndexPixelComponent(indexes+x))));
p++;
}
(void) jpeg_write_scanlines(&jpeg_info,scanline,1);
- if (SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows) == MagickFalse)
+ status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+ image->rows);
+ if (status == MagickFalse)
break;
}
}
p++;
}
(void) jpeg_write_scanlines(&jpeg_info,scanline,1);
- if (SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows) == MagickFalse)
+ status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+ image->rows);
+ if (status == MagickFalse)
break;
}
else
}
(void) jpeg_write_scanlines(&jpeg_info,scanline,1);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
- image->rows);
+ image->rows);
if (status == MagickFalse)
break;
}
GetGreenPixelComponent(p)) >> 4));
*q++=(JSAMPLE) (4095-(ScaleQuantumToShort(
GetBluePixelComponent(p)) >> 4));
- *q++=(JSAMPLE) (4095-(ScaleQuantumToShort(indexes[x]) >> 4));
+ *q++=(JSAMPLE) (4095-(ScaleQuantumToShort(
+ GetIndexPixelComponent(indexes+x)) >> 4));
p++;
}
(void) jpeg_write_scanlines(&jpeg_info,scanline,1);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
- image->rows);
+ image->rows);
if (status == MagickFalse)
break;
}