10 files changed, 24 insertions, 20 deletions
diff --git a/src/display/cairo-utils.cpp b/src/display/cairo-utils.cpp
index fc56c7b26..a55b05fe3 100644
--- a/src/display/cairo-utils.cpp
+++ b/src/display/cairo-utils.cpp
@@ -655,8 +655,8 @@ int ink_cairo_surface_srgb_to_linear(cairo_surface_t *surface)
     cairo_surface_flush(surface);
     int width = cairo_image_surface_get_width(surface);
     int height = cairo_image_surface_get_height(surface);
-    // int stride = cairo_image_surface_get_stride(surface);
-    // unsigned char *data = cairo_image_surface_get_data(surface);
+    int stride = cairo_image_surface_get_stride(surface);
+    unsigned char *data = cairo_image_surface_get_data(surface);
 
     ink_cairo_surface_filter( surface, surface, SurfaceSrgbToLinear() );
 
@@ -698,8 +698,8 @@ int ink_cairo_surface_linear_to_srgb(cairo_surface_t *surface)
     cairo_surface_flush(surface);
     int width = cairo_image_surface_get_width(surface);
     int height = cairo_image_surface_get_height(surface);
-    // int stride = cairo_image_surface_get_stride(surface);
-    // unsigned char *data = cairo_image_surface_get_data(surface);
+    int stride = cairo_image_surface_get_stride(surface);
+    unsigned char *data = cairo_image_surface_get_data(surface);
 
     ink_cairo_surface_filter( surface, surface, SurfaceLinearToSrgb() );
 
@@ -888,4 +888,4 @@ guint32 argb32_from_rgba(guint32 in)
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
diff --git a/src/display/canvas-axonomgrid.h b/src/display/canvas-axonomgrid.h
index f58ea3aca..0e24d3f56 100644
--- a/src/display/canvas-axonomgrid.h
+++ b/src/display/canvas-axonomgrid.h
@@ -12,7 +12,7 @@
 #include "line-snapper.h"
 #include "canvas-grid.h"
 
-struct SPCanvasBuf;
+class  SPCanvasBuf;
 class  SPDesktop;
 struct SPNamedView;
 
diff --git a/src/display/guideline.h b/src/display/guideline.h
index 2d9a87d9b..164244c46 100644
--- a/src/display/guideline.h
+++ b/src/display/guideline.h
@@ -21,7 +21,7 @@
 #define SP_GUIDELINE(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_GUIDELINE, SPGuideLine))
 #define SP_IS_GUIDELINE(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), SP_TYPE_GUIDELINE))
 
-struct SPCtrlPoint;
+class SPCtrlPoint;
 
 struct SPGuideLine {
     SPCanvasItem item;
diff --git a/src/display/nr-filter-diffuselighting.h b/src/display/nr-filter-diffuselighting.h
index 15cc8e1ff..315bf9f48 100644
--- a/src/display/nr-filter-diffuselighting.h
+++ b/src/display/nr-filter-diffuselighting.h
@@ -19,10 +19,10 @@
 #include "display/nr-filter-slot.h"
 #include "display/nr-filter-units.h"
 
-struct SPFeDistantLight;
-struct SPFePointLight;
-struct SPFeSpotLight;
-struct SVGICCColor;
+class SPFeDistantLight;
+class SPFePointLight;
+class SPFeSpotLight;
+class SVGICCColor;
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-flood.h b/src/display/nr-filter-flood.h
index 9a968047d..8568502ff 100644
--- a/src/display/nr-filter-flood.h
+++ b/src/display/nr-filter-flood.h
@@ -14,7 +14,7 @@
 
 #include "display/nr-filter-primitive.h"
 
-struct SVGICCColor;
+class SVGICCColor;
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-filter-specularlighting.h b/src/display/nr-filter-specularlighting.h
index 0d1c0644f..4f8c2d112 100644
--- a/src/display/nr-filter-specularlighting.h
+++ b/src/display/nr-filter-specularlighting.h
@@ -17,10 +17,10 @@
 #include "display/nr-light-types.h"
 #include "display/nr-filter-primitive.h"
 
-struct SPFeDistantLight;
-struct SPFePointLight;
-struct SPFeSpotLight;
-struct SVGICCColor;
+class SPFeDistantLight;
+class SPFePointLight;
+class SPFeSpotLight;
+class SVGICCColor;
 
 namespace Inkscape {
 namespace Filters {
diff --git a/src/display/nr-style.h b/src/display/nr-style.h
index 80547c43e..597ae7a2c 100644
--- a/src/display/nr-style.h
+++ b/src/display/nr-style.h
@@ -16,7 +16,8 @@
 #include <2geom/rect.h>
 #include "color.h"
 
-struct SPPaintServer;
+class SPColor;
+class SPPaintServer;
 struct SPStyle;
 
 namespace Inkscape {
diff --git a/src/display/nr-svgfonts.cpp b/src/display/nr-svgfonts.cpp
index 84b4bd080..0d1b56d54 100644
--- a/src/display/nr-svgfonts.cpp
+++ b/src/display/nr-svgfonts.cpp
@@ -1,4 +1,5 @@
 #include "config.h"
+#ifdef ENABLE_SVG_FONTS
 /*
  * SVGFonts rendering implementation
  *
@@ -355,6 +356,8 @@ void SvgFont::refresh(){
     this->userfont = NULL;
 }
 
+#endif //#ifdef ENABLE_SVG_FONTS
+
 /*
   Local Variables:
   mode:c++
diff --git a/src/display/nr-svgfonts.h b/src/display/nr-svgfonts.h
index 1101f93f2..6138e2fbb 100644
--- a/src/display/nr-svgfonts.h
+++ b/src/display/nr-svgfonts.h
@@ -18,8 +18,8 @@
 
 class SvgFont;
 struct SPFont;
-struct SPGlyph;
-struct SPMissingGlyph;
+class SPGlyph;
+class SPMissingGlyph;
 
 struct _GdkEventExpose;
 typedef _GdkEventExpose GdkEventExpose;
diff --git a/src/display/sp-ctrlcurve.h b/src/display/sp-ctrlcurve.h
index 90936185c..15de20161 100644
--- a/src/display/sp-ctrlcurve.h
+++ b/src/display/sp-ctrlcurve.h
@@ -17,7 +17,7 @@
 
 #include "display/sp-ctrlline.h"
 
-class SPItem;
+struct SPItem;
 
 #define SP_TYPE_CTRLCURVE (SPCtrlCurve::getType())
 #define SP_CTRLCURVE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_CTRLCURVE, SPCtrlCurve))