FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Johannes Scholz, "Attached you find a patch for osgDB::OutputStream and osgDB::InputStream to include osg::Image::data() using Base64 encoding inside the ASCII OSGT, if WriteImageHint=IncludeData is set, only."

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14748 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-03-02 12:11:43 +00:00
parent 1d9e7f144b
commit 58edd10d04
5 changed files with 514 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/osgDB/InputStream.cpp
View File

@@ -15,9 +15,11 @@
#include <osg/Notify>
#include <osg/ImageSequence>
#include <osgDB/ReadFile>
#include <osgDB/WriteFile>
#include <osgDB/XmlParser>
#include <osgDB/FileNameUtils>
#include <osgDB/ObjectWrapper>
#include <osgDB/ConvertBase64>
using namespace osgDB;
@@ -726,6 +728,61 @@ osg::Image* InputStream::readImage(bool readFromExternal)
if ( image && levelSize>0 )
image->setMipmapLevels( levels );
readFromExternal = false;
} else { // ASCII
// _origin, _s & _t & _r, _internalTextureFormat
int origin, s, t, r, internalFormat;
*this >> PROPERTY("Origin") >> origin;
*this >> PROPERTY("Size") >> s >> t >> r;
*this >> PROPERTY("InternalTextureFormat") >> internalFormat;
// _pixelFormat, _dataType, _packing, _allocationMode
int pixelFormat, dataType, packing, mode;
*this >> PROPERTY("PixelFormat") >> pixelFormat;
*this >> PROPERTY("DataType") >> dataType;
*this >> PROPERTY("Packing") >> packing;
*this >> PROPERTY("AllocationMode") >> mode;
*this >> PROPERTY("Data");
unsigned int levelSize = readSize()-1;
*this >> BEGIN_BRACKET;
// _data
std::vector<std::string> encodedData;
encodedData.resize(levelSize+1);
readWrappedString(encodedData.at(0));
// Read all mipmap levels and to also add them to char* data
// _mipmapData
osg::Image::MipmapDataType levels(levelSize);
for ( unsigned int i=1; i<=levelSize; ++i )
{
//*this >> levels[i];
readWrappedString(encodedData.at(i));
}
Base64decoder d;
char* data = d.decode(encodedData, levels);
// remove last item as we do not need the actual size
// of the image including all mipmaps
levels.pop_back();
*this >> END_BRACKET;
if ( !data )
throwException( "InputStream::readImage() Decoding of stream failed. Out of memory." );
if ( getException() ) return NULL;
image = new osg::Image;
image->setOrigin( (osg::Image::Origin)origin );
image->setImage( s, t, r, internalFormat, pixelFormat, dataType,
(unsigned char*)data, (osg::Image::AllocationMode)mode, packing );
// Level positions (size of mipmap data)
// from actual size of mipmap data read before
if ( image && levelSize>0 )
image->setMipmapLevels( levels );
readFromExternal = false;
}
break;
case IMAGE_INLINE_FILE: