From 8d74fc1f224b5ec4673768bcc787fe29d55ee908 Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 25 May 2011 23:02:47 +0000 Subject: [PATCH] --- Magick++/bin/Magick++-config | 2 +- Magick++/lib/Magick++/Include.h | 6 +-- PerlMagick/Makefile.PL | 6 +-- PerlMagick/check.sh | 4 +- coders/png.c | 65 ++++++++------------------------- config/configure.xml | 10 ++--- libtool | 16 ++++---- magick/Magick-config | 2 +- magick/magick-config.h | 12 ++---- magick/pixel.h | 13 +++++++ magick/version.h | 4 +- wand/Wand-config | 2 +- 12 files changed, 57 insertions(+), 85 deletions(-) diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config index 1f392380c..21201e6df 100755 --- a/Magick++/bin/Magick++-config +++ b/Magick++/bin/Magick++-config @@ -55,7 +55,7 @@ while test $# -gt 0; do echo '-L/usr/local/lib ' ;; --libs) - echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl" + echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread " ;; *) echo "${usage}" 1>&2 diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h index 2cdd0d5b1..7240c19e2 100644 --- a/Magick++/lib/Magick++/Include.h +++ b/Magick++/lib/Magick++/Include.h @@ -10,7 +10,7 @@ #if !defined(_MAGICK_CONFIG_H) # define _MAGICK_CONFIG_H # if !defined(vms) && !defined(macintosh) -# include "MagickCore/magick-config.h" +# include "magick/magick-config.h" # else # include "magick-config.h" # endif @@ -44,8 +44,8 @@ // namespace MagickCore { -#include -#include +#include +#include #undef inline // Remove possible definition from config.h #undef class diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index 17cd3f73c..f24e06f41 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -198,7 +198,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/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/libpng12 -I/usr/include/graphviz -I/usr/include/freetype2 -I/usr/include/libxml2", @@ -207,7 +207,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, @@ -228,7 +228,7 @@ WriteMakefile # 'OPTIMIZE' => '', # Use same compiler as ImageMagick - 'PERLMAINCC' => ' -fopenmp', + 'PERLMAINCC' => 'g++ -fopenmp', # Set Perl installation prefix to ImageMagick installation prefix # 'PREFIX' => '/usr/local', diff --git a/PerlMagick/check.sh b/PerlMagick/check.sh index 731f0ecc0..521a28a24 100755 --- a/PerlMagick/check.sh +++ b/PerlMagick/check.sh @@ -41,10 +41,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/png.c b/coders/png.c index c9c604c2b..528c961fb 100644 --- a/coders/png.c +++ b/coders/png.c @@ -125,41 +125,6 @@ ((color).blue == (target).blue)) #endif -/* Convenience macros for copying RGB or RGB+opacity components - * between a pixel and a PixelPacket. - */ - -#define GetRGBOPixelComponents(pixel, packet) \ - { \ - (packet).red = GetRedPixelComponent((pixel)); \ - (packet).green = GetGreenPixelComponent((pixel)); \ - (packet).blue = GetBluePixelComponent((pixel)); \ - (packet).opacity = GetOpacityPixelComponent((pixel)); \ - } - -/* Not same as SetRGBOPixelComponent in magick/pixel.h */ -#define SetRGBOPixelComponents(pixel, packet) \ - { \ - SetRedPixelComponent((pixel),(packet).red); \ - SetGreenPixelComponent((pixel),(packet).green); \ - SetBluePixelComponent((pixel),(packet).blue); \ - SetOpacityPixelComponent((pixel),(packet).opacity); \ - } - -#define GetRGBPixelComponents(pixel, packet) \ - { \ - (packet).red = GetRedPixelComponent((pixel)); \ - (packet).green = GetGreenPixelComponent((pixel)); \ - (packet).blue = GetBluePixelComponent((pixel)); \ - } - -#define SetRGBPixelComponents(pixel, packet) \ - { \ - SetRedPixelComponent((pixel),(packet).red); \ - SetGreenPixelComponent((pixel),(packet).green); \ - SetBluePixelComponent((pixel),(packet).blue); \ - } - /* Macros for left-bit-replication to ensure that pixels * and PixelPackets all have the image->depth, and for use * in PNG8 quantization. @@ -6358,14 +6323,14 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) if (magn_methy <= 1) { /* replicate previous */ - SetRGBOPixelComponent(q,(pixels)); + SetRGBOPixelComponents(q,(pixels)); } else if (magn_methy == 2 || magn_methy == 4) { if (i == 0) { - SetRGBOPixelComponent(q,(pixels)); + SetRGBOPixelComponents(q,(pixels)); } else @@ -6416,12 +6381,12 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) /* Replicate nearest */ if (i <= ((m+1) << 1)) { - SetRGBOPixelComponent(q,(pixels)); + SetRGBOPixelComponents(q,(pixels)); } else { - SetRGBOPixelComponent(q,(n)); + SetRGBOPixelComponents(q,(n)); } if (magn_methy == 5) @@ -6499,14 +6464,14 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) if (magn_methx <= 1) { /* replicate previous */ - SetRGBOPixelComponent(q,(pixels)); + SetRGBOPixelComponents(q,(pixels)); } else if (magn_methx == 2 || magn_methx == 4) { if (i == 0) { - SetRGBOPixelComponent(q,(pixels)); + SetRGBOPixelComponents(q,(pixels)); } /* To do: Rewrite using Get/Set***PixelComponent() */ @@ -6563,12 +6528,12 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) /* Replicate nearest */ if (i <= ((m+1) << 1)) { - SetRGBOPixelComponent(q,(pixels)); + SetRGBOPixelComponents(q,(pixels)); } else { - SetRGBOPixelComponent(q,(n)); + SetRGBOPixelComponents(q,(n)); } if (magn_methx == 5) @@ -7991,7 +7956,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, { if (number_opaque == 0) { - GetRGBPixelComponents(q, opaque[0]); + GetRGBPixelComponents(q, opaque); opaque[0].opacity=OpaqueOpacity; number_opaque=1; } @@ -8006,7 +7971,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, number_opaque < 259) { number_opaque++; - GetRGBPixelComponents(q, opaque[i]); + GetRGBPixelComponents(q, opaque+i); opaque[i].opacity=OpaqueOpacity; } } @@ -8017,7 +7982,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, { if (number_transparent == 0) { - GetRGBOPixelComponents(q, transparent[0]); + GetRGBOPixelComponents(q, transparent); ping_trans_color.red= (unsigned short) GetRedPixelComponent(q); ping_trans_color.green= @@ -8039,7 +8004,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, number_transparent < 259) { number_transparent++; - GetRGBOPixelComponents(q, transparent[i]); + GetRGBOPixelComponents(q, transparent+i); } } } @@ -8049,7 +8014,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, { if (number_semitransparent == 0) { - GetRGBOPixelComponents(q, semitransparent[0]); + GetRGBOPixelComponents(q, semitransparent); number_semitransparent = 1; } @@ -8065,7 +8030,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, number_semitransparent < 259) { number_semitransparent++; - GetRGBOPixelComponents(q, semitransparent[i]); + GetRGBOPixelComponents(q, semitransparent+i); } } } @@ -8410,7 +8375,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, if (GetOpacityPixelComponent(r) > TransparentOpacity/2) { SetOpacityPixelComponent(r,TransparentOpacity); - SetRGBPixelComponents(r,image->background_color); + SetRGBPixelComponents(r,&image->background_color); } else SetOpacityPixelComponent(r,OpaqueOpacity); diff --git a/config/configure.xml b/config/configure.xml index 21406a800..b4c5fdf43 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -11,8 +11,8 @@ - - + + @@ -22,16 +22,16 @@ - + - + - + diff --git a/libtool b/libtool index 013362eb1..f7006fd14 100755 --- a/libtool +++ b/libtool @@ -74,7 +74,7 @@ DLLTOOL="false" OBJDUMP="objdump" # Whether or not to build shared libraries. -build_libtool_libs=yes +build_libtool_libs=no # Whether or not to build static libraries. build_old_libs=yes @@ -83,7 +83,7 @@ build_old_libs=yes pic_mode=default # Whether or not to optimize for fast installation. -fast_install=yes +fast_install=needless # The host system. host_alias= @@ -161,7 +161,7 @@ old_postuninstall_cmds="" lock_old_archive_extraction=no # A C compiler. -LTCC="gcc -std=gnu99 -std=gnu99" +LTCC="g++" # LTCC compiler flags. LTCFLAGS="-fopenmp -g -O2 -Wall -pthread" @@ -281,10 +281,10 @@ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /us dlopen_support=yes # Whether dlopen of programs is supported. -dlopen_self=yes +dlopen_self=no # Whether dlopen of statically linked programs is supported. -dlopen_self_static=yes +dlopen_self_static=unknown # Commands to strip libraries. old_striplib="strip --strip-debug" @@ -302,13 +302,13 @@ reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$oldlib" # A language specific compiler. -CC="gcc -std=gnu99 -std=gnu99" +CC="g++" # Is the compiler the GNU compiler? with_gcc=yes # Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin" +no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions" # Additional compiler flags for building library objects. pic_flag=" -fPIC -DPIC" @@ -323,7 +323,7 @@ link_static_flag="" compiler_c_o="yes" # Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=no +build_libtool_need_lc=yes # Whether or not to disallow shared libs when runtime libs are static. allow_libtool_libs_with_static_runtimes=no diff --git a/magick/Magick-config b/magick/Magick-config index 42bea3bcd..8d272b335 100755 --- a/magick/Magick-config +++ b/magick/Magick-config @@ -52,7 +52,7 @@ while test $# -gt 0; do echo '-L/usr/local/lib ' ;; --libs) - echo "-L${libdir} -lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl" + echo "-L${libdir} -lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread " ;; *) echo "${usage}" 1>&2 diff --git a/magick/magick-config.h b/magick/magick-config.h index dfe16798e..3bf8ae856 100644 --- a/magick/magick-config.h +++ b/magick/magick-config.h @@ -502,9 +502,7 @@ #endif /* Define to 1 if you have a working `mmap' system call. */ -#ifndef MAGICKCORE_HAVE_MMAP_FILEIO -#define MAGICKCORE_HAVE_MMAP_FILEIO 1 -#endif +/* #undef HAVE_MMAP_FILEIO */ /* Define to 1 if you have the `munmap' function. */ #ifndef MAGICKCORE_HAVE_MUNMAP @@ -1065,9 +1063,7 @@ #endif /* 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 @@ -1138,9 +1134,7 @@ /* #undef LQR_DELEGATE */ /* Define if using libltdl to support dynamically loadable modules */ -#ifndef MAGICKCORE_LTDL_DELEGATE -#define MAGICKCORE_LTDL_DELEGATE 1 -#endif +/* #undef LTDL_DELEGATE */ /* Define if the OS needs help to load dependent libraries for dlopen(). */ /* #undef LTDL_DLOPEN_DEPLIBS */ diff --git a/magick/pixel.h b/magick/pixel.h index 450598543..80f434428 100644 --- a/magick/pixel.h +++ b/magick/pixel.h @@ -43,6 +43,19 @@ extern "C" { #define GetNextPixel(pixel) ((pixel)+1) #define GetOpacityPixelComponent(pixel) ((pixel)->opacity) #define GetRedPixelComponent(pixel) ((pixel)->red) +#define GetRGBPixelComponents(pixel,packet) \ +{ \ + (packet)->red=GetRedPixelComponent((pixel)); \ + (packet)->green=GetGreenPixelComponent((pixel)); \ + (packet)->blue=GetBluePixelComponent((pixel)); \ +} +#define GetRGBOPixelComponents(pixel,packet) \ +{ \ + (packet)->red=GetRedPixelComponent((pixel)); \ + (packet)->green=GetGreenPixelComponent((pixel)); \ + (packet)->blue=GetBluePixelComponent((pixel)); \ + (packet)->opacity=GetOpacityPixelComponent((pixel)); \ +} #define GetYPixelComponent(pixel) ((pixel)->red) #define GetYellowPixelComponent(pixel) ((pixel)->blue) #define SetAlphaPixelComponent(pixel,value) \ diff --git a/magick/version.h b/magick/version.h index 57aa504a2..ca3b0111f 100644 --- a/magick/version.h +++ b/magick/version.h @@ -34,8 +34,8 @@ extern "C" { #define MagickLibAddendum "-1" #define MagickLibInterface 4 #define MagickLibMinInterface 4 -#define MagickReleaseDate "2011-05-24" -#define MagickChangeDate "20110522" +#define MagickReleaseDate "2011-05-25" +#define MagickChangeDate "20110525" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) #define MagickOpenMPFeature "OpenMP " diff --git a/wand/Wand-config b/wand/Wand-config index 09d5c78c7..bc5e47b5c 100755 --- a/wand/Wand-config +++ b/wand/Wand-config @@ -52,7 +52,7 @@ while test $# -gt 0; do echo '-L/usr/local/lib ' ;; --libs) - echo "-L${libdir} -lMagickWand -lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread -lltdl" + echo "-L${libdir} -lMagickWand -lMagickCore -llcms2 -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -llzma -lbz2 -lxml2 -lgvc -lgraph -lcdt -lz -lm -lgomp -lpthread " ;; *) echo "${usage}" 1>&2 -- 2.49.0