Merging in the DBus Interface from GSoC 2009

[inkscape.git] / src / display / nr-filter-merge.cpp

diff --git a/src/display/nr-filter-merge.cpp b/src/display/nr-filter-merge.cpp
index 4581238b7cbd5880329e0b8a0bf37478fdb82094..b913e2cd7193509cb4c50ef95a7e3fd4d2f4bc7e 100644 (file)
--- a/src/display/nr-filter-merge.cpp
+++ b/src/display/nr-filter-merge.cpp
@@ -22,7 +22,6 @@
 #include "libnr/nr-blit.h"
 #include "libnr/nr-pixblock.h"
 #include "libnr/nr-pixops.h"
-#include "libnr/nr-matrix.h"
 
 inline void
 composite_over(unsigned char *r, unsigned char const *a, unsigned char const *b)
@@ -33,7 +32,8 @@ composite_over(unsigned char *r, unsigned char const *a, unsigned char const *b)
     r[3] = a[3] + NR_NORMALIZE_21(b[3] * (255 - a[3]));
 }
 
-namespace NR {
+namespace Inkscape {
+namespace Filters {
 
 FilterMerge::FilterMerge() :
     _input_image(1, NR_FILTER_SLOT_NOT_SET)
@@ -129,7 +129,8 @@ void FilterMerge::set_input(int input, int slot) {
     }
 }
 
-} /* namespace NR */
+} /* namespace Filters */
+} /* namespace Inkscape */
 
 /*
   Local Variables: