Changeset 3399Tweet

Timestamp:

02/21/09 15:26:32 (4 years ago)

Author:

sam

Message:

Properly handle alpha components in the convolution code.

File:

• libpipi/trunk/pipi/filter/convolution.c (modified) (9 diffs)

libpipi/trunk/pipi/filter/convolution.c

@@ -135 +135 @@
         for(x = 0; x < w; x++)
         {
-            double R = 0., G = 0., B = 0.;
+            double R = 0., G = 0., B = 0., A = 0.;
             double Y = 0.;
             int x2, y2, off = 4 * (y * w + x);
@@ -160 +160 @@
                         G += f * srcdata[(y2 * w + x2) * 4 + 1];
                         B += f * srcdata[(y2 * w + x2) * 4 + 2];
+                        A += f * srcdata[(y2 * w + x2) * 4 + 3];
                     }
                 }
@@ -171 +172 @@
                 dstdata[off + 1] = G < 0.0 ? 0.0 : G > 1.0 ? 1.0 : G;
                 dstdata[off + 2] = B < 0.0 ? 0.0 : B > 1.0 ? 1.0 : B;
+                dstdata[off + 3] = A < 0.0 ? 0.0 : A > 1.0 ? 1.0 : A;
             }
         }
@@ -205 +207 @@
         for(x = 0; x < w; x++)
         {
-            double R = 0., G = 0., B = 0.;
+            double R = 0., G = 0., B = 0., A = 0.;
             double Y = 0.;
             int x2, off = 4 * (y * w + x);
@@ -224 +226 @@
                     G += f * srcdata[(y * w + x2) * 4 + 1];
                     B += f * srcdata[(y * w + x2) * 4 + 2];
+                    A += f * srcdata[(y * w + x2) * 4 + 3];
                 }
             }
@@ -234 +237 @@
                 buffer[off + 1] = G;
                 buffer[off + 2] = B;
+                buffer[off + 3] = A;
             }
         }
@@ -242 +246 @@
         for(x = 0; x < w; x++)
         {
-            double R = 0., G = 0., B = 0.;
+            double R = 0., G = 0., B = 0., A = 0.;
             double Y = 0.;
             int y2, off = 4 * (y * w + x);
@@ -261 +265 @@
                     G += f * buffer[(y2 * w + x) * 4 + 1];
                     B += f * buffer[(y2 * w + x) * 4 + 2];
+                    A += f * buffer[(y2 * w + x) * 4 + 3];
                 }
             }
@@ -271 +276 @@
                 dstdata[off + 1] = G < 0.0 ? 0.0 : G > 1.0 ? 1.0 : G;
                 dstdata[off + 2] = B < 0.0 ? 0.0 : B > 1.0 ? 1.0 : B;
+                dstdata[off + 3] = A < 0.0 ? 0.0 : A > 1.0 ? 1.0 : A;
             }
         }