(no commit message)

diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config
index cca65e9df9c71b8bc67651b3e5bd8c7a32464ec9..f12e86eae3b5453d13f43daa488ff6602d0d2a70 100755 (executable)
--- a/Magick++/bin/Magick++-config
+++ b/Magick++/bin/Magick++-config
@@ -23,7 +23,7 @@ fi
 
 while test $# -gt 0; do
   case "$1" in
-    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+    -*=*) optarg=`echo -n "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
     *) optarg= ;;
   esac
   case $1 in
@@ -31,31 +31,31 @@ while test $# -gt 0; do
       prefix=$optarg
       ;;
     --prefix)
-      echo $prefix
+      echo -n $prefix
       ;;
     --exec-prefix=*)
       exec_prefix=$optarg
       ;;
     --exec-prefix)
-      echo $exec_prefix
+      echo -n $exec_prefix
       ;;
     --version)
-      echo '6.6.5 Q16 '
+      echo -n '6.6.5 Q16 '
       ;;
     --cflags)
-      echo "-I${includedir} -fopenmp"
+      echo -n "-I${includedir} -fopenmp"
       ;;
     --cxxflags)
-      echo '-g -O2 -pthread'
+      echo -n '-g -O2 -pthread'
       ;;
     --cppflags)
-      echo '-I/usr/local/include/ImageMagick'
+      echo -n '-I/usr/local/include/ImageMagick'
       ;;
     --ldflags)
-      echo '-L/usr/local/lib '
+      echo -n '-L/usr/local/lib '
       ;;
     --libs)
-      echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
+      echo -n "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl"
       ;;
     *)
       echo "${usage}" 1>&2

diff --git a/coders/png.c b/coders/png.c
index 5b94062f07f095d480c35328ba5c2df37ae5a15e..0aa7ecebe6c0c1c8442f01f345821b2e6c9d566d 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -6445,7 +6445,7 @@ static MagickBooleanType OptimizePNGColormap(Image *image, IndexPacket *opt_map)
 
       (void) LogMagickEvent(CoderEvent,GetMagickModule(),
           "    i  mark opt_map  (red,green,blue,opacity)");
-      for (i=0; i < image->colors; i++)
+      for (i=0; i < (ssize_t) image->colors; i++)
       {
         (void) LogMagickEvent(CoderEvent,GetMagickModule(),
             "    %d  %d  %d (%d,%d,%d,%d)",
@@ -6478,7 +6478,7 @@ static MagickBooleanType OptimizePNGColormap(Image *image, IndexPacket *opt_map)
       }
       for (i=0; i < new_number_colors; i++)
         image->colormap[i]=colormap[i];
-      for (; i < image->colors; i++)
+      for (; i < (ssize_t) image->colors; i++)
         image->colormap[i]=colormap[0];
     }
 
@@ -7468,7 +7468,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
             "  Setting up bKGD chunk with index=%d",(int) i);
         }
 
-        if (i < number_colors)
+        if (i < (ssize_t) number_colors)
         {
           png_set_bKGD(ping,ping_info,&ping_background);
           if (logging)

diff --git a/config/configure.xml b/config/configure.xml
index 5af303f6e2998f702fe080de20fd81a44ce3946f..c88d640a8416bf51969be0f7e5926f1b668cd273 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x665"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,5,8"/>
-  <configure name="RELEASE_DATE" value="2010-11-09"/>
+  <configure name="RELEASE_DATE" value="2010-11-10"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/magick/version.h b/magick/version.h
index 3ead84a7d4bc6ce1e44ff6675c4949e5a3124774..fc847796f0bc67d31c223f02d3b77172d03c8550 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -33,7 +33,7 @@ extern "C" {
 #define MagickLibAddendum  "-8"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
-#define MagickReleaseDate  "2010-11-09"
+#define MagickReleaseDate  "2010-11-10"
 #define MagickChangeDate   "20101108"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)