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

From Patrick Neary, "To the tiff plugin, add the capability to write tiff images with unsigned short data"

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14969 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield 2015-07-17 08:12:38 +00:00
parent 7a94ce8585
commit 67fb0b3530
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/osgPlugins/tiff/ReaderWriterTIFF.cpp
View File

@ -852,6 +852,9 @@ class ReaderWriterTIFF : public osgDB::ReaderWriter
else if (compressTypeOpt == "jpeg") {
compressionType = COMPRESSION_JPEG;
}
else if (compressTypeOpt == "none") {
compressionType = COMPRESSION_NONE;
}
}
}
}
@ -883,10 +886,12 @@ class ReaderWriterTIFF : public osgDB::ReaderWriter
case GL_DEPTH_COMPONENT:
case GL_LUMINANCE:
case GL_ALPHA:
case GL_RED:
photometric = PHOTOMETRIC_MINISBLACK;
samplesPerPixel = 1;
break;
case GL_LUMINANCE_ALPHA:
case GL_RG:
photometric = PHOTOMETRIC_MINISBLACK;
samplesPerPixel = 2;
break;
@ -913,6 +918,10 @@ class ReaderWriterTIFF : public osgDB::ReaderWriter
TIFFSetField(image, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_INT);
bitsPerSample = 16;
break;
case GL_UNSIGNED_SHORT:
TIFFSetField(image, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT);
bitsPerSample = 16;
break;
default:
bitsPerSample = 8;
break;