Patch 337357 by Lubomir Rintel: GCC 4.4 compilation & start fix (woohoo, happy on...

diff --git a/src/extension/internal/bitmap/imagemagick.cpp b/src/extension/internal/bitmap/imagemagick.cpp
index 402e0c973863087f62dd0ccff7ae18cc4bc2c056..f86d0ec42feeccd2b844ac6635b1b98272084bb1 100644 (file)
--- 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 7ecdd75c3e6f5f0953b2b75ee7fd2d25d80f859b..d92052d10666c784bf9184d02f59050649b255ae 100644 (file)
--- 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;