get rid of a lot of no longer needed "libnr/nr-..." includes.

[inkscape.git] / src / display / nr-3dutils.cpp

diff --git a/src/display/nr-3dutils.cpp b/src/display/nr-3dutils.cpp
index fa1f21d9a1a8c795b58817efe2af6c5da719ceb5..ffeaebe8e57fa823fb223d40b9e8b8c9ecc2a764 100644 (file)
--- a/src/display/nr-3dutils.cpp
+++ b/src/display/nr-3dutils.cpp
@@ -12,7 +12,6 @@
 #include <glib/gmessages.h>
 
 #include "libnr/nr-pixblock.h"
-#include "libnr/nr-matrix.h"
 #include "display/nr-3dutils.h"
 #include <cmath>
 
@@ -116,7 +115,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);