summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Koloska <uwe.koloska@voiceinterconnect.de>2015-10-14 14:41:55 (GMT)
committerUwe Koloska <uwe.koloska@voiceinterconnect.de>2015-10-14 14:41:55 (GMT)
commita7cf9c9696dbdcc422bd14bc5af5485c2179e9ab (patch)
tree502d5a87084dd980d005cbc618e7bdab9599c80e
parenta530b79d5a9257588debf6fe0a17fdccc442dc68 (diff)
downloadmxe-a7cf9c9696dbdcc422bd14bc5af5485c2179e9ab.zip
mxe-a7cf9c9696dbdcc422bd14bc5af5485c2179e9ab.tar.gz
mxe-a7cf9c9696dbdcc422bd14bc5af5485c2179e9ab.tar.bz2
use better type for pointer cast
-rw-r--r--src/openscenegraph-3-fix-pointer-to-int-conversion-on-64bit.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openscenegraph-3-fix-pointer-to-int-conversion-on-64bit.patch b/src/openscenegraph-3-fix-pointer-to-int-conversion-on-64bit.patch
index aae13de..6e0a6b4 100644
--- a/src/openscenegraph-3-fix-pointer-to-int-conversion-on-64bit.patch
+++ b/src/openscenegraph-3-fix-pointer-to-int-conversion-on-64bit.patch
@@ -14,12 +14,12 @@ diff --git a/src/osgPlugins/osgjs/WriteVisitor.cpp b/src/osgPlugins/osgjs/WriteV
index 9f2b3c7..98e0c19 100644
--- a/src/osgPlugins/osgjs/WriteVisitor.cpp
+++ b/src/osgPlugins/osgjs/WriteVisitor.cpp
-@@ -225,7 +225,7 @@ JSONObject* createImage(osg::Image* image, bool inlineImages, int maxTextureDime
+@@ -225,8 +225,7 @@ JSONObject* createImage(osg::Image* image, bool inlineImages, int maxTextureDime
// no image file so use this inline name image and create a file
std::stringstream ss;
ss << osgDB::getFilePath(baseName) << osgDB::getNativePathSeparator();
- ss << (long int)image << ".inline_conv_generated.png"; // write the pointer location
-+ ss << (long long int)image << ".inline_conv_generated.png"; // write the pointer location
++ ss << (intptr_t)image << ".inline_conv_generated.png"; // write the pointer location
std::string filename = ss.str();
if (osgDB::writeImageFile(*image, filename)) {
image->setFileName(filename);