From 17aaa4db947a46e7e3b09c8fb237d4a92707183f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 30 Sep 2010 16:31:22 +0000 Subject: [PATCH] From Craig Bosma, "Attached is an updated Image.cpp that fixes a very specific compatability regression that was introduced almost 2 years ago in r8834. The IVE version number was bumped to 32 because of the change in binary layout, but the guard for reading/writing the new field was checked against 31. Of course this only causes a problem (as for us) when you've produced IVE files at version 31, which no longer load (or crash) when loaded by newer OSG/IVE versions." --- src/osgPlugins/ive/Image.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osgPlugins/ive/Image.cpp b/src/osgPlugins/ive/Image.cpp index 0bdce5044..d716bd325 100644 --- a/src/osgPlugins/ive/Image.cpp +++ b/src/osgPlugins/ive/Image.cpp @@ -36,7 +36,7 @@ void Image::write(DataOutputStream* out) // Write name out->writeString(getFileName()); - if ( out->getVersion() >= VERSION_0031) + if ( out->getVersion() >= VERSION_0032) { out->writeInt((int)getWriteHint()); } @@ -96,7 +96,7 @@ void Image::read(DataInputStream* in) // Read name setFileName(in->readString()); - if ( in->getVersion() >= VERSION_0031) + if ( in->getVersion() >= VERSION_0032) { setWriteHint((osg::Image::WriteHint)in->readInt()); }