Remove warnings

(bzr r5604)

7 files changed, 12 insertions, 8 deletions

diff --git a/src/display/canvas-arena.cpp b/src/display/canvas-arena.cpp
index f813a03c9..933c7850d 100644
--- a/src/display/canvas-arena.cpp
+++ b/src/display/canvas-arena.cpp
@@ -57,7 +57,7 @@ sp_canvas_arena_get_type (void)
     static GtkType type = 0;
     if (!type) {
         GtkTypeInfo info = {
-            "SPCanvasArena",
+            (gchar *)"SPCanvasArena",
             sizeof (SPCanvasArena),
             sizeof (SPCanvasArenaClass),
             (GtkClassInitFunc) sp_canvas_arena_class_init,
diff --git a/src/display/canvas-bpath.cpp b/src/display/canvas-bpath.cpp
index 8fecb4e3d..ed317722c 100644
--- a/src/display/canvas-bpath.cpp
+++ b/src/display/canvas-bpath.cpp
@@ -43,7 +43,7 @@ sp_canvas_bpath_get_type (void)
     static GtkType type = 0;
     if (!type) {
         GtkTypeInfo info = {
-            "SPCanvasBPath",
+            (gchar *)"SPCanvasBPath",
             sizeof (SPCanvasBPath),
             sizeof (SPCanvasBPathClass),
             (GtkClassInitFunc) sp_canvas_bpath_class_init,
diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp
index 7aebe0095..83eed0772 100644
--- a/src/display/canvas-grid.cpp
+++ b/src/display/canvas-grid.cpp
@@ -64,7 +64,7 @@ grid_canvasitem_get_type (void)
 
     if (!grid_canvasitem_type) {
         GtkTypeInfo grid_canvasitem_info = {
-            "GridCanvasItem",
+            (gchar *)"GridCanvasItem",
             sizeof (GridCanvasItem),
             sizeof (GridCanvasItemClass),
             (GtkClassInitFunc) grid_canvasitem_class_init,
diff --git a/src/display/gnome-canvas-acetate.cpp b/src/display/gnome-canvas-acetate.cpp
index b4fa5523a..ee6834075 100644
--- a/src/display/gnome-canvas-acetate.cpp
+++ b/src/display/gnome-canvas-acetate.cpp
@@ -32,7 +32,7 @@ sp_canvas_acetate_get_type (void)
 	static GtkType acetate_type = 0;
 	if (!acetate_type) {
 		GtkTypeInfo acetate_info = {
-			"SPCanvasAcetate",
+			(gchar *)"SPCanvasAcetate",
 			sizeof (SPCanvasAcetate),
 			sizeof (SPCanvasAcetateClass),
 			(GtkClassInitFunc) sp_canvas_acetate_class_init,
diff --git a/src/display/nr-filter-component-transfer.cpp b/src/display/nr-filter-component-transfer.cpp
index a81d8f53a..f4749de82 100644
--- a/src/display/nr-filter-component-transfer.cpp
+++ b/src/display/nr-filter-component-transfer.cpp
@@ -116,6 +116,9 @@ int FilterComponentTransfer::render(FilterSlot &slot, FilterUnits const &/*units
                     out_data[i] = CLAMP_D_TO_U8(256 * (_amplitude * pow((double)in_data[i]/256, _exponent) + _offset));
                 }
                 break;
+            case COMPONENTTRANSFER_TYPE_ERROR:
+                //TODO: report an error here
+                break;
         }
     }
 
diff --git a/src/display/nr-filter-image.cpp b/src/display/nr-filter-image.cpp
index 1eeb3e8c6..086e4114d 100644
--- a/src/display/nr-filter-image.cpp
+++ b/src/display/nr-filter-image.cpp
@@ -40,7 +40,7 @@ FilterImage::~FilterImage()
 int FilterImage::render(FilterSlot &slot, FilterUnits const &units) {
     if (!feImageHref) return 0;
 
-    NRPixBlock* pb;
+    NRPixBlock* pb = NULL;
     bool free_pb_on_exit = false;
 
     if(from_element){
diff --git a/src/display/nr-filter-skeleton.cpp b/src/display/nr-filter-skeleton.cpp
index 04d22cdc5..d45f6e916 100644
--- a/src/display/nr-filter-skeleton.cpp
+++ b/src/display/nr-filter-skeleton.cpp
@@ -39,9 +39,10 @@ FilterPrimitive * FilterSkeleton::create() {
 FilterSkeleton::~FilterSkeleton()
 {}
 
-int FilterSkeleton::render(FilterSlot &slot, FilterUnits const &units) {
-    NRPixBlock *in = slot.get(_input);
-    NRPixBlock *out;
+int FilterSkeleton::render(FilterSlot &slot,
+                           FilterUnits const &/*units*/) {
+    //NRPixBlock *in = slot.get(_input);
+    NRPixBlock *out = new NRPixBlock();
 
     /* Insert rendering code here */