From: scislac <scislac@users.sourceforge.net>
Date: Thu, 7 May 2009 01:22:33 +0000 (+0000)
Subject: Patch 337357 by Lubomir Rintel: GCC 4.4 compilation & start fix (woohoo, happy on... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8476924574b4e7f173f580099b507a0e410ec7d6;p=inkscape.git

Patch 337357 by Lubomir Rintel: GCC 4.4 compilation & start fix (woohoo, happy on Karmic now)
---

diff --git a/src/extension/internal/bitmap/imagemagick.cpp b/src/extension/internal/bitmap/imagemagick.cpp
index 402e0c973..f86d0ec42 100644
--- a/src/extension/internal/bitmap/imagemagick.cpp
+++ b/src/extension/internal/bitmap/imagemagick.cpp
@@ -114,7 +114,7 @@ ImageMagickDocCache::readImage(const char *xlink, Magick::Image *image)
 	char *search = (char *) g_strndup(xlink, 30);
 	if (strstr(search, "base64") != (char*)NULL) {
 		// 7 = strlen("base64") + strlen(",")
-		char* pureBase64 = strstr(xlink, "base64") + 7;		
+		const char* pureBase64 = strstr(xlink, "base64") + 7;		
 		Magick::Blob blob;
 		blob.base64(pureBase64);
 		image->read(blob);
diff --git a/src/libnr/nr-object.cpp b/src/libnr/nr-object.cpp
index 7ecdd75c3..d92052d10 100644
--- a/src/libnr/nr-object.cpp
+++ b/src/libnr/nr-object.cpp
@@ -198,8 +198,8 @@ NRObject *NRObject::alloc(NRType type)
     );
     memset(object, 0xf0, c->isize);
 
-    object->klass = c;
     c->cpp_ctor(object);
+    object->klass = c;
     nr_class_tree_object_invoke_init (c, object);
 
     return object;