From: cristy Date: Sat, 24 Oct 2009 16:10:18 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~10470 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=739df914b6aa8bd201dbd283f66e62d61d03975b;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index da7d0f91a..adbe6d2d5 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %define VERSION 6.5.7 -%define Patchlevel 1 +%define Patchlevel 2 Name: ImageMagick Version: %{VERSION} diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index 0368fcdc7..8b90a3099 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -117,9 +117,8 @@ EOF my $inc = join ' ', map "-I\"$_\"", @incdir; my $lib = join ' ', map "-L\"$_\"", @libdir; - $lib .= " -lMagickCore"; - return ($inc, $lib, '-O2'); + return ($inc, $lib); } @@ -128,7 +127,7 @@ my $delegate_tests='t/*.t'; my $delegate; foreach $delegate (qw/bzlib djvu fftw fontconfig freetype jpeg jng jp2 lcms mpeg png rsvg tiff x11 xml wmf zlib/) { if ( -d "t/$delegate" ) { - if ($delegate =~ /x11/) { + if ( defined($ENV{'DISPLAY'}) && ($^O ne 'MSWin32') ) { if ( defined $ENV{'DISPLAY'} ) { $delegate_tests .= " t/$delegate/*.t"; } @@ -142,10 +141,20 @@ foreach $delegate (qw/bzlib djvu fftw fontconfig freetype jpeg jng jp2 lcms mpeg my $INC_magick = '-I../ -I.. -I/usr/include/freetype2 -I/usr/include/libxml2 -I"' . $Config{'usrinc'} . '/ImageMagick"'; my $LIBS_magick = '-L../magick/.libs -lMagickCore -lperl -lm'; my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -g -O2 -Wall -W -pthread"; +my $LDFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'ldflags'} "; +my $LDDLFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'lddlflags'} "; if (($^O eq 'MSWin32') && ($Config{cc} =~ /gcc/)) { - # a special setup for strawberry perl - ($INC_magick, $LIBS_magick, $CCFLAGS_magick) = AutodetectWin32gcc(); + my($Ipaths, $Lpaths) = AutodetectWin32gcc(); + + # + # Setup for strawberry perl. + # + $INC_magick = "$Ipaths"; + $LIBS_magick = "-lMagickCore"; + $CCFLAGS_magick = "$Config{'ccflags'}"; + $LDFLAGS_magick = "$Config{'ldflags'} $Lpaths "; + $LDDLFLAGS_magick = "$Config{'lddlflags'} $Lpaths "; } # See lib/ExtUtils/MakeMaker.pm for details of how to influence @@ -183,10 +192,10 @@ WriteMakefile #'LD' => $Config{'ld'} == $Config{'cc'} ? 'gcc -std=gnu99' : $Config{'ld'}, # Linker flags for building an executable - 'LDFLAGS' => "-L../magick/.libs -lMagickCore $Config{'ldflags'} ", + 'LDFLAGS' => $LDFLAGS_magick, # Linker flags for building a dynamically loadable module - 'LDDLFLAGS' => "-L../magick/.libs -lMagickCore $Config{'lddlflags'} ", + 'LDDLFLAGS' => $LDDLFLAGS_magick, # Install PerlMagick binary into ImageMagick bin directory 'INSTALLBIN' => '/usr/local/bin', diff --git a/config/configure.xml b/config/configure.xml index 6173469bf..710734e52 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,8 +8,8 @@ - - + + diff --git a/index.html b/index.html index 898c83388..75e2d46bf 100644 --- a/index.html +++ b/index.html @@ -123,7 +123,7 @@
diff --git a/libtool b/libtool index 844d30691..f0cc226b8 100755 --- a/libtool +++ b/libtool @@ -1,7 +1,7 @@ #! /bin/sh # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (ImageMagick) 6.5.7-1 +# Generated automatically by config.status (ImageMagick) 6.5.7-2 # Libtool was configured on host magick.imagemagick.org: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # @@ -240,7 +240,7 @@ finish_eval="" hardcode_into_libs=yes # Compile-time system search path for libraries. -sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.4.1 /usr/lib64 /lib64" +sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.4.2 /usr/lib64 /lib64" # Run-time system search path for libraries. sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /usr/lib64/mysql /usr/lib64/openmotif /usr/lib64/qt-3.3/lib /usr/lib64/xulrunner-1.9.1 " @@ -9046,17 +9046,17 @@ file_list_spec="" hardcode_action=immediate # The directories searched by this compiler when creating a shared library. -compiler_lib_search_dirs="/usr/lib/gcc/x86_64-redhat-linux/4.4.1 /usr/lib/gcc/x86_64-redhat-linux/4.4.1 /usr/lib/gcc/x86_64-redhat-linux/4.4.1/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /usr/lib/gcc/x86_64-redhat-linux/4.4.1/../../.." +compiler_lib_search_dirs="/usr/lib/gcc/x86_64-redhat-linux/4.4.2 /usr/lib/gcc/x86_64-redhat-linux/4.4.2 /usr/lib/gcc/x86_64-redhat-linux/4.4.2/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /usr/lib/gcc/x86_64-redhat-linux/4.4.2/../../.." # Dependencies to place before and after the objects being linked to # create a shared library. -predep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.4.1/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/4.4.1/crtbeginS.o" -postdep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.4.1/crtendS.o /usr/lib/gcc/x86_64-redhat-linux/4.4.1/../../../../lib64/crtn.o" +predep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.4.2/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/4.4.2/crtbeginS.o" +postdep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.4.2/crtendS.o /usr/lib/gcc/x86_64-redhat-linux/4.4.2/../../../../lib64/crtn.o" predeps="" postdeps="-lstdc++ -lm -lgomp -lgcc_s -lpthread -lc -lgcc_s" # The library search path used internally by the compiler when linking # a shared library. -compiler_lib_search_path="-L/usr/lib/gcc/x86_64-redhat-linux/4.4.1 -L/usr/lib/gcc/x86_64-redhat-linux/4.4.1 -L/usr/lib/gcc/x86_64-redhat-linux/4.4.1/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/4.4.1/../../.." +compiler_lib_search_path="-L/usr/lib/gcc/x86_64-redhat-linux/4.4.2 -L/usr/lib/gcc/x86_64-redhat-linux/4.4.2 -L/usr/lib/gcc/x86_64-redhat-linux/4.4.2/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/4.4.2/../../.." # ### END LIBTOOL TAG CONFIG: CXX diff --git a/magick/magick-config.h b/magick/magick-config.h index 69046ceb0..489fde941 100644 --- a/magick/magick-config.h +++ b/magick/magick-config.h @@ -905,7 +905,7 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_WINDOWS_H */ -/* This value is set to 1 to indicate that the system argz component works */ +/* This value is set to 1 to indicate that the system argz facility works */ #ifndef MAGICKCORE_HAVE_WORKING_ARGZ #define MAGICKCORE_HAVE_WORKING_ARGZ 1 #endif diff --git a/magick/version.h b/magick/version.h index 6fd3cda51..7b4c34112 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,9 +30,9 @@ extern "C" { #define MagickLibVersion 0x657 #define MagickLibVersionText "6.5.7" #define MagickLibVersionNumber 2,0,0 -#define MagickLibSubversion "-1" -#define MagickReleaseDate "2009-10-18" -#define MagickChangeDate "20091018" +#define MagickLibSubversion "-2" +#define MagickReleaseDate "2009-10-24" +#define MagickChangeDate "20091023" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.5.7/index.html" #if (MAGICKCORE_QUANTUM_DEPTH == 8) diff --git a/version.sh b/version.sh index 2a6948c08..52033443b 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). PACKAGE_VERSION='6.5.7' PACKAGE_LIB_VERSION="0x657" -PACKAGE_RELEASE="1" +PACKAGE_RELEASE="2" PACKAGE_LIB_VERSION_NUMBER="6,5,7,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index 657c41df2..b10672fe2 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -124,7 +124,7 @@
diff --git a/www/api/animate.html b/www/api/animate.html index 3d516a3e5..0fba7b415 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -183,7 +183,7 @@ _8c.html" target="source" name="AnimateImages">AnimateImages Discourse Server • Mailing Lists • - Studio + Studio  
diff --git a/www/api/attribute.html b/www/api/attribute.html index 2fb72ce0b..260312b65 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -123,7 +123,7 @@
diff --git a/www/api/cache-view.html b/www/api/cache-view.html index 70ac6be3b..203179fad 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -576,7 +576,7 @@ _8c.html" target="source" name="SyncCacheViewAuthenticPixels">SyncCacheViewAuthe Discourse Server • Mailing Lists • - Studio + Studio  
diff --git a/www/api/cipher.html b/www/api/cipher.html index 2b2792cfc..dc87947b3 100644 --- a/www/api/cipher.html +++ b/www/api/cipher.html @@ -123,7 +123,7 @@
diff --git a/www/api/compare.html b/www/api/compare.html index c24f4d4aa..f91f4f8d9 100644 --- a/www/api/compare.html +++ b/www/api/compare.html @@ -325,7 +325,7 @@ _8c.html" target="source" name="SimilarityImage">SimilarityImage Discourse Server • Mailing Lists • - Studio + Studio  
diff --git a/www/api/composite.html b/www/api/composite.html index a7f7af258..c800b7b05 100644 --- a/www/api/composite.html +++ b/www/api/composite.html @@ -232,7 +232,7 @@ _8c.html" target="source" name="TextureImage">TextureImage Discourse Server • Mailing Lists • - Studio + Studio  
diff --git a/www/api/decorate.html b/www/api/decorate.html index 11dfc8e0f..29d789006 100644 --- a/www/api/decorate.html +++ b/www/api/decorate.html @@ -236,7 +236,7 @@ _8c.html" target="source" name="RaiseImage">RaiseImage Discourse Server • Mailing Lists • - Studio + Studio   diff --git a/www/api/display.html b/www/api/display.html index 8698ae2dd..9daf1d611 100644 --- a/www/api/display.html +++ b/www/api/display.html @@ -123,7 +123,7 @@
diff --git a/www/api/distort.html b/www/api/distort.html index 20007743e..831782b5a 100644 --- a/www/api/distort.html +++ b/www/api/distort.html @@ -123,7 +123,7 @@
diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html index e7bad6b1d..1e5350ef6 100644 --- a/www/api/drawing-wand.html +++ b/www/api/drawing-wand.html @@ -123,7 +123,7 @@
diff --git a/www/api/effect.html b/www/api/effect.html index a60f77332..6e55b4b79 100644 --- a/www/api/effect.html +++ b/www/api/effect.html @@ -688,7 +688,7 @@ _8c.html" target="source" name="UnsharpMaskImage">UnsharpMaskImage Discourse Server • Mailing Lists • - Studio + Studio  
diff --git a/www/api/enhance.html b/www/api/enhance.html index 77ba8fb18..a78012f3c 100644 --- a/www/api/enhance.html +++ b/www/api/enhance.html @@ -123,7 +123,7 @@
diff --git a/www/api/image.html b/www/api/image.html index a84cb0206..01103d351 100644 --- a/www/api/image.html +++ b/www/api/image.html @@ -123,7 +123,7 @@
diff --git a/www/api/module.html b/www/api/module.html index e0b6b370a..ce044ea56 100644 --- a/www/api/module.html +++ b/www/api/module.html @@ -123,7 +123,7 @@
diff --git a/www/api/montage.html b/www/api/montage.html index a30ce8a6d..227852699 100644 --- a/www/api/montage.html +++ b/www/api/montage.html @@ -123,7 +123,7 @@
diff --git a/www/api/pixel-view.html b/www/api/pixel-view.html index a9f15b55c..8347bd26e 100644 --- a/www/api/pixel-view.html +++ b/www/api/pixel-view.html @@ -567,7 +567,7 @@ _8c.html" target="source" name="UpdatePixelViewIterator">UpdatePixelViewIterator Discourse Server • Mailing Lists • - Studio + Studio  
diff --git a/www/api/property.html b/www/api/property.html index dd0398343..277b683a5 100644 --- a/www/api/property.html +++ b/www/api/property.html @@ -397,7 +397,7 @@ _8c.html" target="source" name="SetImageProperty">SetImageProperty Discourse Server • Mailing Lists • - Studio + Studio  
diff --git a/www/api/registry.html b/www/api/registry.html index 266645cd1..fbc05a0b4 100644 --- a/www/api/registry.html +++ b/www/api/registry.html @@ -151,7 +151,7 @@
-

[DefineImageRegistry • DeleteImageRegistry • DestroyImageRegistry • GetImageRegistry • GetNextImageRegistry • RemoveImageRegistry • ResetImageRegistryIterator • SetImageRegistry]

+

[DefineImageRegistry • DeleteImageRegistry • DestroyRegistryComponent • GetImageRegistry • GetNextImageRegistry • RemoveImageRegistry • ResetImageRegistryIterator • SetImageRegistry]

DefineImageRegistry

@@ -197,15 +197,15 @@ _8c.html" target="source" name="DeleteImageRegistry">DeleteImageRegistry

DestroyImageRegistry

+_8c.html" target="source" name="DestroyRegistryComponent">DestroyRegistryComponent
-

DestroyImageRegistry() releases memory associated with the image registry.

+

DestroyRegistryComponent() destroys the registry component.

The format of the DestroyDefines method is:

-  void DestroyImageRegistry(void)
+  void DestroyRegistryComponent(void)
@@ -314,7 +314,7 @@ _8c.html" target="source" name="SetImageRegistry">SetImageRegistry Discourse Server • Mailing Lists • - Studio + Studio  
diff --git a/www/api/shear.html b/www/api/shear.html index de43da0c4..a016f3729 100644 --- a/www/api/shear.html +++ b/www/api/shear.html @@ -265,7 +265,7 @@ _8c.html" target="source" name="ShearImage">ShearImage Discourse Server • Mailing Lists • - Studio + Studio  
diff --git a/www/api/signature.html b/www/api/signature.html index 858f87b0f..f1b508393 100644 --- a/www/api/signature.html +++ b/www/api/signature.html @@ -179,7 +179,7 @@ _8c.html" target="source" name="SignatureImage">SignatureImage Discourse Server • Mailing Lists • - Studio + Studio  
diff --git a/www/api/stream.html b/www/api/stream.html index 425ad0c7f..6efbe64e8 100644 --- a/www/api/stream.html +++ b/www/api/stream.html @@ -208,7 +208,7 @@ _8c.html" target="source" name="WriteStream">WriteStream Discourse Server • Mailing Lists • - Studio + Studio  
diff --git a/www/api/transform.html b/www/api/transform.html index f96505ec2..80c061c6a 100644 --- a/www/api/transform.html +++ b/www/api/transform.html @@ -123,7 +123,7 @@