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

Fixed warnings, updated NEWS

Browse Source
This commit is contained in:
Robert Osfield
2009-01-30 10:55:28 +00:00
parent 6710fbc78a
commit 411431f3be
18 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/osg/Array
View File

@@ -226,8 +226,8 @@ class TemplateArray : public Array, public MixinVector<T>
}
virtual const GLvoid* getDataPointer() const { if (!this->empty()) return &this->front(); else return 0; }
virtual unsigned int getTotalDataSize() const { return this->size()*sizeof(T); }
virtual unsigned int getNumElements() const { return this->size(); }
virtual unsigned int getTotalDataSize() const { return static_cast<unsigned int>(this->size()*sizeof(T)); }
virtual unsigned int getNumElements() const { return static_cast<unsigned int>(this->size()); }
typedef T ElementDataType; // expose T
@@ -312,8 +312,8 @@ class TemplateIndexArray : public IndexArray, public MixinVector<T>
}
virtual const GLvoid* getDataPointer() const { if (!this->empty()) return &this->front(); else return 0; }
virtual unsigned int getTotalDataSize() const { return this->size()*sizeof(T); }
virtual unsigned int getNumElements() const { return this->size(); }
virtual unsigned int getTotalDataSize() const { return static_cast<unsigned int>(this->size()*sizeof(T)); }
virtual unsigned int getNumElements() const { return static_cast<unsigned int>(this->size()); }
virtual unsigned int index(unsigned int pos) const { return (*this)[pos]; }