% July 1992 %
% %
% %
-% Copyright 1999-2015 ImageMagick Studio LLC, a non-profit organization %
+% Copyright 1999-2017 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 %
% obtain a copy of the License at %
% %
-% http://www.imagemagick.org/script/license.php %
+% https://www.imagemagick.org/script/license.php %
% %
% Unless required by applicable law or agreed to in writing, software %
% distributed under the License is distributed on an "AS IS" BASIS, %
#include "MagickCore/log.h"
#include "MagickCore/magick.h"
#include "MagickCore/memory_.h"
+#include "MagickCore/memory-private.h"
#include "MagickCore/module.h"
#include "MagickCore/monitor.h"
#include "MagickCore/monitor-private.h"
static SemaphoreInfo
*tiff_semaphore = (SemaphoreInfo *) NULL;
+static TIFFErrorHandler
+ error_handler,
+ warning_handler;
+
static volatile MagickBooleanType
instantiate_key = MagickFalse;
\f
if ((unique_file == -1) || (file == (FILE *) NULL))
ThrowImageException(FileOpenError,"UnableToCreateTemporaryFile");
length=fwrite("\111\111\052\000\010\000\000\000\016\000",1,10,file);
+ if (length != 10)
+ ThrowReaderException(CorruptImageError,"UnexpectedEndOfFile");
length=fwrite("\376\000\003\000\001\000\000\000\000\000\000\000",1,12,file);
length=fwrite("\000\001\004\000\001\000\000\000",1,8,file);
length=WriteLSBLong(file,image->columns);
length=fwrite("\000\000\000\000",1,4,file);
length=WriteLSBLong(file,(long) image->resolution.x);
length=WriteLSBLong(file,1);
+ status=MagickTrue;
for (length=0; (c=ReadBlobByte(image)) != EOF; length++)
- (void) fputc(c,file);
+ if (fputc(c,file) != c)
+ status=MagickFalse;
offset=(ssize_t) fseek(file,(ssize_t) offset,SEEK_SET);
length=WriteLSBLong(file,(unsigned int) length);
+ if (ferror(file) != 0)
+ {
+ (void) fclose(file);
+ ThrowImageException(FileOpenError,"UnableToCreateTemporaryFile");
+ }
(void) fclose(file);
(void) CloseBlob(image);
image=DestroyImage(image);
(void) CopyMagickString(image->magick,"GROUP4",MagickPathExtent);
}
(void) RelinquishUniqueFileResource(filename);
+ if (status == MagickFalse)
+ image=DestroyImage(image);
return(image);
}
#endif
(void) vsprintf(message,format,error);
#endif
(void) ConcatenateMagickString(message,".",MagickPathExtent);
- exception=(ExceptionInfo *) MagickGetThreadValue(tiff_exception);
+ exception=(ExceptionInfo *) GetMagickThreadValue(tiff_exception);
if (exception != (ExceptionInfo *) NULL)
(void) ThrowMagickException(exception,GetMagickModule(),CoderError,message,
"`%s'",module);
return((toff_t) GetBlobSize((Image *) image));
}
-static void TIFFGetProfiles(TIFF *tiff,Image *image,MagickBooleanType ping,
- ExceptionInfo *exception)
+static void TIFFGetProfiles(TIFF *tiff,Image *image,ExceptionInfo *exception)
{
uint32
length;
*profile;
length=0;
- if (ping == MagickFalse)
- {
#if defined(TIFFTAG_ICCPROFILE)
- if ((TIFFGetField(tiff,TIFFTAG_ICCPROFILE,&length,&profile) == 1) &&
- (profile != (unsigned char *) NULL))
- (void) ReadProfile(image,"icc",profile,(ssize_t) length,exception);
+ if ((TIFFGetField(tiff,TIFFTAG_ICCPROFILE,&length,&profile) == 1) &&
+ (profile != (unsigned char *) NULL))
+ (void) ReadProfile(image,"icc",profile,(ssize_t) length,exception);
#endif
#if defined(TIFFTAG_PHOTOSHOP)
- if ((TIFFGetField(tiff,TIFFTAG_PHOTOSHOP,&length,&profile) == 1) &&
- (profile != (unsigned char *) NULL))
- (void) ReadProfile(image,"8bim",profile,(ssize_t) length,exception);
+ if ((TIFFGetField(tiff,TIFFTAG_PHOTOSHOP,&length,&profile) == 1) &&
+ (profile != (unsigned char *) NULL))
+ (void) ReadProfile(image,"8bim",profile,(ssize_t) length,exception);
#endif
#if defined(TIFFTAG_RICHTIFFIPTC)
- if ((TIFFGetField(tiff,TIFFTAG_RICHTIFFIPTC,&length,&profile) == 1) &&
- (profile != (unsigned char *) NULL))
- {
- if (TIFFIsByteSwapped(tiff) != 0)
- TIFFSwabArrayOfLong((uint32 *) profile,(size_t) length);
- (void) ReadProfile(image,"iptc",profile,4L*length,exception);
- }
+ if ((TIFFGetField(tiff,TIFFTAG_RICHTIFFIPTC,&length,&profile) == 1) &&
+ (profile != (unsigned char *) NULL))
+ {
+ if (TIFFIsByteSwapped(tiff) != 0)
+ TIFFSwabArrayOfLong((uint32 *) profile,(size_t) length);
+ (void) ReadProfile(image,"iptc",profile,4L*length,exception);
+ }
#endif
#if defined(TIFFTAG_XMLPACKET)
- if ((TIFFGetField(tiff,TIFFTAG_XMLPACKET,&length,&profile) == 1) &&
- (profile != (unsigned char *) NULL))
- (void) ReadProfile(image,"xmp",profile,(ssize_t) length,exception);
+ if ((TIFFGetField(tiff,TIFFTAG_XMLPACKET,&length,&profile) == 1) &&
+ (profile != (unsigned char *) NULL))
+ (void) ReadProfile(image,"xmp",profile,(ssize_t) length,exception);
#endif
- if ((TIFFGetField(tiff,34118,&length,&profile) == 1) &&
- (profile != (unsigned char *) NULL))
- (void) ReadProfile(image,"tiff:34118",profile,(ssize_t) length,
- exception);
- }
+ if ((TIFFGetField(tiff,34118,&length,&profile) == 1) &&
+ (profile != (unsigned char *) NULL))
+ (void) ReadProfile(image,"tiff:34118",profile,(ssize_t) length,
+ exception);
if ((TIFFGetField(tiff,37724,&length,&profile) == 1) &&
(profile != (unsigned char *) NULL))
(void) ReadProfile(image,"tiff:37724",profile,(ssize_t) length,exception);
unsigned long
*tietz;
-
- if (TIFFGetField(tiff,TIFFTAG_ARTIST,&text) == 1)
+ if ((TIFFGetField(tiff,TIFFTAG_ARTIST,&text) == 1) &&
+ (text != (char *) NULL))
(void) SetImageProperty(image,"tiff:artist",text,exception);
- if (TIFFGetField(tiff,TIFFTAG_COPYRIGHT,&text) == 1)
+ if ((TIFFGetField(tiff,TIFFTAG_COPYRIGHT,&text) == 1) &&
+ (text != (char *) NULL))
(void) SetImageProperty(image,"tiff:copyright",text,exception);
- if (TIFFGetField(tiff,TIFFTAG_DATETIME,&text) == 1)
+ if ((TIFFGetField(tiff,TIFFTAG_DATETIME,&text) == 1) &&
+ (text != (char *) NULL))
(void) SetImageProperty(image,"tiff:timestamp",text,exception);
- if (TIFFGetField(tiff,TIFFTAG_DOCUMENTNAME,&text) == 1)
+ if ((TIFFGetField(tiff,TIFFTAG_DOCUMENTNAME,&text) == 1) &&
+ (text != (char *) NULL))
(void) SetImageProperty(image,"tiff:document",text,exception);
- if (TIFFGetField(tiff,TIFFTAG_HOSTCOMPUTER,&text) == 1)
+ if ((TIFFGetField(tiff,TIFFTAG_HOSTCOMPUTER,&text) == 1) &&
+ (text != (char *) NULL))
(void) SetImageProperty(image,"tiff:hostcomputer",text,exception);
- if (TIFFGetField(tiff,TIFFTAG_IMAGEDESCRIPTION,&text) == 1)
+ if ((TIFFGetField(tiff,TIFFTAG_IMAGEDESCRIPTION,&text) == 1) &&
+ (text != (char *) NULL))
(void) SetImageProperty(image,"comment",text,exception);
- if (TIFFGetField(tiff,TIFFTAG_MAKE,&text) == 1)
+ if ((TIFFGetField(tiff,TIFFTAG_MAKE,&text) == 1) &&
+ (text != (char *) NULL))
(void) SetImageProperty(image,"tiff:make",text,exception);
- if (TIFFGetField(tiff,TIFFTAG_MODEL,&text) == 1)
+ if ((TIFFGetField(tiff,TIFFTAG_MODEL,&text) == 1) &&
+ (text != (char *) NULL))
(void) SetImageProperty(image,"tiff:model",text,exception);
- if (TIFFGetField(tiff,TIFFTAG_OPIIMAGEID,&count,&text) == 1)
+ if ((TIFFGetField(tiff,TIFFTAG_OPIIMAGEID,&count,&text) == 1) &&
+ (text != (char *) NULL))
{
if (count >= MagickPathExtent)
count=MagickPathExtent-1;
(void) CopyMagickString(message,text,count+1);
(void) SetImageProperty(image,"tiff:image-id",message,exception);
}
- if (TIFFGetField(tiff,TIFFTAG_PAGENAME,&text) == 1)
+ if ((TIFFGetField(tiff,TIFFTAG_PAGENAME,&text) == 1) &&
+ (text != (char *) NULL))
(void) SetImageProperty(image,"label",text,exception);
- if (TIFFGetField(tiff,TIFFTAG_SOFTWARE,&text) == 1)
+ if ((TIFFGetField(tiff,TIFFTAG_SOFTWARE,&text) == 1) &&
+ (text != (char *) NULL))
(void) SetImageProperty(image,"tiff:software",text,exception);
- if (TIFFGetField(tiff,33423,&count,&text) == 1)
+ if ((TIFFGetField(tiff,33423,&count,&text) == 1) &&
+ (text != (char *) NULL))
{
if (count >= MagickPathExtent)
count=MagickPathExtent-1;
(void) CopyMagickString(message,text,count+1);
(void) SetImageProperty(image,"tiff:kodak-33423",message,exception);
}
- if (TIFFGetField(tiff,36867,&count,&text) == 1)
+ if ((TIFFGetField(tiff,36867,&count,&text) == 1) &&
+ (text != (char *) NULL))
{
if (count >= MagickPathExtent)
count=MagickPathExtent-1;
default:
break;
}
- if (TIFFGetField(tiff,37706,&length,&tietz) == 1)
+ if ((TIFFGetField(tiff,37706,&length,&tietz) == 1) &&
+ (tietz != (unsigned long *) NULL))
{
(void) FormatLocaleString(message,MagickPathExtent,"%lu",tietz[0]);
(void) SetImageProperty(image,"tiff:tietz_offset",message,exception);
(void) vsprintf(message,format,warning);
#endif
(void) ConcatenateMagickString(message,".",MagickPathExtent);
- exception=(ExceptionInfo *) MagickGetThreadValue(tiff_exception);
+ exception=(ExceptionInfo *) GetMagickThreadValue(tiff_exception);
if (exception != (ExceptionInfo *) NULL)
(void) ThrowMagickException(exception,GetMagickModule(),CoderWarning,
message,"`%s'",module);
TIFF
*tiff;
- TIFFErrorHandler
- error_handler,
- warning_handler;
-
TIFFMethodType
method;
width;
unsigned char
- *pixels;
+ *tiff_pixels;
/*
Open image.
image=DestroyImageList(image);
return((Image *) NULL);
}
- (void) MagickSetThreadValue(tiff_exception,exception);
- error_handler=TIFFSetErrorHandler(TIFFErrors);
- warning_handler=TIFFSetWarningHandler(TIFFWarnings);
+ (void) SetMagickThreadValue(tiff_exception,exception);
tiff=TIFFClientOpen(image->filename,"rb",(thandle_t) image,TIFFReadBlob,
TIFFWriteBlob,TIFFSeekBlob,TIFFCloseBlob,TIFFGetBlobSize,TIFFMapBlob,
TIFFUnmapBlob);
if (tiff == (TIFF *) NULL)
{
- (void) TIFFSetWarningHandler(warning_handler);
- (void) TIFFSetErrorHandler(error_handler);
image=DestroyImageList(image);
return((Image *) NULL);
}
image->columns=(size_t) width;
image->rows=(size_t) height;
image->depth=(size_t) bits_per_sample;
- status=SetImageExtent(image,image->columns,image->rows,exception);
- if (status == MagickFalse)
- return(DestroyImageList(image));
if (image->debug != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),"Image depth: %.20g",
(double) image->depth);
SetImageColorspace(image,CMYKColorspace,exception);
if (photometric == PHOTOMETRIC_CIELAB)
SetImageColorspace(image,LabColorspace,exception);
- TIFFGetProfiles(tiff,image,image_info->ping,exception);
+ TIFFGetProfiles(tiff,image,exception);
TIFFGetProperties(tiff,image,exception);
option=GetImageOption(image_info,"tiff:exif-properties");
if (IsStringFalse(option) == MagickFalse) /* enabled by default */
horizontal,
vertical;
- tiff_status=TIFFGetFieldDefaulted(tiff,TIFFTAG_YCBCRSUBSAMPLING,
- &horizontal,&vertical);
+ tiff_status=TIFFGetField(tiff,TIFFTAG_YCBCRSUBSAMPLING,&horizontal,
+ &vertical);
if (tiff_status == 1)
{
(void) FormatLocaleString(sampling_factor,MagickPathExtent,
case COMPRESSION_ADOBE_DEFLATE: image->compression=ZipCompression; break;
default: image->compression=RLECompression; break;
}
- /*
- Allocate memory for the image and pixel buffer.
- */
- quantum_info=AcquireQuantumInfo(image_info,image);
- if (quantum_info == (QuantumInfo *) NULL)
- {
- TIFFClose(tiff);
- ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
- }
- if (sample_format == SAMPLEFORMAT_UINT)
- status=SetQuantumFormat(image,quantum_info,UnsignedQuantumFormat);
- if (sample_format == SAMPLEFORMAT_INT)
- status=SetQuantumFormat(image,quantum_info,SignedQuantumFormat);
- if (sample_format == SAMPLEFORMAT_IEEEFP)
- status=SetQuantumFormat(image,quantum_info,FloatingPointQuantumFormat);
- if (status == MagickFalse)
- {
- TIFFClose(tiff);
- quantum_info=DestroyQuantumInfo(quantum_info);
- ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
- }
- status=MagickTrue;
- switch (photometric)
- {
- case PHOTOMETRIC_MINISBLACK:
- {
- quantum_info->min_is_white=MagickFalse;
- break;
- }
- case PHOTOMETRIC_MINISWHITE:
- {
- quantum_info->min_is_white=MagickTrue;
- break;
- }
- default:
- break;
- }
- tiff_status=TIFFGetFieldDefaulted(tiff,TIFFTAG_EXTRASAMPLES,&extra_samples,
- &sample_info);
- if (tiff_status == 1)
- {
- (void) SetImageProperty(image,"tiff:alpha","unspecified",exception);
- if (extra_samples == 0)
- {
- if ((samples_per_pixel == 4) && (photometric == PHOTOMETRIC_RGB))
- image->alpha_trait=BlendPixelTrait;
- }
- else
- for (i=0; i < extra_samples; i++)
- {
- image->alpha_trait=BlendPixelTrait;
- if (sample_info[i] == EXTRASAMPLE_ASSOCALPHA)
- {
- SetQuantumAlphaType(quantum_info,DisassociatedQuantumAlpha);
- (void) SetImageProperty(image,"tiff:alpha","associated",
- exception);
- }
- else
- if (sample_info[i] == EXTRASAMPLE_UNASSALPHA)
- (void) SetImageProperty(image,"tiff:alpha","unassociated",
- exception);
- }
- }
+ quantum_info=(QuantumInfo *) NULL;
if ((photometric == PHOTOMETRIC_PALETTE) &&
(pow(2.0,1.0*bits_per_sample) <= MaxColormapSize))
{
}
}
}
- if (image->alpha_trait == UndefinedPixelTrait)
- image->depth=GetImageDepth(image,exception);
}
if (image_info->ping != MagickFalse)
{
if (image_info->number_scenes != 0)
if (image->scene >= (image_info->scene+image_info->number_scenes-1))
- {
- quantum_info=DestroyQuantumInfo(quantum_info);
- break;
- }
+ break;
goto next_tiff_frame;
}
+ status=SetImageExtent(image,image->columns,image->rows,exception);
+ if (status == MagickFalse)
+ return(DestroyImageList(image));
+ /*
+ Allocate memory for the image and pixel buffer.
+ */
+ quantum_info=AcquireQuantumInfo(image_info,image);
+ if (quantum_info == (QuantumInfo *) NULL)
+ {
+ TIFFClose(tiff);
+ ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+ }
+ if (sample_format == SAMPLEFORMAT_UINT)
+ status=SetQuantumFormat(image,quantum_info,UnsignedQuantumFormat);
+ if (sample_format == SAMPLEFORMAT_INT)
+ status=SetQuantumFormat(image,quantum_info,SignedQuantumFormat);
+ if (sample_format == SAMPLEFORMAT_IEEEFP)
+ status=SetQuantumFormat(image,quantum_info,FloatingPointQuantumFormat);
+ if (status == MagickFalse)
+ {
+ TIFFClose(tiff);
+ quantum_info=DestroyQuantumInfo(quantum_info);
+ ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+ }
+ status=MagickTrue;
+ switch (photometric)
+ {
+ case PHOTOMETRIC_MINISBLACK:
+ {
+ quantum_info->min_is_white=MagickFalse;
+ break;
+ }
+ case PHOTOMETRIC_MINISWHITE:
+ {
+ quantum_info->min_is_white=MagickTrue;
+ break;
+ }
+ default:
+ break;
+ }
+ tiff_status=TIFFGetFieldDefaulted(tiff,TIFFTAG_EXTRASAMPLES,&extra_samples,
+ &sample_info);
+ if (tiff_status == 1)
+ {
+ (void) SetImageProperty(image,"tiff:alpha","unspecified",exception);
+ if (extra_samples == 0)
+ {
+ if ((samples_per_pixel == 4) && (photometric == PHOTOMETRIC_RGB))
+ image->alpha_trait=BlendPixelTrait;
+ }
+ else
+ for (i=0; i < extra_samples; i++)
+ {
+ image->alpha_trait=BlendPixelTrait;
+ if (sample_info[i] == EXTRASAMPLE_ASSOCALPHA)
+ {
+ SetQuantumAlphaType(quantum_info,DisassociatedQuantumAlpha);
+ (void) SetImageProperty(image,"tiff:alpha","associated",
+ exception);
+ }
+ else
+ if (sample_info[i] == EXTRASAMPLE_UNASSALPHA)
+ (void) SetImageProperty(image,"tiff:alpha","unassociated",
+ exception);
+ }
+ }
method=ReadGenericMethod;
if (TIFFGetField(tiff,TIFFTAG_ROWSPERSTRIP,&rows_per_strip) == 1)
{
(unsigned int) rows_per_strip);
(void) SetImageProperty(image,"tiff:rows-per-strip",value,exception);
}
- if ((samples_per_pixel >= 2) && (interlace == PLANARCONFIG_CONTIG))
- method=ReadRGBAMethod;
- if ((samples_per_pixel >= 2) && (interlace == PLANARCONFIG_SEPARATE))
- method=ReadCMYKAMethod;
+ if ((samples_per_pixel >= 3) && (interlace == PLANARCONFIG_CONTIG))
+ if ((image->alpha_trait == UndefinedPixelTrait) ||
+ (samples_per_pixel >= 4))
+ method=ReadRGBAMethod;
+ if ((samples_per_pixel >= 4) && (interlace == PLANARCONFIG_SEPARATE))
+ if ((image->alpha_trait == UndefinedPixelTrait) ||
+ (samples_per_pixel >= 5))
+ method=ReadCMYKAMethod;
if ((photometric != PHOTOMETRIC_RGB) &&
(photometric != PHOTOMETRIC_CIELAB) &&
(photometric != PHOTOMETRIC_SEPARATED))
method=ReadTileMethod;
quantum_info->endian=LSBEndian;
quantum_type=RGBQuantum;
- pixels=(unsigned char *) GetQuantumPixels(quantum_info);
+ tiff_pixels=(unsigned char *) AcquireMagickMemory(MagickMax(
+ TIFFScanlineSize(tiff),(ssize_t) (image->columns*samples_per_pixel*
+ pow(2.0,ceil(log(bits_per_sample)/log(2.0))))));
+ if (tiff_pixels == (unsigned char *) NULL)
+ {
+ TIFFClose(tiff);
+ ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+ }
switch (method)
{
case ReadSingleSampleMethod:
quantum_type=GrayQuantum;
pad=(size_t) MagickMax((size_t) samples_per_pixel-1,0);
}
- status=SetQuantumPad(image,quantum_info,pad*((bits_per_sample+7) >> 3));
+ status=SetQuantumPad(image,quantum_info,pad*pow(2,ceil(log(
+ bits_per_sample)/log(2))));
if (status == MagickFalse)
{
TIFFClose(tiff);
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
}
- pixels=(unsigned char *) GetQuantumPixels(quantum_info);
for (y=0; y < (ssize_t) image->rows; y++)
{
int
register Quantum
*magick_restrict q;
- status=TIFFReadPixels(tiff,bits_per_sample,0,y,(char *) pixels);
+ status=TIFFReadPixels(tiff,bits_per_sample,0,y,(char *) tiff_pixels);
if (status == -1)
break;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
if (q == (Quantum *) NULL)
break;
(void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
- quantum_type,pixels,exception);
+ quantum_type,tiff_pixels,exception);
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
if (image->previous == (Image *) NULL)
TIFFClose(tiff);
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
}
- pixels=(unsigned char *) GetQuantumPixels(quantum_info);
for (y=0; y < (ssize_t) image->rows; y++)
{
int
register Quantum
*magick_restrict q;
- status=TIFFReadPixels(tiff,bits_per_sample,0,y,(char *) pixels);
+ status=TIFFReadPixels(tiff,bits_per_sample,0,y,(char *) tiff_pixels);
if (status == -1)
break;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
if (q == (Quantum *) NULL)
break;
(void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
- quantum_type,pixels,exception);
+ quantum_type,tiff_pixels,exception);
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
if (image->previous == (Image *) NULL)
status;
status=TIFFReadPixels(tiff,bits_per_sample,(tsample_t) i,y,(char *)
- pixels);
+ tiff_pixels);
if (status == -1)
break;
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
default: quantum_type=UndefinedQuantum; break;
}
(void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
- quantum_type,pixels,exception);
+ quantum_type,tiff_pixels,exception);
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
}
}
case ReadYCCKMethod:
{
- pixels=(unsigned char *) GetQuantumPixels(quantum_info);
for (y=0; y < (ssize_t) image->rows; y++)
{
int
unsigned char
*p;
- status=TIFFReadPixels(tiff,bits_per_sample,0,y,(char *) pixels);
+ status=TIFFReadPixels(tiff,bits_per_sample,0,y,(char *) tiff_pixels);
if (status == -1)
break;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
if (q == (Quantum *) NULL)
break;
- p=pixels;
+ p=tiff_pixels;
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelCyan(image,ScaleCharToQuantum(ClampYCC((double) *p+
break;
if (i == 0)
{
- if (TIFFReadRGBAStrip(tiff,(tstrip_t) y,(uint32 *) pixels) == 0)
+ if (TIFFReadRGBAStrip(tiff,(tstrip_t) y,(uint32 *) tiff_pixels) == 0)
break;
i=(ssize_t) MagickMin((ssize_t) rows_per_strip,(ssize_t)
image->rows-y);
}
i--;
- p=((uint32 *) pixels)+image->columns*i;
+ p=((uint32 *) tiff_pixels)+image->columns*i;
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelRed(image,ScaleCharToQuantum((unsigned char)
columns,
rows;
- size_t
- number_pixels;
-
/*
Convert tiled TIFF image to DirectClass MIFF image.
*/
ThrowReaderException(CoderError,"ImageIsNotTiled");
}
(void) SetImageStorageClass(image,DirectClass,exception);
- number_pixels=columns*rows;
- tile_pixels=(uint32 *) AcquireQuantumMemory(number_pixels,
+ number_pixels=(MagickSizeType) columns*rows;
+ if (HeapOverflowSanityCheck(rows,sizeof(*tile_pixels)) != MagickFalse)
+ {
+ TIFFClose(tiff);
+ ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+ }
+ tile_pixels=(uint32 *) AcquireQuantumMemory(columns,rows*
sizeof(*tile_pixels));
if (tile_pixels == (uint32 *) NULL)
{
Convert TIFF image to DirectClass MIFF image.
*/
number_pixels=(MagickSizeType) image->columns*image->rows;
- if ((number_pixels*sizeof(uint32)) != (MagickSizeType) ((size_t)
- (number_pixels*sizeof(uint32))))
+ if (HeapOverflowSanityCheck(image->rows,sizeof(*pixels)) != MagickFalse)
{
TIFFClose(tiff);
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
}
pixels=(uint32 *) GetVirtualMemoryBlob(pixel_info);
- (void) TIFFReadRGBAImage(tiff,(uint32) image->columns,
- (uint32) image->rows,(uint32 *) pixels,0);
+ (void) TIFFReadRGBAImage(tiff,(uint32) image->columns,(uint32)
+ image->rows,(uint32 *) pixels,0);
/*
Convert image to DirectClass pixel packets.
*/
break;
}
}
+ tiff_pixels=(unsigned char *) RelinquishMagickMemory(tiff_pixels);
SetQuantumImageType(image,quantum_type);
next_tiff_frame:
- quantum_info=DestroyQuantumInfo(quantum_info);
+ if (quantum_info != (QuantumInfo *) NULL)
+ quantum_info=DestroyQuantumInfo(quantum_info);
if (photometric == PHOTOMETRIC_CIELAB)
DecodeLabImage(image,exception);
if ((photometric == PHOTOMETRIC_LOGL) ||
break;
}
} while (status != MagickFalse);
- (void) TIFFSetWarningHandler(warning_handler);
- (void) TIFFSetErrorHandler(error_handler);
TIFFClose(tiff);
TIFFReadPhotoshopLayers(image,image_info,exception);
if (image_info->number_scenes != 0)
LockSemaphoreInfo(tiff_semaphore);
if (instantiate_key == MagickFalse)
{
- if (MagickCreateThreadKey(&tiff_exception) == MagickFalse)
+ if (CreateMagickThreadKey(&tiff_exception,NULL) == MagickFalse)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
+ error_handler=TIFFSetErrorHandler(TIFFErrors);
+ warning_handler=TIFFSetWarningHandler(TIFFWarnings);
#if defined(MAGICKCORE_HAVE_TIFFMERGEFIELDINFO) && defined(MAGICKCORE_HAVE_TIFFSETTAGEXTENDER)
if (tag_extender == (TIFFExtendProc) NULL)
tag_extender=TIFFSetTagExtender(TIFFTagExtender);
#endif
entry->flags|=CoderRawSupportFlag;
entry->flags|=CoderEndianSupportFlag;
- entry->flags|=CoderSeekableStreamFlag;
+ entry->flags|=CoderDecoderSeekableStreamFlag;
+ entry->flags|=CoderEncoderSeekableStreamFlag;
entry->flags^=CoderAdjoinFlag;
entry->flags^=CoderUseExtensionFlag;
entry->format_type=ImplicitFormatType;
entry->encoder=(EncodeImageHandler *) WritePTIFImage;
#endif
entry->flags|=CoderEndianSupportFlag;
- entry->flags|=CoderSeekableStreamFlag;
+ entry->flags|=CoderDecoderSeekableStreamFlag;
+ entry->flags|=CoderEncoderSeekableStreamFlag;
entry->flags^=CoderUseExtensionFlag;
entry->mime_type=ConstantString("image/tiff");
(void) RegisterMagickInfo(entry);
entry->encoder=(EncodeImageHandler *) WriteTIFFImage;
#endif
entry->flags|=CoderEndianSupportFlag;
- entry->flags|=CoderSeekableStreamFlag;
+ entry->flags|=CoderDecoderSeekableStreamFlag;
+ entry->flags|=CoderEncoderSeekableStreamFlag;
entry->flags|=CoderStealthFlag;
entry->flags^=CoderUseExtensionFlag;
if (*version != '\0')
#endif
entry->magick=(IsImageFormatHandler *) IsTIFF;
entry->flags|=CoderEndianSupportFlag;
- entry->flags|=CoderSeekableStreamFlag;
+ entry->flags|=CoderDecoderSeekableStreamFlag;
+ entry->flags|=CoderEncoderSeekableStreamFlag;
entry->flags^=CoderUseExtensionFlag;
if (*version != '\0')
entry->version=ConstantString(version);
entry->encoder=(EncodeImageHandler *) WriteTIFFImage;
#endif
entry->flags|=CoderEndianSupportFlag;
- entry->flags|=CoderSeekableStreamFlag;
+ entry->flags|=CoderDecoderSeekableStreamFlag;
+ entry->flags|=CoderEncoderSeekableStreamFlag;
entry->flags^=CoderAdjoinFlag;
entry->flags^=CoderUseExtensionFlag;
if (*version != '\0')
if (tag_extender == (TIFFExtendProc) NULL)
(void) TIFFSetTagExtender(tag_extender);
#endif
- if (MagickDeleteThreadKey(tiff_exception) == MagickFalse)
+ if (DeleteMagickThreadKey(tiff_exception) == MagickFalse)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
+ (void) TIFFSetWarningHandler(warning_handler);
+ (void) TIFFSetErrorHandler(error_handler);
instantiate_key=MagickFalse;
}
UnlockSemaphoreInfo(tiff_semaphore);
(void) SetImageType(huffman_image,BilevelType,exception);
write_info=CloneImageInfo((ImageInfo *) NULL);
SetImageInfoFile(write_info,file);
+ (void) SetImageDepth(image,1,exception);
+ (void) SetImageType(image,BilevelType,exception);
write_info->compression=Group4Compression;
write_info->type=BilevelType;
(void) SetImageOption(write_info,"quantum:polarity","min-is-white");
AppendImageToList(&images,pyramid_image);
}
}
- images=GetFirstImageInList(images);
- /*
- Write pyramid-encoded TIFF image.
- */
- write_info=CloneImageInfo(image_info);
- write_info->adjoin=MagickTrue;
- (void) CopyMagickString(write_info->magick,"TIFF",MagickPathExtent);
- (void) CopyMagickString(images->magick,"TIFF",MagickPathExtent);
- status=WriteTIFFImage(write_info,images,exception);
- images=DestroyImageList(images);
- write_info=DestroyImageInfo(write_info);
+ status=MagickFalse;
+ if (images != (Image *) NULL)
+ {
+ /*
+ Write pyramid-encoded TIFF image.
+ */
+ images=GetFirstImageInList(images);
+ write_info=CloneImageInfo(image_info);
+ write_info->adjoin=MagickTrue;
+ (void) CopyMagickString(write_info->magick,"TIFF",MagickPathExtent);
+ (void) CopyMagickString(images->magick,"TIFF",MagickPathExtent);
+ status=WriteTIFFImage(write_info,images,exception);
+ images=DestroyImageList(images);
+ write_info=DestroyImageInfo(write_info);
+ }
return(status);
}
#endif
(void) ResetMagickMemory(tiff_info,0,sizeof(*tiff_info));
option=GetImageOption(image_info,"tiff:tile-geometry");
if (option == (const char *) NULL)
- return(MagickTrue);
+ {
+ uint32
+ rows_per_strip;
+
+ option=GetImageOption(image_info,"tiff:rows-per-strip");
+ if (option != (const char *) NULL)
+ rows_per_strip=(size_t) strtol(option,(char **) NULL,10);
+ else
+ if (TIFFGetField(tiff,TIFFTAG_IMAGELENGTH,&rows_per_strip) == 0)
+ rows_per_strip=0; /* use default */
+ rows_per_strip=TIFFDefaultStripSize(tiff,rows_per_strip);
+ (void) TIFFSetField(tiff,TIFFTAG_ROWSPERSTRIP,rows_per_strip);
+ return(MagickTrue);
+ }
+ /*
+ Create tiled TIFF, ignore "tiff:rows-per-strip".
+ */
flags=ParseAbsoluteGeometry(option,&tiff_info->tile_geometry);
if ((flags & HeightValue) == 0)
tiff_info->tile_geometry.height=tiff_info->tile_geometry.width;
uint16
page,
pages;
-
+
page=(uint16) image->scene;
pages=(uint16) GetImageListLength(image);
if ((image_info->adjoin != MagickFalse) && (pages > 1))
static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
Image *image,ExceptionInfo *exception)
{
-#if !defined(TIFFDefaultStripSize)
-#define TIFFDefaultStripSize(tiff,request) (8192UL/TIFFScanlineSize(tiff))
-#endif
-
const char
*mode,
*option;
TIFF
*tiff;
- TIFFErrorHandler
- error_handler,
- warning_handler;
-
TIFFInfo
tiff_info;
endian,
photometric;
- uint32
- rows_per_strip;
-
unsigned char
*pixels;
status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception);
if (status == MagickFalse)
return(status);
- (void) MagickSetThreadValue(tiff_exception,exception);
- error_handler=TIFFSetErrorHandler((TIFFErrorHandler) TIFFErrors);
- warning_handler=TIFFSetWarningHandler((TIFFErrorHandler) TIFFWarnings);
+ (void) SetMagickThreadValue(tiff_exception,exception);
endian_type=UndefinedEndian;
option=GetImageOption(image_info,"tiff:endian");
if (option != (const char *) NULL)
TIFFWriteBlob,TIFFSeekBlob,TIFFCloseBlob,TIFFGetBlobSize,TIFFMapBlob,
TIFFUnmapBlob);
if (tiff == (TIFF *) NULL)
- {
- (void) TIFFSetWarningHandler(warning_handler);
- (void) TIFFSetErrorHandler(error_handler);
- return(MagickFalse);
- }
+ return(MagickFalse);
scene=0;
debug=IsEventLogging();
(void) debug;
case Group4Compression:
{
(void) SetImageType(image,BilevelType,exception);
+ (void) SetImageDepth(image,1,exception);
break;
}
case JPEGCompression:
MagickFalse ? PHOTOMETRIC_MINISWHITE :
PHOTOMETRIC_MINISBLACK);
(void) TIFFSetField(tiff,TIFFTAG_SAMPLESPERPIXEL,1);
- if ((image_info->depth == 0) &&
- (image->alpha_trait == UndefinedPixelTrait) &&
- (SetImageMonochrome(image,exception) != MagickFalse))
- {
- status=SetQuantumDepth(image,quantum_info,1);
- if (status == MagickFalse)
- ThrowWriterException(ResourceLimitError,
- "MemoryAllocationFailed");
- }
+ if ((image->depth == 1) &&
+ (image->alpha_trait == UndefinedPixelTrait))
+ SetImageMonochrome(image,exception);
}
else
if (image->storage_class == PseudoClass)
if ((image_info->interlace == PlaneInterlace) ||
(image_info->interlace == PartitionInterlace))
(void) TIFFSetField(tiff,TIFFTAG_PLANARCONFIG,PLANARCONFIG_SEPARATE);
- rows_per_strip=TIFFDefaultStripSize(tiff,0);
- option=GetImageOption(image_info,"tiff:rows-per-strip");
- if (option != (const char *) NULL)
- rows_per_strip=(size_t) strtol(option,(char **) NULL,10);
switch (compress_tag)
{
case COMPRESSION_JPEG:
{
#if defined(JPEG_SUPPORT)
- const char
- *sampling_factor;
-
- GeometryInfo
- geometry_info;
- MagickStatusType
- flags;
- rows_per_strip+=(16-(rows_per_strip % 16));
if (image_info->quality != UndefinedCompressionQuality)
(void) TIFFSetField(tiff,TIFFTAG_JPEGQUALITY,image_info->quality);
(void) TIFFSetField(tiff,TIFFTAG_JPEGCOLORMODE,JPEGCOLORMODE_RAW);
*value;
(void) TIFFSetField(tiff,TIFFTAG_JPEGCOLORMODE,JPEGCOLORMODE_RGB);
- sampling_factor=(const char *) NULL;
- value=GetImageProperty(image,"jpeg:sampling-factor",exception);
- if (value != (char *) NULL)
+ if (image->colorspace == YCbCrColorspace)
{
- sampling_factor=value;
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " Input sampling-factors=%s",sampling_factor);
- }
- if (image_info->sampling_factor != (char *) NULL)
- sampling_factor=image_info->sampling_factor;
- if (sampling_factor != (const char *) NULL)
- {
- flags=ParseGeometry(sampling_factor,&geometry_info);
- if ((flags & SigmaValue) == 0)
- geometry_info.sigma=geometry_info.rho;
- if (image->colorspace == YCbCrColorspace)
- (void) TIFFSetField(tiff,TIFFTAG_YCBCRSUBSAMPLING,(uint16)
- geometry_info.rho,(uint16) geometry_info.sigma);
- }
+ const char
+ *sampling_factor;
+
+ GeometryInfo
+ geometry_info;
+
+ MagickStatusType
+ flags;
+
+ sampling_factor=(const char *) NULL;
+ value=GetImageProperty(image,"jpeg:sampling-factor",exception);
+ if (value != (char *) NULL)
+ {
+ sampling_factor=value;
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+ " Input sampling-factors=%s",sampling_factor);
+ }
+ if (image_info->sampling_factor != (char *) NULL)
+ sampling_factor=image_info->sampling_factor;
+ if (sampling_factor != (const char *) NULL)
+ {
+ flags=ParseGeometry(sampling_factor,&geometry_info);
+ if ((flags & SigmaValue) == 0)
+ geometry_info.sigma=geometry_info.rho;
+ (void) TIFFSetField(tiff,TIFFTAG_YCBCRSUBSAMPLING,(uint16)
+ geometry_info.rho,(uint16) geometry_info.sigma);
+ }
+ }
}
(void) TIFFGetFieldDefaulted(tiff,TIFFTAG_BITSPERSAMPLE,
&bits_per_sample);
}
case COMPRESSION_ADOBE_DEFLATE:
{
- rows_per_strip=(uint32) image->rows;
(void) TIFFGetFieldDefaulted(tiff,TIFFTAG_BITSPERSAMPLE,
&bits_per_sample);
if (((photometric == PHOTOMETRIC_RGB) ||
/*
Byte-aligned EOL.
*/
- rows_per_strip=(uint32) image->rows;
(void) TIFFSetField(tiff,TIFFTAG_GROUP3OPTIONS,4);
break;
}
case COMPRESSION_CCITTFAX4:
- {
- rows_per_strip=(uint32) image->rows;
break;
- }
#if defined(LZMA_SUPPORT) && defined(COMPRESSION_LZMA)
case COMPRESSION_LZMA:
{
default:
break;
}
- if (rows_per_strip < 1)
- rows_per_strip=1;
- if ((image->rows/rows_per_strip) >= (1UL << 15))
- rows_per_strip=(uint32) (image->rows >> 15);
- (void) TIFFSetField(tiff,TIFFTAG_ROWSPERSTRIP,rows_per_strip);
if ((image->resolution.x != 0.0) && (image->resolution.y != 0.0))
{
unsigned short
if (status == MagickFalse)
break;
} while (image_info->adjoin != MagickFalse);
- (void) TIFFSetWarningHandler(warning_handler);
- (void) TIFFSetErrorHandler(error_handler);
TIFFClose(tiff);
return(MagickTrue);
}
projects / imagemagick / blobdiff