FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed compile problems under VisualStudio w.r.t the new additions for

Browse Source 
precompiled mipmaps.  Changed std::size_t to unsigned int.
This commit is contained in:
Robert Osfield 2002-04-23 10:34:20 +00:00
parent a9bf24cf71
commit 2f392b635c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/osg/Image
View File

@ -133,11 +133,11 @@ class SG_EXPORT Image : public Object
static const unsigned int computeRowWidthInBytes(int width,GLenum format,GLenum type,int packing); static const unsigned int computeRowWidthInBytes(int width,GLenum format,GLenum type,int packing);
// precomputed mipmaps stuff; // precomputed mipmaps stuff;
typedef std::vector< std::size_t > MipmapDataType; typedef std::vector< unsigned int > MipmapDataType;
inline bool isMipmap() const {return !_mipmapData.empty();}; inline bool isMipmap() const {return !_mipmapData.empty();};
std::size_t getNumMipmaps() const unsigned int getNumMipmaps() const
{ {
return _mipmapData.size()+1; return _mipmapData.size()+1;
}; };
@ -149,7 +149,7 @@ class SG_EXPORT Image : public Object
_mipmapData = mipmapDataVector; _mipmapData = mipmapDataVector;
}; };
inline unsigned char* getMipmapData(std::size_t mipmapNumber ) const inline unsigned char* getMipmapData(unsigned int mipmapNumber) const
{ {
if(mipmapNumber == 0) if(mipmapNumber == 0)
return _data; return _data;