commited Solaris 2.8 / gcc-3.2.3 fixes

(bzr r2485)

3 files changed, 6 insertions, 2 deletions

diff --git a/src/display/nr-filter-gaussian.cpp b/src/display/nr-filter-gaussian.cpp
index 7ebeebd88..42ab92808 100644
--- a/src/display/nr-filter-gaussian.cpp
+++ b/src/display/nr-filter-gaussian.cpp
@@ -19,7 +19,7 @@
 #include <glib.h>
 #include <limits>
 
-using std::isnormal;
+#include "isnormal.h"
 
 #include "display/nr-filter-primitive.h"
 #include "display/nr-filter-gaussian.h"
@@ -276,7 +276,7 @@ void filter2D_IIR(PT *dest, int dstr1, int dstr2, PT const *src, int sstr1, int
         }
         // Backward pass
         IIRValue v[N+1][PC];
-        calcTriggsSdikaInitialization(M, u, iplus, iplus, b[0], v);
+        calcTriggsSdikaInitialization<PC>(M, u, iplus, iplus, b[0], v);
         dstimg -= dstr1;
         for(unsigned int c=0; c<PC; c++) dstimg[c] = clip_round_cast<PT>(v[0][c]);
         int c1=n1-1;
diff --git a/src/display/nr-filter.cpp b/src/display/nr-filter.cpp
index a720050c9..d2f459149 100644
--- a/src/display/nr-filter.cpp
+++ b/src/display/nr-filter.cpp
@@ -29,6 +29,8 @@
 #include "libnr/nr-scale.h"
 #include "svg/svg-length.h"
 #include "sp-filter-units.h"
+#include "round.h"
+using Inkscape::round;
 
 //#include "display/nr-arena-shape.h"
 
diff --git a/src/display/pixblock-transform.cpp b/src/display/pixblock-transform.cpp
index 7aa616eb3..2d5abc62c 100644
--- a/src/display/pixblock-transform.cpp
+++ b/src/display/pixblock-transform.cpp
@@ -13,6 +13,8 @@
 
 #include <glib.h>
 #include <cmath>
+#include "round.h"
+using Inkscape::round;
 using std::floor;
 
 #include "libnr/nr-pixblock.h"