summaryrefslogtreecommitdiffstats
path: root/src/display
diff options
context:
space:
mode:
Diffstat (limited to 'src/display')
-rw-r--r--src/display/nr-filter-colormatrix.cpp12
-rw-r--r--src/display/nr-filter-component-transfer.cpp8
-rw-r--r--src/display/nr-filter-composite.cpp2
-rw-r--r--src/display/nr-filter-convolve-matrix.cpp6
-rw-r--r--src/display/nr-filter-displacement-map.cpp18
-rw-r--r--src/display/nr-filter-flood.cpp8
-rw-r--r--src/display/nr-filter-image.cpp8
-rw-r--r--src/display/nr-filter-merge.cpp6
-rw-r--r--src/display/nr-filter-morphology.cpp16
-rw-r--r--src/display/nr-filter-primitive.cpp2
-rw-r--r--src/display/nr-filter-specularlighting.cpp16
-rw-r--r--src/display/nr-filter-tile.cpp8
-rw-r--r--src/display/nr-filter-turbulence.cpp13
13 files changed, 64 insertions, 59 deletions
diff --git a/src/display/nr-filter-colormatrix.cpp b/src/display/nr-filter-colormatrix.cpp
index e69e753e8..e5a3ca33f 100644
--- a/src/display/nr-filter-colormatrix.cpp
+++ b/src/display/nr-filter-colormatrix.cpp
@@ -27,7 +27,7 @@ FilterPrimitive * FilterColorMatrix::create() {
FilterColorMatrix::~FilterColorMatrix()
{}
-int FilterColorMatrix::render(FilterSlot &slot, FilterUnits const &units) {
+int FilterColorMatrix::render(FilterSlot &slot, FilterUnits const &/*units*/) {
NRPixBlock *in = slot.get(_input);
NRPixBlock *out = new NRPixBlock;
@@ -43,12 +43,12 @@ int FilterColorMatrix::render(FilterSlot &slot, FilterUnits const &units) {
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++){
@@ -92,7 +92,7 @@ int FilterColorMatrix::render(FilterSlot &slot, FilterUnits const &units) {
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;
@@ -100,7 +100,7 @@ int FilterColorMatrix::render(FilterSlot &slot, FilterUnits const &units) {
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 );
@@ -130,7 +130,7 @@ int FilterColorMatrix::render(FilterSlot &slot, FilterUnits const &units) {
return 0;
}
-void FilterColorMatrix::area_enlarge(NRRectL &area, Matrix const &trans)
+void FilterColorMatrix::area_enlarge(NRRectL &/*area*/, Matrix const &/*trans*/)
{
}
diff --git a/src/display/nr-filter-component-transfer.cpp b/src/display/nr-filter-component-transfer.cpp
index a190cecde..270e2296c 100644
--- a/src/display/nr-filter-component-transfer.cpp
+++ b/src/display/nr-filter-component-transfer.cpp
@@ -26,7 +26,7 @@ FilterPrimitive * FilterComponentTransfer::create() {
FilterComponentTransfer::~FilterComponentTransfer()
{}
-int FilterComponentTransfer::render(FilterSlot &slot, FilterUnits const &units) {
+int FilterComponentTransfer::render(FilterSlot &slot, FilterUnits const &/*units*/) {
NRPixBlock *in = slot.get(_input);
NRPixBlock *out = new NRPixBlock;
@@ -38,13 +38,15 @@ int FilterComponentTransfer::render(FilterSlot &slot, FilterUnits const &units)
unsigned char *out_data = NR_PIXBLOCK_PX(out);
//IMPLEMENT ME!
-
+ (void)in_data;
+ (void)out_data;
+
out->empty = FALSE;
slot.set(_output, out);
return 0;
}
-void FilterComponentTransfer::area_enlarge(NRRectL &area, Matrix const &trans)
+void FilterComponentTransfer::area_enlarge(NRRectL &/*area*/, Matrix const &/*trans*/)
{
}
diff --git a/src/display/nr-filter-composite.cpp b/src/display/nr-filter-composite.cpp
index de7dd7952..8670f61b2 100644
--- a/src/display/nr-filter-composite.cpp
+++ b/src/display/nr-filter-composite.cpp
@@ -98,7 +98,7 @@ FilterPrimitive * FilterComposite::create() {
FilterComposite::~FilterComposite()
{}
-int FilterComposite::render(FilterSlot &slot, FilterUnits const &units) {
+int FilterComposite::render(FilterSlot &slot, FilterUnits const &/*units*/) {
NRPixBlock *in1 = slot.get(_input);
NRPixBlock *in2 = slot.get(_input2);
NRPixBlock *original_in1 = in1;
diff --git a/src/display/nr-filter-convolve-matrix.cpp b/src/display/nr-filter-convolve-matrix.cpp
index e40a201a0..fe28c4b0b 100644
--- a/src/display/nr-filter-convolve-matrix.cpp
+++ b/src/display/nr-filter-convolve-matrix.cpp
@@ -34,7 +34,7 @@ static bool inside_area(int px, int py, int w, int h){
return true;
}
-int FilterConvolveMatrix::render(FilterSlot &slot, FilterUnits const &units) {
+int FilterConvolveMatrix::render(FilterSlot &slot, FilterUnits const &/*units*/) {
NRPixBlock *in = slot.get(_input);
NRPixBlock *out = new NRPixBlock;
@@ -112,13 +112,13 @@ void FilterConvolveMatrix::set_kernelMatrix(std::vector<gdouble> &km) {
void FilterConvolveMatrix::set_edgeMode(FilterConvolveMatrixEdgeMode mode){
edgeMode = mode;
-}
+}
void FilterConvolveMatrix::set_preserveAlpha(bool pa){
preserveAlpha = pa;
}
-void FilterConvolveMatrix::area_enlarge(NRRectL &area, Matrix const &trans)
+void FilterConvolveMatrix::area_enlarge(NRRectL &area, Matrix const &/*trans*/)
{
//Seems to me that since this filter's operation is resolution dependent,
// some spurious pixels may still appear at the borders when low zooming or rotating. Needs a better fix.
diff --git a/src/display/nr-filter-displacement-map.cpp b/src/display/nr-filter-displacement-map.cpp
index 184aa802d..afc2df8e7 100644
--- a/src/display/nr-filter-displacement-map.cpp
+++ b/src/display/nr-filter-displacement-map.cpp
@@ -26,24 +26,24 @@ FilterPrimitive * FilterDisplacementMap::create() {
FilterDisplacementMap::~FilterDisplacementMap()
{}
-int FilterDisplacementMap::render(FilterSlot &slot, FilterUnits const &units) {
+int FilterDisplacementMap::render(FilterSlot &slot, FilterUnits const &/*units*/) {
NRPixBlock *texture = slot.get(_input);
NRPixBlock *map = slot.get(_input2);
-
+
// Bail out if either one of source images is missing
if (!map || !texture) {
g_warning("Missing source image for feDisplacementMap (map=%d texture=%d)", _input, _input2);
return 1;
}
-
+
//TODO: check whether do we really need this check:
if (map->area.x1 <= map->area.x0 || map->area.y1 <= map->area.y0) return 0; //nothing to do!
-
- NRPixBlock *out = new NRPixBlock;
+
+ NRPixBlock *out = new NRPixBlock;
//are these checks really necessary?
if (out_w > map->area.x1 - out_x0) out_w = map->area.x1 - out_x0;
- if (out_h > map->area.y1 - out_y0) out_h = map->area.y1 - out_y0;
+ if (out_h > map->area.y1 - out_y0) out_h = map->area.y1 - out_y0;
if (out_x0 < map->area.x0){
out_x0 = map->area.x0;
out_w -= (map->area.x0 - out_x0);
@@ -59,7 +59,7 @@ int FilterDisplacementMap::render(FilterSlot &slot, FilterUnits const &units) {
out->area.y1 = out_y0 + out_h;
nr_pixblock_setup_fast(out, map->mode, out->area.x0, out->area.y0, out->area.x1, out->area.y1, true);
-
+
unsigned char *map_data = NR_PIXBLOCK_PX(map);
unsigned char *texture_data = NR_PIXBLOCK_PX(texture);
unsigned char *out_data = NR_PIXBLOCK_PX(out);
@@ -74,7 +74,7 @@ int FilterDisplacementMap::render(FilterSlot &slot, FilterUnits const &units) {
x+out_x0-map->area.x0 < in_w &&
y+out_y0-map->area.y0 >= 0 &&
y+out_y0-map->area.y0 < in_h){
-
+
coordx = out_x0 - map->area.x0 + x + scale * ( double(map_data[4*((x+out_x0-map->area.x0) + in_w*(y+out_y0-map->area.y0)) + Xchannel])/255 - 0.5);
coordy = out_y0 - map->area.y0 + y + scale * ( double(map_data[4*((x+out_x0-map->area.x0) + in_w*(y+out_y0-map->area.y0)) + Ychannel])/255 - 0.5);
@@ -121,7 +121,7 @@ void FilterDisplacementMap::set_channel_selector(int s, int channel) {
if (s == 1) Ychannel = channel;
}
-void FilterDisplacementMap::area_enlarge(NRRectL &area, Matrix const &trans)
+void FilterDisplacementMap::area_enlarge(NRRectL &area, Matrix const &/*trans*/)
{
out_x0 = area.x0;
out_y0 = area.y0;
diff --git a/src/display/nr-filter-flood.cpp b/src/display/nr-filter-flood.cpp
index fc03e564f..55576842b 100644
--- a/src/display/nr-filter-flood.cpp
+++ b/src/display/nr-filter-flood.cpp
@@ -26,7 +26,7 @@ FilterPrimitive * FilterFlood::create() {
FilterFlood::~FilterFlood()
{}
-int FilterFlood::render(FilterSlot &slot, FilterUnits const &units) {
+int FilterFlood::render(FilterSlot &slot, FilterUnits const &/*units*/) {
NRPixBlock *in = slot.get(_input);
NRPixBlock *out = new NRPixBlock;
@@ -38,13 +38,15 @@ int FilterFlood::render(FilterSlot &slot, FilterUnits const &units) {
unsigned char *out_data = NR_PIXBLOCK_PX(out);
//IMPLEMENT ME!
-
+ (void)in_data;
+ (void)out_data;
+
out->empty = FALSE;
slot.set(_output, out);
return 0;
}
-void FilterFlood::area_enlarge(NRRectL &area, Matrix const &trans)
+void FilterFlood::area_enlarge(NRRectL &/*area*/, Matrix const &/*trans*/)
{
}
diff --git a/src/display/nr-filter-image.cpp b/src/display/nr-filter-image.cpp
index d96d2013b..312e85404 100644
--- a/src/display/nr-filter-image.cpp
+++ b/src/display/nr-filter-image.cpp
@@ -31,9 +31,9 @@ FilterImage::~FilterImage()
if (image_pixbuf) g_free(image_pixbuf);
}
-int FilterImage::render(FilterSlot &slot, FilterUnits const &units) {
+int FilterImage::render(FilterSlot &slot, FilterUnits const &/*units*/) {
if (!feImageHref) return 0;
-
+
if (!image_pixbuf){
if ( (image = Gdk::Pixbuf::create_from_file(feImageHref)) < 0 ) return 0;
width = image->get_width();
@@ -49,7 +49,7 @@ int FilterImage::render(FilterSlot &slot, FilterUnits const &units) {
int x1 = in->area.x1, y1 = in->area.y1;
int bbox_x0 = (int) slot.get_arenaitem()->bbox.x0;
int bbox_y0 = (int) slot.get_arenaitem()->bbox.y0;
-
+
nr_pixblock_setup_fast(out, in->mode, x0, y0, x1, y1, true);
w = x1 - x0;
@@ -92,7 +92,7 @@ void FilterImage::set_region(SVGLength x, SVGLength y, SVGLength width, SVGLengt
FilterTraits FilterImage::get_input_traits() {
return TRAIT_PARALLER;
}
-
+
} /* namespace NR */
/*
diff --git a/src/display/nr-filter-merge.cpp b/src/display/nr-filter-merge.cpp
index 1e95d7cf1..ed060b649 100644
--- a/src/display/nr-filter-merge.cpp
+++ b/src/display/nr-filter-merge.cpp
@@ -46,7 +46,7 @@ FilterPrimitive * FilterMerge::create() {
FilterMerge::~FilterMerge()
{}
-int FilterMerge::render(FilterSlot &slot, FilterUnits const &units) {
+int FilterMerge::render(FilterSlot &slot, FilterUnits const &/*units*/) {
NRPixBlock *in[_input_image.size()];
NRPixBlock *original_in[_input_image.size()];
@@ -117,10 +117,10 @@ void FilterMerge::set_input(int slot) {
void FilterMerge::set_input(int input, int slot) {
if (input < 0) return;
- if (_input_image.size() > input) {
+ if (static_cast<int>(_input_image.size()) > input) {
_input_image[input] = slot;
} else {
- for (unsigned int i = _input_image.size() ; i < input ; i++) {
+ for (int i = static_cast<int>(_input_image.size()) ; i < input ; i++) {
_input_image.push_back(NR_FILTER_SLOT_NOT_SET);
}
_input_image.push_back(slot);
diff --git a/src/display/nr-filter-morphology.cpp b/src/display/nr-filter-morphology.cpp
index 20dc95bfa..abc529aad 100644
--- a/src/display/nr-filter-morphology.cpp
+++ b/src/display/nr-filter-morphology.cpp
@@ -25,19 +25,19 @@ FilterPrimitive * FilterMorphology::create() {
FilterMorphology::~FilterMorphology()
{}
-int FilterMorphology::render(FilterSlot &slot, FilterUnits const &units) {
+int FilterMorphology::render(FilterSlot &slot, FilterUnits const &/*units*/) {
NRPixBlock *in = slot.get(_input);
NRPixBlock *out = new NRPixBlock;
int x0=in->area.x0;
int y0=in->area.y0;
int x1=in->area.x1;
- int y1=in->area.y1;
+ int y1=in->area.y1;
int w=x1-x0, h=y1-y0;
int x,y,i,j;
int rmax,gmax,bmax,amax;
int rmin,gmin,bmin,amin;
-
+
nr_pixblock_setup_fast(out, in->mode, x0, y0, x1, y1, true);
unsigned char *in_data = NR_PIXBLOCK_PX(in);
@@ -55,11 +55,11 @@ int FilterMorphology::render(FilterSlot &slot, FilterUnits const &units) {
if(in_data[4*(i + w*j)+1]>gmax) gmax = in_data[4*(i + w*j)+1];
if(in_data[4*(i + w*j)+2]>bmax) bmax = in_data[4*(i + w*j)+2];
if(in_data[4*(i + w*j)+3]>amax) amax = in_data[4*(i + w*j)+3];
-
+
if(in_data[4*(i + w*j)]<rmin) rmin = in_data[4*(i + w*j)];
if(in_data[4*(i + w*j)+1]<gmin) gmin = in_data[4*(i + w*j)+1];
if(in_data[4*(i + w*j)+2]<bmin) bmin = in_data[4*(i + w*j)+2];
- if(in_data[4*(i + w*j)+3]<amin) amin = in_data[4*(i + w*j)+3];
+ if(in_data[4*(i + w*j)+3]<amin) amin = in_data[4*(i + w*j)+3];
}
}
if (Operator==MORPHOLOGY_OPERATOR_DILATE){
@@ -75,18 +75,18 @@ int FilterMorphology::render(FilterSlot &slot, FilterUnits const &units) {
}
}
}
-
+
out->empty = FALSE;
slot.set(_output, out);
return 0;
}
-void FilterMorphology::area_enlarge(NRRectL &area, Matrix const &trans)
+void FilterMorphology::area_enlarge(NRRectL &area, Matrix const &/*trans*/)
{
area.x0-=xradius;
area.x1+=xradius;
area.y0-=yradius;
- area.y1+=yradius;
+ area.y1+=yradius;
}
void FilterMorphology::set_operator(FilterMorphologyOperator &o){
diff --git a/src/display/nr-filter-primitive.cpp b/src/display/nr-filter-primitive.cpp
index 6e7e9e6ab..32467e3de 100644
--- a/src/display/nr-filter-primitive.cpp
+++ b/src/display/nr-filter-primitive.cpp
@@ -36,7 +36,7 @@ FilterPrimitive::~FilterPrimitive()
// Nothing to do here
}
-void FilterPrimitive::area_enlarge(NRRectL &area, Matrix const &m)
+void FilterPrimitive::area_enlarge(NRRectL &/*area*/, Matrix const &/*m*/)
{
// This doesn't need to do anything by default
}
diff --git a/src/display/nr-filter-specularlighting.cpp b/src/display/nr-filter-specularlighting.cpp
index 7f24f3ec2..3f459f164 100644
--- a/src/display/nr-filter-specularlighting.cpp
+++ b/src/display/nr-filter-specularlighting.cpp
@@ -29,7 +29,7 @@
namespace NR {
-FilterSpecularLighting::FilterSpecularLighting()
+FilterSpecularLighting::FilterSpecularLighting()
{
light_type = NO_LIGHT;
specularConstant = 1;
@@ -47,7 +47,7 @@ FilterSpecularLighting::~FilterSpecularLighting()
//Investigating Phong Lighting model we should not take N.H but
//R.E which equals to 2*N.H^2 - 1
-//replace the second line by
+//replace the second line by
//gdouble scal = scalar_product((N), (H)); scal = 2 * scal * scal - 1;
//to get the expected formula
#define COMPUTE_INTER(inter, H, N, ks, speculaExponent) \
@@ -64,7 +64,7 @@ int FilterSpecularLighting::render(FilterSlot &slot, FilterUnits const &units) {
NRPixBlock *out = new NRPixBlock;
//Fvector *L = NULL; //vector to the light
-
+
int w = in->area.x1 - in->area.x0;
int h = in->area.y1 - in->area.y0;
int x0 = in->area.x0;
@@ -80,7 +80,7 @@ int FilterSpecularLighting::render(FilterSlot &slot, FilterUnits const &units) {
gdouble ks = specularConstant; //diffuse lighting constant
Fvector L, N, LC, H;
gdouble inter;
-
+
nr_pixblock_setup_fast(out, in->mode,
in->area.x0, in->area.y0, in->area.x1, in->area.y1,
true);
@@ -88,7 +88,7 @@ int FilterSpecularLighting::render(FilterSlot &slot, FilterUnits const &units) {
unsigned char *data_o = NR_PIXBLOCK_PX (out);
//No light, nothing to do
switch (light_type) {
- case DISTANT_LIGHT:
+ case DISTANT_LIGHT:
//the light vector is constant
{
DistantLight *dl = new DistantLight(light.distant, lighting_color);
@@ -126,7 +126,7 @@ int FilterSpecularLighting::render(FilterSlot &slot, FilterUnits const &units) {
ss * (double) data_i[4*i+3]/ 255);
normalized_sum(H, L, EYE_VECTOR);
COMPUTE_INTER(inter, N, H, ks, specularExponent);
-
+
data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_RED]);
data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_GREEN]);
data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_BLUE]);
@@ -153,7 +153,7 @@ int FilterSpecularLighting::render(FilterSlot &slot, FilterUnits const &units) {
sl->light_components(LC, L);
normalized_sum(H, L, EYE_VECTOR);
COMPUTE_INTER(inter, N, H, ks, specularExponent);
-
+
data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_RED]);
data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_GREEN]);
data_o[j++] = CLAMP_D_TO_U8(inter * LC[LIGHT_BLUE]);
@@ -172,7 +172,7 @@ int FilterSpecularLighting::render(FilterSlot &slot, FilterUnits const &units) {
out->empty = false;
}
}
-
+
//finishing
slot.set(_output, out);
nr_pixblock_release(in);
diff --git a/src/display/nr-filter-tile.cpp b/src/display/nr-filter-tile.cpp
index 01453da39..b058db2bc 100644
--- a/src/display/nr-filter-tile.cpp
+++ b/src/display/nr-filter-tile.cpp
@@ -26,7 +26,7 @@ FilterPrimitive * FilterTile::create() {
FilterTile::~FilterTile()
{}
-int FilterTile::render(FilterSlot &slot, FilterUnits const &units) {
+int FilterTile::render(FilterSlot &slot, FilterUnits const &/*units*/) {
NRPixBlock *in = slot.get(_input);
NRPixBlock *out = new NRPixBlock;
@@ -38,13 +38,15 @@ int FilterTile::render(FilterSlot &slot, FilterUnits const &units) {
unsigned char *out_data = NR_PIXBLOCK_PX(out);
//IMPLEMENT ME!
-
+ (void)in_data;
+ (void)out_data;
+
out->empty = FALSE;
slot.set(_output, out);
return 0;
}
-void FilterTile::area_enlarge(NRRectL &area, Matrix const &trans)
+void FilterTile::area_enlarge(NRRectL &/*area*/, Matrix const &/*trans*/)
{
}
diff --git a/src/display/nr-filter-turbulence.cpp b/src/display/nr-filter-turbulence.cpp
index addbbb663..2c5d0ee64 100644
--- a/src/display/nr-filter-turbulence.cpp
+++ b/src/display/nr-filter-turbulence.cpp
@@ -2,13 +2,13 @@
* feTurbulence filter primitive renderer
*
* Authors:
- * Felipe Corrêa da Silva Sanches <felipe.sanches@gmail.com>
+ * Felipe Corrêa da Silva Sanches <felipe.sanches@gmail.com>
*
* Copyright (C) 2007 authors
*
* Released under GNU GPL, read the file 'COPYING' for more information
*/
-
+
#include "display/nr-arena-item.h"
#include "display/nr-filter.h"
#include "display/nr-filter-turbulence.h"
@@ -72,8 +72,7 @@ void FilterTurbulence::update_pixbuffer(FilterSlot &slot) {
int bbox_y1 = (int) slot.get_arenaitem()->bbox.y1;
int w = bbox_x1 - bbox_x0;
- int h = bbox_y1 - bbox_y0;
- int x,y;
+ int h = bbox_y1 - bbox_y0;
if (!pix){
pix = new NRPixBlock;
@@ -107,10 +106,10 @@ void FilterTurbulence::update_pixbuffer(FilterSlot &slot) {
updated=true;
}
-int FilterTurbulence::render(FilterSlot &slot, FilterUnits const &units) {
+int FilterTurbulence::render(FilterSlot &slot, FilterUnits const &/*units*/) {
//g_warning("render");
if (!updated) update_pixbuffer(slot);
-
+
NRPixBlock *in = slot.get(_input);
NRPixBlock *out = new NRPixBlock;
int x,y;
@@ -123,7 +122,7 @@ int FilterTurbulence::render(FilterSlot &slot, FilterUnits const &units) {
int bbox_y0 = (int) slot.get_arenaitem()->bbox.y0;
int bbox_x1 = (int) slot.get_arenaitem()->bbox.x1;
int bbox_w = bbox_x1 - bbox_x0;
-
+
unsigned char *out_data = NR_PIXBLOCK_PX(out);
for (x=x0; x < x1; x++){
for (y=y0; y < y1; y++){
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-21 11:27:41 +0000