(no commit message)

diff --git a/coders/stegano.c b/coders/stegano.c
index ac4f94814b500e485012717964bdc32e5b56f395..2ee6658c04c963e5dc2a5d1d22da45694e3ec1ec 100644 (file)
--- a/coders/stegano.c
+++ b/coders/stegano.c
@@ -111,12 +111,8 @@ static Image *ReadSTEGANOImage(const ImageInfo *image_info,
   ImageInfo
     *read_info;
 
-  ssize_t
-    c,
-    i,
-    j,
-    k,
-    y;
+  int
+    c;
 
   MagickBooleanType
     status;
@@ -127,16 +123,22 @@ static Image *ReadSTEGANOImage(const ImageInfo *image_info,
   register IndexPacket
     *indexes;
 
-  register ssize_t
-    x;
-
   register PixelPacket
     *q;
 
+  register ssize_t
+    x;
+
   size_t
     depth,
     one;
 
+  ssize_t
+    i,
+    j,
+    k,
+    y;
+
   /*
     Initialize Image structure.
   */
@@ -172,14 +174,14 @@ static Image *ReadSTEGANOImage(const ImageInfo *image_info,
   c=0;
   i=0;
   j=0;
-  i=MAGICKCORE_QUANTUM_DEPTH-1;
-  depth=MAGICKCORE_QUANTUM_DEPTH;
+  i=watermark->depth-1;
+  depth=watermark->depth;
   for (k=image->offset; (i >= 0) && (j < (ssize_t) depth); i--)
   {
     for (y=0; (y < (ssize_t) image->rows) && (j < (ssize_t) depth); y++)
     {
       x=0;
-      for (; (x < (ssize_t) image->columns) && (j < (ssize_t) depth); x++)
+      for ( ; (x < (ssize_t) image->columns) && (j < (ssize_t) depth); x++)
       {
         if ((k/(ssize_t) watermark->columns) >= (ssize_t) watermark->rows)
           break;

diff --git a/magick/fx.c b/magick/fx.c
index 1c75b30671f2ece82dc53764b2caef7153d2a85b..e7f58fb6c51a882b3da4a0e76bef44174f1a6990 100644 (file)
--- a/magick/fx.c
+++ b/magick/fx.c
@@ -4528,8 +4528,7 @@ MagickExport MagickBooleanType SolarizeImage(Image *image,
 MagickExport Image *SteganoImage(const Image *image,const Image *watermark,
   ExceptionInfo *exception)
 {
-#define GetBit(alpha,i) ((((size_t) (alpha) >> (size_t) \
-  (i)) & 0x01) != 0)
+#define GetBit(alpha,i) ((((size_t) (alpha) >> (size_t) (i)) & 0x01) != 0)
 #define SetBit(alpha,i,set) (alpha)=(Quantum) ((set) != 0 ? (size_t) (alpha) \
   | (one << (size_t) (i)) : (size_t) (alpha) & ~(one << (size_t) (i)))
 #define SteganoImageTag  "Stegano/Image"
@@ -4540,28 +4539,28 @@ MagickExport Image *SteganoImage(const Image *image,const Image *watermark,
   int
     c;
 
-  ssize_t
-    i,
-    j,
-    k,
-    y;
-
   MagickBooleanType
     status;
 
   PixelPacket
     pixel;
 
-  register ssize_t
-    x;
-
   register PixelPacket
     *q;
 
+  register ssize_t
+    x;
+
   size_t
     depth,
     one;
 
+  ssize_t
+    i,
+    j,
+    k,
+    y;
+
   /*
     Initialize steganographic image attributes.
   */