Added 'paraller axis' rendering hint to filter primitives, that need it.

diff --git a/src/display/nr-filter-convolve-matrix.cpp b/src/display/nr-filter-convolve-matrix.cpp
index 6adf9c9a52483072f97dcee5555c92cec4516985..13bc585c9cfd1801e78b135a422d755ce4b5bcc6 100644 (file)
--- a/src/display/nr-filter-convolve-matrix.cpp
+++ b/src/display/nr-filter-convolve-matrix.cpp
@@ -126,6 +126,10 @@ void FilterConvolveMatrix::area_enlarge(NRRectL &area, Matrix const &trans)
     area.y1 += orderY - targetY;
 }
 
+FilterTraits FilterConvolveMatrix::get_input_traits() {
+    return TRAIT_PARALLER;
+}
+
 } /* namespace NR */
 
 /*

diff --git a/src/display/nr-filter-convolve-matrix.h b/src/display/nr-filter-convolve-matrix.h
index 2a397abf20563f0e03abf099db5a873a554e1263..ec47028e1ed325462ed9403b4a41d060c88aac5a 100644 (file)
--- a/src/display/nr-filter-convolve-matrix.h
+++ b/src/display/nr-filter-convolve-matrix.h
@@ -35,6 +35,7 @@ public:
 
     virtual int render(FilterSlot &slot, Matrix const &trans);
     virtual void area_enlarge(NRRectL &area, Matrix const &trans);
+    virtual FilterTraits get_input_traits();
 
     void set_targetY(int coord);
     void set_targetX(int coord);

diff --git a/src/display/nr-filter-diffuselighting.cpp b/src/display/nr-filter-diffuselighting.cpp
index 500a275afd7fb800931cd73b910530ca2c995fe9..0fa0495e76ee3c02147c381448a15053f664bf75 100644 (file)
--- a/src/display/nr-filter-diffuselighting.cpp
+++ b/src/display/nr-filter-diffuselighting.cpp
@@ -169,6 +169,10 @@ int FilterDiffuseLighting::render(FilterSlot &slot, Matrix const &trans) {
     return 0;
 }
 
+FilterTraits FilterDiffuseLighting::get_input_traits() {
+    return TRAIT_PARALLER;
+}
+
 } /* namespace NR */
 
 /*

diff --git a/src/display/nr-filter-diffuselighting.h b/src/display/nr-filter-diffuselighting.h
index 486b81acada7926a1411e2e25bd4f56df0b437ad..37da884ca47412aff33c6d8fad3e02a6e657eb7f 100644 (file)
--- a/src/display/nr-filter-diffuselighting.h
+++ b/src/display/nr-filter-diffuselighting.h
@@ -41,6 +41,7 @@ public:
     static FilterPrimitive *create();
     virtual ~FilterDiffuseLighting();
     virtual int render(FilterSlot &slot, Matrix const &trans);
+    virtual FilterTraits get_input_traits();
 
 private:
 };

diff --git a/src/display/nr-filter-displacement-map.cpp b/src/display/nr-filter-displacement-map.cpp
index 9e87fdddc298ff4e5d787015b33820d07f4173f7..f405109283e3feb80f1a7857330f55d6cad28702 100644 (file)
--- a/src/display/nr-filter-displacement-map.cpp
+++ b/src/display/nr-filter-displacement-map.cpp
@@ -132,6 +132,10 @@ void FilterDisplacementMap::area_enlarge(NRRectL &area, Matrix const &trans)
     area.y1 += (int)(scale/2);
 }
 
+FilterTraits FilterDisplacementMap::get_input_traits() {
+    return TRAIT_PARALLER;
+}
+
 } /* namespace NR */
 
 /*

diff --git a/src/display/nr-filter-displacement-map.h b/src/display/nr-filter-displacement-map.h
index 83601a5acdf8b64668214d4ffaed6c06ea62fe6f..bf0565c22dd67e61e52210aec704c9daf5a5cca0 100644 (file)
--- a/src/display/nr-filter-displacement-map.h
+++ b/src/display/nr-filter-displacement-map.h
@@ -31,6 +31,7 @@ public:
     virtual void set_channel_selector(int channel, int s);
     virtual int render(FilterSlot &slot, Matrix const &trans);
     virtual void area_enlarge(NRRectL &area, Matrix const &trans);
+    virtual FilterTraits get_input_traits();
 
 private:
     double scale;

diff --git a/src/display/nr-filter-image.cpp b/src/display/nr-filter-image.cpp
index 8e89cdc81adf5fa77a10dac56f5cde1834b90340..bd5e5296585b614c6c03dfff25e270b182fc8d81 100644 (file)
--- a/src/display/nr-filter-image.cpp
+++ b/src/display/nr-filter-image.cpp
@@ -73,6 +73,10 @@ void FilterImage::set_region(SVGLength x, SVGLength y, SVGLength width, SVGLengt
         feImageWidth=width.computed;
         feImageHeight=height.computed;
 }
+
+FilterTraits FilterImage::get_input_traits() {
+    return TRAIT_PARALLER;
+}
     
 } /* namespace NR */
 

diff --git a/src/display/nr-filter-image.h b/src/display/nr-filter-image.h
index 5841ad86a881b86257ad706c0510bf5012bf2f72..0e522139ca553ff1164e37a8dae17cc67a03f51c 100644 (file)
--- a/src/display/nr-filter-image.h
+++ b/src/display/nr-filter-image.h
@@ -25,6 +25,7 @@ public:
     virtual ~FilterImage();
 
     virtual int render(FilterSlot &slot, Matrix const &trans);
+    virtual FilterTraits get_input_traits();
     void set_region(SVGLength x, SVGLength y, SVGLength width, SVGLength height);
 private:
     guint8* image_pixbuf;

diff --git a/src/display/nr-filter-morphology.cpp b/src/display/nr-filter-morphology.cpp
index 07b1b1d94b4403156de8252b74357314132bf730..6cc6dd7b8f713651ce5253b3190859a579bf5ac5 100644 (file)
--- a/src/display/nr-filter-morphology.cpp
+++ b/src/display/nr-filter-morphology.cpp
@@ -99,6 +99,10 @@ void FilterMorphology::set_yradius(int y){
     yradius = y;
 }
 
+FilterTraits FilterMorphology::get_input_traits() {
+    return TRAIT_PARALLER;
+}
+
 } /* namespace NR */
 
 /*

diff --git a/src/display/nr-filter-morphology.h b/src/display/nr-filter-morphology.h
index be182203ca0697cc1034c0c406451fd2e6c2e5b7..7283b0cea8990a770c3166c0f5f4d0eafc41594a 100644 (file)
--- a/src/display/nr-filter-morphology.h
+++ b/src/display/nr-filter-morphology.h
@@ -31,6 +31,7 @@ public:
 
     virtual int render(FilterSlot &slot, Matrix const &trans);
     virtual void area_enlarge(NRRectL &area, Matrix const &trans);
+    virtual FilterTraits get_input_traits();
     void set_operator(FilterMorphologyOperator &o);
     void set_xradius(int x);
     void set_yradius(int y);

diff --git a/src/display/nr-filter-specularlighting.cpp b/src/display/nr-filter-specularlighting.cpp
index 90d243a6b00e320f141abe13ea79f4b66f7abf77..ca8bca6a8b3f3c8eb35ccdd0528150616f107675 100644 (file)
--- a/src/display/nr-filter-specularlighting.cpp
+++ b/src/display/nr-filter-specularlighting.cpp
@@ -179,6 +179,10 @@ int FilterSpecularLighting::render(FilterSlot &slot, Matrix const &trans) {
     return 0;
 }
 
+FilterTraits FilterSpecularLighting::get_input_traits() {
+    return TRAIT_PARALLER;
+}
+
 } /* namespace NR */
 
 /*

diff --git a/src/display/nr-filter-specularlighting.h b/src/display/nr-filter-specularlighting.h
index a9b3429f4939fb472489fdec43f2285b17c6f741..578b7ad4ad56a067077f9ff55cc9a04f3c6fcfe7 100644 (file)
--- a/src/display/nr-filter-specularlighting.h
+++ b/src/display/nr-filter-specularlighting.h
@@ -42,6 +42,7 @@ public:
     static FilterPrimitive *create();
     virtual ~FilterSpecularLighting();
     virtual int render(FilterSlot &slot, Matrix const &trans);
+    virtual FilterTraits get_input_traits();
 
 private:
 };

diff --git a/src/display/nr-filter-tile.cpp b/src/display/nr-filter-tile.cpp
index 69d577687f590b3305bda5ec31c2a657f205c9ef..39e2bff33c458b95213dd42d60001633ff98ba21 100644 (file)
--- a/src/display/nr-filter-tile.cpp
+++ b/src/display/nr-filter-tile.cpp
@@ -46,6 +46,10 @@ void FilterTile::area_enlarge(NRRectL &area, Matrix const &trans)
 {
 }
 
+FilterTraits FilterTile::get_input_traits() {
+    return TRAIT_PARALLER;
+}
+
 } /* namespace NR */
 
 /*

diff --git a/src/display/nr-filter-tile.h b/src/display/nr-filter-tile.h
index 32aa7b086d1fb581b250b41e581e49061150f3a9..56c26bd6630c14688c9fa2c93d6b4bf12c86405a 100644 (file)
--- a/src/display/nr-filter-tile.h
+++ b/src/display/nr-filter-tile.h
@@ -27,6 +27,7 @@ public:
 
     virtual int render(FilterSlot &slot, Matrix const &trans);
     virtual void area_enlarge(NRRectL &area, Matrix const &trans);
+    virtual FilterTraits get_input_traits();
 };
 
 } /* namespace NR */

diff --git a/src/display/nr-filter-turbulence.cpp b/src/display/nr-filter-turbulence.cpp
index d0921047af972f7cf0bf4f8056af00640c9b63e8..b3938418f62ebbef667bfdd33b9e4ef42363ac86 100644 (file)
--- a/src/display/nr-filter-turbulence.cpp
+++ b/src/display/nr-filter-turbulence.cpp
@@ -295,6 +295,10 @@ double FilterTurbulence::turbulence(int nColorChannel, double *point)
   return fSum;
 }
 
+FilterTraits FilterTurbulence::get_input_traits() {
+    return TRAIT_PARALLER;
+}
+
 } /* namespace NR */
 
 /*

diff --git a/src/display/nr-filter-turbulence.h b/src/display/nr-filter-turbulence.h
index db2b2854aec6d9ac2056881343d03c23e96c34fa..03c2e22a5ad4971d0d6bace6805718cd8a7842b0 100644 (file)
--- a/src/display/nr-filter-turbulence.h
+++ b/src/display/nr-filter-turbulence.h
@@ -66,6 +66,7 @@ public:
     virtual void set_stitchTiles(bool st);
     virtual void set_type(FilterTurbulenceType t);
     virtual void set_updated(bool u);
+    virtual FilterTraits get_input_traits();
 private:
 
     long Turbulence_setup_seed(long lSeed);