/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.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/profile.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.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/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
\f
/*
Typedef declaration.
Forward declaractions.
*/
static MagickBooleanType
- WriteDPXImage(const ImageInfo *,Image *);
+ WriteDPXImage(const ImageInfo *,Image *,ExceptionInfo *);
\f
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
*/
-static size_t GetBytesPerRow(unsigned long columns,
- unsigned long samples_per_pixel,unsigned long bits_per_pixel,
+static size_t GetBytesPerRow(size_t columns,
+ size_t samples_per_pixel,size_t bits_per_pixel,
MagickBooleanType pad)
{
size_t
bits_per_pixel+31)/32);
break;
}
- bytes_per_row=4*(((size_t) (32*((samples_per_pixel*columns)/3))+31)/32);
+ bytes_per_row=4*(((size_t) (32*((samples_per_pixel*columns+2)/3))+31)/32);
break;
}
case 12:
unsigned int
unsigned_value;
- float
+ double
float_value;
} quantum;
}
}
-static void TimeCodeToString(const unsigned long timestamp,char *code)
+static void TimeCodeToString(const size_t timestamp,char *code)
{
#define TimeFields 7
unsigned int
shift;
- register long
+ register ssize_t
i;
*code='\0';
shift=4*TimeFields;
for (i=0; i <= TimeFields; i++)
{
- (void) FormatMagickString(code,MaxTextExtent-strlen(code),"%x",
+ (void) FormatLocaleString(code,MaxTextExtent-strlen(code),"%x",
(unsigned int) ((timestamp >> shift) & 0x0fU));
code++;
if (((i % 2) != 0) && (i < TimeFields))
Image
*image;
- long
- y;
-
MagickBooleanType
status;
MagickOffsetType
offset;
+ QuantumInfo
+ *quantum_info;
+
QuantumType
quantum_type;
- register long
+ register ssize_t
i;
- register PixelPacket
- *q;
+ size_t
+ extent,
+ samples_per_pixel;
ssize_t
- count;
-
- size_t
- extent;
+ count,
+ row,
+ y;
unsigned char
component_type;
- unsigned long
- samples_per_pixel;
-
/*
Open image file.
*/
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)
{
switch (dpx.image.orientation)
{
default:
- case 0: image->orientation=TopLeftOrientation; break;
- case 1: image->orientation=TopRightOrientation; break;
- case 2: image->orientation=BottomLeftOrientation; break;
- case 3: image->orientation=BottomRightOrientation; break;
- case 4: image->orientation=LeftTopOrientation; break;
- case 5: image->orientation=RightTopOrientation; break;
- case 6: image->orientation=LeftBottomOrientation; break;
- case 7: image->orientation=RightBottomOrientation; break;
+ case 0: image->orientation=TopLeftOrientation; break;
+ case 1: image->orientation=TopRightOrientation; break;
+ case 2: image->orientation=BottomLeftOrientation; break;
+ case 3: image->orientation=BottomRightOrientation; break;
+ case 4: image->orientation=LeftTopOrientation; break;
+ case 5: image->orientation=RightTopOrientation; break;
+ case 6: image->orientation=LeftBottomOrientation; break;
+ case 7: image->orientation=RightBottomOrientation; break;
}
dpx.image.number_elements=ReadBlobShort(image);
offset+=2;
offset+=ReadBlob(image,sizeof(dpx.image.image_element[i].description),
(unsigned char *) dpx.image.image_element[i].description);
}
+ SetImageColorspace(image,RGBColorspace,exception);
SetPrimaryChromaticity((DPXColorimetric)
dpx.image.image_element[0].colorimetric,&image->chromaticity);
offset+=ReadBlob(image,sizeof(dpx.image.reserve),(unsigned char *)
dpx.television.time_code=(unsigned int) ReadBlobLong(image);
offset+=4;
TimeCodeToString(dpx.television.time_code,value);
- (void) SetImageProperty(image,"dpx:television.time.code",value);
+ (void) SetImageProperty(image,"dpx:television.time.code",value,exception);
dpx.television.user_bits=(unsigned int) ReadBlobLong(image);
offset+=4;
TimeCodeToString(dpx.television.user_bits,value);
- (void) SetImageProperty(image,"dpx:television.user.bits",value);
+ (void) SetImageProperty(image,"dpx:television.user.bits",value,exception);
dpx.television.interlace=(unsigned char) ReadBlobByte(image);
offset++;
if (dpx.television.interlace != 0)
- (void) FormatImageProperty(image,"dpx:television.interlace","%ld",(long)
- dpx.television.interlace);
+ (void) FormatImageProperty(image,"dpx:television.interlace","%.20g",
+ (double) dpx.television.interlace);
dpx.television.field_number=(unsigned char) ReadBlobByte(image);
offset++;
if (dpx.television.field_number != 0)
- (void) FormatImageProperty(image,"dpx:television.field_number","%ld",
- (long) dpx.television.field_number);
+ (void) FormatImageProperty(image,"dpx:television.field_number","%.20g",
+ (double) dpx.television.field_number);
dpx.television.video_signal=(unsigned char) ReadBlobByte(image);
offset++;
if (dpx.television.video_signal != 0)
- (void) FormatImageProperty(image,"dpx:television.video_signal","%ld",
- (long) dpx.television.video_signal);
+ (void) FormatImageProperty(image,"dpx:television.video_signal","%.20g",
+ (double) dpx.television.video_signal);
dpx.television.padding=(unsigned char) ReadBlobByte(image);
offset++;
if (dpx.television.padding != 0)
StringInfo
*profile;
- profile=AcquireStringInfo(dpx.file.user_size-sizeof(dpx.user.id));
+ profile=BlobToStringInfo((const void *) NULL,
+ dpx.file.user_size-sizeof(dpx.user.id));
+ if (profile == (StringInfo *) NULL)
+ ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
offset+=ReadBlob(image,GetStringInfoLength(profile),
GetStringInfoDatum(profile));
- (void) SetImageProfile(image,"dpx:user.data",profile);
+ (void) SetImageProfile(image,"dpx",profile,exception);
profile=DestroyStringInfo(profile);
}
}
- for ( ; offset < (long) dpx.file.image_offset; offset++)
+ for ( ; offset < (MagickOffsetType) dpx.file.image_offset; offset++)
(void) ReadBlobByte(image);
/*
Read DPX image header.
case CbYACrYA4224ComponentType:
case CbYCr444ComponentType:
{
- image->colorspace=Rec709YCbCrColorspace;
+ SetImageColorspace(image,Rec709YCbCrColorspace,exception);
break;
}
case LumaComponentType:
{
- image->colorspace=RGBColorspace;
+ SetImageColorspace(image,sRGBColorspace,exception);
break;
}
default:
{
- image->colorspace=RGBColorspace;
+ SetImageColorspace(image,sRGBColorspace,exception);
if (dpx.image.image_element[0].transfer == LogarithmicColorimetric)
- image->colorspace=LogColorspace;
+ SetImageColorspace(image,LogColorspace,exception);
if (dpx.image.image_element[0].transfer == PrintingDensityColorimetric)
- image->colorspace=LogColorspace;
+ SetImageColorspace(image,LogColorspace,exception);
break;
}
}
extent=GetBytesPerRow(image->columns,samples_per_pixel,image->depth,
dpx.image.image_element[0].packing == 0 ? MagickFalse : MagickTrue);
- if ((quantum_type == GrayQuantum) &&
- (dpx.image.image_element[0].packing != 0) && (image->depth == 10) &&
- (image->endian == MSBEndian))
- {
- QuantumAny
- range;
-
- QuantumInfo
- *quantum_info;
-
- register long
- x;
-
- unsigned char
- *pixels;
-
- unsigned long
- pixel;
-
- quantum_info=AcquireQuantumInfo(image_info,image);
- if (quantum_info == (QuantumInfo *) NULL)
- ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
- SetQuantumQuantum(quantum_info,32);
- SetQuantumPack(quantum_info,dpx.image.image_element[0].packing == 0 ?
- MagickTrue : MagickFalse);
- pixels=GetQuantumPixels(quantum_info);
- pixel=0U;
- i=0;
- range=GetQuantumRange(image->depth);
- for (y=0; y < (long) image->rows; y++)
- {
- q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (long) image->columns; x++)
- {
- switch (i++ % 3)
- {
- case 0:
- {
- pixel=ReadBlobMSBLong(image);
- q->red=ScaleAnyToQuantum((pixel >> 0) & 0x3ff,range);
- break;
- }
- case 1:
- {
- q->red=ScaleAnyToQuantum((pixel >> 10) & 0x3ff,range);
- break;
- }
- case 2:
- {
- q->red=ScaleAnyToQuantum((pixel >> 20) & 0x3ff,range);
- break;
- }
- }
- q->green=q->red;
- q->blue=q->red;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- status=SetImageProgress(image,LoadImageTag,y,image->rows);
- if (status == MagickFalse)
- break;
- }
- quantum_info=DestroyQuantumInfo(quantum_info);
- }
- else
- {
- long
- row;
-
- QuantumInfo
- *quantum_info;
-
- CacheView
- *image_view;
-
- /*
- DPX any-bit pixel format.
- */
- status=MagickTrue;
- row=0;
- quantum_info=AcquireQuantumInfo(image_info,image);
- if (quantum_info == (QuantumInfo *) NULL)
- ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
- SetQuantumQuantum(quantum_info,32);
- SetQuantumPack(quantum_info,dpx.image.image_element[0].packing == 0 ?
- MagickTrue : MagickFalse);
- image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505)
- #pragma omp parallel for shared(row,status,quantum_type)
-#endif
- for (y=0; y < (long) image->rows; y++)
- {
- long
- offset;
-
- MagickBooleanType
- sync;
+ /*
+ DPX any-bit pixel format.
+ */
+ status=MagickTrue;
+ row=0;
+ quantum_info=AcquireQuantumInfo(image_info,image);
+ if (quantum_info == (QuantumInfo *) NULL)
+ ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+ SetQuantumQuantum(quantum_info,32);
+ SetQuantumPack(quantum_info,dpx.image.image_element[0].packing == 0 ?
+ MagickTrue : MagickFalse);
+ for (y=0; y < (ssize_t) image->rows; y++)
+ {
+ MagickBooleanType
+ sync;
- register PixelPacket
- *q;
+ register Quantum
+ *q;
- ssize_t
- count;
+ size_t
+ length;
- size_t
- length;
+ ssize_t
+ count,
+ offset;
- unsigned char
- *pixels;
+ unsigned char
+ *pixels;
- if (status == MagickFalse)
- continue;
- pixels=GetQuantumPixels(quantum_info);
-#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505)
- #pragma omp critical (MagickCore_ReadDPXImage)
-#endif
+ if (status == MagickFalse)
+ continue;
+ pixels=GetQuantumPixels(quantum_info);
+ {
+ count=ReadBlob(image,extent,pixels);
+ if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
+ (image->previous == (Image *) NULL))
{
- count=ReadBlob(image,extent,pixels);
- if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
- (image->previous == (Image *) NULL))
- {
- MagickBooleanType
- proceed;
-
- proceed=SetImageProgress(image,LoadImageTag,row,image->rows);
- if (proceed == MagickFalse)
- status=MagickFalse;
- }
- offset=row++;
- }
- if (count != (ssize_t) extent)
- status=MagickFalse;
- q=QueueCacheViewAuthenticPixels(image_view,0,offset,image->columns,1,
- exception);
- if (q == (PixelPacket *) NULL)
- {
+ MagickBooleanType
+ proceed;
+
+ proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType) row,
+ image->rows);
+ if (proceed == MagickFalse)
status=MagickFalse;
- continue;
- }
- length=ImportQuantumPixels(image,image_view,quantum_info,quantum_type,
- pixels,exception);
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
- status=MagickFalse;
- }
- image_view=DestroyCacheView(image_view);
- quantum_info=DestroyQuantumInfo(quantum_info);
- if (status == MagickFalse)
- ThrowReaderException(CorruptImageError,"UnableToReadImageData");
+ }
+ offset=row++;
}
+ if (count != (ssize_t) extent)
+ status=MagickFalse;
+ q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
+ if (q == (Quantum *) NULL)
+ {
+ status=MagickFalse;
+ continue;
+ }
+ length=ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,exception);
+ (void) length;
+ sync=SyncAuthenticPixels(image,exception);
+ if (sync == MagickFalse)
+ status=MagickFalse;
+ }
+ quantum_info=DestroyQuantumInfo(quantum_info);
+ if (status == MagickFalse)
+ ThrowReaderException(CorruptImageError,"UnableToReadImageData");
SetQuantumImageType(image,quantum_type);
if (EOFBlob(image) != MagickFalse)
ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
%
% The format of the RegisterDPXImage method is:
%
-% unsigned long RegisterDPXImage(void)
+% size_t RegisterDPXImage(void)
%
*/
-ModuleExport unsigned long RegisterDPXImage(void)
+ModuleExport size_t RegisterDPXImage(void)
{
MagickInfo
*entry;
%
% The format of the WriteDPXImage method is:
%
-% MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image)
+% MagickBooleanType WriteDPXImage(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 inline const char *GetDPXProperty(const ImageInfo *image_info,
- const Image *image,const char *property)
+ const Image *image,const char *property,ExceptionInfo *exception)
{
const char
*value;
value=GetImageOption(image_info,property);
if (value != (const char *) NULL)
return(value);
- return(GetImageProperty(image,property));
+ return(GetImageProperty(image,property,exception));
}
static unsigned int StringToTimeCode(const char *key)
char
buffer[2];
- register long
+ register ssize_t
i;
unsigned int
return(value);
}
-static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image)
+static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image,
+ ExceptionInfo *exception)
{
const char
*value;
DPXInfo
dpx;
- long
- horizontal_factor,
- vertical_factor,
- y;
+ GeometryInfo
+ geometry_info;
MagickBooleanType
status;
MagickStatusType
flags;
- GeometryInfo
- geometry_info;
-
QuantumInfo
*quantum_info;
QuantumType
quantum_type;
- register const PixelPacket
+ register const Quantum
*p;
- register long
+ register ssize_t
i;
size_t
extent;
ssize_t
- count;
+ count,
+ horizontal_factor,
+ vertical_factor,
+ y;
time_t
seconds;
flags;
flags=ParseGeometry(image_info->sampling_factor,&geometry_info);
- horizontal_factor=(long) geometry_info.rho;
- vertical_factor=(long) geometry_info.sigma;
+ horizontal_factor=(ssize_t) geometry_info.rho;
+ vertical_factor=(ssize_t) geometry_info.sigma;
if ((flags & SigmaValue) == 0)
vertical_factor=horizontal_factor;
if ((horizontal_factor != 1) && (horizontal_factor != 2) &&
((horizontal_factor == 2) || (vertical_factor == 2)))
if ((image->columns % 2) != 0)
image->columns++;
- status=OpenBlob(image_info,image,WriteBinaryBlobMode,&image->exception);
+ assert(exception != (ExceptionInfo *) NULL);
+ assert(exception->signature == MagickSignature);
+ status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
/*
dpx.file.magic=0x53445058U;
offset+=WriteBlobLong(image,dpx.file.magic);
dpx.file.image_offset=0x2000U;
- profile=GetImageProfile(image,"dpx:user.data");
+ profile=GetImageProfile(image,"dpx");
if (profile != (StringInfo *) NULL)
{
+ if (GetStringInfoLength(profile) > 1048576)
+ ThrowWriterException(ImageError,"WidthOrHeightExceedsLimit");
dpx.file.image_offset+=(unsigned int) GetStringInfoLength(profile);
dpx.file.image_offset=(((dpx.file.image_offset+0x2000-1)/0x2000)*0x2000);
}
dpx.file.user_size=(((dpx.file.user_size+0x2000-1)/0x2000)*0x2000);
}
offset+=WriteBlobLong(image,dpx.file.user_size);
- value=GetDPXProperty(image_info,image,"dpx:file.filename");
+ value=GetDPXProperty(image_info,image,"dpx:file.filename",exception);
if (value != (const char *) NULL)
(void) strncpy(dpx.file.filename,value,sizeof(dpx.file.filename));
offset+=WriteBlob(image,sizeof(dpx.file.filename),(unsigned char *)
dpx.file.timestamp);
offset+=WriteBlob(image,sizeof(dpx.file.timestamp),(unsigned char *)
dpx.file.timestamp);
- (void) strncpy(dpx.file.creator,GetMagickVersion((unsigned long *) NULL),
+ (void) strncpy(dpx.file.creator,GetMagickVersion((size_t *) NULL),
sizeof(dpx.file.creator));
- value=GetDPXProperty(image_info,image,"dpx:file.creator");
+ value=GetDPXProperty(image_info,image,"dpx:file.creator",exception);
if (value != (const char *) NULL)
(void) strncpy(dpx.file.creator,value,sizeof(dpx.file.creator));
offset+=WriteBlob(image,sizeof(dpx.file.creator),(unsigned char *)
dpx.file.creator);
- value=GetDPXProperty(image_info,image,"dpx:file.project");
+ value=GetDPXProperty(image_info,image,"dpx:file.project",exception);
if (value != (const char *) NULL)
(void) strncpy(dpx.file.project,value,sizeof(dpx.file.project));
offset+=WriteBlob(image,sizeof(dpx.file.project),(unsigned char *)
dpx.file.project);
- value=GetDPXProperty(image_info,image,"dpx:file.copyright");
+ value=GetDPXProperty(image_info,image,"dpx:file.copyright",exception);
if (value != (const char *) NULL)
- (void) strncpy(dpx.file.copyright,value,
- sizeof(dpx.file.copyright));
+ (void) strncpy(dpx.file.copyright,value,sizeof(dpx.file.copyright));
offset+=WriteBlob(image,sizeof(dpx.file.copyright),(unsigned char *)
dpx.file.copyright);
dpx.file.encrypt_key=(~0U);
dpx.image.image_element[i].descriptor=RGBComponentType;
if (image->matte != MagickFalse)
dpx.image.image_element[i].descriptor=RGBAComponentType;
- if ((IsGrayImage(image,&image->exception) != MagickFalse) &&
- (image->matte == MagickFalse))
+ if ((image_info->type != TrueColorType) &&
+ (image->matte == MagickFalse) &&
+ (IsImageGray(image,exception) != MagickFalse))
dpx.image.image_element[i].descriptor=LumaComponentType;
break;
}
(void) DeleteImageProperty(image,"dpx:orientation.y_size");
}
dpx.orientation.x_offset=0U;
- value=GetDPXProperty(image_info,image,"dpx:orientation.x_offset");
+ value=GetDPXProperty(image_info,image,"dpx:orientation.x_offset",exception);
if (value != (const char *) NULL)
- dpx.orientation.x_offset=(unsigned int) atoi(value);
+ dpx.orientation.x_offset=(unsigned int) StringToUnsignedLong(value);
offset+=WriteBlobLong(image,dpx.orientation.x_offset);
dpx.orientation.y_offset=0U;
- value=GetDPXProperty(image_info,image,"dpx:orientation.y_offset");
+ value=GetDPXProperty(image_info,image,"dpx:orientation.y_offset",exception);
if (value != (const char *) NULL)
- dpx.orientation.y_offset=(unsigned int) atoi(value);
+ dpx.orientation.y_offset=(unsigned int) StringToUnsignedLong(value);
offset+=WriteBlobLong(image,dpx.orientation.y_offset);
dpx.orientation.x_center=0.0f;
- value=GetDPXProperty(image_info,image,"dpx:orientation.x_center");
+ value=GetDPXProperty(image_info,image,"dpx:orientation.x_center",exception);
if (value != (const char *) NULL)
- dpx.orientation.x_center=atof(value);
+ dpx.orientation.x_center=StringToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.orientation.x_center);
dpx.orientation.y_center=0.0f;
- value=GetDPXProperty(image_info,image,"dpx:orientation.y_center");
+ value=GetDPXProperty(image_info,image,"dpx:orientation.y_center",exception);
if (value != (const char *) NULL)
- dpx.orientation.y_center=atof(value);
+ dpx.orientation.y_center=StringToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.orientation.y_center);
dpx.orientation.x_size=0U;
- value=GetDPXProperty(image_info,image,"dpx:orientation.x_size");
+ value=GetDPXProperty(image_info,image,"dpx:orientation.x_size",exception);
if (value != (const char *) NULL)
- dpx.orientation.x_size=(unsigned int) atoi(value);
+ dpx.orientation.x_size=(unsigned int) StringToUnsignedLong(value);
offset+=WriteBlobLong(image,dpx.orientation.x_size);
dpx.orientation.y_size=0U;
- value=GetDPXProperty(image_info,image,"dpx:orientation.y_size");
+ value=GetDPXProperty(image_info,image,"dpx:orientation.y_size",exception);
if (value != (const char *) NULL)
- dpx.orientation.y_size=(unsigned int) atoi(value);
+ dpx.orientation.y_size=(unsigned int) StringToUnsignedLong(value);
offset+=WriteBlobLong(image,dpx.orientation.y_size);
- value=GetDPXProperty(image_info,image,"dpx:orientation.filename");
+ value=GetDPXProperty(image_info,image,"dpx:orientation.filename",exception);
if (value != (const char *) NULL)
(void) strncpy(dpx.orientation.filename,value,
sizeof(dpx.orientation.filename));
dpx.orientation.filename);
offset+=WriteBlob(image,sizeof(dpx.orientation.timestamp),(unsigned char *)
dpx.orientation.timestamp);
- value=GetDPXProperty(image_info,image,"dpx:orientation.device");
+ value=GetDPXProperty(image_info,image,"dpx:orientation.device",exception);
if (value != (const char *) NULL)
- (void) strncpy(dpx.orientation.device,value,
- sizeof(dpx.orientation.device));
+ (void) strncpy(dpx.orientation.device,value,sizeof(dpx.orientation.device));
offset+=WriteBlob(image,sizeof(dpx.orientation.device),(unsigned char *)
dpx.orientation.device);
+ value=GetDPXProperty(image_info,image,"dpx:orientation.serial",exception);
+ if (value != (const char *) NULL)
+ (void) strncpy(dpx.orientation.serial,value,sizeof(dpx.orientation.serial));
offset+=WriteBlob(image,sizeof(dpx.orientation.serial),(unsigned char *)
dpx.orientation.serial);
for (i=0; i < 4; i++)
dpx.orientation.border[i]=0;
- value=GetDPXProperty(image_info,image,"dpx:orientation.border");
+ value=GetDPXProperty(image_info,image,"dpx:orientation.border",exception);
if (value != (const char *) NULL)
{
flags=ParseGeometry(value,&geometry_info);
offset+=WriteBlobShort(image,dpx.orientation.border[i]);
for (i=0; i < 2; i++)
dpx.orientation.aspect_ratio[i]=0U;
- value=GetDPXProperty(image_info,image,"dpx:orientation.aspect_ratio");
+ value=GetDPXProperty(image_info,image,"dpx:orientation.aspect_ratio",
+ exception);
if (value != (const char *) NULL)
{
flags=ParseGeometry(value,&geometry_info);
Write film header.
*/
*dpx.film.id='\0';
- value=GetDPXProperty(image_info,image,"dpx:film.id");
+ value=GetDPXProperty(image_info,image,"dpx:film.id",exception);
if (value != (const char *) NULL)
(void) strncpy(dpx.film.id,value,sizeof(dpx.film.id));
offset+=WriteBlob(image,sizeof(dpx.film.id),(unsigned char *) dpx.film.id);
*dpx.film.type='\0';
- value=GetDPXProperty(image_info,image,"dpx:film.type");
+ value=GetDPXProperty(image_info,image,"dpx:film.type",exception);
if (value != (const char *) NULL)
(void) strncpy(dpx.film.type,value,sizeof(dpx.film.type));
offset+=WriteBlob(image,sizeof(dpx.film.type),(unsigned char *)
dpx.film.type);
*dpx.film.offset='\0';
- value=GetDPXProperty(image_info,image,"dpx:film.offset");
+ value=GetDPXProperty(image_info,image,"dpx:film.offset",exception);
if (value != (const char *) NULL)
(void) strncpy(dpx.film.offset,value,sizeof(dpx.film.offset));
offset+=WriteBlob(image,sizeof(dpx.film.offset),(unsigned char *)
dpx.film.offset);
*dpx.film.prefix='\0';
- value=GetDPXProperty(image_info,image,"dpx:film.prefix");
+ value=GetDPXProperty(image_info,image,"dpx:film.prefix",exception);
if (value != (const char *) NULL)
(void) strncpy(dpx.film.prefix,value,sizeof(dpx.film.prefix));
offset+=WriteBlob(image,sizeof(dpx.film.prefix),(unsigned char *)
dpx.film.prefix);
*dpx.film.count='\0';
- value=GetDPXProperty(image_info,image,"dpx:film.count");
+ value=GetDPXProperty(image_info,image,"dpx:film.count",exception);
if (value != (const char *) NULL)
(void) strncpy(dpx.film.count,value,sizeof(dpx.film.count));
offset+=WriteBlob(image,sizeof(dpx.film.count),(unsigned char *)
dpx.film.count);
*dpx.film.format='\0';
- value=GetDPXProperty(image_info,image,"dpx:film.format");
+ value=GetDPXProperty(image_info,image,"dpx:film.format",exception);
if (value != (const char *) NULL)
(void) strncpy(dpx.film.format,value,sizeof(dpx.film.format));
offset+=WriteBlob(image,sizeof(dpx.film.format),(unsigned char *)
dpx.film.format);
dpx.film.frame_position=0U;
- value=GetDPXProperty(image_info,image,"dpx:film.frame_position");
+ value=GetDPXProperty(image_info,image,"dpx:film.frame_position",exception);
if (value != (const char *) NULL)
- dpx.film.frame_position=(unsigned int) atoi(value);
+ dpx.film.frame_position=(unsigned int) StringToUnsignedLong(value);
offset+=WriteBlobLong(image,dpx.film.frame_position);
dpx.film.sequence_extent=0U;
- value=GetDPXProperty(image_info,image,"dpx:film.sequence_extent");
+ value=GetDPXProperty(image_info,image,"dpx:film.sequence_extent",exception);
if (value != (const char *) NULL)
- dpx.film.sequence_extent=(unsigned int) atoi(value);
+ dpx.film.sequence_extent=(unsigned int) StringToUnsignedLong(value);
offset+=WriteBlobLong(image,dpx.film.sequence_extent);
dpx.film.held_count=0U;
- value=GetDPXProperty(image_info,image,"dpx:film.held_count");
+ value=GetDPXProperty(image_info,image,"dpx:film.held_count",exception);
if (value != (const char *) NULL)
- dpx.film.held_count=(unsigned int) atoi(value);
+ dpx.film.held_count=(unsigned int) StringToUnsignedLong(value);
offset+=WriteBlobLong(image,dpx.film.held_count);
dpx.film.frame_rate=0.0f;
- value=GetDPXProperty(image_info,image,"dpx:film.frame_rate");
+ value=GetDPXProperty(image_info,image,"dpx:film.frame_rate",exception);
if (value != (const char *) NULL)
- dpx.film.frame_rate=atof(value);
+ dpx.film.frame_rate=StringToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.film.frame_rate);
dpx.film.shutter_angle=0.0f;
- value=GetDPXProperty(image_info,image,"dpx:film.shutter_angle");
+ value=GetDPXProperty(image_info,image,"dpx:film.shutter_angle",exception);
if (value != (const char *) NULL)
- dpx.film.shutter_angle=atof(value);
+ dpx.film.shutter_angle=StringToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.film.shutter_angle);
*dpx.film.frame_id='\0';
- value=GetDPXProperty(image_info,image,"dpx:film.frame_id");
+ value=GetDPXProperty(image_info,image,"dpx:film.frame_id",exception);
if (value != (const char *) NULL)
(void) strncpy(dpx.film.frame_id,value,sizeof(dpx.film.frame_id));
offset+=WriteBlob(image,sizeof(dpx.film.frame_id),(unsigned char *)
dpx.film.frame_id);
- value=GetDPXProperty(image_info,image,"dpx:film.slate");
+ value=GetDPXProperty(image_info,image,"dpx:film.slate",exception);
if (value != (const char *) NULL)
(void) strncpy(dpx.film.slate,value,sizeof(dpx.film.slate));
offset+=WriteBlob(image,sizeof(dpx.film.slate),(unsigned char *)
/*
Write television header.
*/
- value=GetDPXProperty(image_info,image,"dpx:television.time.code");
+ value=GetDPXProperty(image_info,image,"dpx:television.time.code",exception);
if (value != (const char *) NULL)
dpx.television.time_code=StringToTimeCode(value);
offset+=WriteBlobLong(image,dpx.television.time_code);
- value=GetDPXProperty(image_info,image,"dpx:television.user.bits");
+ value=GetDPXProperty(image_info,image,"dpx:television.user.bits",exception);
if (value != (const char *) NULL)
dpx.television.user_bits=StringToTimeCode(value);
offset+=WriteBlobLong(image,dpx.television.user_bits);
- value=GetDPXProperty(image_info,image,"dpx:television.interlace");
+ value=GetDPXProperty(image_info,image,"dpx:television.interlace",exception);
if (value != (const char *) NULL)
- dpx.television.interlace=(unsigned char) atoi(value);
+ dpx.television.interlace=(unsigned char) StringToLong(value);
offset+=WriteBlobByte(image,dpx.television.interlace);
- value=GetDPXProperty(image_info,image,"dpx:television.field_number");
+ value=GetDPXProperty(image_info,image,"dpx:television.field_number",
+ exception);
if (value != (const char *) NULL)
- dpx.television.field_number=(unsigned char) atoi(value);
+ dpx.television.field_number=(unsigned char) StringToLong(value);
offset+=WriteBlobByte(image,dpx.television.field_number);
dpx.television.video_signal=0;
- value=GetDPXProperty(image_info,image,"dpx:television.video_signal");
+ value=GetDPXProperty(image_info,image,"dpx:television.video_signal",
+ exception);
if (value != (const char *) NULL)
- dpx.television.video_signal=(unsigned char) atoi(value);
+ dpx.television.video_signal=(unsigned char) StringToLong(value);
offset+=WriteBlobByte(image,dpx.television.video_signal);
dpx.television.padding=0;
- value=GetDPXProperty(image_info,image,"dpx:television.padding");
+ value=GetDPXProperty(image_info,image,"dpx:television.padding",exception);
if (value != (const char *) NULL)
- dpx.television.padding=(unsigned char) atoi(value);
+ dpx.television.padding=(unsigned char) StringToLong(value);
offset+=WriteBlobByte(image,dpx.television.padding);
dpx.television.horizontal_sample_rate=0.0f;
- value=GetDPXProperty(image_info,image,
- "dpx:television.horizontal_sample_rate");
+ value=GetDPXProperty(image_info,image,"dpx:television.horizontal_sample_rate", exception);
if (value != (const char *) NULL)
- dpx.television.horizontal_sample_rate=atof(value);
+ dpx.television.horizontal_sample_rate=StringToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.television.horizontal_sample_rate);
dpx.television.vertical_sample_rate=0.0f;
- value=GetDPXProperty(image_info,image,"dpx:television.vertical_sample_rate");
+ value=GetDPXProperty(image_info,image,"dpx:television.vertical_sample_rate",
+ exception);
if (value != (const char *) NULL)
- dpx.television.vertical_sample_rate=atof(value);
+ dpx.television.vertical_sample_rate=StringToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.television.vertical_sample_rate);
dpx.television.frame_rate=0.0f;
- value=GetDPXProperty(image_info,image,"dpx:television.frame_rate");
+ value=GetDPXProperty(image_info,image,"dpx:television.frame_rate",exception);
if (value != (const char *) NULL)
- dpx.television.frame_rate=atof(value);
+ dpx.television.frame_rate=StringToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.television.frame_rate);
dpx.television.time_offset=0.0f;
- value=GetDPXProperty(image_info,image,"dpx:television.time_offset");
+ value=GetDPXProperty(image_info,image,"dpx:television.time_offset",exception);
if (value != (const char *) NULL)
- dpx.television.time_offset=atof(value);
+ dpx.television.time_offset=StringToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.television.time_offset);
dpx.television.gamma=0.0f;
- value=GetDPXProperty(image_info,image,"dpx:television.gamma");
+ value=GetDPXProperty(image_info,image,"dpx:television.gamma",exception);
if (value != (const char *) NULL)
- dpx.television.gamma=atof(value);
+ dpx.television.gamma=StringToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.television.gamma);
dpx.television.black_level=0.0f;
- value=GetDPXProperty(image_info,image,"dpx:television.black_level");
+ value=GetDPXProperty(image_info,image,"dpx:television.black_level",exception);
if (value != (const char *) NULL)
- dpx.television.black_level=atof(value);
+ dpx.television.black_level=StringToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.television.black_level);
dpx.television.black_gain=0.0f;
- value=GetDPXProperty(image_info,image,"dpx:television.black_gain");
+ value=GetDPXProperty(image_info,image,"dpx:television.black_gain",exception);
if (value != (const char *) NULL)
- dpx.television.black_gain=atof(value);
+ dpx.television.black_gain=StringToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.television.black_gain);
dpx.television.break_point=0.0f;
- value=GetDPXProperty(image_info,image,"dpx:television.break_point");
+ value=GetDPXProperty(image_info,image,"dpx:television.break_point",exception);
if (value != (const char *) NULL)
- dpx.television.break_point=atof(value);
+ dpx.television.break_point=StringToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.television.break_point);
dpx.television.white_level=0.0f;
- value=GetDPXProperty(image_info,image,"dpx:television.white_level");
+ value=GetDPXProperty(image_info,image,"dpx:television.white_level",exception);
if (value != (const char *) NULL)
- dpx.television.white_level=atof(value);
+ dpx.television.white_level=StringToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.television.white_level);
dpx.television.integration_times=0.0f;
- value=GetDPXProperty(image_info,image,"dpx:television.integration_times");
+ value=GetDPXProperty(image_info,image,"dpx:television.integration_times",
+ exception);
if (value != (const char *) NULL)
- dpx.television.integration_times=atof(value);
+ dpx.television.integration_times=StringToDouble(value,(char **) NULL);
offset+=WriteBlobFloat(image,dpx.television.integration_times);
offset+=WriteBlob(image,sizeof(dpx.television.reserve),(unsigned char *)
dpx.television.reserve);
/*
Write user header.
*/
- value=GetDPXProperty(image_info,image,"dpx:user.id");
+ value=GetDPXProperty(image_info,image,"dpx:user.id",exception);
if (value != (const char *) NULL)
(void) strncpy(dpx.user.id,value,sizeof(dpx.user.id));
offset+=WriteBlob(image,sizeof(dpx.user.id),(unsigned char *) dpx.user.id);
count=WriteBlobByte(image,0x00);
if (count != 1)
{
- ThrowFileException(&image->exception,FileOpenError,"UnableToWriteFile",
+ ThrowFileException(exception,FileOpenError,"UnableToWriteFile",
image->filename);
break;
}
Convert pixel packets to DPX raster image.
*/
quantum_info=AcquireQuantumInfo(image_info,image);
- quantum_info->quantum=32;
- quantum_info->pack=dpx.image.image_element[0].packing == 0 ? MagickTrue :
- MagickFalse;
+ SetQuantumQuantum(quantum_info,32);
+ SetQuantumPack(quantum_info,dpx.image.image_element[0].packing == 0 ?
+ MagickTrue : MagickFalse);
quantum_type=RGBQuantum;
if (image->matte != MagickFalse)
quantum_type=RGBAQuantum;
}
extent=GetBytesPerRow(image->columns,image->matte != MagickFalse ? 4UL : 3UL,
image->depth,MagickTrue);
- if ((IsGrayImage(image,&image->exception) != MagickFalse) &&
- (image->matte == MagickFalse))
+ if ((image_info->type != TrueColorType) && (image->matte == MagickFalse) &&
+ (IsImageGray(image,exception) != MagickFalse))
{
quantum_type=GrayQuantum;
extent=GetBytesPerRow(image->columns,1UL,image->depth,MagickTrue);
}
pixels=GetQuantumPixels(quantum_info);
- for (y=0; y < (long) image->rows; y++)
+ 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;
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,quantum_info,
- quantum_type,pixels,&image->exception);
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,exception);
count=WriteBlob(image,extent,pixels);
if (count != (ssize_t) extent)
break;
- status=SetImageProgress(image,SaveImageTag,y,image->rows);
+ status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
+ image->rows);
if (status == MagickFalse)
break;
}
projects / imagemagick / blobdiff