From: cristy Date: Sun, 12 Sep 2010 19:42:50 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~8948 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15b98cde1f8098cb20bceac08481ba6def4efb97;p=imagemagick --- diff --git a/ImageMagick.spec b/ImageMagick.spec index cd83a69d3..e2cacb0b8 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %global VERSION 6.6.4 -%global Patchlevel 2 +%global Patchlevel 1 Name: ImageMagick Version: %{VERSION} diff --git a/Magick++/bin/Magick++-config b/Magick++/bin/Magick++-config index 341145e0f..917a32b52 100755 --- a/Magick++/bin/Magick++-config +++ b/Magick++/bin/Magick++-config @@ -43,7 +43,7 @@ while test $# -gt 0; do echo '6.6.4 Q16 ' ;; --cflags) - echo "-I${includedir} " + echo "-I${includedir} -fopenmp" ;; --cxxflags) echo '-g -O2 -pthread' @@ -55,7 +55,7 @@ while test $# -gt 0; do echo '-L/usr/local/lib ' ;; --libs) - echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lpthread -lltdl" + echo "-L${libdir} -lMagick++ -lMagickWand -lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl" ;; *) echo "${usage}" 1>&2 diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index 0211588c8..8178f18c2 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -140,7 +140,7 @@ foreach $delegate (qw/bzlib fontconfig freetype jpeg jng jp2 png tiff x11 xml zl # defaults for LIBS & INC & CCFLAGS params that we later pass to Writemakefile my $INC_magick = '-I../ -I.. -I/usr/include/cairo -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12 -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'} -g -O2 -Wall -pthread"; +my $CCFLAGS_magick = "$Config{'ccflags'} -fopenmp -g -O2 -Wall -pthread"; my $LDFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'ldflags'} "; my $LDDLFLAGS_magick = "-L../magick/.libs -lMagickCore $Config{'lddlflags'} "; @@ -210,7 +210,7 @@ WriteMakefile # 'OPTIMIZE' => '', # Use same compiler as ImageMagick - 'PERLMAINCC' => ' ', + 'PERLMAINCC' => ' -fopenmp', # Set Perl installation prefix to ImageMagick installation prefix # 'PREFIX' => '/usr/local', diff --git a/config/configure.xml b/config/configure.xml index 0e40b499f..bf449fb2e 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,24 +8,24 @@ - + - + - + - + - + - + diff --git a/libtool b/libtool index fd03d692c..2720f8f07 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.6.4-2 +# Generated automatically by config.status (ImageMagick) 6.6.4-1 # Libtool was configured on host magick.imagemagick.org: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # @@ -144,7 +144,7 @@ lock_old_archive_extraction=no LTCC="gcc -std=gnu99 -std=gnu99" # LTCC compiler flags. -LTCFLAGS="-g -O2 -Wall -pthread" +LTCFLAGS="-fopenmp -g -O2 -Wall -pthread" # Take the output of nm and produce a listing of raw symbols and C names. global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'" @@ -9403,7 +9403,7 @@ compiler_lib_search_dirs="/usr/lib/gcc/x86_64-redhat-linux/4.5.1 /usr/lib/gcc/x8 predep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.5.1/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/4.5.1/crtbeginS.o" postdep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.5.1/crtendS.o /usr/lib/gcc/x86_64-redhat-linux/4.5.1/../../../../lib64/crtn.o" predeps="" -postdeps="-lstdc++ -lm -lgcc_s -lpthread -lc -lgcc_s" +postdeps="-lstdc++ -lm -lgomp -lgcc_s -lpthread -lc -lgcc_s" # The library search path used internally by the compiler when linking # a shared library. diff --git a/magick/ImageMagick.pc b/magick/ImageMagick.pc index e382aaca4..7f3df55c3 100644 --- a/magick/ImageMagick.pc +++ b/magick/ImageMagick.pc @@ -7,4 +7,4 @@ Name: ImageMagick Description: ImageMagick - Convert, Edit, and Compose Images Version: 6.6.4 Libs: -L${libdir} -lMagickCore -Cflags: -I${includedir} +Cflags: -I${includedir} -fopenmp diff --git a/magick/Magick-config b/magick/Magick-config index 585a0d396..ed474943c 100755 --- a/magick/Magick-config +++ b/magick/Magick-config @@ -40,7 +40,7 @@ while test $# -gt 0; do echo '6.6.4 Q16 ' ;; --cflags) - echo "-I${includedir} " + echo "-I${includedir} -fopenmp" ;; --cxxflags) echo '-g -O2 -pthread' @@ -52,7 +52,7 @@ while test $# -gt 0; do echo '-L/usr/local/lib ' ;; --libs) - echo "-L${libdir} -lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lpthread -lltdl" + echo "-L${libdir} -lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl" ;; *) echo "${usage}" 1>&2 diff --git a/magick/display.c b/magick/display.c index 87b2283b3..4498c2899 100644 --- a/magick/display.c +++ b/magick/display.c @@ -4238,8 +4238,9 @@ static MagickBooleanType XCompositeImage(Display *display, /* Scale composite image. */ - resize_image=ZoomImage(composite_image,composite_info.width, - composite_info.height,&image->exception); + resize_image=ResizeImage(composite_image,composite_info.width, + composite_info.height,composite_image->filter,composite_image->blur, + &image->exception); composite_image=DestroyImage(composite_image); if (resize_image == (Image *) NULL) { diff --git a/magick/fx.c b/magick/fx.c index cd73e8a0b..a201feec2 100644 --- a/magick/fx.c +++ b/magick/fx.c @@ -3372,9 +3372,10 @@ MagickExport Image *MorphImages(const Image *image, beta=(MagickRealType) (i+1.0)/(MagickRealType) (number_frames+1.0); alpha=1.0-beta; - morph_image=ZoomImage(next,(size_t) (alpha*next->columns+beta* + morph_image=ResizeImage(next,(size_t) (alpha*next->columns+beta* GetNextImageInList(next)->columns+0.5),(size_t) (alpha* - next->rows+beta*GetNextImageInList(next)->rows+0.5),exception); + next->rows+beta*GetNextImageInList(next)->rows+0.5), + next->filter,next->blur,exception); if (morph_image == (Image *) NULL) { morph_images=DestroyImageList(morph_images); @@ -3388,8 +3389,9 @@ MagickExport Image *MorphImages(const Image *image, } AppendImageToList(&morph_images,morph_image); morph_images=GetLastImageInList(morph_images); - morph_image=ZoomImage(GetNextImageInList(next),morph_images->columns, - morph_images->rows,exception); + morph_image=ResizeImage(GetNextImageInList(next),morph_images->columns, + morph_images->rows,GetNextImageInList(next)->filter, + GetNextImageInList(next)->blur,exception); if (morph_image == (Image *) NULL) { morph_images=DestroyImageList(morph_images); diff --git a/magick/transform.c b/magick/transform.c index 24027211c..e2e7a9e32 100644 --- a/magick/transform.c +++ b/magick/transform.c @@ -1888,8 +1888,8 @@ MagickExport MagickBooleanType TransformImage(Image **image, if ((transform_image->columns == geometry.width) && (transform_image->rows == geometry.height)) return(MagickTrue); - resize_image=ZoomImage(transform_image,geometry.width,geometry.height, - &(*image)->exception); + resize_image=ResizeImage(transform_image,geometry.width,geometry.height, + transform_image->filter,transform_image->blur,&(*image)->exception); if (resize_image == (Image *) NULL) return(MagickFalse); transform_image=DestroyImage(transform_image); diff --git a/magick/version.h b/magick/version.h index 6abb90c02..8a673e708 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,13 +30,13 @@ extern "C" { #define MagickLibVersion 0x664 #define MagickLibVersionText "6.6.4" #define MagickLibVersionNumber 4,0,0 -#define MagickLibAddendum "-2" +#define MagickLibAddendum "-1" #define MagickLibInterface 4 #define MagickLibMinInterface 4 #define MagickReleaseDate "2010-09-12" #define MagickChangeDate "20100909" #define MagickAuthoritativeURL "http://www.imagemagick.org" -#define MagickFeatures "" +#define MagickFeatures "OpenMP " #define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.6.4/index.html" #if (MAGICKCORE_QUANTUM_DEPTH == 8) #define MagickQuantumDepth "Q8" diff --git a/version.sh b/version.sh index 12510e72b..c7349254e 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). PACKAGE_VERSION='6.6.4' PACKAGE_LIB_VERSION="0x664" -PACKAGE_RELEASE="2" +PACKAGE_RELEASE="1" PACKAGE_LIB_VERSION_NUMBER="6,6,4,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/wand/Wand-config b/wand/Wand-config index c603b2723..47228f64d 100755 --- a/wand/Wand-config +++ b/wand/Wand-config @@ -40,7 +40,7 @@ while test $# -gt 0; do echo '6.6.4 Q16 ' ;; --cflags) - echo "-I${includedir} " + echo "-I${includedir} -fopenmp" ;; --cxxflags) echo '-g -O2 -pthread' @@ -52,7 +52,7 @@ while test $# -gt 0; do echo '-L/usr/local/lib ' ;; --libs) - echo "-L${libdir} -lMagickWand -lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lpthread -lltdl" + echo "-L${libdir} -lMagickWand -lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl" ;; *) echo "${usage}" 1>&2 diff --git a/wand/Wand.pc b/wand/Wand.pc index 62f78841c..d72598a39 100644 --- a/wand/Wand.pc +++ b/wand/Wand.pc @@ -8,4 +8,4 @@ Version: 6.6.4 Description: MagickWand - C API for ImageMagick Requires: ImageMagick Libs: -L${libdir} -lMagickWand -lMagickCore -Cflags: -I${includedir} +Cflags: -I${includedir} -fopenmp diff --git a/wand/mogrify.c b/wand/mogrify.c index 8d6bdb250..95a378e8d 100644 --- a/wand/mogrify.c +++ b/wand/mogrify.c @@ -1849,17 +1849,17 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, else { Image - *zoom_image; + *resize_image; /* Resize image. */ - zoom_image=ZoomImage(*image,geometry.width,geometry.height, - exception); - if (zoom_image == (Image *) NULL) + resize_image=ResizeImage(*image,geometry.width,geometry.height, + (*image)->filter,(*image)->blur,exception); + if (resize_image == (Image *) NULL) break; *image=DestroyImage(*image); - *image=zoom_image; + *image=resize_image; } break; }