Show
Ignore:
Timestamp:
01/30/09 11:55:28 (5 years ago)
Author:
robert
Message:

Fixed warnings, updated NEWS

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/include/osg/PrimitiveSet

    r9447 r9599  
    317317        virtual void accept(PrimitiveIndexFunctor& functor) const; 
    318318         
    319         virtual unsigned int getNumIndices() const { return _count; } 
    320         virtual unsigned int index(unsigned int pos) const { return _first+pos; } 
     319        virtual unsigned int getNumIndices() const { return static_cast<unsigned int>(_count); } 
     320        virtual unsigned int index(unsigned int pos) const { return static_cast<unsigned int>(_first)+pos; } 
    321321        virtual void offsetIndices(int offset) { _first += offset; } 
    322322 
     
    494494 
    495495        virtual const GLvoid*   getDataPointer() const { return empty()?0:&front(); } 
    496         virtual unsigned int    getTotalDataSize() const { return size(); } 
     496        virtual unsigned int    getTotalDataSize() const { return static_cast<unsigned int>(size()); } 
    497497        virtual bool            supportsBufferObject() const { return false; } 
    498498 
     
    502502        virtual void accept(PrimitiveIndexFunctor& functor) const; 
    503503 
    504         virtual unsigned int getNumIndices() const { return size(); } 
     504        virtual unsigned int getNumIndices() const { return static_cast<unsigned int>(size()); } 
    505505        virtual unsigned int index(unsigned int pos) const { return (*this)[pos]; } 
    506506        virtual void offsetIndices(int offset); 
     
    569569 
    570570        virtual const GLvoid*   getDataPointer() const { return empty()?0:&front(); } 
    571         virtual unsigned int    getTotalDataSize() const { return 2*size(); } 
     571        virtual unsigned int    getTotalDataSize() const { return 2u*static_cast<unsigned int>(size()); } 
    572572        virtual bool            supportsBufferObject() const { return false; } 
    573573 
     
    577577        virtual void accept(PrimitiveIndexFunctor& functor) const; 
    578578 
    579         virtual unsigned int getNumIndices() const { return size(); } 
     579        virtual unsigned int getNumIndices() const { return static_cast<unsigned int>(size()); } 
    580580        virtual unsigned int index(unsigned int pos) const { return (*this)[pos]; } 
    581581        virtual void offsetIndices(int offset); 
     
    643643 
    644644        virtual const GLvoid*   getDataPointer() const { return empty()?0:&front(); } 
    645         virtual unsigned int    getTotalDataSize() const { return 4*size(); } 
     645        virtual unsigned int    getTotalDataSize() const { return 4u*static_cast<unsigned int>(size()); } 
    646646        virtual bool            supportsBufferObject() const { return false; } 
    647647 
     
    651651        virtual void accept(PrimitiveIndexFunctor& functor) const; 
    652652 
    653         virtual unsigned int getNumIndices() const { return size(); } 
     653        virtual unsigned int getNumIndices() const { return static_cast<unsigned int>(size()); } 
    654654        virtual unsigned int index(unsigned int pos) const { return (*this)[pos]; } 
    655655        virtual void offsetIndices(int offset);