(no commit message)

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index ff2a032e570148ee2c3c3746f0454d21ef90a3b6..9c7fc803b994e49caac91d9f63b3b6d6ed63a537 100644 (file)
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -1659,6 +1659,9 @@ static MagickBooleanType RenderPostscript(Image *image,
   register ssize_t
     i;
 
+  size_t
+    length;
+
   ssize_t
     y;
 
@@ -1695,7 +1698,8 @@ static MagickBooleanType RenderPostscript(Image *image,
     (fabs(draw_info->affine.ry) < MagickEpsilon) ? MagickTrue : MagickFalse;
   extent.x=0.0;
   extent.y=0.0;
-  for (i=0; i <= (ssize_t) (strlen(draw_info->text)+2); i++)
+  length=strlen(draw_info->text);
+  for (i=0; i <= (ssize_t) (length+2); i++)
   {
     point.x=fabs(draw_info->affine.sx*i*draw_info->pointsize+
       draw_info->affine.ry*2.0*draw_info->pointsize);

diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index e1dcc4b2af9947a9480cdfd4389686f4111a2e4e..10d1e410ac08a3e84157d5c1e25c53f6dcd655b6 100644 (file)
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -364,6 +364,9 @@ static void ExportCharPixel(const Image *image,const RectangleInfo *roi,
   register unsigned char
     *restrict q;
 
+  size_t
+    length;
+
   ssize_t
     y;
 
@@ -489,6 +492,7 @@ static void ExportCharPixel(const Image *image,const RectangleInfo *roi,
       }
       return;
     }
+  length=strlen(map);
   for (y=0; y < (ssize_t) roi->height; y++)
   {
     p=GetVirtualPixels(image,roi->x,roi->y+y,roi->width,1,exception);
@@ -499,7 +503,7 @@ static void ExportCharPixel(const Image *image,const RectangleInfo *roi,
       register ssize_t
         i;
 
-      for (i=0; i < (ssize_t) strlen(map); i++)
+      for (i=0; i < (ssize_t) length; i++)
       {
         *q=0;
         switch (quantum_map[i])
@@ -566,6 +570,9 @@ static void ExportDoublePixel(const Image *image,const RectangleInfo *roi,
   register ssize_t
     x;
 
+  size_t
+    length;
+
   ssize_t
     y;
 
@@ -691,6 +698,7 @@ static void ExportDoublePixel(const Image *image,const RectangleInfo *roi,
       }
       return;
     }
+  length=strlen(map);
   for (y=0; y < (ssize_t) roi->height; y++)
   {
     p=GetVirtualPixels(image,roi->x,roi->y+y,roi->width,1,exception);
@@ -701,7 +709,7 @@ static void ExportDoublePixel(const Image *image,const RectangleInfo *roi,
       register ssize_t
         i;
 
-      for (i=0; i < (ssize_t) strlen(map); i++)
+      for (i=0; i < (ssize_t) length; i++)
       {
         *q=0;
         switch (quantum_map[i])
@@ -769,6 +777,9 @@ static void ExportFloatPixel(const Image *image,const RectangleInfo *roi,
   register ssize_t
     x;
 
+  size_t
+    length;
+
   ssize_t
     y;
 
@@ -894,6 +905,7 @@ static void ExportFloatPixel(const Image *image,const RectangleInfo *roi,
       }
       return;
     }
+  length=strlen(map);
   for (y=0; y < (ssize_t) roi->height; y++)
   {
     p=GetVirtualPixels(image,roi->x,roi->y+y,roi->width,1,exception);
@@ -904,7 +916,7 @@ static void ExportFloatPixel(const Image *image,const RectangleInfo *roi,
       register ssize_t
         i;
 
-      for (i=0; i < (ssize_t) strlen(map); i++)
+      for (i=0; i < (ssize_t) length; i++)
       {
         *q=0;
         switch (quantum_map[i])
@@ -971,6 +983,9 @@ static void ExportLongPixel(const Image *image,const RectangleInfo *roi,
   register unsigned int
     *restrict q;
 
+  size_t
+    length;
+
   ssize_t
     y;
 
@@ -1096,6 +1111,7 @@ static void ExportLongPixel(const Image *image,const RectangleInfo *roi,
       }
       return;
     }
+  length=strlen(map);
   for (y=0; y < (ssize_t) roi->height; y++)
   {
     p=GetVirtualPixels(image,roi->x,roi->y+y,roi->width,1,exception);
@@ -1106,7 +1122,7 @@ static void ExportLongPixel(const Image *image,const RectangleInfo *roi,
       register ssize_t
         i;
 
-      for (i=0; i < (ssize_t) strlen(map); i++)
+      for (i=0; i < (ssize_t) length; i++)
       {
         *q=0;
         switch (quantum_map[i])
@@ -1173,6 +1189,9 @@ static void ExportLongLongPixel(const Image *image,const RectangleInfo *roi,
   register MagickSizeType
     *restrict q;
 
+  size_t
+    length;
+
   ssize_t
     y;
 
@@ -1298,6 +1317,7 @@ static void ExportLongLongPixel(const Image *image,const RectangleInfo *roi,
       }
       return;
     }
+  length=strlen(map);
   for (y=0; y < (ssize_t) roi->height; y++)
   {
     p=GetVirtualPixels(image,roi->x,roi->y+y,roi->width,1,exception);
@@ -1308,7 +1328,7 @@ static void ExportLongLongPixel(const Image *image,const RectangleInfo *roi,
       register ssize_t
         i;
 
-      for (i=0; i < (ssize_t) strlen(map); i++)
+      for (i=0; i < (ssize_t) length; i++)
       {
         *q=0;
         switch (quantum_map[i])
@@ -1375,6 +1395,9 @@ static void ExportQuantumPixel(const Image *image,const RectangleInfo *roi,
   register ssize_t
     x;
 
+  size_t
+    length;
+
   ssize_t
     y;
 
@@ -1500,6 +1523,7 @@ static void ExportQuantumPixel(const Image *image,const RectangleInfo *roi,
       }
       return;
     }
+  length=strlen(map);
   for (y=0; y < (ssize_t) roi->height; y++)
   {
     p=GetVirtualPixels(image,roi->x,roi->y+y,roi->width,1,exception);
@@ -1510,7 +1534,7 @@ static void ExportQuantumPixel(const Image *image,const RectangleInfo *roi,
       register ssize_t
         i;
 
-      for (i=0; i < (ssize_t) strlen(map); i++)
+      for (i=0; i < (ssize_t) length; i++)
       {
         *q=(Quantum) 0;
         switch (quantum_map[i])
@@ -1577,12 +1601,15 @@ static void ExportShortPixel(const Image *image,const RectangleInfo *roi,
   register ssize_t
     x;
 
-  ssize_t
-    y;
-
   register unsigned short
     *restrict q;
 
+  size_t
+    length;
+
+  ssize_t
+    y;
+
   q=(unsigned short *) pixels;
   if (LocaleCompare(map,"BGR") == 0)
     {
@@ -1705,6 +1732,7 @@ static void ExportShortPixel(const Image *image,const RectangleInfo *roi,
       }
       return;
     }
+  length=strlen(map);
   for (y=0; y < (ssize_t) roi->height; y++)
   {
     p=GetVirtualPixels(image,roi->x,roi->y+y,roi->width,1,exception);
@@ -1715,7 +1743,7 @@ static void ExportShortPixel(const Image *image,const RectangleInfo *roi,
       register ssize_t
         i;
 
-      for (i=0; i < (ssize_t) strlen(map); i++)
+      for (i=0; i < (ssize_t) length; i++)
       {
         *q=0;
         switch (quantum_map[i])
@@ -1782,19 +1810,22 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
   register ssize_t
     i;
 
+  size_t
+    length;
+
   assert(image != (Image *) NULL);
   assert(image->signature == MagickSignature);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
-  quantum_map=(QuantumType *) AcquireQuantumMemory(strlen(map),
-    sizeof(*quantum_map));
+  length=strlen(map);
+  quantum_map=(QuantumType *) AcquireQuantumMemory(length,sizeof(*quantum_map));
   if (quantum_map == (QuantumType *) NULL)
     {
       (void) ThrowMagickException(exception,GetMagickModule(),
         ResourceLimitError,"MemoryAllocationFailed","'%s'",image->filename);
       return(MagickFalse);
     }
-  for (i=0; i < (ssize_t) strlen(map); i++)
+  for (i=0; i < (ssize_t) length; i++)
   {
     switch (map[i])
     {
@@ -2061,6 +2092,9 @@ static void ImportCharPixel(Image *image,const RectangleInfo *roi,
   register ssize_t
     x;
 
+  size_t
+    length;
+
   ssize_t
     y;
 
@@ -2240,6 +2274,7 @@ static void ImportCharPixel(Image *image,const RectangleInfo *roi,
       }
       return;
     }
+  length=strlen(map);
   for (y=0; y < (ssize_t) roi->height; y++)
   {
     q=GetAuthenticPixels(image,roi->x,roi->y+y,roi->width,1,exception);
@@ -2250,7 +2285,7 @@ static void ImportCharPixel(Image *image,const RectangleInfo *roi,
       register ssize_t
         i;
 
-      for (i=0; i < (ssize_t) strlen(map); i++)
+      for (i=0; i < (ssize_t) length; i++)
       {
         switch (quantum_map[i])
         {
@@ -2317,6 +2352,9 @@ static void ImportDoublePixel(Image *image,const RectangleInfo *roi,
   register ssize_t
     x;
 
+  size_t
+    length;
+
   ssize_t
     y;
 
@@ -2497,6 +2535,7 @@ static void ImportDoublePixel(Image *image,const RectangleInfo *roi,
       }
       return;
     }
+   length=strlen(map);
   for (y=0; y < (ssize_t) roi->height; y++)
   {
     q=GetAuthenticPixels(image,roi->x,roi->y+y,roi->width,1,exception);
@@ -2507,7 +2546,7 @@ static void ImportDoublePixel(Image *image,const RectangleInfo *roi,
       register ssize_t
         i;
 
-      for (i=0; i < (ssize_t) strlen(map); i++)
+      for (i=0; i < (ssize_t) length; i++)
       {
         switch (quantum_map[i])
         {
@@ -2581,6 +2620,9 @@ static void ImportFloatPixel(Image *image,const RectangleInfo *roi,
   register ssize_t
     x;
 
+  size_t
+    length;
+
   ssize_t
     y;
 
@@ -2761,6 +2803,7 @@ static void ImportFloatPixel(Image *image,const RectangleInfo *roi,
       }
       return;
     }
+  length=strlen(map);
   for (y=0; y < (ssize_t) roi->height; y++)
   {
     q=GetAuthenticPixels(image,roi->x,roi->y+y,roi->width,1,exception);
@@ -2771,7 +2814,7 @@ static void ImportFloatPixel(Image *image,const RectangleInfo *roi,
       register ssize_t
         i;
 
-      for (i=0; i < (ssize_t) strlen(map); i++)
+      for (i=0; i < (ssize_t) length; i++)
       {
         switch (quantum_map[i])
         {
@@ -2845,6 +2888,9 @@ static void ImportLongPixel(Image *image,const RectangleInfo *roi,
   register ssize_t
     x;
 
+  size_t
+    length;
+
   ssize_t
     y;
 
@@ -2984,6 +3030,7 @@ static void ImportLongPixel(Image *image,const RectangleInfo *roi,
       }
       return;
     }
+  length=strlen(map);
   for (y=0; y < (ssize_t) roi->height; y++)
   {
     q=GetAuthenticPixels(image,roi->x,roi->y+y,roi->width,1,exception);
@@ -2994,7 +3041,7 @@ static void ImportLongPixel(Image *image,const RectangleInfo *roi,
       register ssize_t
         i;
 
-      for (i=0; i < (ssize_t) strlen(map); i++)
+      for (i=0; i < (ssize_t) length; i++)
       {
         switch (quantum_map[i])
         {
@@ -3061,6 +3108,9 @@ static void ImportLongLongPixel(Image *image,const RectangleInfo *roi,
   register ssize_t
     x;
 
+  size_t
+    length;
+
   ssize_t
     y;
 
@@ -3200,6 +3250,7 @@ static void ImportLongLongPixel(Image *image,const RectangleInfo *roi,
       }
       return;
     }
+  length=strlen(map);
   for (y=0; y < (ssize_t) roi->height; y++)
   {
     q=GetAuthenticPixels(image,roi->x,roi->y+y,roi->width,1,exception);
@@ -3210,7 +3261,7 @@ static void ImportLongLongPixel(Image *image,const RectangleInfo *roi,
       register ssize_t
         i;
 
-      for (i=0; i < (ssize_t) strlen(map); i++)
+      for (i=0; i < (ssize_t) length; i++)
       {
         switch (quantum_map[i])
         {
@@ -3277,6 +3328,9 @@ static void ImportQuantumPixel(Image *image,const RectangleInfo *roi,
   register ssize_t
     x;
 
+  size_t
+    length;
+
   ssize_t
     y;
 
@@ -3416,6 +3470,7 @@ static void ImportQuantumPixel(Image *image,const RectangleInfo *roi,
       }
       return;
     }
+  length=strlen(map);
   for (y=0; y < (ssize_t) roi->height; y++)
   {
     q=GetAuthenticPixels(image,roi->x,roi->y+y,roi->width,1,exception);
@@ -3426,7 +3481,7 @@ static void ImportQuantumPixel(Image *image,const RectangleInfo *roi,
       register ssize_t
         i;
 
-      for (i=0; i < (ssize_t) strlen(map); i++)
+      for (i=0; i < (ssize_t) length; i++)
       {
         switch (quantum_map[i])
         {
@@ -3493,6 +3548,9 @@ static void ImportShortPixel(Image *image,const RectangleInfo *roi,
   register ssize_t
     x;
 
+  size_t
+    length;
+
   ssize_t
     y;
 
@@ -3632,6 +3690,7 @@ static void ImportShortPixel(Image *image,const RectangleInfo *roi,
       }
       return;
     }
+  length=strlen(map);
   for (y=0; y < (ssize_t) roi->height; y++)
   {
     q=GetAuthenticPixels(image,roi->x,roi->y+y,roi->width,1,exception);
@@ -3642,7 +3701,7 @@ static void ImportShortPixel(Image *image,const RectangleInfo *roi,
       register ssize_t
         i;
 
-      for (i=0; i < (ssize_t) strlen(map); i++)
+      for (i=0; i < (ssize_t) length; i++)
       {
         switch (quantum_map[i])
         {
@@ -3709,6 +3768,9 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,const ssize_t x,
   register ssize_t
     i;
 
+  size_t
+    length;
+
   /*
     Allocate image structure.
   */
@@ -3716,12 +3778,12 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,const ssize_t x,
   assert(image->signature == MagickSignature);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
-  quantum_map=(QuantumType *) AcquireQuantumMemory(strlen(map),
-    sizeof(*quantum_map));
+  length=strlen(map);
+  quantum_map=(QuantumType *) AcquireQuantumMemory(length,sizeof(*quantum_map));
   if (quantum_map == (QuantumType *) NULL)
     ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
       image->filename);
-  for (i=0; i < (ssize_t) strlen(map); i++)
+  for (i=0; i < (ssize_t) length; i++)
   {
     switch (map[i])
     {