Changeset 408

Timestamp:

10/18/09 07:55:29 (5 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk

Files:

• ChangeLog (modified) (1 diff)
• magick/resize.c (modified) (2 diffs)

ImageMagick/trunk/ChangeLog

@@ +1 @@
+2009-10-18  6.5.7-1 Cristy  <quetzlzacatenango@image...>
+  * Alpha blending is not required for ScaleImage().
+
 2009-10-14  6.5.7-0 Pino Toscano  <pino@kde...>
   * ImageMagick fails to build in GNU/HURD due to absence of PATH_MAX.

ImageMagick/trunk/magick/resize.c

@@ -2457 +2457 @@
     *y_vector,
     zero;
-
-  MagickRealType
-    alpha,
-    gamma;
 
   PointInfo
@@ -2768 +2764 @@
       for (x=0; x < (long) scale_image->columns; x++)
       {
-        alpha=1.0;
-        if (image->matte != MagickFalse)
-          alpha=(MagickRealType) (QuantumScale*(QuantumRange-t->opacity));
-        gamma=1.0/(fabs((double) alpha) <= MagickEpsilon ? 1.0 : alpha);
-        q->red=RoundToQuantum(gamma*t->red);
-        q->green=RoundToQuantum(gamma*t->green);
-        q->blue=RoundToQuantum(gamma*t->blue);
+        q->red=RoundToQuantum(t->red);
+        q->green=RoundToQuantum(t->green);
+        q->blue=RoundToQuantum(t->blue);
         if (scale_image->matte != MagickFalse)
           q->opacity=RoundToQuantum(t->opacity);
         if (scale_indexes != (IndexPacket *) NULL)
-          scale_indexes[x]=(IndexPacket) RoundToQuantum(gamma*t->index);
+          scale_indexes[x]=(IndexPacket) RoundToQuantum(t->index);
         t++;
         q++;