(no commit message)

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index af697670067e2cf6f873283c37c80387dd5b8378..1cd1db4c27a7131c7d06817324f0b9418e9632b5 100644 (file)
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -1464,8 +1464,8 @@ MagickExport Image *ConvolveImage(const Image *image,
 */
 
 static void Hull(const ssize_t x_offset,const ssize_t y_offset,
-  const size_t columns,const size_t rows,Quantum *f,Quantum *g,
-  const int polarity)
+  const size_t columns,const size_t rows,const int polarity,Quantum *f,
+  Quantum *g)
 {
   MagickRealType
     v;
@@ -1633,7 +1633,7 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception)
   for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
   {
     PixelChannel
-       channel;
+      channel;
 
     PixelTrait
       despeckle_traits,
@@ -1687,10 +1687,10 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception)
     (void) ResetMagickMemory(buffer,0,length*sizeof(*buffer));
     for (k=0; k < 4; k++)
     {
-      Hull(X[k],Y[k],image->columns,image->rows,pixel,buffer,1);
-      Hull(-X[k],-Y[k],image->columns,image->rows,pixel,buffer,1);
-      Hull(-X[k],-Y[k],image->columns,image->rows,pixel,buffer,-1);
-      Hull(X[k],Y[k],image->columns,image->rows,pixel,buffer,-1);
+      Hull(X[k],Y[k],image->columns,image->rows,1,pixel,buffer);
+      Hull(-X[k],-Y[k],image->columns,image->rows,1,pixel,buffer);
+      Hull(-X[k],-Y[k],image->columns,image->rows,-1,pixel,buffer);
+      Hull(X[k],Y[k],image->columns,image->rows,-1,pixel,buffer);
     }
     j=(ssize_t) image->columns+2;
     for (y=0; y < (ssize_t) image->rows; y++)

diff --git a/MagickCore/utility.c b/MagickCore/utility.c
index a8e4e90039056e8b350fc2fc74a7101dfb6f8811..52ed7921e4fb667d57750da685de10a56ab829ad 100644 (file)
--- a/MagickCore/utility.c
+++ b/MagickCore/utility.c
@@ -1844,7 +1844,7 @@ MagickExport int SystemCommand(const MagickBooleanType asynchronous,
   status=system(shell_command);
 #else
   if ((asynchronous != MagickFalse) ||
-      (strpbrk(shell_command,"&;<>|") == (char *) NULL))
+      (strpbrk(shell_command,"&;<>|") != (char *) NULL))
     status=system(shell_command);
   else
     {

diff --git a/coders/tiff.c b/coders/tiff.c
index 2fd26e3576b3cd0a56539038c43194495b727665..b06a8b83b2af09fd0b6197c7329bb072d1eb7622 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1115,6 +1115,10 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
         TIFFClose(tiff);
         ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
       }
+    quantum_info->endian=LSBEndian;
+    if (endian == FILLORDER_LSB2MSB)
+      quantum_info->endian=MSBEndian;
+    image->endian=quantum_info->endian;
     if (sample_format == SAMPLEFORMAT_UINT)
       status=SetQuantumFormat(image,quantum_info,UnsignedQuantumFormat);
     if (sample_format == SAMPLEFORMAT_INT)
@@ -1690,9 +1694,6 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
       }
     if (image->storage_class == PseudoClass)
       image->depth=GetImageDepth(image,exception);
-    image->endian=MSBEndian;
-    if (endian == FILLORDER_LSB2MSB)
-      image->endian=LSBEndian;
     if ((photometric == PHOTOMETRIC_LOGL) ||
         (photometric == PHOTOMETRIC_MINISBLACK) ||
         (photometric == PHOTOMETRIC_MINISWHITE))