From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 5 Oct 2014 19:22:25 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1922
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02bcb987d673414e54bdeec2e4779b269e5d2a55;p=imagemagick

---

diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h
index f73bde06a..bbde8db36 100644
--- a/MagickCore/magick-baseconfig.h
+++ b/MagickCore/magick-baseconfig.h
@@ -1047,7 +1047,9 @@
 /* #undef HAVE__ALIGNED_MALLOC */
 
 /* Define to 1 if the system has the type `_Bool'. */
-/* #undef HAVE__BOOL */
+#ifndef MAGICKCORE_HAVE__BOOL
+#define MAGICKCORE_HAVE__BOOL 1
+#endif
 
 /* Define to 1 if you have the `_exit' function. */
 #ifndef MAGICKCORE_HAVE__EXIT
diff --git a/MagickCore/profile.c b/MagickCore/profile.c
index 400f4fd3b..ef1a570fd 100644
--- a/MagickCore/profile.c
+++ b/MagickCore/profile.c
@@ -1885,13 +1885,13 @@ static MagickBooleanType Sync8BimProfile(Image *image,StringInfo *profile)
       return(MagickFalse);
     id=ReadProfileMSBShort(&p,&length);
     count=(ssize_t) ReadProfileByte(&p,&length);
-    if (count > length)
+    if (count > (ssize_t) length)
       return(MagickFalse);
     p+=count;
     if ((*p & 0x01) == 0)
       (void) ReadProfileByte(&p,&length);
     count=(ssize_t) ReadProfileMSBLong(&p,&length);
-    if (count > length)
+    if (count > (ssize_t) length)
       return(MagickFalse);
     if ((id == 0x3ED) && (count == 16))
       {
diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL
index 2b947191d..3b25a53a2 100644
--- a/PerlMagick/Makefile.PL
+++ b/PerlMagick/Makefile.PL
@@ -206,7 +206,7 @@ WriteMakefile
    'INC'	=> $INC_magick,
 
    # C compiler
-   #'CC' => 'g++',
+   #'CC' => 'gcc -std=gnu99 -std=gnu99',
 
    # 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/libdrm -I/usr/include/libpng16 -I/usr/include/freetype2 -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'} ? 'g++' : $Config{'ld'},
+   #'LD' => $Config{'ld'} == $Config{'cc'} ? 'gcc -std=gnu99 -std=gnu99' : $Config{'ld'},
 
    # Linker flags for building an executable
    'LDFLAGS' =>  $LDFLAGS_magick,
diff --git a/PerlMagick/check.sh b/PerlMagick/check.sh
index 5a4b3fc78..4edd1f613 100755
--- 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='g++' TEST_VERBOSE=1 test
+  ${MAKE} -f Makefile.aperl CC='gcc -std=gnu99 -std=gnu99' TEST_VERBOSE=1 test
 elif test -f Makefile -a -f Magick.o; then
   # Shared build test incantation
-  ${MAKE} CC='g++' TEST_VERBOSE=1 test
+  ${MAKE} CC='gcc -std=gnu99 -std=gnu99' TEST_VERBOSE=1 test
 else
   echo 'PerlMagick has not been built!'
   exit 1
diff --git a/coders/sixel.c b/coders/sixel.c
index ea5a6b21c..62d50aaee 100644
--- a/coders/sixel.c
+++ b/coders/sixel.c
@@ -553,7 +553,7 @@ MagickBooleanType sixel_decode(unsigned char              /* in */  *p,
     *pheight = imsy;
     *ncolors = max_color_index + 1;
     *palette = (unsigned char *) AcquireQuantumMemory(*ncolors,4);
-    for (n = 0; n < *ncolors; ++n) {
+    for (n = 0; n < (ssize_t) *ncolors; ++n) {
         (*palette)[n * 4 + 0] = sixel_palet[n] >> 16 & 0xff;
         (*palette)[n * 4 + 1] = sixel_palet[n] >> 8 & 0xff;
         (*palette)[n * 4 + 2] = sixel_palet[n] & 0xff;
@@ -722,7 +722,7 @@ static MagickBooleanType sixel_encode_impl(unsigned char *pixels, int width,int
         return (MagickFalse);
     }
     (void) ResetMagickMemory(map, 0, len);
-    for (n = 0; n < ncolors; n++) {
+    for (n = 0; n < (ssize_t) ncolors; n++) {
         context->conv_palette[n] = n;
     }