diff options
| author | Felipe Corr??a da Silva Sanches <juca@members.fsf.org> | 2008-01-22 19:05:31 +0000 |
|---|---|---|
| committer | jucablues <jucablues@users.sourceforge.net> | 2008-01-22 19:05:31 +0000 |
| commit | 96041f11b0ba6315f2eadac80b4c454af189dead (patch) | |
| tree | da4fc9003a6896c3c74f47a6aa410b9fa6687265 /src | |
| parent | update (diff) | |
| download | inkscape-96041f11b0ba6315f2eadac80b4c454af189dead.tar.gz inkscape-96041f11b0ba6315f2eadac80b4c454af189dead.zip | |
fixes feImage rendering, but does not add it to filters dialog yet
(bzr r4577)
Diffstat (limited to 'src')
| -rw-r--r-- | src/display/nr-filter-image.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/display/nr-filter-image.cpp b/src/display/nr-filter-image.cpp index 028744b5c..0c35e026f 100644 --- a/src/display/nr-filter-image.cpp +++ b/src/display/nr-filter-image.cpp @@ -31,7 +31,7 @@ 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){ @@ -66,8 +66,8 @@ int FilterImage::render(FilterSlot &slot, FilterUnits const &/*units*/) { int x0 = in->area.x0, y0 = in->area.y0; 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; + + Matrix unit_trans = units.get_matrix_primitiveunits2pb().inverse(); nr_pixblock_setup_fast(out, in->mode, x0, y0, x1, y1, true); @@ -79,8 +79,8 @@ int FilterImage::render(FilterSlot &slot, FilterUnits const &/*units*/) { for (x=x0; x < x1; x++){ for (y=y0; y < y1; y++){ //TODO: use interpolation - coordx = int((x - feImageX - bbox_x0)*scaleX); - coordy = int((y - feImageY - bbox_y0)*scaleY); + coordx = int(scaleX * ((x * unit_trans[0] + unit_trans[4]) - feImageX)); + coordy = int(scaleY * ((y * unit_trans[3] + unit_trans[5]) - feImageY)); if (coordx > 0 && coordx < width && coordy > 0 && coordy < height){ out_data[4*((x - x0)+w*(y - y0))] = (unsigned char) image_pixbuf[3*coordx + rowstride*coordy]; //Red |