/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/annotate.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/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/annotate.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/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
\f
/*
Forward declarations.
*/
static MagickBooleanType
- WriteTXTImage(const ImageInfo *,Image *);
+ WriteTXTImage(const ImageInfo *,Image *,ExceptionInfo *);
\f
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
(void) FormatLocaleString(geometry,MaxTextExtent,"0x0%+ld%+ld",(long) page.x,
(long) page.y);
(void) CloneString(&draw_info->geometry,geometry);
- status=GetTypeMetrics(image,draw_info,&metrics);
+ status=GetTypeMetrics(image,draw_info,&metrics,exception);
if (status == MagickFalse)
ThrowReaderException(TypeError,"UnableToGetTypeMetrics");
page.y=(ssize_t) ceil((double) page.y+metrics.ascent-0.5);
(void) SetImageProgressMonitor(image,progress_monitor,
image->client_data);
}
- (void) AnnotateImage(image,draw_info);
+ (void) AnnotateImage(image,draw_info,exception);
if (p == (char *) NULL)
break;
/*
*/
*draw_info->text='\0';
offset=2*page.y;
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
(void) TextureImage(image,texture);
(void) SetImageProgressMonitor(image,progress_monitor,image->client_data);
}
- (void) AnnotateImage(image,draw_info);
+ (void) AnnotateImage(image,draw_info,exception);
if (texture != (Image *) NULL)
texture=DestroyImage(texture);
draw_info=DestroyDrawInfo(draw_info);
Image
*image;
- IndexPacket
- *indexes;
-
long
type,
x_offset,
y,
y_offset;
- LongPixelPacket
+ PixelLongPacket
pixel;
MagickBooleanType
i,
x;
- register PixelPacket
+ register Quantum
*q;
ssize_t
image_info->filename);
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
- image=AcquireImage(image_info);
+ image=AcquireImage(image_info,exception);
status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
if (status == MagickFalse)
{
{
if (image->matte != MagickFalse)
count=(ssize_t) sscanf(text,"%ld,%ld: (%u,%u,%u,%u,%u",&x_offset,
- &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.index,
- &pixel.opacity);
+ &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.black,
+ &pixel.alpha);
else
count=(ssize_t) sscanf(text,"%ld,%ld: (%u,%u,%u,%u",&x_offset,
- &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.index);
+ &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.black);
}
else
if (image->matte != MagickFalse)
count=(ssize_t) sscanf(text,"%ld,%ld: (%u,%u,%u,%u",&x_offset,
- &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.opacity);
+ &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.alpha);
else
count=(ssize_t) sscanf(text,"%ld,%ld: (%u,%u,%u",&x_offset,
&y_offset,&pixel.red,&pixel.green,&pixel.blue);
if (count < 5)
continue;
q=GetAuthenticPixels(image,x_offset,y_offset,1,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
continue;
- SetRedPixelComponent(q,ScaleAnyToQuantum(pixel.red,range));
- SetGreenPixelComponent(q,ScaleAnyToQuantum(pixel.green,range));
- SetBluePixelComponent(q,ScaleAnyToQuantum(pixel.blue,range));
+ SetPixelRed(image,ScaleAnyToQuantum(pixel.red,range),q);
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel.green,range),q);
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel.blue,range),q);
if (image->colorspace == CMYKColorspace)
- {
- indexes=GetAuthenticIndexQueue(image);
- SetIndexPixelComponent(indexes,ScaleAnyToQuantum(pixel.index,
- range));
- }
+ SetPixelBlack(image,ScaleAnyToQuantum(pixel.black,range),q);
if (image->matte != MagickFalse)
- SetAlphaPixelComponent(q,ScaleAnyToQuantum(pixel.opacity,range));
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel.alpha,range),q);
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
}
/*
Allocate next image structure.
*/
- AcquireNextImage(image_info,image);
+ AcquireNextImage(image_info,image,exception);
if (GetNextImageInList(image) == (Image *) NULL)
{
image=DestroyImageList(image);
%
% The format of the WriteTXTImage method is:
%
-% MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image)
+% MagickBooleanType WriteTXTImage(const ImageInfo *image_info,
+% Image *image,ExceptionInfo *exception)
%
% A description of each parameter follows.
%
%
% o image: The image.
%
+% o exception: return any errors or warnings in this structure.
+%
*/
-static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image)
+static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image,
+ ExceptionInfo *exception)
{
char
buffer[MaxTextExtent],
MagickOffsetType
scene;
- MagickPixelPacket
+ PixelInfo
pixel;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
assert(image->signature == MagickSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- status=OpenBlob(image_info,image,WriteBlobMode,&image->exception);
+ status=OpenBlob(image_info,image,WriteBlobMode,exception);
if (status == MagickFalse)
return(status);
scene=0;
image->columns,(double) image->rows,(double)
GetQuantumRange(image->depth),colorspace);
(void) WriteBlobString(image,buffer);
- GetMagickPixelPacket(image,&pixel);
+ GetPixelInfo(image,&pixel);
for (y=0; y < (ssize_t) image->rows; y++)
{
- p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ p=GetVirtualPixels(image,0,y,image->columns,1,exception);
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
(void) FormatLocaleString(buffer,MaxTextExtent,"%.20g,%.20g: ",(double)
x,(double) y);
(void) WriteBlobString(image,buffer);
- SetMagickPixelPacket(image,p,indexes+x,&pixel);
+ SetPixelInfo(image,p,&pixel);
(void) CopyMagickString(tuple,"(",MaxTextExtent);
- ConcatenateColorComponent(&pixel,RedChannel,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,RedPixelChannel,X11Compliance,
+ tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,GreenChannel,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,GreenPixelChannel,X11Compliance,
+ tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,BlueChannel,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,BluePixelChannel,X11Compliance,
+ tuple);
if (pixel.colorspace == CMYKColorspace)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,IndexChannel,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,BlackPixelChannel,X11Compliance,
+ tuple);
}
if (pixel.matte != MagickFalse)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,AlphaChannel,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,AlphaPixelChannel,X11Compliance,
+ tuple);
}
(void) ConcatenateMagickString(tuple,")",MaxTextExtent);
(void) WriteBlobString(image,tuple);
(void) FormatLocaleString(buffer,MaxTextExtent,"%s",tuple);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image," ");
- (void) QueryMagickColorname(image,&pixel,SVGCompliance,tuple,
- &image->exception);
+ (void) QueryMagickColorname(image,&pixel,SVGCompliance,tuple,exception);
(void) WriteBlobString(image,tuple);
(void) WriteBlobString(image,"\n");
- p++;
+ p+=GetPixelChannels(image);
}
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
image->rows);
projects / imagemagick / blobdiff