From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 1 Dec 2010 01:00:50 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~8432
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=32c2aeaecd0abcb91039f999f270ca8ce439abd0;p=imagemagick

---

diff --git a/wand/composite.c b/wand/composite.c
index ee42e2472..ff34cbaa8 100644
--- a/wand/composite.c
+++ b/wand/composite.c
@@ -1387,7 +1387,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
               ThrowCompositeException(OptionError,"MissingArgument",option);
             if (IsGeometry(argv[i]) == MagickFalse)
               ThrowCompositeInvalidArgumentException(option,argv[i]);
-            composite_options.stegano=StringToLong(argv[i])+1;
+            composite_options.stegano=(ssize_t) StringToLong(argv[i])+1;
             break;
           }
         if (LocaleCompare("stereo",option+1) == 0)
diff --git a/wand/drawtest.c b/wand/drawtest.c
index a7cf55708..274e877eb 100644
--- a/wand/drawtest.c
+++ b/wand/drawtest.c
@@ -74,8 +74,8 @@ static MagickBooleanType ScribbleImage (MagickWand *canvas)
   color=NewPixelWand();
   (void) PushDrawingWand(picasso);
   {
-    DrawSetViewbox(picasso,0,0,MagickGetImageWidth(canvas),
-      MagickGetImageHeight(canvas));
+    DrawSetViewbox(picasso,0,0,(ssize_t) MagickGetImageWidth(canvas),
+      (ssize_t) MagickGetImageHeight(canvas));
     DrawScale(picasso,1.101,1.08);
     DrawTranslate(picasso,-23.69,-22.97);
     DrawRotate(picasso,0);
diff --git a/wand/import.c b/wand/import.c
index 772d40400..196567e2c 100644
--- a/wand/import.c
+++ b/wand/import.c
@@ -1177,7 +1177,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
               ThrowImportException(OptionError,"MissingArgument",option);
             if (IsGeometry(argv[i]) == MagickFalse)
               ThrowImportInvalidArgumentException(option,argv[i]);
-            snapshots=StringToLong(argv[i]);
+            snapshots=(ssize_t) StringToLong(argv[i]);
             break;
           }
         if (LocaleCompare("strip",option+1) == 0)
diff --git a/wand/mogrify.c b/wand/mogrify.c
index d9f9f1acd..f4fc07361 100644
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -1289,7 +1289,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
               Cycle an image colormap.
             */
             (void) SyncImageSettings(mogrify_info,*image);
-            (void) CycleColormapImage(*image,StringToLong(argv[i+1]));
+            (void) CycleColormapImage(*image,(ssize_t) StringToLong(argv[i+1]));
             InheritException(exception,&(*image)->exception);
             break;
           }
@@ -2256,7 +2256,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
             if ((*p == ':') || (*p == ','))
               GetMagickToken(p,&p,token);
             if ((*p != '\0'))
-              iterations=StringToLong(p);
+              iterations=(ssize_t) StringToLong(p);
             kernel=AcquireKernelInfo(argv[i+2]);
             if (kernel == (KernelInfo *) NULL)
               {
@@ -7969,7 +7969,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
 
             index=0;
             if (*option != '+')
-              index=StringToLong(argv[i+1]);
+              index=(ssize_t) StringToLong(argv[i+1]);
             p=RemoveLastImageFromList(images);
             if (p == (Image *) NULL)
               {