(no commit message)

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index 1966cb6bb96dcc3b652da4600975435da92f6e6a..846537a4a2a2eaa0e95582c6debb15fc020a62c7 100644 (file)
--- 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 36d39b4a3a97f38e21d40c510046999ab45ad02a..e355b2718dbd37768aa8465c33e75e7b7214b3b3 100644 (file)
--- 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 cd61378651f09abffff3a124b6e85515ee8035cc..cdfd8bedc18c114ae2f0ddce8e4f23e0465f8f32 100644 (file)
--- 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 e3536488d371bf2bf139c594539e23a6376ffec3..a1bb9188ee8199b9e02b77a2a60e12c9a3f02ca9 100644 (file)
--- 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 065054ad5ec8f7a530c5a69196af8527c6facf46..197631759201b23688881e87e126056cc8d7651a 100644 (file)
--- 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 af7837927352ce110f58aa46627b52c155b0c4fe..f8ad33dccd64805d4b1808bd1ea4c509fe8710a5 100644 (file)
--- 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++;
 }