From 39a5cf3ad978121b4f53d04e8e0b6e897f8800c8 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Mon, 14 Apr 2003 15:02:13 +0000
Subject: [PATCH] Added extra debugging details to help track down IRIX64 &
 Solaris64 problems.

---
 src/osgText/Font.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/osgText/Font.cpp b/src/osgText/Font.cpp
index b8e235674..6b8a5346f 100644
--- a/src/osgText/Font.cpp
+++ b/src/osgText/Font.cpp
@@ -21,6 +21,7 @@
 #include <osg/GLU>
 
 using namespace osgText;
+using namespace std;
 
 std::string findFontFile(const std::string& str)
 {
@@ -533,7 +534,7 @@ void Font::Glyph::subload() const
     GLenum errorNo = glGetError();
     if (errorNo!=GL_NO_ERROR)
     {
-        osg::notify(osg::WARN)<<"before: detected OpenGL error '"<<gluErrorString(errorNo)<<std::endl;
+        osg::notify(osg::WARN)<<"before Font::Glyph::subload(): detected OpenGL error '"<<gluErrorString(errorNo)<<std::endl;
     }
 
     glPixelStorei(GL_UNPACK_ALIGNMENT,getPacking());
@@ -548,13 +549,13 @@ void Font::Glyph::subload() const
     errorNo = glGetError();
     if (errorNo!=GL_NO_ERROR)
     {
-        std::cout << "  "<<GL_TEXTURE_2D<<"\t"<<0<<"\t"<<
-                    _texturePosX<<"\t"<<_texturePosY<<"\t"<<
-                    s()<<"\t"<<t()<<"\t"<<
-                    (GLenum)getPixelFormat()<<"\t"<<
-                    (GLenum)getDataType()<<"\t"<<
-                    (int)(*data())<<std::endl;
 
-        osg::notify(osg::WARN)<<"after: detected OpenGL error '"<<gluErrorString(errorNo)<<std::endl;
+        osg::notify(osg::WARN)<<"after Font::Glyph::subload() : detected OpenGL error '"<<gluErrorString(errorNo)<<"'"<<std::endl;
+        std::cout << "\tglTexSubImage2D("<<GL_TEXTURE_2D<<" ,"<<0<<"\t"<<std::endl<<
+                     "\t                "<<_texturePosX<<" ,"<<_texturePosY<<std::endl<<
+                     "\t                "<<s()<<" ,"<<t()<<std::endl<<hex<<
+                     "\t                0x"<<(GLenum)getPixelFormat()<<std::endl<<
+                     "\t                0x"<<(GLenum)getDataType()<<std::endl<<
+                     "\t                0x"<<(unsigned int)data()<<");"<<dec<<std::endl;
     }                    
 }