From 11de6ae8ef60258c25a18e14127ea7b6ff57cc9c Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 6 Dec 2006 21:39:09 +0000
Subject: [PATCH] From Gerrick Bivins, fixed newly introduced texture setup
 bug.

---
 src/osgPlugins/Inventor/ConvertFromInventor.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/osgPlugins/Inventor/ConvertFromInventor.cpp b/src/osgPlugins/Inventor/ConvertFromInventor.cpp
index 9ea721e21..21b508fe6 100644
--- a/src/osgPlugins/Inventor/ConvertFromInventor.cpp
+++ b/src/osgPlugins/Inventor/ConvertFromInventor.cpp
@@ -1143,7 +1143,7 @@ void ConvertFromInventor::addPointCB(void* data, SoCallbackAction* action,
 }
 //////////////////////////////////////////////////////////////////////
 void ConvertFromInventor::_setVRMLImageTexture(const SoVRMLImageTexture* vit,
-                                               SoCallbackAction* /*action*/)
+                                               SoCallbackAction* action)
 {
     _hasVRMLImageTexture = true;
     ///Coin API to extract VRML97 ImageTexture
@@ -1184,7 +1184,7 @@ void ConvertFromInventor::_setVRMLImageTexture(const SoVRMLImageTexture* vit,
     };
 
     osg::ref_ptr<osg::Image> image = new osg::Image();
-    image->setImage(dimensions[0], dimensions[1], 0, nComponents,
+    image->setImage(dimensions[0], dimensions[1], 1, nComponents,
                    format, GL_UNSIGNED_BYTE, const_cast<unsigned char*>(data), 
                    osg::Image::USE_NEW_DELETE);