From: dirk Date: Tue, 13 Oct 2015 05:14:08 +0000 (+0200) Subject: Reverted typecast due to issues in 64-bit build. X-Git-Tag: 7.0.1-0~564 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca41d6217207703b616165002c165b1e1d85a2a7;p=imagemagick Reverted typecast due to issues in 64-bit build. --- diff --git a/coders/psd.c b/coders/psd.c index aec0ae314..255a8e10f 100644 --- a/coders/psd.c +++ b/coders/psd.c @@ -1336,12 +1336,12 @@ ModuleExport MagickStatusType ReadPSDLayers(Image *image, if (image->debug != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " reading layer #%.20g",(double) i+1); - layer_info[i].page.y=(ssize_t) ReadBlobLong(image); - layer_info[i].page.x=(ssize_t) ReadBlobLong(image); - y=(ssize_t) ReadBlobLong(image); - x=(ssize_t) ReadBlobLong(image); - layer_info[i].page.width=x-layer_info[i].page.x; - layer_info[i].page.height=y-layer_info[i].page.y; + layer_info[i].page.y=(int) ReadBlobLong(image); + layer_info[i].page.x=(int) ReadBlobLong(image); + y=(int) ReadBlobLong(image); + x=(int) ReadBlobLong(image); + layer_info[i].page.width=(size_t) (x-layer_info[i].page.x); + layer_info[i].page.height=(size_t) (y-layer_info[i].page.y); layer_info[i].channels=ReadBlobShort(image); if (layer_info[i].channels > MaxPSDChannels) { @@ -1409,8 +1409,8 @@ ModuleExport MagickStatusType ReadPSDLayers(Image *image, /* Layer mask info. */ - layer_info[i].mask.page.y=(ssize_t) ReadBlobLong(image); - layer_info[i].mask.page.x=(ssize_t) ReadBlobLong(image); + layer_info[i].mask.page.y=(int) ReadBlobLong(image); + layer_info[i].mask.page.x=(int) ReadBlobLong(image); layer_info[i].mask.page.height=(size_t) (ReadBlobLong(image)- layer_info[i].mask.page.y); layer_info[i].mask.page.width=(size_t) (ReadBlobLong(image)-