(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 5dfbf6a70756dd2b8055dbd456b1548ff6559756..58d1b47cd1c68de6c39a53e7af466beaeaf49615 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
     http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=18132).
   * Avoid seg fault in AppendImages() when one image is in the RGB colorspace
     but the other is in the CMYK colorspace.
+  * Get rid of ''respect_parenthesis' defined but not used warnings (reference
+    http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=18173).
 
 2011-02-22  6.6.7-10 Glenn Randers-Pehrson <glennrp@image...>
   * Write sub-8-bit grayscale PNG images as palette-indexed PNG images.  This

diff --git a/magick/random.c b/magick/random.c
index fe174f727b34db5149d51d078bf7c64c644e0efe..62127dc7a8cc60c347d41e7d40ab472b653ecb37 100644 (file)
--- a/magick/random.c
+++ b/magick/random.c
@@ -596,16 +596,16 @@ static StringInfo *GenerateEntropicChaos(RandomInfo *random_info)
 */
 MagickExport double GetPseudoRandomValue(RandomInfo *random_info)
 {
-  register size_t
+  register unsigned long
     *seed;
 
-  size_t
+  unsigned long
     alpha;
 
   seed=random_info->seed;
   do
   {
-    alpha=(size_t) (seed[1] ^ (seed[1] << 11));
+    alpha=(unsigned long) (seed[1] ^ (seed[1] << 11));
     seed[1]=seed[2];
     seed[2]=seed[3];
     seed[3]=seed[0];
@@ -749,7 +749,7 @@ MagickExport void RandomComponentTerminus(void)
 %
 %  The format of the SeedPseudoRandomGenerator method is:
 %
-%      void SeedPseudoRandomGenerator(const size_t seed)
+%      void SeedPseudoRandomGenerator(const unsigned long seed)
 %
 %  A description of each parameter follows:
 %

diff --git a/magick/random_.h b/magick/random_.h
index ddc5d3bd1b2b870d8e78c84a390bc0afe1dbe3a5..7af29382b3d7a546b916063be9654e03d56222d8 100644 (file)
--- a/magick/random_.h
+++ b/magick/random_.h
@@ -49,7 +49,7 @@ extern MagickExport StringInfo
 
 extern MagickExport void
   RandomComponentTerminus(void),
-  SeedPseudoRandomGenerator(const size_t),
+  SeedPseudoRandomGenerator(const unsigned long),
   SetRandomKey(RandomInfo *,const size_t,unsigned char *),
   SetRandomTrueRandom(const MagickBooleanType);
 

diff --git a/wand/animate.c b/wand/animate.c
index 8f4114a8c7175ea1b32e789ff9e1b3efd54fb681..d6a130996b14d0fc4602264b604c0e5aa30f375d 100644 (file)
--- a/wand/animate.c
+++ b/wand/animate.c
@@ -276,7 +276,8 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
 
   MagickBooleanType
     fire,
-    pend;
+    pend,
+    respect_parenthesis;
 
   MagickStatusType
     status;
@@ -326,6 +327,7 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
   NewImageStack();
   option=(char *) NULL;
   pend=MagickFalse;
+  respect_parenthesis=MagickFalse;
   resource_database=(XrmDatabase) NULL;
   (void) ResetMagickMemory(&resource_info,0,sizeof(XResourceInfo));
   server_name=(char *) NULL;

diff --git a/wand/compare.c b/wand/compare.c
index 623f7666bebd7fff192ea88d85d5fae48492eaa9..b33fcd3b711102c45ff9ee06c8540145891a0179 100644 (file)
--- a/wand/compare.c
+++ b/wand/compare.c
@@ -229,6 +229,7 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
   MagickBooleanType
     fire,
     pend,
+    respect_parenthesis,
     subimage_search;
 
   MagickStatusType
@@ -283,6 +284,7 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
   option=(char *) NULL;
   pend=MagickFalse;
   reconstruct_image=NewImageList();
+  respect_parenthesis=MagickFalse;
   status=MagickTrue;
   subimage_search=MagickFalse;
   /*

diff --git a/wand/composite.c b/wand/composite.c
index 61da2488e4d0f1210dae6ce912a353bf7189100f..cdfd31cf3144eac6b28db5af44a0a4d8a5db62f4 100644 (file)
--- a/wand/composite.c
+++ b/wand/composite.c
@@ -427,7 +427,8 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
 
   MagickBooleanType
     fire,
-    pend;
+    pend,
+    respect_parenthesis;
 
   MagickStatusType
     status;
@@ -470,6 +471,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
   NewImageStack();
   option=(char *) NULL;
   pend=MagickFalse;
+  respect_parenthesis=MagickFalse;
   status=MagickTrue;
   /*
     Check command syntax.

diff --git a/wand/conjure.c b/wand/conjure.c
index ad9fa145865c31203b979a1d6031ea754e83e9c3..dd7a962990befb4d378a6017a2e7d9bee3cda546 100644 (file)
--- a/wand/conjure.c
+++ b/wand/conjure.c
@@ -182,7 +182,6 @@ WandExport MagickBooleanType ConjureImageCommand(ImageInfo *image_info,
   image=NewImageList();
   number_images=0;
   option=(char *) NULL;
-  (void) respect_parenthesis;
   /*
     Conjure an image.
   */

diff --git a/wand/convert.c b/wand/convert.c
index dda2c980cb8b1488b8e31dbf393ef8646098d0a5..ec93818b94b19532880c7573ca6b0c749ca5fbf7 100644 (file)
--- a/wand/convert.c
+++ b/wand/convert.c
@@ -495,7 +495,8 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
 
   MagickBooleanType
     fire,
-    pend;
+    pend,
+    respect_parenthesis;
 
   MagickStatusType
     status;
@@ -533,6 +534,7 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
   NewImageStack();
   option=(char *) NULL;
   pend=MagickFalse;
+  respect_parenthesis=MagickFalse;
   status=MagickTrue;
   /*
     Parse command-line arguments.

diff --git a/wand/display.c b/wand/display.c
index 61a8596aa9227f82c92cd9d7eae64cd06f2f159e..aeb3f290a2fd66292fe79f8fe8b37b3fbcf21a18 100644 (file)
--- a/wand/display.c
+++ b/wand/display.c
@@ -320,10 +320,11 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
     l;
 
   MagickBooleanType
-    fire;
+    fire,
+    pend,
+    respect_parenthesis;
 
   MagickStatusType
-    pend,
     status;
 
   QuantizeInfo
@@ -375,6 +376,7 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
   NewImageStack();
   option=(char *) NULL;
   pend=MagickFalse;
+  respect_parenthesis=MagickFalse;
   resource_database=(XrmDatabase) NULL;
   (void) ResetMagickMemory(&resource_info,0,sizeof(resource_info));
   server_name=(char *) NULL;

diff --git a/wand/identify.c b/wand/identify.c
index 97fd3fae93f37b0f25acfc6a1704599c072e5c60..6f3d5f849eceff2421099b7633bfa7f455f15e6b 100644 (file)
--- a/wand/identify.c
+++ b/wand/identify.c
@@ -217,7 +217,8 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
 
   MagickBooleanType
     fire,
-    pend;
+    pend,
+    respect_parenthesis;
 
   MagickStatusType
     status;
@@ -258,6 +259,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
   NewImageStack();
   option=(char *) NULL;
   pend=MagickFalse;
+  respect_parenthesis=MagickFalse;
   status=MagickTrue;
   /*
     Identify an image.

diff --git a/wand/import.c b/wand/import.c
index 17cd35ce0be7e6746b3ea74d5d19f7043e06da0f..092c798ee8318ad5969b7440e2a0b8825776e65c 100644 (file)
--- a/wand/import.c
+++ b/wand/import.c
@@ -274,7 +274,8 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
 
   MagickBooleanType
     fire,
-    pend;
+    pend,
+    respect_parenthesis;
 
   MagickStatusType
     status;
@@ -322,6 +323,7 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
   option=(char *) NULL;
   pend=MagickFalse;
   resource_database=(XrmDatabase) NULL;
+  respect_parenthesis=MagickFalse;
   (void) ResetMagickMemory(&resource_info,0,sizeof(resource_info));
   server_name=(char *) NULL;
   status=MagickTrue;

diff --git a/wand/mogrify-private.h b/wand/mogrify-private.h
index fa25c1a05aee75ccbfcba143b2f870103ed06c40..03e1ba07da92702e7fbd5dc8c12eb1473bb5a58b 100644 (file)
--- a/wand/mogrify-private.h
+++ b/wand/mogrify-private.h
@@ -122,9 +122,6 @@ typedef struct _ImageStack
     *image;
 } ImageStack;
 
-static MagickBooleanType
-  respect_parenthesis = MagickFalse;
-
 static inline MagickRealType MagickPixelIntensity(
   const MagickPixelPacket *pixel)
 {

diff --git a/wand/mogrify.c b/wand/mogrify.c
index ba70b746fc0c727f13ef7a5a32f7b35156dcb6b6..9084b82048688a26649ee03f6d313dc65d0f2731 100644 (file)
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -596,10 +596,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
   ImageInfo
     *mogrify_info;
 
-  ssize_t
-    count;
-
-  MagickBooleanType
+  MagickStatusType
     status;
 
   MagickPixelPacket
@@ -618,6 +615,9 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
   register ssize_t
     i;
 
+  ssize_t
+    count;
+
   /*
     Initialize method variables.
   */
@@ -2724,11 +2724,6 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
             *image=resize_image;
             break;
           }
-        if (LocaleNCompare("respect-parentheses",option+1,17) == 0)
-          {
-            respect_parenthesis=(*option == '-') ? MagickTrue : MagickFalse;
-            break;
-          }
         if (LocaleCompare("roll",option+1) == 0)
           {
             Image
@@ -3974,23 +3969,24 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
   ImageStack
     image_stack[MaxImageStackDepth+1];
 
-  ssize_t
-    j,
-    k;
-
-  register ssize_t
-    i;
-
   MagickBooleanType
     global_colormap;
 
   MagickBooleanType
     fire,
-    pend;
+    pend,
+    respect_parenthesis;
 
   MagickStatusType
     status;
 
+  register ssize_t
+    i;
+
+  ssize_t
+    j,
+    k;
+
   /*
     Set defaults.
   */
@@ -4022,6 +4018,7 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
   NewImageStack();
   option=(char *) NULL;
   pend=MagickFalse;
+  respect_parenthesis=MagickFalse;
   status=MagickTrue;
   /*
     Parse command line.
@@ -5760,6 +5757,11 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
               ThrowMogrifyInvalidArgumentException(option,argv[i]);
             break;
           }
+        if (LocaleNCompare("respect-parentheses",option+1,17) == 0)
+          {
+            respect_parenthesis=(*option == '-') ? MagickTrue : MagickFalse;
+            break;
+          }
         if (LocaleCompare("reverse",option+1) == 0)
           break;
         if (LocaleCompare("roll",option+1) == 0)

diff --git a/wand/montage.c b/wand/montage.c
index b362ecc22347f7586dc2c7bcf59c5caa1ab585c9..5b4e418c29f97703f743e0851878b741b35367e5 100644 (file)
--- a/wand/montage.c
+++ b/wand/montage.c
@@ -306,7 +306,8 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
 
   MagickBooleanType
     fire,
-    pend;
+    pend,
+    respect_parenthesis;
 
   MagickStatusType
     status;
@@ -350,6 +351,7 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
   NewImageStack();
   option=(char *) NULL;
   pend=MagickFalse;
+  respect_parenthesis=MagickFalse;
   scene=0;
   status=MagickFalse;
   transparent_color=(char *) NULL;

diff --git a/wand/stream.c b/wand/stream.c
index ead2f7af192bca78f2404c51a0ce9e53e687e585..194b810dbbc7d5acb0438f3d5544875327c175e4 100644 (file)
--- a/wand/stream.c
+++ b/wand/stream.c
@@ -204,7 +204,8 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
 
   MagickBooleanType
     fire,
-    pend;
+    pend,
+    respect_parenthesis;
 
   MagickStatusType
     status;
@@ -246,6 +247,7 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
   NewImageStack();
   option=(char *) NULL;
   pend=MagickFalse;
+  respect_parenthesis=MagickFalse;
   stream_info=AcquireStreamInfo(image_info);
   status=MagickTrue;
   /*