summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNiko Kiirala <niko@kiirala.com>2008-01-23 11:54:28 +0000
committerkiirala <kiirala@users.sourceforge.net>2008-01-23 11:54:28 +0000
commitcf98d435f0b0b4e0c12933753415dab26d0b3a5a (patch)
treeddad0dfab71c49e9fc4cbd8adcff1266dddd9897 /src
parentDocument Ctrl+click in Pen/Pencil tool in doc/keys.xml (diff)
downloadinkscape-cf98d435f0b0b4e0c12933753415dab26d0b3a5a.tar.gz
inkscape-cf98d435f0b0b4e0c12933753415dab26d0b3a5a.zip
Fixed crash with lighting effects and missing source image
(bzr r4585)
Diffstat (limited to 'src')
-rw-r--r--src/display/nr-filter-diffuselighting.cpp6
-rw-r--r--src/display/nr-filter-specularlighting.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/display/nr-filter-diffuselighting.cpp b/src/display/nr-filter-diffuselighting.cpp
index 0fca45095..32896712c 100644
--- a/src/display/nr-filter-diffuselighting.cpp
+++ b/src/display/nr-filter-diffuselighting.cpp
@@ -51,7 +51,7 @@ do {\
int FilterDiffuseLighting::render(FilterSlot &slot, FilterUnits const &units) {
- NRPixBlock *in = filter_get_alpha(slot.get(_input));
+ NRPixBlock *in = slot.get(_input);
if (!in) {
g_warning("Missing source image for feDiffuseLighting (in=%d)", _input);
return 1;
@@ -170,8 +170,8 @@ int FilterDiffuseLighting::render(FilterSlot &slot, FilterUnits const &units) {
//finishing
slot.set(_output, out);
- nr_pixblock_release(in);
- delete in;
+ //nr_pixblock_release(in);
+ //delete in;
return 0;
}
diff --git a/src/display/nr-filter-specularlighting.cpp b/src/display/nr-filter-specularlighting.cpp
index d579bf5f7..677f93dde 100644
--- a/src/display/nr-filter-specularlighting.cpp
+++ b/src/display/nr-filter-specularlighting.cpp
@@ -60,7 +60,7 @@ do {\
}while(0)
int FilterSpecularLighting::render(FilterSlot &slot, FilterUnits const &units) {
- NRPixBlock *in = filter_get_alpha(slot.get(_input));
+ NRPixBlock *in = slot.get(_input);
if (!in) {
g_warning("Missing source image for feSpecularLighting (in=%d)", _input);
return 1;
@@ -180,8 +180,8 @@ int FilterSpecularLighting::render(FilterSlot &slot, FilterUnits const &units) {
//finishing
slot.set(_output, out);
- nr_pixblock_release(in);
- delete in;
+ //nr_pixblock_release(in);
+ //delete in;
return 0;
}