(no commit message)

diff --git a/MagickCore/composite-private.h b/MagickCore/composite-private.h
index 17a7691a582364a24a683e17f915f722d31c4d6e..cf9bca64feab21b21d1c40128ca1235f19049e58 100644 (file)
--- 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 fb41b94e336920842d4fc6fab4920ce75d5f076f..af40ebb1ba03cb65d3654b13dde5bf9bde1a3df6 100644 (file)
--- 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 cd494e75079fa2d39cf750d13a0ea44ca0096779..3ab6a65341bdcb074ea94a5fa113d0aafa73212a 100644 (file)
--- 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 6257e46df98f3a4064f12a4b2099ae639447f761..fd3d4bfe6b51164bbe5f329d21987368430f8ba2 100755 (executable)
--- 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