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

Added automatic toggling between png and jpeg when compressImageData option is used. Jpeg

Browse Source 
is used to compress RGB data only, the just of the formats are passed on to the png plugin.
This commit is contained in:
Robert Osfield
2006-03-02 20:31:40 +00:00
parent c42e14dd1f
commit 8796f37acb
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osgPlugins/ive/DataOutputStream.cpp
View File

@@ -1061,11 +1061,17 @@ void DataOutputStream::writeImage(IncludeImageMode mode, osg::Image *image)
}
break;
case IMAGE_COMPRESS_DATA:
if(image) {
if(image)
{
//Get ReaderWriter for jpeg images
osgDB::ReaderWriter *writer = osgDB::Registry::instance()->getReaderWriterForExtension("jpeg");
std::string extension = "png";
if (image->getPixelFormat()==GL_RGB) extension = "jpg";
osgDB::ReaderWriter* writer = osgDB::Registry::instance()->getReaderWriterForExtension(extension);
if(writer) {
if(writer)
{
//Attempt to write the image to an output stream.
//The reason this isn't performed directly on the internal _ostream
//is because the writer might perform seek operations which could
@@ -1079,7 +1085,7 @@ void DataOutputStream::writeImage(IncludeImageMode mode, osg::Image *image)
//Write file format. Do this for two reasons:
// 1 - Same code can be used to read in as with IMAGE_INCLUDE_FILE mode
// 2 - Maybe in future version user can specify which format to use
writeString(".jpeg"); //Need to add dot so osgDB::getFileExtension will work
writeString(std::string(".")+extension); //Need to add dot so osgDB::getFileExtension will work
//Write size of stream
int size = outputStream.tellp();