summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiko Kiirala <niko@kiirala.com>2008-02-06 07:47:18 +0000
committerkiirala <kiirala@users.sourceforge.net>2008-02-06 07:47:18 +0000
commitbf5fdd06cf59245f8d7e7b3b74fe05bebba5e1df (patch)
treebdb94a7d3614eef1533fb48ce730c094c501816c
parentavoid dangerous equality comparison on doubles; remove useless asserts that w... (diff)
downloadinkscape-bf5fdd06cf59245f8d7e7b3b74fe05bebba5e1df.tar.gz
inkscape-bf5fdd06cf59245f8d7e7b3b74fe05bebba5e1df.zip
Fixed crash with lighting effects used on non-premultiplied input (bug 189468)
(bzr r4664)
-rw-r--r--src/display/nr-3dutils.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/display/nr-3dutils.cpp b/src/display/nr-3dutils.cpp
index fa1f21d9a..4a4cb78ec 100644
--- a/src/display/nr-3dutils.cpp
+++ b/src/display/nr-3dutils.cpp
@@ -116,7 +116,7 @@ void compute_surface_normal(Fvector &N, gdouble ss, NRPixBlock *in, int i, int j
gdouble accu_x;
gdouble accu_y;
unsigned char *data = NR_PIXBLOCK_PX (in);
- g_assert(in->mode == NR_PIXBLOCK_MODE_R8G8B8A8P);
+ g_assert(NR_PIXBLOCK_BPP(in) == 4);
x_carac = get_carac(j, w, dx); //LEFT, MIDDLE or RIGHT
y_carac = get_carac(i, h, dy); //TOP, MIDDLE or BOTTOM
alpha_idx = 4*(i*w + j);