From 759ba919e9fe454989454f481f4055fd38b32307 Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 26 Jun 2014 11:59:43 +0000 Subject: [PATCH] --- MagickCore/coder.c | 4 ++-- MagickCore/color.c | 4 ++-- MagickCore/configure.c | 4 ++-- MagickCore/delegate.c | 4 ++-- MagickCore/locale.c | 4 ++-- MagickCore/magic.c | 8 ++++---- MagickCore/magick-baseconfig.h | 4 +--- MagickCore/matrix.c | 4 ++-- MagickCore/mime.c | 4 ++-- MagickCore/policy.c | 10 +++++----- MagickCore/profile.c | 6 +++--- MagickCore/type.c | 4 ++-- MagickCore/version.h | 2 +- PerlMagick/Makefile.PL | 4 ++-- PerlMagick/check.sh | 4 ++-- 15 files changed, 34 insertions(+), 36 deletions(-) diff --git a/MagickCore/coder.c b/MagickCore/coder.c index e42c06821..0ba578b68 100644 --- a/MagickCore/coder.c +++ b/MagickCore/coder.c @@ -789,7 +789,7 @@ static MagickBooleanType LoadCoderCache(SplayTreeInfo *coder_cache, CoderInfo *coder_info; - MagickBooleanType + MagickStatusType status; /* @@ -941,5 +941,5 @@ static MagickBooleanType LoadCoderCache(SplayTreeInfo *coder_cache, } } token=(char *) RelinquishMagickMemory(token); - return(status); + return(status != 0 ? MagickTrue : MagickFalse); } diff --git a/MagickCore/color.c b/MagickCore/color.c index d2fa27635..a63403117 100644 --- a/MagickCore/color.c +++ b/MagickCore/color.c @@ -1939,7 +1939,7 @@ static MagickBooleanType LoadColorCache(LinkedListInfo *color_cache, const char *q; - MagickBooleanType + MagickStatusType status; /* @@ -2106,7 +2106,7 @@ static MagickBooleanType LoadColorCache(LinkedListInfo *color_cache, } } token=(char *) RelinquishMagickMemory(token); - return(status); + return(status != 0 ? MagickTrue : MagickFalse); } /* diff --git a/MagickCore/configure.c b/MagickCore/configure.c index a3f10e3ad..f4b6489a1 100644 --- a/MagickCore/configure.c +++ b/MagickCore/configure.c @@ -1134,7 +1134,7 @@ static MagickBooleanType LoadConfigureCache(LinkedListInfo *configure_cache, const char *q; - MagickBooleanType + MagickStatusType status; /* @@ -1287,5 +1287,5 @@ static MagickBooleanType LoadConfigureCache(LinkedListInfo *configure_cache, } } token=(char *) RelinquishMagickMemory(token); - return(status); + return(status != 0 ? MagickTrue : MagickFalse); } diff --git a/MagickCore/delegate.c b/MagickCore/delegate.c index 25c5348d9..9c7f72205 100644 --- a/MagickCore/delegate.c +++ b/MagickCore/delegate.c @@ -1318,7 +1318,7 @@ static MagickBooleanType LoadDelegateCache(LinkedListInfo *delegate_cache, DelegateInfo *delegate_info; - MagickBooleanType + MagickStatusType status; /* @@ -1534,5 +1534,5 @@ static MagickBooleanType LoadDelegateCache(LinkedListInfo *delegate_cache, } } token=(char *) RelinquishMagickMemory(token); - return(status); + return(status != 0 ? MagickTrue : MagickFalse); } diff --git a/MagickCore/locale.c b/MagickCore/locale.c index c0111e535..8d7ff3327 100644 --- a/MagickCore/locale.c +++ b/MagickCore/locale.c @@ -1176,7 +1176,7 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache, LocaleInfo *locale_info; - MagickBooleanType + MagickStatusType status; register char @@ -1382,7 +1382,7 @@ static MagickBooleanType LoadLocaleCache(SplayTreeInfo *locale_cache, } token=(char *) RelinquishMagickMemory(token); (void) SetFatalErrorHandler(fatal_handler); - return(status); + return(status != 0 ? MagickTrue : MagickFalse); } /* diff --git a/MagickCore/magic.c b/MagickCore/magic.c index 93772aa1a..50cbf346c 100644 --- a/MagickCore/magic.c +++ b/MagickCore/magic.c @@ -764,12 +764,12 @@ static MagickBooleanType LoadMagicCache(LinkedListInfo *magic_cache, const char *q; - MagickBooleanType - status; - MagicInfo *magic_info; + MagickStatusType + status; + /* Load the magic map file. */ @@ -978,7 +978,7 @@ static MagickBooleanType LoadMagicCache(LinkedListInfo *magic_cache, } } token=(char *) RelinquishMagickMemory(token); - return(status); + return(status != 0 ? MagickTrue : MagickFalse); } /* diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h index bbde8db36..f73bde06a 100644 --- 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/matrix.c b/MagickCore/matrix.c index b19dc2eb9..983ccee53 100644 --- a/MagickCore/matrix.c +++ b/MagickCore/matrix.c @@ -737,7 +737,7 @@ MagickExport MagickBooleanType GetMatrixElement(const MatrixInfo *matrix_info, return(MagickTrue); } count=ReadMatrixElements(matrix_info,i*matrix_info->stride, - matrix_info->stride,value); + matrix_info->stride,(unsigned char *) value); if (count != (MagickOffsetType) matrix_info->stride) return(MagickFalse); return(MagickTrue); @@ -1144,7 +1144,7 @@ MagickExport MagickBooleanType SetMatrixElement(const MatrixInfo *matrix_info, return(MagickTrue); } count=WriteMatrixElements(matrix_info,i*matrix_info->stride, - matrix_info->stride,value); + matrix_info->stride,(unsigned char *) value); if (count != (MagickOffsetType) matrix_info->stride) return(MagickFalse); return(MagickTrue); diff --git a/MagickCore/mime.c b/MagickCore/mime.c index 25a71830b..39dc767ec 100644 --- a/MagickCore/mime.c +++ b/MagickCore/mime.c @@ -800,7 +800,7 @@ static MagickBooleanType LoadMimeCache(LinkedListInfo *mime_cache, MimeInfo *mime_info = (MimeInfo *) NULL; - MagickBooleanType + MagickStatusType status; XMLTreeInfo @@ -971,7 +971,7 @@ static MagickBooleanType LoadMimeCache(LinkedListInfo *mime_cache, mime=GetNextXMLTreeTag(mime); } mime_map=DestroyXMLTree(mime_map); - return(status); + return(status != 0 ? MagickTrue : MagickFalse); } /* diff --git a/MagickCore/policy.c b/MagickCore/policy.c index f190e49df..5383aa7d9 100644 --- a/MagickCore/policy.c +++ b/MagickCore/policy.c @@ -739,15 +739,15 @@ static MagickBooleanType LoadPolicyCache(LinkedListInfo *policy_cache, keyword[MaxTextExtent], *token; - PolicyInfo - *policy_info; - const char *q; - MagickBooleanType + MagickStatusType status; + PolicyInfo + *policy_info; + /* Load the policy map file. */ @@ -928,7 +928,7 @@ static MagickBooleanType LoadPolicyCache(LinkedListInfo *policy_cache, } } token=(char *) RelinquishMagickMemory(token); - return(status); + return(status != 0 ? MagickTrue : MagickFalse); } /* diff --git a/MagickCore/profile.c b/MagickCore/profile.c index 37b673fcb..11675ab27 100644 --- a/MagickCore/profile.c +++ b/MagickCore/profile.c @@ -53,7 +53,7 @@ #include "MagickCore/monitor.h" #include "MagickCore/monitor-private.h" #include "MagickCore/option.h" -#include "MagickCore/optioni-private.h" +#include "MagickCore/option-private.h" #include "MagickCore/pixel-accessor.h" #include "MagickCore/profile.h" #include "MagickCore/profile-private.h" @@ -1186,7 +1186,7 @@ static void WriteTo8BimProfile(Image *image,const char *name, break; p=ReadResourceLong(p,&value); count=(ssize_t) value; - if ((p > (datum+length-count)) || (count > length)) + if ((p > (datum+length-count)) || (count > (ssize_t) length)) break; if ((count & 0x01) != 0) count++; @@ -1277,7 +1277,7 @@ static void GetProfilesFromResourceBlock(Image *image, break; p=ReadResourceLong(p,&value); count=(ssize_t) value; - if ((p > (datum+length-count)) || (count > length)) + if ((p > (datum+length-count)) || (count > (ssize_t) length)) break; switch (id) { diff --git a/MagickCore/type.c b/MagickCore/type.c index 61014d481..6abcc2fb3 100644 --- a/MagickCore/type.c +++ b/MagickCore/type.c @@ -1093,7 +1093,7 @@ static MagickBooleanType LoadTypeCache(SplayTreeInfo *type_cache, const char *q; - MagickBooleanType + MagickStatusType status; TypeInfo @@ -1339,7 +1339,7 @@ static MagickBooleanType LoadTypeCache(SplayTreeInfo *type_cache, } } token=(char *) RelinquishMagickMemory(token); - return(status); + return(status != 0 ? MagickTrue : MagickFalse); } /* diff --git a/MagickCore/version.h b/MagickCore/version.h index 703e1329f..ec5e952fe 100644 --- 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-06-25" +#define MagickReleaseDate "2014-06-26" #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 3b25a53a2..2b947191d 100644 --- 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/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'} ? '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 4edd1f613..5a4b3fc78 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='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 -- 2.40.0