From 9c5171c13c7186088b10ec322e199f60e455a7e1 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 25 May 2014 21:26:39 +0000 Subject: [PATCH] --- MagickCore/annotate.c | 5 +---- MagickCore/cache.c | 3 ++- MagickCore/montage.c | 10 ++++------ MagickCore/xwindow.c | 9 ++++++--- MagickWand/wand.c | 10 ++++------ coders/msl.c | 4 ++-- 6 files changed, 19 insertions(+), 22 deletions(-) diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c index 1966cb6bb..846537a4a 100644 --- a/MagickCore/annotate.c +++ b/MagickCore/annotate.c @@ -1453,10 +1453,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info, q=GetCacheViewAuthenticPixels(image_view,x_offset,y_offset,1,1, exception); if (q == (Quantum *) NULL) - { - q+=GetPixelChannels(image); - continue; - } + continue; GetPixelInfo(image,&fill_color); (void) GetFillColor(draw_info,x_offset,y_offset,&fill_color, exception); diff --git a/MagickCore/cache.c b/MagickCore/cache.c index 36d39b4a3..e355b2718 100644 --- a/MagickCore/cache.c +++ b/MagickCore/cache.c @@ -542,7 +542,8 @@ static MagickBooleanType ClonePixelCacheRepository( { CopyPixels(clone_info->pixels,cache_info->pixels,cache_info->columns* cache_info->number_channels*cache_info->rows); - if (cache_info->metacontent_extent != 0) + if ((cache_info->metacontent_extent != 0) && + (clone_info->metacontent_extent != 0)) (void) memcpy(clone_info->metacontent,cache_info->metacontent, cache_info->columns*cache_info->rows*clone_info->metacontent_extent* sizeof(cache_info->metacontent)); diff --git a/MagickCore/montage.c b/MagickCore/montage.c index cd6137865..cdfd8bedc 100644 --- a/MagickCore/montage.c +++ b/MagickCore/montage.c @@ -279,12 +279,10 @@ static void GetMontageGeometry(char *geometry,const size_t number_images, (void) GetGeometry(geometry,x_offset,y_offset,tiles_per_row,tiles_per_column); if ((*tiles_per_column == 0) && (*tiles_per_row == 0)) *tiles_per_column=(size_t) sqrt((double) number_images); - if (*tiles_per_column == 0) - *tiles_per_column=(size_t) - ceil((double) number_images/(*tiles_per_row)); - if (*tiles_per_row == 0) - *tiles_per_row=(size_t) - ceil((double) number_images/(*tiles_per_column)); + if ((*tiles_per_column == 0) && (*tiles_per_row != 0)) + *tiles_per_column=(size_t) ceil((double) number_images/(*tiles_per_row)); + if ((*tiles_per_row == 0) && (*tiles_per_column != 0)) + *tiles_per_row=(size_t) ceil((double) number_images/(*tiles_per_column)); } static inline ssize_t MagickMax(const ssize_t x,const ssize_t y) diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c index e3536488d..a1bb9188e 100644 --- a/MagickCore/xwindow.c +++ b/MagickCore/xwindow.c @@ -5559,9 +5559,12 @@ MagickPrivate MagickBooleanType XMakeImage(Display *display, (char *) NULL,&segment_info[1],width,height); if (ximage == (XImage *) NULL) window->shared_memory=MagickFalse; - length=(size_t) ximage->bytes_per_line*ximage->height; - if (CheckOverflowException(length,ximage->bytes_per_line,ximage->height)) - window->shared_memory=MagickFalse; + else + { + length=(size_t) ximage->bytes_per_line*ximage->height; + if (CheckOverflowException(length,ximage->bytes_per_line,ximage->height)) + window->shared_memory=MagickFalse; + } if (window->shared_memory != MagickFalse) segment_info[1].shmid=shmget(IPC_PRIVATE,length,IPC_CREAT | 0777); if (window->shared_memory != MagickFalse) diff --git a/MagickWand/wand.c b/MagickWand/wand.c index 065054ad5..197631759 100644 --- a/MagickWand/wand.c +++ b/MagickWand/wand.c @@ -79,14 +79,12 @@ WandExport size_t AcquireWandId(void) if (wand_semaphore == (SemaphoreInfo *) NULL) ActivateSemaphoreInfo(&wand_semaphore); LockSemaphoreInfo(wand_semaphore); - if ((wand_ids == (SplayTreeInfo *) NULL) && IsMagickFalse(instantiate_wand)) - { - wand_ids=NewSplayTree((int (*)(const void *,const void *)) NULL, - (void *(*)(void *)) NULL,(void *(*)(void *)) NULL); - instantiate_wand=MagickTrue; - } + if (wand_ids == (SplayTreeInfo *) NULL) + wand_ids=NewSplayTree((int (*)(const void *,const void *)) NULL, + (void *(*)(void *)) NULL,(void *(*)(void *)) NULL); id++; (void) AddValueToSplayTree(wand_ids,(const void *) id,(const void *) id); + instantiate_wand=MagickTrue; UnlockSemaphoreInfo(wand_semaphore); return(id); } diff --git a/coders/msl.c b/coders/msl.c index af7837927..f8ad33dcc 100644 --- a/coders/msl.c +++ b/coders/msl.c @@ -570,7 +570,7 @@ static void MSLPushImage(MSLInfo *msl_info,Image *image) (msl_info->draw_info == (DrawInfo **) NULL) || (msl_info->attributes == (Image **) NULL) || (msl_info->image == (Image **) NULL)) - ThrowMSLException(ResourceLimitFatalError,"MemoryAllocationFailed","msl"); + ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed") msl_info->image_info[n]=CloneImageInfo(msl_info->image_info[n-1]); msl_info->draw_info[n]=CloneDrawInfo(msl_info->image_info[n-1], msl_info->draw_info[n-1]); @@ -583,7 +583,7 @@ static void MSLPushImage(MSLInfo *msl_info,Image *image) msl_info->image[n]=(Image *) image; if ((msl_info->image_info[n] == (ImageInfo *) NULL) || (msl_info->attributes[n] == (Image *) NULL)) - ThrowMSLException(ResourceLimitFatalError,"MemoryAllocationFailed","msl"); + ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed") if (msl_info->number_groups != 0) msl_info->group_info[msl_info->number_groups-1].numImages++; } -- 2.50.1