Fixed crash with lighting effects and missing source image

diff --git a/src/display/nr-filter-diffuselighting.cpp b/src/display/nr-filter-diffuselighting.cpp
index 0fca4509547b918bd93ec117f37e1fdc435bc9f3..32896712cb64c206acf5368cbd800957b67d90b8 100644 (file)
--- 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 d579bf5f7da932d814eb7793f9d73f38135744a6..677f93dded1f355c39c02c59dc459aeecdaca389 100644 (file)
--- 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;
 }