From: cristy Date: Sun, 5 Oct 2014 19:18:23 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~1923 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=26842027345d2b15ec697414c10dece3ef36684f;p=imagemagick --- 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/version.h b/MagickCore/version.h index 81b30f81f..dfb4f3a1e 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-10-04" +#define MagickReleaseDate "2014-10-05" #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 diff --git a/coders/pdf.c b/coders/pdf.c index f3a7a7c0f..3be02dd40 100644 --- a/coders/pdf.c +++ b/coders/pdf.c @@ -126,27 +126,28 @@ static MagickBooleanType % */ #if defined(MAGICKCORE_GS_DELEGATE) || defined(MAGICKCORE_WINDOWS_SUPPORT) -static int MagickDLLCall PDFDelegateMessage(void *handle,const char *msg, - int len) +static int MagickDLLCall PDFDelegateMessage(void *handle,const char *message, + int length) { char **messages; - size_t offset; + ssize_t + offset; offset=0; - messages=(char **)handle; + messages=(char **) handle; if (*messages == (char *) NULL) - *messages=(char *) AcquireQuantumMemory(len+1,sizeof(char *)); + *messages=(char *) AcquireQuantumMemory(length+1,sizeof(char *)); else { offset=strlen(*messages); - *messages=(char *) ResizeQuantumMemory(*messages,offset+len+1, + *messages=(char *) ResizeQuantumMemory(*messages,offset+length+1, sizeof(char *)); } - (void) memcpy(*messages+offset,msg,len); - (*messages)[offset+len] ='\0'; - return(len); + (void) memcpy(*messages+offset,message,length); + (*messages)[length+offset] ='\0'; + return(length); } #endif @@ -157,10 +158,10 @@ static MagickBooleanType InvokePDFDelegate(const MagickBooleanType verbose, status; #if defined(MAGICKCORE_GS_DELEGATE) || defined(MAGICKCORE_WINDOWS_SUPPORT) -#define SetArgsStart \ +#define SetArgsStart(command,args_start) \ if (args_start == (const char *) NULL) \ { \ - if (command[0] != '"') \ + if (*command != '"') \ args_start=strchr(command,' '); \ else \ { \ @@ -170,24 +171,24 @@ static MagickBooleanType InvokePDFDelegate(const MagickBooleanType verbose, } \ } -#define ExecuteGhostscriptCommand \ - { \ - status=SystemCommand(MagickFalse,verbose,command,exception); \ - if (status == 0) \ - return(MagickTrue); \ - if (status < 0) \ - return(MagickFalse); \ - (void) ThrowMagickException(exception,GetMagickModule(),DelegateError, \ - "FailedToExecuteCommand","`%s' (%d)",command,status); \ +#define ExecuteGhostscriptCommand(command,status) \ +{ \ + status=SystemCommand(MagickFalse,verbose,command,exception); \ + if (status == 0) \ + return(MagickTrue); \ + if (status < 0) \ return(MagickFalse); \ - } + (void) ThrowMagickException(exception,GetMagickModule(),DelegateError, \ + "FailedToExecuteCommand","`%s' (%d)",command,status); \ + return(MagickFalse); \ +} char **argv, *errors; const char - *args_start=NULL; + *args_start = (const char *) NULL; const GhostInfo *ghost_info; @@ -224,17 +225,17 @@ static MagickBooleanType InvokePDFDelegate(const MagickBooleanType verbose, gsapi_set_stdio; #endif if (ghost_info == (GhostInfo *) NULL) - ExecuteGhostscriptCommand + ExecuteGhostscriptCommand(command,status); if (verbose != MagickFalse) { (void) fputs("[ghostscript library]",stdout); - SetArgsStart + SetArgsStart(command,args_start); (void) fputs(args_start,stdout); } errors=(char *) NULL; status=(ghost_info->new_instance)(&interpreter,(void *) &errors); if (status < 0) - ExecuteGhostscriptCommand + ExecuteGhostscriptCommand(command,status); code=0; argv=StringToArgv(command,&argc); if (argv == (char **) NULL) @@ -252,7 +253,7 @@ static MagickBooleanType InvokePDFDelegate(const MagickBooleanType verbose, argv=(char **) RelinquishMagickMemory(argv); if ((status != 0) && (status != -101)) { - SetArgsStart + SetArgsStart(command,args_start); (void) ThrowMagickException(exception,GetMagickModule(),DelegateError, "PDFDelegateFailed","`[ghostscript library]%s': %s",args_start, errors); diff --git a/coders/ps.c b/coders/ps.c index ac43126ad..cac2868b2 100644 --- a/coders/ps.c +++ b/coders/ps.c @@ -116,26 +116,27 @@ static MagickBooleanType */ #if defined(MAGICKCORE_GS_DELEGATE) || defined(MAGICKCORE_WINDOWS_SUPPORT) static int MagickDLLCall PostscriptDelegateMessage(void *handle, - const char *msg,int len) + const char *message,int length) { char **messages; - size_t offset; + ssize_t + offset; offset=0; - messages=(char **)handle; + messages=(char **) handle; if (*messages == (char *) NULL) - *messages=(char *) AcquireQuantumMemory(len+1,sizeof(char *)); + *messages=(char *) AcquireQuantumMemory(length+1,sizeof(char *)); else { offset=strlen(*messages); - *messages=(char *) ResizeQuantumMemory(*messages,offset+len+1, + *messages=(char *) ResizeQuantumMemory(*messages,offset+length+1, sizeof(char *)); } - (void) memcpy(*messages+offset,msg,len); - (*messages)[offset+len] ='\0'; - return(len); + (void) memcpy(*messages+offset,message,length); + (*messages)[length+offset] ='\0'; + return(length); } #endif @@ -146,10 +147,10 @@ static MagickBooleanType InvokePostscriptDelegate( status; #if defined(MAGICKCORE_GS_DELEGATE) || defined(MAGICKCORE_WINDOWS_SUPPORT) -#define SetArgsStart \ +#define SetArgsStart(command,args_start) \ if (args_start == (const char *) NULL) \ { \ - if (command[0] != '"') \ + if (*command != '"') \ args_start=strchr(command,' '); \ else \ { \ @@ -159,24 +160,24 @@ static MagickBooleanType InvokePostscriptDelegate( } \ } -#define ExecuteGhostscriptCommand \ - { \ - status=SystemCommand(MagickFalse,verbose,command,exception); \ - if (status == 0) \ - return(MagickTrue); \ - if (status < 0) \ - return(MagickFalse); \ - (void) ThrowMagickException(exception,GetMagickModule(),DelegateError, \ - "FailedToExecuteCommand","`%s' (%d)",command,status); \ +#define ExecuteGhostscriptCommand(command,status) \ +{ \ + status=SystemCommand(MagickFalse,verbose,command,exception); \ + if (status == 0) \ + return(MagickTrue); \ + if (status < 0) \ return(MagickFalse); \ - } + (void) ThrowMagickException(exception,GetMagickModule(),DelegateError, \ + "FailedToExecuteCommand","`%s' (%d)",command,status); \ + return(MagickFalse); \ +} char **argv, *errors; const char - *args_start=NULL; + *args_start = (const char *) NULL; const GhostInfo *ghost_info; @@ -213,17 +214,17 @@ static MagickBooleanType InvokePostscriptDelegate( gsapi_set_stdio; #endif if (ghost_info == (GhostInfo *) NULL) - ExecuteGhostscriptCommand + ExecuteGhostscriptCommand(command,status); if (verbose != MagickFalse) { (void) fputs("[ghostscript library]",stdout); - SetArgsStart + SetArgsStart(command,args_start); (void) fputs(args_start,stdout); } errors=(char *) NULL; status=(ghost_info->new_instance)(&interpreter,(void *) &errors); if (status < 0) - ExecuteGhostscriptCommand + ExecuteGhostscriptCommand(command,status); code=0; argv=StringToArgv(command,&argc); if (argv == (char **) NULL) @@ -241,7 +242,7 @@ static MagickBooleanType InvokePostscriptDelegate( argv=(char **) RelinquishMagickMemory(argv); if ((status != 0) && (status != -101)) { - SetArgsStart + SetArgsStart(command,args_start); (void) ThrowMagickException(exception,GetMagickModule(),DelegateError, "PostscriptDelegateFailed","`[ghostscript library]%s': %s",args_start, errors);