Rename LPE: mirror reflect --> mirror symmetry

[inkscape.git] / src / display / nr-filter-colormatrix.cpp

diff --git a/src/display/nr-filter-colormatrix.cpp b/src/display/nr-filter-colormatrix.cpp
index 3ed193984a02bbc1027670a833c6ef95b862f62b..1d73f14e1906ec92ff560d18bba0d8fec95cdc8a 100644 (file)
--- a/src/display/nr-filter-colormatrix.cpp
+++ b/src/display/nr-filter-colormatrix.cpp
@@ -10,8 +10,10 @@
  */
 
 #include "display/nr-filter-colormatrix.h"
+#include "display/nr-filter-units.h"
 #include "display/nr-filter-utils.h"
-#include<math.h>
+#include "libnr/nr-blit.h"
+#include <math.h>
 
 namespace NR {
 
@@ -26,14 +28,33 @@ FilterPrimitive * FilterColorMatrix::create() {
 FilterColorMatrix::~FilterColorMatrix()
 {}
 
-int FilterColorMatrix::render(FilterSlot &slot, Matrix const &trans) {
+int FilterColorMatrix::render(FilterSlot &slot, FilterUnits const &/*units*/) {
     NRPixBlock *in = slot.get(_input);
+    if (!in) {
+        g_warning("Missing source image for feColorMatrix (in=%d)", _input);
+        return 1;
+    }
+
     NRPixBlock *out = new NRPixBlock;
 
-    nr_pixblock_setup_fast(out, in->mode,
+    nr_pixblock_setup_fast(out, NR_PIXBLOCK_MODE_R8G8B8A8N,
                            in->area.x0, in->area.y0, in->area.x1, in->area.y1,
                            true);
 
+    // this primitive is defined for non-premultiplied RGBA values,
+    // thus convert them to that format
+    bool free_in_on_exit = false;
+    if (in->mode != NR_PIXBLOCK_MODE_R8G8B8A8N) {
+        NRPixBlock *original_in = in;
+        in = new NRPixBlock;
+        nr_pixblock_setup_fast(in, NR_PIXBLOCK_MODE_R8G8B8A8N,
+                               original_in->area.x0, original_in->area.y0,
+                               original_in->area.x1, original_in->area.y1,
+                               true);
+        nr_blit_pixblock_pixblock(in, original_in);
+        free_in_on_exit = true;
+    }
+
     unsigned char *in_data = NR_PIXBLOCK_PX(in);
     unsigned char *out_data = NR_PIXBLOCK_PX(out);
     unsigned char r,g,b,a;
@@ -42,12 +63,12 @@ int FilterColorMatrix::render(FilterSlot &slot, Matrix const &trans) {
     x0=in->area.x0;
     y0=in->area.y0;
     x1=in->area.x1;
-    y1=in->area.y1;    
+    y1=in->area.y1;
 
     switch(type){
         case COLORMATRIX_MATRIX:
             if (values.size()!=20) {
-                g_warning("ColorMatrix: values parameter error. Wrong size: %i.", values.size());
+                g_warning("ColorMatrix: values parameter error. Wrong size: %i.", static_cast<int>(values.size()));
                 return -1;
             }
             for (x=x0;x<x1;x++){
@@ -91,7 +112,7 @@ int FilterColorMatrix::render(FilterSlot &slot, Matrix const &trans) {
             a20 = 0.213 + coshue*(-0.213) + sinhue*(-0.787);
             a21 = 0.715 + coshue*(-0.715) + sinhue*( 0.715);
             a22 = 0.072 + coshue*( 0.928) + sinhue*( 0.072);
-                                    
+
             for (x=x0;x<x1;x++){
                 for (y=y0;y<y1;y++){
                     i = ((x-x0) + (x1-x0)*(y-y0))*4;
@@ -99,7 +120,7 @@ int FilterColorMatrix::render(FilterSlot &slot, Matrix const &trans) {
                     g = in_data[i+1];
                     b = in_data[i+2];
                     a = in_data[i+3];
-                    
+
                     out_data[i] = CLAMP_D_TO_U8( r*a00 + g*a01 + b*a02 );
                     out_data[i+1] = CLAMP_D_TO_U8( r*a10 + g*a11 + b*a12 );
                     out_data[i+2] = CLAMP_D_TO_U8( r*a20 + g*a21 + b*a22 );
@@ -124,12 +145,18 @@ int FilterColorMatrix::render(FilterSlot &slot, Matrix const &trans) {
         case COLORMATRIX_ENDTYPE:
             break;
     }
+
+    if (free_in_on_exit) {
+        nr_pixblock_release(in);
+        delete in;
+    }
+
     out->empty = FALSE;
     slot.set(_output, out);
     return 0;
 }
 
-void FilterColorMatrix::area_enlarge(NRRectL &area, Matrix const &trans)
+void FilterColorMatrix::area_enlarge(NRRectL &/*area*/, Matrix const &/*trans*/)
 {
 }