From 5c9a302beb8ef982ed799bb1ab193b79d763f59d Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 5 Sep 2012 09:08:25 +0000
Subject: [PATCH] Added GL_RGBA8 and GL_RGBA16 entries to the
 Image::computePixelFormat() and improved he readability of the method by
 inserting line spacing.

---
 src/osg/Image.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/osg/Image.cpp b/src/osg/Image.cpp
index 4fdee2e49..b74fbdb55 100644
--- a/src/osg/Image.cpp
+++ b/src/osg/Image.cpp
@@ -333,18 +333,25 @@ GLenum Image::computePixelFormat(GLenum format)
         case(GL_ALPHA16F_ARB):
         case(GL_ALPHA32F_ARB):
             return GL_ALPHA;
+
         case(GL_LUMINANCE16F_ARB):
         case(GL_LUMINANCE32F_ARB):
             return GL_LUMINANCE;
+
         case(GL_INTENSITY16F_ARB):
         case(GL_INTENSITY32F_ARB):
             return GL_INTENSITY;
+
         case(GL_LUMINANCE_ALPHA16F_ARB):
         case(GL_LUMINANCE_ALPHA32F_ARB):
             return GL_LUMINANCE_ALPHA;
+
         case(GL_RGB32F_ARB):
         case(GL_RGB16F_ARB):
             return GL_RGB;
+
+        case(GL_RGBA8):
+        case(GL_RGBA16):
         case(GL_RGBA32F_ARB):
         case(GL_RGBA16F_ARB):
             return GL_RGBA;
@@ -356,6 +363,7 @@ GLenum Image::computePixelFormat(GLenum format)
         case(GL_ALPHA16UI_EXT):
         case(GL_ALPHA32UI_EXT):
             return GL_ALPHA_INTEGER_EXT;
+
         case(GL_LUMINANCE8I_EXT):
         case(GL_LUMINANCE16I_EXT):
         case(GL_LUMINANCE32I_EXT):
@@ -363,6 +371,7 @@ GLenum Image::computePixelFormat(GLenum format)
         case(GL_LUMINANCE16UI_EXT):
         case(GL_LUMINANCE32UI_EXT):
             return GL_LUMINANCE_INTEGER_EXT;
+
         case(GL_INTENSITY8I_EXT):
         case(GL_INTENSITY16I_EXT):
         case(GL_INTENSITY32I_EXT):
@@ -371,6 +380,7 @@ GLenum Image::computePixelFormat(GLenum format)
         case(GL_INTENSITY32UI_EXT):
             OSG_WARN<<"Image::computePixelFormat("<<std::hex<<format<<std::dec<<") intensity pixel format is not correctly specified, so assume GL_LUMINANCE_INTEGER."<<std::endl;
             return GL_LUMINANCE_INTEGER_EXT;
+
         case(GL_LUMINANCE_ALPHA8I_EXT):
         case(GL_LUMINANCE_ALPHA16I_EXT):
         case(GL_LUMINANCE_ALPHA32I_EXT):
@@ -378,6 +388,7 @@ GLenum Image::computePixelFormat(GLenum format)
         case(GL_LUMINANCE_ALPHA16UI_EXT):
         case(GL_LUMINANCE_ALPHA32UI_EXT):
             return GL_LUMINANCE_ALPHA_INTEGER_EXT;
+
         case(GL_RGB32I_EXT):
         case(GL_RGB16I_EXT):
         case(GL_RGB8I_EXT):
@@ -385,13 +396,14 @@ GLenum Image::computePixelFormat(GLenum format)
         case(GL_RGB16UI_EXT):
         case(GL_RGB8UI_EXT):
             return GL_RGB_INTEGER_EXT;
+
         case(GL_RGBA32I_EXT):
         case(GL_RGBA16I_EXT):
         case(GL_RGBA8I_EXT):
         case(GL_RGBA32UI_EXT):
         case(GL_RGBA16UI_EXT):
         case(GL_RGBA8UI_EXT):
-            return GL_RGBA_INTEGER_EXT;;
+            return GL_RGBA_INTEGER_EXT;
 
         default:
             return format;