From 8aced97ecd2b02723f8cad14245b81b6c26404b0 Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 2 Jun 2015 20:51:51 +0000 Subject: [PATCH] --- MagickCore/composite-private.h | 28 +++++++++++----------------- MagickCore/version.h | 2 +- PerlMagick/Makefile.PL | 4 ++-- PerlMagick/check.sh | 4 ++-- 4 files changed, 16 insertions(+), 22 deletions(-) diff --git a/MagickCore/composite-private.h b/MagickCore/composite-private.h index 17a7691a5..cf9bca64f 100644 --- a/MagickCore/composite-private.h +++ b/MagickCore/composite-private.h @@ -49,7 +49,6 @@ static inline void CompositePixelOver(const Image *image,const PixelInfo *p, { double Da, - gamma, Sa; register ssize_t @@ -59,9 +58,7 @@ static inline void CompositePixelOver(const Image *image,const PixelInfo *p, Compose pixel p over pixel q with the given alpha. */ Sa=QuantumScale*alpha; - Da=QuantumScale*beta, - gamma=Sa*(-Da)+Sa+Da; - gamma=PerceptibleReciprocal(gamma); + Da=QuantumScale*beta; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { PixelChannel @@ -78,31 +75,31 @@ static inline void CompositePixelOver(const Image *image,const PixelInfo *p, { case RedPixelChannel: { - composite[i]=ClampToQuantum(gamma*MagickOver_((double) p->red,alpha, + composite[i]=ClampToQuantum(MagickOver_((double) p->red,alpha, (double) q[i],beta)); break; } case GreenPixelChannel: { - composite[i]=ClampToQuantum(gamma*MagickOver_((double) p->green,alpha, + composite[i]=ClampToQuantum(MagickOver_((double) p->green,alpha, (double) q[i],beta)); break; } case BluePixelChannel: { - composite[i]=ClampToQuantum(gamma*MagickOver_((double) p->blue,alpha, + composite[i]=ClampToQuantum(MagickOver_((double) p->blue,alpha, (double) q[i],beta)); break; } case BlackPixelChannel: { - composite[i]=ClampToQuantum(gamma*MagickOver_((double) p->black,alpha, + composite[i]=ClampToQuantum(MagickOver_((double) p->black,alpha, (double) q[i],beta)); break; } case AlphaPixelChannel: { - composite[i]=ClampToQuantum(QuantumRange*(Sa*(-Da)+Sa+Da)); + composite[i]=ClampToQuantum(QuantumRange*(Sa+Da-Sa*-Da)); break; } default: @@ -119,7 +116,6 @@ static inline void CompositePixelInfoOver(const PixelInfo *p, { double Da, - gamma, Sa; /* @@ -127,14 +123,12 @@ static inline void CompositePixelInfoOver(const PixelInfo *p, */ Sa=QuantumScale*alpha; Da=QuantumScale*beta, - gamma=Sa*(-Da)+Sa+Da; - composite->alpha=(double) QuantumRange*gamma; - gamma=PerceptibleReciprocal(gamma); - composite->red=gamma*MagickOver_(p->red,alpha,q->red,beta); - composite->green=gamma*MagickOver_(p->green,alpha,q->green,beta); - composite->blue=gamma*MagickOver_(p->blue,alpha,q->blue,beta); + composite->alpha=(double) QuantumRange*(Sa+Da-Sa*Da); + composite->red=MagickOver_(p->red,alpha,q->red,beta); + composite->green=MagickOver_(p->green,alpha,q->green,beta); + composite->blue=MagickOver_(p->blue,alpha,q->blue,beta); if (q->colorspace == CMYKColorspace) - composite->black=gamma*MagickOver_(p->black,alpha,q->black,beta); + composite->black=MagickOver_(p->black,alpha,q->black,beta); } static inline double RoundToUnity(const double value) diff --git a/MagickCore/version.h b/MagickCore/version.h index fb41b94e3..af40ebb1b 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -48,7 +48,7 @@ extern "C" { #define MagickppLibAddendum "-0" #define MagickppLibInterface 0 #define MagickppLibMinInterface 0 -#define MagickReleaseDate "2015-05-30" +#define MagickReleaseDate "2015-06-02" #define MagickChangeDate "20120427" #define MagickAuthoritativeLicense \ "http://www.imagemagick.org/script/license.php" diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index cd494e750..3ab6a6534 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' => 'gcc', # 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/libpng16 -I/usr/include/freetype2 -I/usr/include/libdrm -I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/libpng16 -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'} ? 'gcc' : $Config{'ld'}, # Linker flags for building an executable 'LDFLAGS' => $LDFLAGS_magick, diff --git a/PerlMagick/check.sh b/PerlMagick/check.sh index 6257e46df..fd3d4bfe6 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='gcc' 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='gcc' TEST_VERBOSE=1 test else echo 'PerlMagick has not been built!' exit 1 -- 2.50.1