From 2c38b270bff70f9fa597d714b7b8c53ffccbdecf Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 18 Feb 2011 23:25:33 +0000 Subject: [PATCH] --- magick/cache.c | 4 ++-- magick/shear.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/magick/cache.c b/magick/cache.c index 19be74231..71091b659 100644 --- a/magick/cache.c +++ b/magick/cache.c @@ -705,7 +705,7 @@ static inline MagickOffsetType ReadPixelCacheRegion(CacheInfo *cache_info, (MagickSizeType) SSIZE_MAX)); #else count=pread(cache_info->file,buffer+i,(size_t) MagickMin(length-i, - (MagickSizeType) SSIZE_MAX),(off_t) (offset+i)); + (MagickSizeType) SSIZE_MAX),offset+i); #endif if (count > 0) continue; @@ -749,7 +749,7 @@ static inline MagickOffsetType WritePixelCacheRegion(CacheInfo *cache_info, (MagickSizeType) SSIZE_MAX)); #else count=pwrite(cache_info->file,buffer+i,(size_t) MagickMin(length-i, - (MagickSizeType) SSIZE_MAX),(off_t) (offset+i)); + (MagickSizeType) SSIZE_MAX),offset+i); #endif if (count > 0) continue; diff --git a/magick/shear.c b/magick/shear.c index 88b596029..26560fe51 100644 --- a/magick/shear.c +++ b/magick/shear.c @@ -439,7 +439,7 @@ static inline size_t MagickMin(const size_t x,const size_t y) } static inline ssize_t ReadRadonCell(const RadonInfo *radon_info, - const off_t offset,const size_t length,unsigned char *buffer) + const MagickOffsetType offset,const size_t length,unsigned char *buffer) { register ssize_t i; @@ -464,7 +464,7 @@ static inline ssize_t ReadRadonCell(const RadonInfo *radon_info, SSIZE_MAX)); #else count=pread(radon_info->file,buffer+i,MagickMin(length-i,(size_t) - SSIZE_MAX),(off_t) (offset+i)); + SSIZE_MAX),offset+i); #endif if (count > 0) continue; @@ -483,7 +483,7 @@ static inline ssize_t ReadRadonCell(const RadonInfo *radon_info, } static inline ssize_t WriteRadonCell(const RadonInfo *radon_info, - const off_t offset,const size_t length,const unsigned char *buffer) + const MagickOffsetType offset,const size_t length,const unsigned char *buffer) { register ssize_t i; @@ -507,7 +507,7 @@ static inline ssize_t WriteRadonCell(const RadonInfo *radon_info, SSIZE_MAX)); #else count=pwrite(radon_info->file,buffer+i,MagickMin(length-i,(size_t) - SSIZE_MAX),(off_t) (offset+i)); + SSIZE_MAX),offset+i); #endif if (count > 0) continue; @@ -528,13 +528,13 @@ static inline ssize_t WriteRadonCell(const RadonInfo *radon_info, static inline unsigned short GetRadonCell(const RadonInfo *radon_info, const ssize_t x,const ssize_t y) { - off_t + MagickOffsetType i; unsigned short value; - i=(off_t) radon_info->height*x+y; + i=(MagickOffsetType) radon_info->height*x+y; if ((i < 0) || ((MagickSizeType) (i*sizeof(*radon_info->cells)) >= radon_info->length)) return(0); @@ -549,13 +549,13 @@ static inline unsigned short GetRadonCell(const RadonInfo *radon_info, static inline MagickBooleanType SetRadonCell(const RadonInfo *radon_info, const ssize_t x,const ssize_t y,const unsigned short value) { - off_t + MagickOffsetType i; ssize_t count; - i=(off_t) radon_info->height*x+y; + i=(MagickOffsetType) radon_info->height*x+y; if ((i < 0) || ((MagickSizeType) (i*sizeof(*radon_info->cells)) >= radon_info->length)) return(MagickFalse); -- 2.40.0