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

Mered fix for internalFormat

Browse Source
This commit is contained in:
Kent
2019-09-03 16:11:14 +08:00
committed by Robert Osfield
parent 27e3f57da2
commit d215b255c4
1 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -809,8 +809,6 @@ class ReaderWriterTIFF : public osgDB::ReaderWriter
int t = height_ret;
int r = 1;
int internalFormat = numComponents_ret;
unsigned int pixelFormat =
numComponents_ret == 1 ? GL_LUMINANCE :
numComponents_ret == 2 ? GL_LUMINANCE_ALPHA :
@@ -823,6 +821,42 @@ class ReaderWriterTIFF : public osgDB::ReaderWriter
bitspersample_ret == 16 ? GL_UNSIGNED_SHORT :
bitspersample_ret == 32 ? GL_FLOAT : (GLenum)-1;
int internalFormat = 0;
switch (pixelFormat) {
case GL_LUMINANCE: {
switch (dataType) {
case GL_UNSIGNED_BYTE: internalFormat = GL_LUMINANCE8; break;
case GL_UNSIGNED_SHORT: internalFormat = GL_LUMINANCE16; break;
case GL_FLOAT : internalFormat = GL_LUMINANCE32F_ARB; break;
}
break;
}
case GL_LUMINANCE_ALPHA: {
switch (dataType) {
case GL_UNSIGNED_BYTE: internalFormat = GL_LUMINANCE_ALPHA8UI_EXT; break;
case GL_UNSIGNED_SHORT: internalFormat = GL_LUMINANCE_ALPHA16UI_EXT; break;
case GL_FLOAT: internalFormat = GL_LUMINANCE_ALPHA32F_ARB; break;
}
break;
}
case GL_RGB: {
switch (dataType) {
case GL_UNSIGNED_BYTE: internalFormat = GL_RGB8; break;
case GL_UNSIGNED_SHORT: internalFormat = GL_RGB16; break;
case GL_FLOAT: internalFormat = GL_RGB32F_ARB; break;
}
break;
}
case GL_RGBA : {
switch (dataType) {
case GL_UNSIGNED_BYTE: internalFormat = GL_RGBA8; break;
case GL_UNSIGNED_SHORT: internalFormat = GL_RGBA16; break;
case GL_FLOAT: internalFormat = GL_RGBA32F_ARB; break;
}
break;
}
}
osg::Image* pOsgImage = new osg::Image;
pOsgImage->setImage(s,t,r,
internalFormat,