diff options
| author | Josh Andler <scislac@gmail.com> | 2009-05-07 01:22:33 +0000 |
|---|---|---|
| committer | scislac <scislac@users.sourceforge.net> | 2009-05-07 01:22:33 +0000 |
| commit | 18009edf27dfa8dea2efe6639904bbc62a1cc66a (patch) | |
| tree | e39195edb7b6d2638728913ee1225b30f6cf029f /src | |
| parent | fix LP bug 293940, comment 73 (diff) | |
| download | inkscape-18009edf27dfa8dea2efe6639904bbc62a1cc66a.tar.gz inkscape-18009edf27dfa8dea2efe6639904bbc62a1cc66a.zip | |
Patch 337357 by Lubomir Rintel: GCC 4.4 compilation & start fix (woohoo, happy on Karmic now)
(bzr r7831)
Diffstat (limited to 'src')
| -rw-r--r-- | src/extension/internal/bitmap/imagemagick.cpp | 2 | ||||
| -rw-r--r-- | src/libnr/nr-object.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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; |