X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=coders%2Fdpx.c;h=32fb55e7d7f843dbb1234da0fb9c6034004cc3ce;hb=7beda643d8713ff62ffc17b57e4b1f0d3fc9c523;hp=083f98860b726d7f60b0e7b896f39a8588e347bb;hpb=0749099f0ad33fc32ef5de50d65dad5dd1e7fb7a;p=imagemagick diff --git a/coders/dpx.c b/coders/dpx.c index 083f98860..32fb55e7d 100644 --- a/coders/dpx.c +++ b/coders/dpx.c @@ -13,11 +13,11 @@ % Read/Write SMTPE DPX Image Format % % % % Software Design % -% John Cristy % +% Cristy % % March 2001 % % % % % -% Copyright 1999-2008 ImageMagick Studio LLC, a non-profit organization % +% Copyright 1999-2015 ImageMagick Studio LLC, a non-profit organization % % dedicated to making software imaging solutions freely available. % % % % You may not use this file except in compliance with the License. You may % @@ -39,29 +39,37 @@ /* 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/artifact.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" + +/* + Define declaration. +*/ +#define MaxNumberImageElements 8 /* Typedef declaration. @@ -110,6 +118,23 @@ typedef enum UserDef8ElementComponentType = 156 } DPXComponentType; +typedef enum +{ + TransferCharacteristicUserDefined = 0, + TransferCharacteristicPrintingDensity = 1, + TransferCharacteristicLinear = 2, + TransferCharacteristicLogarithmic = 3, + TransferCharacteristicUnspecifiedVideo = 4, + TransferCharacteristicSMTPE274M = 5, /* 1920x1080 TV */ + TransferCharacteristicITU_R709 = 6, /* ITU R709 */ + TransferCharacteristicITU_R601_625L = 7, /* 625 Line */ + TransferCharacteristicITU_R601_525L = 8, /* 525 Line */ + TransferCharacteristicNTSCCompositeVideo = 9, + TransferCharacteristicPALCompositeVideo = 10, + TransferCharacteristicZDepthLinear = 11, + TransferCharacteristicZDepthHomogeneous = 12 +} DPXTransferCharacteristic; + typedef struct _DPXFileInfo { unsigned int @@ -182,7 +207,7 @@ typedef struct _DPXImageElement unsigned char descriptor, - transfer, + transfer_characteristic, colorimetric, bit_size; @@ -210,7 +235,7 @@ typedef struct _DPXImageInfo lines_per_element; DPXImageElement - image_element[8]; + image_element[MaxNumberImageElements]; unsigned char reserve[52]; @@ -305,7 +330,7 @@ typedef struct DPXInfo Forward declaractions. */ static MagickBooleanType - WriteDPXImage(const ImageInfo *,Image *); + WriteDPXImage(const ImageInfo *,Image *,ExceptionInfo *); /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -370,9 +395,9 @@ static MagickBooleanType IsDPX(const unsigned char *magick,const size_t extent) % */ -static size_t GetBytesPerRow(unsigned long columns, - unsigned long samples_per_pixel,unsigned long bits_per_pixel, - MagickBooleanType pad) +static size_t GetBytesPerRow(const size_t columns, + const size_t samples_per_pixel,const size_t bits_per_pixel, + const MagickBooleanType pad) { size_t bytes_per_row; @@ -381,34 +406,34 @@ static size_t GetBytesPerRow(unsigned long columns, { case 1: { - bytes_per_row=4*(((size_t) samples_per_pixel*columns* - bits_per_pixel+31)/32); + bytes_per_row=4*(((size_t) samples_per_pixel*columns*bits_per_pixel+31)/ + 32); break; } case 8: default: { - bytes_per_row=4*(((size_t) samples_per_pixel*columns* - bits_per_pixel+31)/32); + bytes_per_row=4*(((size_t) samples_per_pixel*columns*bits_per_pixel+31)/ + 32); break; } case 10: { if (pad == MagickFalse) { - bytes_per_row=4*(((size_t) samples_per_pixel*columns* - bits_per_pixel+31)/32); + bytes_per_row=4*(((size_t) samples_per_pixel*columns*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: { if (pad == MagickFalse) { - bytes_per_row=4*(((size_t) samples_per_pixel*columns* - bits_per_pixel+31)/32); + bytes_per_row=4*(((size_t) samples_per_pixel*columns*bits_per_pixel+ + 31)/32); break; } bytes_per_row=2*(((size_t) (16*samples_per_pixel*columns)+15)/16); @@ -416,26 +441,114 @@ static size_t GetBytesPerRow(unsigned long columns, } case 16: { - bytes_per_row=2*(((size_t) samples_per_pixel*columns* - bits_per_pixel+8)/16); + if (pad == MagickFalse) + { + bytes_per_row=2*(((size_t) samples_per_pixel*columns*bits_per_pixel+ + 15)/16); + break; + } + bytes_per_row=4*(((size_t) samples_per_pixel*columns*bits_per_pixel+31)/ + 32); break; } case 32: { - bytes_per_row=4*(((size_t) samples_per_pixel*columns* - bits_per_pixel+31)/32); + bytes_per_row=4*(((size_t) samples_per_pixel*columns*bits_per_pixel+31)/ + 32); break; } case 64: { - bytes_per_row=8*(((size_t) samples_per_pixel*columns* - bits_per_pixel+63)/64); + bytes_per_row=8*(((size_t) samples_per_pixel*columns*bits_per_pixel+63)/ + 64); break; } } return(bytes_per_row); } +static const char *GetImageTransferCharacteristic( + const DPXTransferCharacteristic characteristic) +{ + const char + *transfer; + + /* + Get the element transfer characteristic. + */ + switch(characteristic) + { + case TransferCharacteristicUserDefined: + { + transfer="UserDefined"; + break; + } + case TransferCharacteristicPrintingDensity: + { + transfer="PrintingDensity"; + break; + } + case TransferCharacteristicLinear: + { + transfer="Linear"; + break; + } + case TransferCharacteristicLogarithmic: + { + transfer="Logarithmic"; + break; + } + case TransferCharacteristicUnspecifiedVideo: + { + transfer="UnspecifiedVideo"; + break; + } + case TransferCharacteristicSMTPE274M: + { + transfer="SMTPE274M"; + break; + } + case TransferCharacteristicITU_R709: + { + transfer="ITU-R709"; + break; + } + case TransferCharacteristicITU_R601_625L: + { + transfer="ITU-R601-625L"; + break; + } + case TransferCharacteristicITU_R601_525L: + { + transfer="ITU-R601-525L"; + break; + } + case TransferCharacteristicNTSCCompositeVideo: + { + transfer="NTSCCompositeVideo"; + break; + } + case TransferCharacteristicPALCompositeVideo: + { + transfer="PALCompositeVideo"; + break; + } + case TransferCharacteristicZDepthLinear: + { + transfer="ZDepthLinear"; + break; + } + case TransferCharacteristicZDepthHomogeneous: + { + transfer="ZDepthHomogeneous"; + break; + } + default: + transfer="Reserved"; + } + return(transfer); +} + static inline MagickBooleanType IsFloatDefined(const float value) { union @@ -448,7 +561,7 @@ static inline MagickBooleanType IsFloatDefined(const float value) } quantum; quantum.unsigned_value=0U; - quantum.float_value=(double) value; + quantum.float_value=(float) value; if (quantum.unsigned_value == 0U) return(MagickFalse); return(MagickTrue); @@ -513,21 +626,21 @@ static void SetPrimaryChromaticity(const DPXColorimetric colorimetric, } } -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,MagickPathExtent-strlen(code),"%x", (unsigned int) ((timestamp >> shift) & 0x0fU)); code++; if (((i % 2) != 0) && (i < TimeFields)) @@ -541,7 +654,7 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) { char magick[4], - value[MaxTextExtent]; + value[MagickPathExtent]; DPXInfo dpx; @@ -549,36 +662,34 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) 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, + n, + row, + y; unsigned char component_type; - unsigned long - samples_per_pixel; - /* Open image file. */ @@ -589,7 +700,7 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) 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) { @@ -673,23 +784,27 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) Read DPX image header. */ dpx.image.orientation=ReadBlobShort(image); + if (dpx.image.orientation > 7) + ThrowReaderException(CorruptImageError,"ImproperImageHeader"); offset+=2; - if (dpx.image.orientation != (unsigned short) (~0U)) + if (dpx.image.orientation != (unsigned short) ~0) (void) FormatImageProperty(image,"dpx:image.orientation","%d", dpx.image.orientation); 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); + if (dpx.image.number_elements > MaxNumberImageElements) + ThrowReaderException(CorruptImageError,"ImproperImageHeader"); offset+=2; dpx.image.pixels_per_line=ReadBlobLong(image); offset+=4; @@ -699,6 +814,9 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) image->rows=dpx.image.lines_per_element; for (i=0; i < 8; i++) { + char + property[MagickPathExtent]; + dpx.image.image_element[i].data_sign=ReadBlobLong(image); offset+=4; dpx.image.image_element[i].low_data=ReadBlobLong(image); @@ -711,7 +829,13 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) offset+=4; dpx.image.image_element[i].descriptor=(unsigned char) ReadBlobByte(image); offset++; - dpx.image.image_element[i].transfer=(unsigned char) ReadBlobByte(image); + dpx.image.image_element[i].transfer_characteristic=(unsigned char) + ReadBlobByte(image); + (void) FormatLocaleString(property,MagickPathExtent, + "dpx:image.element[%lu].transfer-characteristic",(long) i); + (void) FormatImageProperty(image,property,"%s", + GetImageTransferCharacteristic((DPXTransferCharacteristic) + dpx.image.image_element[i].transfer_characteristic)); offset++; dpx.image.image_element[i].colorimetric=(unsigned char) ReadBlobByte(image); offset++; @@ -730,12 +854,9 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) offset+=ReadBlob(image,sizeof(dpx.image.image_element[i].description), (unsigned char *) dpx.image.image_element[i].description); } - SetPrimaryChromaticity((DPXColorimetric) - dpx.image.image_element[0].colorimetric,&image->chromaticity); + SetImageColorspace(image,RGBColorspace,exception); offset+=ReadBlob(image,sizeof(dpx.image.reserve),(unsigned char *) dpx.image.reserve); - component_type=dpx.image.image_element[0].descriptor; - image->depth=dpx.image.image_element[0].bit_size; if (dpx.file.image_offset >= 1664U) { /* @@ -796,9 +917,10 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) dpx.orientation.border[i]=ReadBlobShort(image); offset+=2; } - if ((dpx.orientation.border[0] != (unsigned short) (~0U)) && - (dpx.orientation.border[1] != (unsigned short) (~0U))) - (void) FormatImageProperty(image,"dpx:orientation.border","%dx%d%+d%+d", dpx.orientation.border[0],dpx.orientation.border[1], + if ((dpx.orientation.border[0] != (unsigned short) (~0)) && + (dpx.orientation.border[1] != (unsigned short) (~0))) + (void) FormatImageProperty(image,"dpx:orientation.border","%dx%d%+d%+d", + dpx.orientation.border[0],dpx.orientation.border[1], dpx.orientation.border[2],dpx.orientation.border[3]); for (i=0; i < 2; i++) { @@ -819,7 +941,7 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) Read DPX film header. */ offset+=ReadBlob(image,sizeof(dpx.film.id),(unsigned char *) dpx.film.id); - if (*dpx.film.type != '\0') + if (*dpx.film.id != '\0') (void) FormatImageProperty(image,"dpx:film.id","%.2s",dpx.film.id); offset+=ReadBlob(image,sizeof(dpx.film.type),(unsigned char *) dpx.film.type); @@ -891,26 +1013,26 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) 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) @@ -984,243 +1106,195 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) StringInfo *profile; - profile=AcquireStringInfo(dpx.file.user_size-sizeof(dpx.user.id)); + profile=BlobToStringInfo((const unsigned char *) 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:user-data",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. - */ if (image_info->ping != MagickFalse) { (void) CloseBlob(image); return(GetFirstImageInList(image)); } - /* - Convert DPX raster image to pixel packets. - */ - samples_per_pixel=1; - quantum_type=GrayQuantum; - switch (component_type) - { - case CbYCrY422ComponentType: - { - samples_per_pixel=2; - quantum_type=CbYCrYQuantum; - break; - } - case CbYACrYA4224ComponentType: - case CbYCr444ComponentType: - { - samples_per_pixel=3; - quantum_type=CbYCrQuantum; - break; - } - case RGBComponentType: - { - samples_per_pixel=3; - quantum_type=RGBQuantum; - break; - } - case ABGRComponentType: - case RGBAComponentType: - { - image->matte=MagickTrue; - samples_per_pixel=4; - quantum_type=RGBAQuantum; - break; - } - default: - break; - } - switch (component_type) + status=SetImageExtent(image,image->columns,image->rows,exception); + if (status == MagickFalse) + return(DestroyImageList(image)); + for (n=0; n < (ssize_t) dpx.image.number_elements; n++) { - case CbYCrY422ComponentType: - case CbYACrYA4224ComponentType: - case CbYCr444ComponentType: - { - image->colorspace=Rec709YCbCrColorspace; - break; - } - case LumaComponentType: - { - image->colorspace=RGBColorspace; - break; - } - default: + /* + Convert DPX raster image to pixel packets. + */ + if ((dpx.image.image_element[n].data_offset != ~0U) && + (dpx.image.image_element[n].data_offset != 0U)) + { + MagickOffsetType + data_offset; + + data_offset=(MagickOffsetType) dpx.image.image_element[n].data_offset; + if (data_offset < offset) + offset=SeekBlob(image,data_offset,SEEK_SET); + else + for ( ; offset < data_offset; offset++) + (void) ReadBlobByte(image); + if (offset != data_offset) + ThrowReaderException(CorruptImageError,"UnableToReadImageData"); + } + SetPrimaryChromaticity((DPXColorimetric) + dpx.image.image_element[n].colorimetric,&image->chromaticity); + image->depth=dpx.image.image_element[n].bit_size; + samples_per_pixel=1; + quantum_type=GrayQuantum; + component_type=dpx.image.image_element[n].descriptor; + switch (component_type) { - image->colorspace=RGBColorspace; - if (dpx.image.image_element[0].transfer == LogarithmicColorimetric) - image->colorspace=LogColorspace; - if (dpx.image.image_element[0].transfer == PrintingDensityColorimetric) - image->colorspace=LogColorspace; - break; + case CbYCrY422ComponentType: + { + samples_per_pixel=2; + quantum_type=CbYCrYQuantum; + break; + } + case CbYACrYA4224ComponentType: + case CbYCr444ComponentType: + { + samples_per_pixel=3; + quantum_type=CbYCrQuantum; + break; + } + case RGBComponentType: + { + samples_per_pixel=3; + quantum_type=RGBQuantum; + break; + } + case ABGRComponentType: + case RGBAComponentType: + { + image->alpha_trait=BlendPixelTrait; + samples_per_pixel=4; + quantum_type=RGBAQuantum; + break; + } + default: + 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)) + switch (component_type) { - 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++) + case CbYCrY422ComponentType: + case CbYACrYA4224ComponentType: + case CbYCr444ComponentType: { - 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; + SetImageColorspace(image,Rec709YCbCrColorspace,exception); + break; + } + case LumaComponentType: + { + SetImageColorspace(image,GRAYColorspace,exception); + break; + } + default: + { + SetImageColorspace(image,sRGBColorspace,exception); + if (dpx.image.image_element[n].transfer_characteristic == LogarithmicColorimetric) + SetImageColorspace(image,LogColorspace,exception); + if (dpx.image.image_element[n].transfer_characteristic == PrintingDensityColorimetric) + SetImageColorspace(image,LogColorspace,exception); + break; } - quantum_info=DestroyQuantumInfo(quantum_info); } - else + extent=GetBytesPerRow(image->columns,samples_per_pixel,image->depth, + dpx.image.image_element[n].packing == 0 ? MagickFalse : MagickTrue); + /* + 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[n].packing == 0 ? + MagickTrue : MagickFalse); + for (y=0; y < (ssize_t) image->rows; y++) { - 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 schedule(static,1) shared(row,status,quantum_type) -#endif - for (y=0; y < (long) image->rows; y++) - { - long - offset; - - MagickBooleanType - sync; + const unsigned char + *pixels; - register PixelPacket - *q; + MagickBooleanType + sync; - ssize_t - count; + register Quantum + *q; - size_t - length; + size_t + length; - unsigned char - *pixels; + ssize_t + count, + offset; - 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=(const unsigned char *) ReadBlobStream(image,extent, + GetQuantumPixels(quantum_info),&count); + if (count != (ssize_t) extent) + status=MagickFalse; + 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++; + MagickBooleanType + proceed; + + proceed=SetImageProgress(image,LoadImageTag,(MagickOffsetType) row, + image->rows); + if (proceed == MagickFalse) + status=MagickFalse; } - if (count != (ssize_t) extent) + offset=row++; + q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception); + if (q == (Quantum *) NULL) + { status=MagickFalse; - q=QueueCacheViewAuthenticPixels(image_view,0,offset,image->columns,1, - exception); - if (q == (PixelPacket *) NULL) + 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", + image->filename); + if ((i+1) < (ssize_t) dpx.image.number_elements) + { + /* + Allocate next image structure. + */ + AcquireNextImage(image_info,image,exception); + if (GetNextImageInList(image) == (Image *) NULL) { - status=MagickFalse; - continue; + image=DestroyImageList(image); + return((Image *) NULL); } - length=ImportQuantumPixels(image,image_view,quantum_info,quantum_type, - pixels,exception); - sync=SyncCacheViewAuthenticPixels(image_view,exception); - if (sync == MagickFalse) - status=MagickFalse; + image=SyncNextImageInList(image); + status=SetImageProgress(image,LoadImagesTag,TellBlob(image), + GetBlobSize(image)); + if (status == MagickFalse) + break; } - image_view=DestroyCacheView(image_view); - quantum_info=DestroyQuantumInfo(quantum_info); - if (status == MagickFalse) - ThrowReaderException(CorruptImageError,"UnableToReadImageData"); - } - SetQuantumImageType(image,quantum_type); - if (EOFBlob(image) != MagickFalse) - ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", - image->filename); + } (void) CloseBlob(image); return(GetFirstImageInList(image)); } @@ -1245,10 +1319,10 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) % % 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; @@ -1260,14 +1334,13 @@ ModuleExport unsigned long RegisterDPXImage(void) "See SMPTE 268M-2003 specification at http://www.smtpe.org\n" }; - entry=SetMagickInfo("DPX"); + entry=AcquireMagickInfo("DPX","DPX","SMPTE 268M-2003 (DPX 2.0)"); entry->decoder=(DecodeImageHandler *) ReadDPXImage; entry->encoder=(EncodeImageHandler *) WriteDPXImage; entry->magick=(IsImageFormatHandler *) IsDPX; - entry->adjoin=MagickFalse; - entry->description=ConstantString("SMPTE 268M-2003 (DPX 2.0)"); + entry->flags^=CoderAdjoinFlag; + entry->flags|=CoderSeekableStreamFlag; entry->note=ConstantString(DPXNote); - entry->module=ConstantString("DPX"); (void) RegisterMagickInfo(entry); return(MagickImageCoderSignature); } @@ -1311,7 +1384,8 @@ ModuleExport void UnregisterDPXImage(void) % % 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. % @@ -1319,26 +1393,16 @@ ModuleExport void UnregisterDPXImage(void) % % 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 char - *value; - - value=GetImageOption(image_info,property); - if (value != (const char *) NULL) - return(value); - return(GetImageProperty(image,property)); -} - static unsigned int StringToTimeCode(const char *key) { char buffer[2]; - register long + register ssize_t i; unsigned int @@ -1362,7 +1426,8 @@ static unsigned int StringToTimeCode(const char *key) 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; @@ -1373,10 +1438,8 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image) DPXInfo dpx; - long - horizontal_factor, - vertical_factor, - y; + GeometryInfo + geometry_info; MagickBooleanType status; @@ -1387,26 +1450,26 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image) 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; @@ -1434,8 +1497,8 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image) 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) && @@ -1447,7 +1510,9 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image) ((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); /* @@ -1458,14 +1523,16 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image) 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:user-data"); 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); } offset+=WriteBlobLong(image,dpx.file.image_offset); - (void) strncpy(dpx.file.version,"V2.0",sizeof(dpx.file.version)); + (void) strncpy(dpx.file.version,"V2.0",sizeof(dpx.file.version)-1); offset+=WriteBlob(image,8,(unsigned char *) &dpx.file.version); dpx.file.file_size=(unsigned int) (4U*image->columns*image->rows+ dpx.file.image_offset); @@ -1483,9 +1550,9 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image) 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=GetImageArtifact(image,"dpx:file.filename"); if (value != (const char *) NULL) - (void) strncpy(dpx.file.filename,value,sizeof(dpx.file.filename)); + (void) strncpy(dpx.file.filename,value,sizeof(dpx.file.filename)-1); offset+=WriteBlob(image,sizeof(dpx.file.filename),(unsigned char *) dpx.file.filename); seconds=time((time_t *) NULL); @@ -1493,22 +1560,21 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image) dpx.file.timestamp); offset+=WriteBlob(image,sizeof(dpx.file.timestamp),(unsigned char *) dpx.file.timestamp); - (void) strncpy(dpx.file.creator,GetMagickVersion((unsigned long *) NULL), - sizeof(dpx.file.creator)); - value=GetDPXProperty(image_info,image,"dpx:file.creator"); + (void) strncpy(dpx.file.creator,GetMagickVersion((size_t *) NULL), + sizeof(dpx.file.creator)-1); + value=GetImageArtifact(image,"dpx:file.creator"); if (value != (const char *) NULL) - (void) strncpy(dpx.file.creator,value,sizeof(dpx.file.creator)); + (void) strncpy(dpx.file.creator,value,sizeof(dpx.file.creator)-1); offset+=WriteBlob(image,sizeof(dpx.file.creator),(unsigned char *) dpx.file.creator); - value=GetDPXProperty(image_info,image,"dpx:file.project"); + value=GetImageArtifact(image,"dpx:file.project"); if (value != (const char *) NULL) - (void) strncpy(dpx.file.project,value,sizeof(dpx.file.project)); + (void) strncpy(dpx.file.project,value,sizeof(dpx.file.project)-1); offset+=WriteBlob(image,sizeof(dpx.file.project),(unsigned char *) dpx.file.project); - value=GetDPXProperty(image_info,image,"dpx:file.copyright"); + value=GetImageArtifact(image,"dpx:file.copyright"); 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)-1); offset+=WriteBlob(image,sizeof(dpx.file.copyright),(unsigned char *) dpx.file.copyright); dpx.file.encrypt_key=(~0U); @@ -1518,7 +1584,18 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image) /* Write image header. */ - dpx.image.orientation=0x00; /* left-to-right; top-to-bottom */ + switch (image->orientation) + { + default: + case TopLeftOrientation: dpx.image.orientation=0; break; + case TopRightOrientation: dpx.image.orientation=1; break; + case BottomLeftOrientation: dpx.image.orientation=2; break; + case BottomRightOrientation: dpx.image.orientation=3; break; + case LeftTopOrientation: dpx.image.orientation=4; break; + case RightTopOrientation: dpx.image.orientation=5; break; + case LeftBottomOrientation: dpx.image.orientation=6; break; + case RightBottomOrientation: dpx.image.orientation=7; break; + } offset+=WriteBlobShort(image,dpx.image.orientation); dpx.image.number_elements=1; offset+=WriteBlobShort(image,dpx.image.number_elements); @@ -1548,23 +1625,29 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image) case YCbCrColorspace: { dpx.image.image_element[i].descriptor=CbYCr444ComponentType; - if (image->matte != MagickFalse) + if (image->alpha_trait != UndefinedPixelTrait) dpx.image.image_element[i].descriptor=CbYCrA4444ComponentType; break; } default: { dpx.image.image_element[i].descriptor=RGBComponentType; - if (image->matte != MagickFalse) + if (image->alpha_trait != UndefinedPixelTrait) dpx.image.image_element[i].descriptor=RGBAComponentType; + if ((image_info->type != TrueColorType) && + (image->alpha_trait == UndefinedPixelTrait) && + (SetImageGray(image,exception) != MagickFalse)) + dpx.image.image_element[i].descriptor=LumaComponentType; break; } } offset+=WriteBlobByte(image,dpx.image.image_element[i].descriptor); - dpx.image.image_element[i].transfer=0; + dpx.image.image_element[i].transfer_characteristic=0; if (image->colorspace == LogColorspace) - dpx.image.image_element[0].transfer=PrintingDensityColorimetric; - offset+=WriteBlobByte(image,dpx.image.image_element[i].transfer); + dpx.image.image_element[0].transfer_characteristic= + PrintingDensityColorimetric; + offset+=WriteBlobByte(image, + dpx.image.image_element[i].transfer_characteristic); dpx.image.image_element[i].colorimetric=0; offset+=WriteBlobByte(image,dpx.image.image_element[i].colorimetric); dpx.image.image_element[i].bit_size=0; @@ -1607,54 +1690,58 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image) (void) DeleteImageProperty(image,"dpx:orientation.y_size"); } dpx.orientation.x_offset=0U; - value=GetDPXProperty(image_info,image,"dpx:orientation.x_offset"); + value=GetImageArtifact(image,"dpx:orientation.x_offset"); 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=GetImageArtifact(image,"dpx:orientation.y_offset"); 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=GetImageArtifact(image,"dpx:orientation.x_center"); 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=GetImageArtifact(image,"dpx:orientation.y_center"); 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=GetImageArtifact(image,"dpx:orientation.x_size"); 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=GetImageArtifact(image,"dpx:orientation.y_size"); 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=GetImageArtifact(image,"dpx:orientation.filename"); if (value != (const char *) NULL) (void) strncpy(dpx.orientation.filename,value, - sizeof(dpx.orientation.filename)); + sizeof(dpx.orientation.filename)-1); offset+=WriteBlob(image,sizeof(dpx.orientation.filename),(unsigned char *) dpx.orientation.filename); offset+=WriteBlob(image,sizeof(dpx.orientation.timestamp),(unsigned char *) dpx.orientation.timestamp); - value=GetDPXProperty(image_info,image,"dpx:orientation.device"); + value=GetImageArtifact(image,"dpx:orientation.device"); if (value != (const char *) NULL) (void) strncpy(dpx.orientation.device,value, - sizeof(dpx.orientation.device)); + sizeof(dpx.orientation.device)-1); offset+=WriteBlob(image,sizeof(dpx.orientation.device),(unsigned char *) dpx.orientation.device); + value=GetImageArtifact(image,"dpx:orientation.serial"); + if (value != (const char *) NULL) + (void) strncpy(dpx.orientation.serial,value, + sizeof(dpx.orientation.serial)-1); 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=GetImageArtifact(image,"dpx:orientation.border"); if (value != (const char *) NULL) { flags=ParseGeometry(value,&geometry_info); @@ -1669,7 +1756,7 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image) 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=GetImageArtifact(image,"dpx:orientation.aspect_ratio"); if (value != (const char *) NULL) { flags=ParseGeometry(value,&geometry_info); @@ -1685,75 +1772,75 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image) /* Write film header. */ - *dpx.film.id='\0'; - value=GetDPXProperty(image_info,image,"dpx:film.id"); + (void) ResetMagickMemory(dpx.film.id,0,sizeof(dpx.film.id)); + value=GetImageArtifact(image,"dpx:film.id"); if (value != (const char *) NULL) - (void) strncpy(dpx.film.id,value,sizeof(dpx.film.id)); + (void) strncpy(dpx.film.id,value,sizeof(dpx.film.id)-1); offset+=WriteBlob(image,sizeof(dpx.film.id),(unsigned char *) dpx.film.id); - *dpx.film.type='\0'; - value=GetDPXProperty(image_info,image,"dpx:film.type"); + (void) ResetMagickMemory(dpx.film.type,0,sizeof(dpx.film.type)); + value=GetImageArtifact(image,"dpx:film.type"); if (value != (const char *) NULL) - (void) strncpy(dpx.film.type,value,sizeof(dpx.film.type)); + (void) strncpy(dpx.film.type,value,sizeof(dpx.film.type)-1); offset+=WriteBlob(image,sizeof(dpx.film.type),(unsigned char *) dpx.film.type); - *dpx.film.offset='\0'; - value=GetDPXProperty(image_info,image,"dpx:film.offset"); + (void) ResetMagickMemory(dpx.film.offset,0,sizeof(dpx.film.offset)); + value=GetImageArtifact(image,"dpx:film.offset"); if (value != (const char *) NULL) - (void) strncpy(dpx.film.offset,value,sizeof(dpx.film.offset)); + (void) strncpy(dpx.film.offset,value,sizeof(dpx.film.offset)-1); offset+=WriteBlob(image,sizeof(dpx.film.offset),(unsigned char *) dpx.film.offset); - *dpx.film.prefix='\0'; - value=GetDPXProperty(image_info,image,"dpx:film.prefix"); + (void) ResetMagickMemory(dpx.film.prefix,0,sizeof(dpx.film.prefix)); + value=GetImageArtifact(image,"dpx:film.prefix"); if (value != (const char *) NULL) - (void) strncpy(dpx.film.prefix,value,sizeof(dpx.film.prefix)); + (void) strncpy(dpx.film.prefix,value,sizeof(dpx.film.prefix)-1); offset+=WriteBlob(image,sizeof(dpx.film.prefix),(unsigned char *) dpx.film.prefix); - *dpx.film.count='\0'; - value=GetDPXProperty(image_info,image,"dpx:film.count"); + (void) ResetMagickMemory(dpx.film.count,0,sizeof(dpx.film.count)); + value=GetImageArtifact(image,"dpx:film.count"); if (value != (const char *) NULL) - (void) strncpy(dpx.film.count,value,sizeof(dpx.film.count)); + (void) strncpy(dpx.film.count,value,sizeof(dpx.film.count)-1); offset+=WriteBlob(image,sizeof(dpx.film.count),(unsigned char *) dpx.film.count); - *dpx.film.format='\0'; - value=GetDPXProperty(image_info,image,"dpx:film.format"); + (void) ResetMagickMemory(dpx.film.format,0,sizeof(dpx.film.format)); + value=GetImageArtifact(image,"dpx:film.format"); if (value != (const char *) NULL) - (void) strncpy(dpx.film.format,value,sizeof(dpx.film.format)); + (void) strncpy(dpx.film.format,value,sizeof(dpx.film.format)-1); 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=GetImageArtifact(image,"dpx:film.frame_position"); 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=GetImageArtifact(image,"dpx:film.sequence_extent"); 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=GetImageArtifact(image,"dpx:film.held_count"); 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=GetImageArtifact(image,"dpx:film.frame_rate"); 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=GetImageArtifact(image,"dpx:film.shutter_angle"); 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"); + (void) ResetMagickMemory(dpx.film.frame_id,0,sizeof(dpx.film.frame_id)); + value=GetImageArtifact(image,"dpx:film.frame_id"); if (value != (const char *) NULL) - (void) strncpy(dpx.film.frame_id,value,sizeof(dpx.film.frame_id)); + (void) strncpy(dpx.film.frame_id,value,sizeof(dpx.film.frame_id)-1); offset+=WriteBlob(image,sizeof(dpx.film.frame_id),(unsigned char *) dpx.film.frame_id); - value=GetDPXProperty(image_info,image,"dpx:film.slate"); + value=GetImageArtifact(image,"dpx:film.slate"); if (value != (const char *) NULL) - (void) strncpy(dpx.film.slate,value,sizeof(dpx.film.slate)); + (void) strncpy(dpx.film.slate,value,sizeof(dpx.film.slate)-1); offset+=WriteBlob(image,sizeof(dpx.film.slate),(unsigned char *) dpx.film.slate); offset+=WriteBlob(image,sizeof(dpx.film.reserve),(unsigned char *) @@ -1761,91 +1848,90 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image) /* Write television header. */ - value=GetDPXProperty(image_info,image,"dpx:television.time.code"); + value=GetImageArtifact(image,"dpx:television.time.code"); 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=GetImageArtifact(image,"dpx:television.user.bits"); 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=GetImageArtifact(image,"dpx:television.interlace"); 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=GetImageArtifact(image,"dpx:television.field_number"); 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=GetImageArtifact(image,"dpx:television.video_signal"); 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=GetImageArtifact(image,"dpx:television.padding"); 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=GetImageArtifact(image,"dpx:television.horizontal_sample_rate"); 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=GetImageArtifact(image,"dpx:television.vertical_sample_rate"); 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=GetImageArtifact(image,"dpx:television.frame_rate"); 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=GetImageArtifact(image,"dpx:television.time_offset"); 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=GetImageArtifact(image,"dpx:television.gamma"); 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=GetImageArtifact(image,"dpx:television.black_level"); 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=GetImageArtifact(image,"dpx:television.black_gain"); 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=GetImageArtifact(image,"dpx:television.break_point"); 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=GetImageArtifact(image,"dpx:television.white_level"); 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=GetImageArtifact(image,"dpx:television.integration_times"); 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=GetImageArtifact(image,"dpx:user.id"); if (value != (const char *) NULL) - (void) strncpy(dpx.user.id,value,sizeof(dpx.user.id)); + (void) strncpy(dpx.user.id,value,sizeof(dpx.user.id)-1); offset+=WriteBlob(image,sizeof(dpx.user.id),(unsigned char *) dpx.user.id); if (profile != (StringInfo *) NULL) offset+=WriteBlob(image,GetStringInfoLength(profile), @@ -1855,7 +1941,7 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image) count=WriteBlobByte(image,0x00); if (count != 1) { - ThrowFileException(&image->exception,FileOpenError,"UnableToWriteFile", + ThrowFileException(exception,FileOpenError,"UnableToWriteFile", image->filename); break; } @@ -1865,40 +1951,44 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image) 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) + if (image->alpha_trait != UndefinedPixelTrait) quantum_type=RGBAQuantum; if (image->colorspace == YCbCrColorspace) { quantum_type=CbYCrQuantum; - if (image->matte != MagickFalse) + if (image->alpha_trait != UndefinedPixelTrait) quantum_type=CbYCrAQuantum; if ((horizontal_factor == 2) || (vertical_factor == 2)) quantum_type=CbYCrYQuantum; } - extent=GetBytesPerRow(image->columns,image->matte != MagickFalse ? 4UL : 3UL, - image->depth,MagickTrue); - if (0) + extent=GetBytesPerRow(image->columns, + image->alpha_trait != UndefinedPixelTrait ? 4UL : 3UL,image->depth, + dpx.image.image_element[0].packing == 0 ? MagickFalse : MagickTrue); + if ((image_info->type != TrueColorType) && + (image->alpha_trait == UndefinedPixelTrait) && + (SetImageGray(image,exception) != MagickFalse)) { quantum_type=GrayQuantum; - extent=GetBytesPerRow(image->columns,image->matte != MagickFalse ? - 4UL : 3UL,image->depth,MagickTrue); + extent=GetBytesPerRow(image->columns,1UL,image->depth, + dpx.image.image_element[0].packing == 0 ? MagickFalse : MagickTrue); } - pixels=GetQuantumPixels(quantum_info); - for (y=0; y < (long) image->rows; y++) + pixels=(unsigned char *) GetQuantumPixels(quantum_info); + 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; }