(no commit message)

diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h
index 4754068872be0d74fe8ae4018fdd7171408860fd..2ef7892ef4821f7504a7c206c3d2ef71e24eaff6 100644 (file)
--- a/MagickCore/magick-baseconfig.h
+++ b/MagickCore/magick-baseconfig.h
@@ -1047,9 +1047,7 @@
 /* #undef HAVE__ALIGNED_MALLOC */
 
 /* Define to 1 if the system has the type `_Bool'. */
-#ifndef MAGICKCORE_HAVE__BOOL
-#define MAGICKCORE_HAVE__BOOL 1
-#endif
+/* #undef HAVE__BOOL */
 
 /* Define to 1 if you have the `_exit' function. */
 #ifndef MAGICKCORE_HAVE__EXIT

diff --git a/MagickCore/version.h b/MagickCore/version.h
index dfa27c014de23ae6e2a4359ff47b0b634903ee04..6477a8b4245af35673039902d7d0941ff176008b 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -48,7 +48,7 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  1
 #define MagickppLibMinInterface  1
-#define MagickReleaseDate  "2014-12-21"
+#define MagickReleaseDate  "2014-12-22"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index 82e0fe3f780a2bc93d74f6ad92bba514a8346d0f..843fc20ed8e663672fa3ed1fc1048961400a563f 100644 (file)
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -206,7 +206,7 @@ WriteMakefile
    'INC'       => $INC_magick,
 
    # C compiler
-   #'CC' => 'gcc -std=gnu99 -std=gnu99',
+   #'CC' => 'g++',
 
    # C pre-processor flags (e.g. -I & -D options)
    # 'CPPFLAGS' => "$Config{'cppflags'} -pthread -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/libdrm -I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/libpng16 -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -I/usr/include/libxml2",
@@ -215,7 +215,7 @@ WriteMakefile
    'CCFLAGS' => $CCFLAGS_magick,
 
    # Linker
-   #'LD' => $Config{'ld'} == $Config{'cc'} ? 'gcc -std=gnu99 -std=gnu99' : $Config{'ld'},
+   #'LD' => $Config{'ld'} == $Config{'cc'} ? 'g++' : $Config{'ld'},
 
    # Linker flags for building an executable
    'LDFLAGS' =>  $LDFLAGS_magick,

diff --git a/PerlMagick/check.sh b/PerlMagick/check.sh
index 6257e46df98f3a4064f12a4b2099ae639447f761..afea61f9bccb1b0b901d65d618bfcc6fc4f3278f 100755 (executable)
--- a/PerlMagick/check.sh
+++ b/PerlMagick/check.sh
@@ -42,10 +42,10 @@ fi
 
 if test -x PerlMagick -a -f Makefile.aperl ; then
   # Static build test incantation
-  ${MAKE} -f Makefile.aperl CC='gcc -std=gnu99 -std=gnu99' TEST_VERBOSE=1 test
+  ${MAKE} -f Makefile.aperl CC='g++' TEST_VERBOSE=1 test
 elif test -f Makefile -a -f Magick.o; then
   # Shared build test incantation
-  ${MAKE} CC='gcc -std=gnu99 -std=gnu99' TEST_VERBOSE=1 test
+  ${MAKE} CC='g++' TEST_VERBOSE=1 test
 else
   echo 'PerlMagick has not been built!'
   exit 1

diff --git a/coders/dds.c b/coders/dds.c
index 006b201a4c30f9de8d1884eb20deb98d5bb19512..26b76c6f44a4b33d35db48f8aeb816e33c6f4cdd 100644 (file)
--- a/coders/dds.c
+++ b/coders/dds.c
@@ -1269,13 +1269,13 @@ static void CompressClusterFit(const size_t count,
 
   o = order + (16*bestIteration);
 
-  for (i=0; i < besti; i++)
+  for (i=0; i < (ssize_t) besti; i++)
     unordered[o[i]] = 0;
-  for (i=besti; i < bestj; i++)
+  for (i=besti; i < (ssize_t) bestj; i++)
     unordered[o[i]] = 2;
-  for (i=bestj; i < bestk; i++)
+  for (i=bestj; i < (ssize_t) bestk; i++)
     unordered[o[i]] = 3;
-  for (i=bestk; i < count; i++)
+  for (i=bestk; i < (ssize_t) count; i++)
     unordered[o[i]] = 1;
 
   RemapIndices(map,unordered,indices);