Show
Ignore:
Timestamp:
10/07/10 13:53:28 (4 years ago)
Author:
robert
Message:

Introduced osg namespace to new local GLU functions

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/examples/osgphotoalbum/PhotoArchive.cpp

    r11828 r11829  
    216216            } 
    217217 
    218             PixelStorageModes psm; 
     218            osg::PixelStorageModes psm; 
    219219            psm.pack_alignment = image->getPacking(); 
    220220            psm.unpack_alignment = image->getPacking(); 
    221221 
    222             GLint status = gluScaleImage(&psm, image->getPixelFormat(), 
     222            GLint status = osg::gluScaleImage(&psm, image->getPixelFormat(), 
    223223                image->s(), 
    224224                image->t(), 
     
    234234               delete [] newData; 
    235235 
    236                 osg::notify(osg::WARN) << "Error scaleImage() did not succeed : errorString = "<<gluErrorString((GLenum)status)<<std::endl; 
     236                osg::notify(osg::WARN) << "Error scaleImage() did not succeed : errorString = "<<osg::gluErrorString((GLenum)status)<<std::endl; 
    237237            } 
    238238     
     
    283283            } 
    284284 
    285             PixelStorageModes psm; 
     285            osg::PixelStorageModes psm; 
    286286            psm.pack_alignment = image->getPacking(); 
    287287            psm.unpack_alignment = image->getPacking(); 
    288288 
    289             GLint status = gluScaleImage(&psm, image->getPixelFormat(), 
     289            GLint status = osg::gluScaleImage(&psm, image->getPixelFormat(), 
    290290                image->s(), 
    291291                image->t(), 
     
    301301               delete [] newData; 
    302302 
    303                 osg::notify(osg::WARN) << "Error scaleImage() did not succeed : errorString = "<<gluErrorString((GLenum)status)<<std::endl; 
     303                osg::notify(osg::WARN) << "Error scaleImage() did not succeed : errorString = "<<osg::gluErrorString((GLenum)status)<<std::endl; 
    304304            } 
    305305