(no commit message)

diff --git a/coders/histogram.c b/coders/histogram.c
index ceb8976c9ae1a379d4ab16a8439b8e15c456f918..b13073451ef797e3d559264c67e6c4c64b55d92b 100644 (file)
--- a/coders/histogram.c
+++ b/coders/histogram.c
@@ -177,7 +177,7 @@ static inline size_t MagickMax(const size_t x,const size_t y)
 static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info,
   Image *image)
 {
-#define HistogramDensity  "256x100"
+#define HistogramDensity  "256x200"
 
   ChannelType
     channel;
@@ -197,9 +197,6 @@ static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info,
   ImageInfo
     *write_info;
 
-  ssize_t
-    y;
-
   MagickBooleanType
     status;
 
@@ -216,16 +213,19 @@ static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info,
   register const PixelPacket
     *p;
 
-  register ssize_t
-    x;
-
   register PixelPacket
     *q,
     *r;
 
+  register ssize_t
+    x;
+
   size_t
     length;
 
+  ssize_t
+    y;
+
   /*
     Allocate histogram image.
   */

diff --git a/magick/enhance.c b/magick/enhance.c
index fc155a3673f77ef3251a7c7b3a40fa419581aac2..0a23a47bbc8ae7aec7603ccd4ddc6f36ed64cbe4 100644 (file)
--- a/magick/enhance.c
+++ b/magick/enhance.c
@@ -917,7 +917,7 @@ static void Contrast(const int sign,Quantum *red,Quantum *green,Quantum *blue)
   saturation=0.0;
   brightness=0.0;
   ConvertRGBToHSB(*red,*green,*blue,&hue,&saturation,&brightness);
-  brightness+=0.5*sign*(0.5*(sin((double) (MagickPI*(brightness-0.5))+1.0))-
+  brightness+=0.5*sign*(0.5*(sin((double) (MagickPI*(brightness-0.5)))+1.0)-
     brightness);
   if (brightness > 1.0)
     brightness=1.0;