From 4c5f33d3978c3f633b9019580d626ab8ac0f77b7 Mon Sep 17 00:00:00 2001 From: Don BURNS Date: Mon, 5 Jul 2004 16:21:43 +0000 Subject: [PATCH] Changed internal formatt on jpeg loader to be GL_RGB, GL_RGBA, etc. rather than numComponents. --- src/osgPlugins/jpeg/ReaderWriterJPEG.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp index ef2534f6a..205b22f1b 100644 --- a/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp +++ b/src/osgPlugins/jpeg/ReaderWriterJPEG.cpp @@ -455,13 +455,18 @@ class ReaderWriterJPEG : public osgDB::ReaderWriter int t = height_ret; int r = 1; - int internalFormat = numComponents_ret; + //int internalFormat = numComponents_ret; + int internalFormat = + numComponents_ret == 1 ? GL_LUMINANCE : + numComponents_ret == 2 ? GL_LUMINANCE_ALPHA : + numComponents_ret == 3 ? GL_RGB : + numComponents_ret == 4 ? GL_RGBA : (GLenum)-1; unsigned int pixelFormat = numComponents_ret == 1 ? GL_LUMINANCE : - numComponents_ret == 2 ? GL_LUMINANCE_ALPHA : - numComponents_ret == 3 ? GL_RGB : - numComponents_ret == 4 ? GL_RGBA : (GLenum)-1; + numComponents_ret == 2 ? GL_LUMINANCE_ALPHA : + numComponents_ret == 3 ? GL_RGB : + numComponents_ret == 4 ? GL_RGBA : (GLenum)-1; unsigned int dataType = GL_UNSIGNED_BYTE;