41 lines
1.7 KiB
Diff
41 lines
1.7 KiB
Diff
One more typing fix for GCC 4.4, and fix a NULL dereference on startup.
|
|
|
|
Lubomir Rintel <lkundrak@v3.sk>
|
|
|
|
diff -up inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44 inkscape/src/extension/internal/bitmap/imagemagick.cpp
|
|
--- inkscape/src/extension/internal/bitmap/imagemagick.cpp.gcc44 2009-01-28 22:12:57.000000000 +0100
|
|
+++ inkscape/src/extension/internal/bitmap/imagemagick.cpp 2009-04-10 12:34:09.189576256 +0200
|
|
@@ -114,7 +114,7 @@ ImageMagickDocCache::readImage(const cha
|
|
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 -up inkscape/src/libnr/nr-object.cpp.gcc44 inkscape/src/libnr/nr-object.cpp
|
|
--- inkscape/src/libnr/nr-object.cpp.gcc44 2008-05-04 07:14:00.000000000 +0200
|
|
+++ inkscape/src/libnr/nr-object.cpp 2009-04-10 12:34:09.190577328 +0200
|
|
@@ -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;
|
|
diff -up inkscape/src/widgets/ege-paint-def.cpp.gcc44 inkscape/src/widgets/ege-paint-def.cpp
|
|
--- inkscape/src/widgets/ege-paint-def.cpp.gcc44 2009-04-10 14:31:06.349578336 +0200
|
|
+++ inkscape/src/widgets/ege-paint-def.cpp 2009-04-10 14:31:20.011577660 +0200
|
|
@@ -45,6 +45,7 @@
|
|
|
|
#include <stdint.h>
|
|
#include <string>
|
|
+#include <cstdio>
|
|
#include <iostream>
|
|
#include <sstream>
|
|
#include <stdlib.h>
|