diff --git a/VisualStudio/osg/osg.dsp b/VisualStudio/osg/osg.dsp index e89305c1f..f0bec0c33 100755 --- a/VisualStudio/osg/osg.dsp +++ b/VisualStudio/osg/osg.dsp @@ -833,10 +833,6 @@ SOURCE=..\..\Include\Osg\BlendFunc # End Source File # Begin Source File -SOURCE=..\..\Include\Osg\Types -# End Source File -# Begin Source File - SOURCE=..\..\Include\Osg\UnitTestFramework # End Source File # Begin Source File diff --git a/include/osg/ColorMask b/include/osg/ColorMask index 6a1977c31..bc84933a1 100644 --- a/include/osg/ColorMask +++ b/include/osg/ColorMask @@ -16,7 +16,6 @@ #include #include -#include namespace osg { diff --git a/include/osg/Depth b/include/osg/Depth index 456da6596..5b3eb5f27 100644 --- a/include/osg/Depth +++ b/include/osg/Depth @@ -15,7 +15,6 @@ #define OSG_DEPTH 1 #include -#include namespace osg { diff --git a/include/osg/Drawable b/include/osg/Drawable index 14f6ae86f..04a166d38 100644 --- a/include/osg/Drawable +++ b/include/osg/Drawable @@ -16,7 +16,6 @@ #include #include -#include #include #include #include diff --git a/include/osg/Fog b/include/osg/Fog index d6682186c..44c1ab230 100644 --- a/include/osg/Fog +++ b/include/osg/Fog @@ -15,7 +15,6 @@ #define OSG_FOG 1 #include -#include #include #ifndef GL_FOG_COORDINATE diff --git a/include/osg/Stencil b/include/osg/Stencil index 5760318a6..a10a035e6 100644 --- a/include/osg/Stencil +++ b/include/osg/Stencil @@ -15,7 +15,6 @@ #define OSG_STENCIL 1 #include -#include namespace osg { diff --git a/include/osg/Texture b/include/osg/Texture index c2f2b26db..7ae984abe 100644 --- a/include/osg/Texture +++ b/include/osg/Texture @@ -15,7 +15,6 @@ #define OSG_TEXTURE 1 #include -#include #include #include #include diff --git a/include/osg/Types b/include/osg/Types deleted file mode 100644 index a92da05e0..000000000 --- a/include/osg/Types +++ /dev/null @@ -1,26 +0,0 @@ -/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 Robert Osfield - * - * This library is open source and may be redistributed and/or modified under - * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or - * (at your option) any later version. The full license is in LICENSE file - * included with this distribution, and on the openscenegraph.org website. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * OpenSceneGraph Public License for more details. -*/ - -#ifndef OSG_TYPES -#define OSG_TYPES 1 - -namespace osg { - -typedef unsigned int uint; -typedef unsigned short ushort; -typedef unsigned char uchar; -typedef uchar ubyte; - -} - -#endif diff --git a/include/osg/Viewport b/include/osg/Viewport index 88f9c8421..86227ae99 100644 --- a/include/osg/Viewport +++ b/include/osg/Viewport @@ -15,7 +15,6 @@ #define OSG_VIEWPORT 1 #include -#include #include namespace osg { diff --git a/include/osgDB/Field b/include/osgDB/Field index 60ec6fda9..7895157a4 100644 --- a/include/osgDB/Field +++ b/include/osgDB/Field @@ -14,7 +14,6 @@ #ifndef OSGDB_FIELD #define OSGDB_FIELD 1 -#include #include #include @@ -83,8 +82,8 @@ class OSGDB_EXPORT Field bool getInt(int& i) const; bool isUInt() const; - bool matchUInt(osg::uint i) const; - bool getUInt(osg::uint& i) const; + bool matchUInt(unsigned int i) const; + bool getUInt(unsigned int& i) const; bool isFloat() const; bool matchFloat(float f) const; diff --git a/include/osgText/Font b/include/osgText/Font index 4e5a52239..dfda4848e 100644 --- a/include/osgText/Font +++ b/include/osgText/Font @@ -36,6 +36,7 @@ #include #include +#include #include @@ -57,8 +58,6 @@ namespace osgText { virtual const char* libraryName() const { return #library; } \ virtual const char* className() const { return #name; } \ -class EncodedText; - class OSGTEXT_EXPORT Font : public osg::Object { public: diff --git a/include/osgText/Text b/include/osgText/Text index 96d684ccc..131fa00c1 100644 --- a/include/osgText/Text +++ b/include/osgText/Text @@ -38,7 +38,6 @@ #include #include -#include #include diff --git a/src/Demos/osghangglide/GliderManipulator.cpp b/src/Demos/osghangglide/GliderManipulator.cpp index f5cbead50..e15f5734d 100644 --- a/src/Demos/osghangglide/GliderManipulator.cpp +++ b/src/Demos/osghangglide/GliderManipulator.cpp @@ -1,6 +1,5 @@ #include "GliderManipulator.h" -#include #include using namespace osg; diff --git a/src/Demos/osgimpostor/TestManipulator.cpp b/src/Demos/osgimpostor/TestManipulator.cpp index 7f8b7f20f..95c30e31e 100644 --- a/src/Demos/osgimpostor/TestManipulator.cpp +++ b/src/Demos/osgimpostor/TestManipulator.cpp @@ -1,5 +1,4 @@ #include "TestManipulator.h" -#include #include using namespace osg; diff --git a/src/Demos/osgtexture2D/osgtexture2D.cpp b/src/Demos/osgtexture2D/osgtexture2D.cpp index 23afbd44e..2c4692ba0 100644 --- a/src/Demos/osgtexture2D/osgtexture2D.cpp +++ b/src/Demos/osgtexture2D/osgtexture2D.cpp @@ -63,7 +63,7 @@ class Texture2DCallback : public osg::NodeCallback osg::ref_ptr _texture; std::vector _filterRange; - osg::uint _currPos; + unsigned int _currPos; double _prevTime; }; diff --git a/src/osg/Camera.cpp b/src/osg/Camera.cpp index e9a9bd01f..d59070ced 100644 --- a/src/osg/Camera.cpp +++ b/src/osg/Camera.cpp @@ -12,7 +12,6 @@ */ #include #include -#include #include #include diff --git a/src/osg/Matrix.cpp b/src/osg/Matrix.cpp index fa518c349..74c61c14e 100644 --- a/src/osg/Matrix.cpp +++ b/src/osg/Matrix.cpp @@ -13,7 +13,6 @@ #include #include #include -#include #include #include diff --git a/src/osg/Quat.cpp b/src/osg/Quat.cpp index 44efca82b..7f569f7a2 100644 --- a/src/osg/Quat.cpp +++ b/src/osg/Quat.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include diff --git a/src/osg/Texture.cpp b/src/osg/Texture.cpp index 3fc1323cf..7738e0ffd 100644 --- a/src/osg/Texture.cpp +++ b/src/osg/Texture.cpp @@ -27,7 +27,7 @@ using namespace osg; // by completely deleted once the appropriate OpenGL context // is set. typedef std::vector TextureObjectVector; -typedef std::map DeletedTextureObjectCache; +typedef std::map DeletedTextureObjectCache; static DeletedTextureObjectCache s_deletedTextureObjectCache; diff --git a/src/osgDB/Field.cpp b/src/osgDB/Field.cpp index 32678ec3d..4d8eff2f9 100644 --- a/src/osgDB/Field.cpp +++ b/src/osgDB/Field.cpp @@ -297,12 +297,12 @@ bool Field::isUInt() const } -bool Field::matchUInt(osg::uint i) const +bool Field::matchUInt(unsigned int i) const { getFieldType(); if (_fieldType==INTEGER) { - return (osg::uint) strtoul(_fieldCache,NULL,0)==i; + return (unsigned int) strtoul(_fieldCache,NULL,0)==i; } else { @@ -311,7 +311,7 @@ bool Field::matchUInt(osg::uint i) const } -bool Field::getUInt(osg::uint& i) const +bool Field::getUInt(unsigned int& i) const { getFieldType(); if (_fieldType==INTEGER) diff --git a/src/osgGA/FlightManipulator.cpp b/src/osgGA/FlightManipulator.cpp index 948397777..e27c49752 100644 --- a/src/osgGA/FlightManipulator.cpp +++ b/src/osgGA/FlightManipulator.cpp @@ -1,5 +1,4 @@ #include -#include #include using namespace osg; diff --git a/src/osgGA/TrackballManipulator.cpp b/src/osgGA/TrackballManipulator.cpp index 4bc9daeb4..7515d5eaa 100644 --- a/src/osgGA/TrackballManipulator.cpp +++ b/src/osgGA/TrackballManipulator.cpp @@ -1,5 +1,4 @@ #include -#include #include using namespace osg; diff --git a/src/osgPlugins/ac3d/ac3d.cpp b/src/osgPlugins/ac3d/ac3d.cpp index 66fa07a31..7720d6e75 100644 --- a/src/osgPlugins/ac3d/ac3d.cpp +++ b/src/osgPlugins/ac3d/ac3d.cpp @@ -589,9 +589,9 @@ osg::Group *ac_load_object(FILE *f,const ACObject *parent) /** calc surface normal **/ if (asurf.num_vertref >= 3) { osg::Vec3 norm; - osg::ushort i1=(*nusidx)[0]; - osg::ushort i2=(*nusidx)[1]; - osg::ushort i3=(*nusidx)[2]; + unsigned short i1=(*nusidx)[0]; + unsigned short i2=(*nusidx)[1]; + unsigned short i3=(*nusidx)[2]; osgtri_calc_normal((*vertpool)[i1], (*vertpool)[i2], (*vertpool)[i3], norm); diff --git a/src/osgPlugins/directx/directx.cpp b/src/osgPlugins/directx/directx.cpp index 5c18abc8f..b8bc46618 100644 --- a/src/osgPlugins/directx/directx.cpp +++ b/src/osgPlugins/directx/directx.cpp @@ -21,6 +21,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#if defined(_MSC_VER) && (_MSC_VER <= 1200) +#pragma warning (disable : 4786) +#endif + #include "directx.h" #include diff --git a/src/osgPlugins/dw/ReaderWriterDW.cpp b/src/osgPlugins/dw/ReaderWriterDW.cpp index 3f20b09fa..7906c5d7c 100644 --- a/src/osgPlugins/dw/ReaderWriterDW.cpp +++ b/src/osgPlugins/dw/ReaderWriterDW.cpp @@ -291,7 +291,7 @@ public: } // mx.postScale(mx,1.0f/themat->TextureWidth, 1.0f/themat->TextureHeight,1); } - inline int setnvop(const osg::ushort n) { // add a new hole in this face with n vertices + inline int setnvop(const unsigned short n) { // add a new hole in this face with n vertices _face *oldop=opening; opening=new _face[nop+1]; for (int i=0; i0 && nff>0) { // there are some strips of this type Geode *geode = new Geode; GeoSet *gset = new GeoSet; - osg::ushort *nunrmidx=new osg::ushort[nload]; - osg::ushort *nutxidx = new osg::ushort[nload]; - osg::ushort *nusidx = new osg::ushort[nload]; + unsigned short *nunrmidx=new unsigned short[nload]; + unsigned short *nutxidx = new unsigned short[nload]; + unsigned short *nusidx = new unsigned short[nload]; Vec3 *nunrms=new Vec3[nload]; // one normal per face (nff) or per vertex (nload) int *nuprimlengs=new int[nff]; // primitive lengths Vec2 *nutxc=new Vec2[nload]; @@ -551,9 +551,9 @@ private: int nload; // numebr of vertices loaded into these arrays int nff; // primitive loaded int *primlengs; - osg::ushort *gsidx; - osg::ushort *nrmidx; - osg::ushort *txidx; + unsigned short *gsidx; + unsigned short *nrmidx; + unsigned short *txidx; Vec3 *nrms; // one normal per face Vec2 *txcoords; // one texture coord per vertex const Matrix *tmat; // local texture matrix, or may be NULL for default mapping @@ -628,8 +628,8 @@ public: { // read up to nexpected openings, each opening may have a number of vertices char buff[256]; openings=new int[nexpected*2]; - fc1=new osg::ushort[nexpected]; - fc2=new osg::ushort[nexpected]; + fc1=new unsigned short[nexpected]; + fc2=new unsigned short[nexpected]; nopens=0; int nvop=0; // current number of vertices in hole in object while (nopens verts; dwmaterial *themat; - osg::ushort nverts,nfaces,nedges; - osg::ushort nfaceverts; - osg::ushort nopens; + unsigned short nverts,nfaces,nedges; + unsigned short nfaceverts; + unsigned short nopens; _face *faces; _dwedge *edges; int *openings; - osg::ushort *fc1, *fc2; // openings[i] is in faces[fc1[i]] to faces[fc2[i]] + unsigned short *fc1, *fc2; // openings[i] is in faces[fc1[i]] to faces[fc2[i]] Matrix *tmat; Matrix *mx; // current uvw transform for currently tessealting face }; @@ -895,7 +895,7 @@ class ReaderWriterDW : public osgDB::ReaderWriter { _dwobj obj; enum reading {NONE, MATERIAL, OBJECT}; - //osg::ushort nrecs=0; // number of records read after a divider (numVerts, numFaces, numOpenings...) + //unsigned short nrecs=0; // number of records read after a divider (numVerts, numFaces, numOpenings...) int nexpected=0; // number of records to be read in a block dwmaterial *matpalet=NULL; int nmat=-1; // current element of matpalet being modified diff --git a/src/osgPlugins/dx/AreaGeoSetTriangulator.cpp b/src/osgPlugins/dx/AreaGeoSetTriangulator.cpp index 3bb7a0cdc..93097a1d6 100644 --- a/src/osgPlugins/dx/AreaGeoSetTriangulator.cpp +++ b/src/osgPlugins/dx/AreaGeoSetTriangulator.cpp @@ -12,19 +12,19 @@ class AreaGeoSetTriangulator // Efficiently collects the various data arrays, which GeoSet can't do. { protected: - std::vector< osg::uint > _cindex; - std::vector< osg::uint > _nindex; - std::vector< osg::uint > _colindex; - std::vector< osg::uint > _tindex; + std::vector< unsigned int > _cindex; + std::vector< unsigned int > _nindex; + std::vector< unsigned int > _colindex; + std::vector< unsigned int > _tindex; const osg::GeoSet &_area_geoset; public: AreaGeoSetTriangulator( const osg::GeoSet &area_geoset ); - void operator() ( osg::uint v1, osg::uint v2, osg::uint v3, - osg::uint prim_index, osg::uint prim_tri_index, - osg::uint v1_geoset, osg::uint v2_geoset, - osg::uint v3_geoset ); + void operator() ( unsigned int v1, unsigned int v2, unsigned int v3, + unsigned int prim_index, unsigned int prim_tri_index, + unsigned int v1_geoset, unsigned int v2_geoset, + unsigned int v3_geoset ); // Passed triangles as primitives are triangulated osg::GeoSet *BuildGeoSet(); @@ -58,10 +58,10 @@ AreaGeoSetTriangulator::AreaGeoSetTriangulator( const osg::GeoSet &area_geoset) //--------------------------------------------------------------------------- void AreaGeoSetTriangulator::operator() ( - osg::uint v1, osg::uint v2, osg::uint v3, - osg::uint prim_index, osg::uint prim_tri_index, - osg::uint v1_geoset, osg::uint v2_geoset, - osg::uint v3_geoset ) + unsigned int v1, unsigned int v2, unsigned int v3, + unsigned int prim_index, unsigned int prim_tri_index, + unsigned int v1_geoset, unsigned int v2_geoset, + unsigned int v3_geoset ) // Passed triangles as primitives are triangulated from the original // GeoSet. Note that the v? params are indicies into the Coord array, // whereas the v?_geoset params are vertex numbers relative to the @@ -222,13 +222,13 @@ void for_each_triangle2(const osg::GeoSet& gset,T& op) { if (gset.getCoordIndices()._is_ushort) { - osg::ushort* base = gset.getCoordIndices()._ptr._ushort; - osg::ushort* iptr = base; + unsigned short* base = gset.getCoordIndices()._ptr._ushort; + unsigned short* iptr = base; const int numPrim = gset.getNumPrims(); for(int i=0; i0) { - osg::ushort *start = iptr; - osg::ushort* iend = iptr+primLength; + unsigned short *start = iptr; + unsigned short* iend = iptr+primLength; ++iptr; for(int j = 2; j < primLength; ++j ) { @@ -512,7 +512,7 @@ void for_each_triangle2(const osg::GeoSet& gset,T& op) } else { - osg::uint cindex = 0; + unsigned int cindex = 0; const int numPrim = gset.getNumPrims(); for(int i=0; i0) { - osg::uint cindex_start = cindex; - osg::uint cindex_end = cindex+primLength; + unsigned int cindex_start = cindex; + unsigned int cindex_end = cindex+primLength; ++cindex; for(int j = 2; j < primLength; ++j) { diff --git a/src/osgPlugins/dx/DXWriter.cpp b/src/osgPlugins/dx/DXWriter.cpp index 35bc0c9d9..eeddf764e 100644 --- a/src/osgPlugins/dx/DXWriter.cpp +++ b/src/osgPlugins/dx/DXWriter.cpp @@ -163,8 +163,8 @@ const float ALPHA_OPAQUE = 1.0; #define ARRAY_LEN(a) (sizeof(a)/sizeof((a)[0])) -typedef osg::ubyte Vec4UB[4]; -typedef osg::ubyte Vec3UB[3]; +typedef unsigned char Vec4UB[4]; +typedef unsigned char Vec3UB[3]; //---------------------------------------------------------------------------- @@ -1129,17 +1129,17 @@ void DXArrayWriter::WritePerVertexColors( try { memset( set, '\0', num_points * sizeof(int) ); - osg::uint num_pt_instances = num_pindices ? num_pindices : num_points; - osg::uint num_color_instances = num_cindices ? num_cindices : num_colors; + unsigned int num_pt_instances = num_pindices ? num_pindices : num_points; + unsigned int num_color_instances = num_cindices ? num_cindices : num_colors; if ( num_pt_instances != num_color_instances ) { msg_bin->Add( "ERROR: Incorrect number of colors found\n" ); throw 1; } - for ( osg::uint i = 0; i < num_pt_instances; i++ ) + for ( unsigned int i = 0; i < num_pt_instances; i++ ) { - osg::uint pindex = pindices.valid() ? pindices[i] : i; - osg::uint cindex = cindices.valid() ? cindices[i] : i; + unsigned int pindex = pindices.valid() ? pindices[i] : i; + unsigned int cindex = cindices.valid() ? cindices[i] : i; if ( set[pindex] && ( pt_cindices[pindex] != cindex ) ) msg_bin->Add( "ERROR: Vertex color aliasing!!! Ask somebody to expand\n" @@ -1463,7 +1463,7 @@ std::string DXWriter::WriteImage( const osg::Image &image ) } unsigned num_pixels = image.s() * image.t(); - osg::ubyte opaque = osg::ubyte( ALPHA_OPAQUE * 255.0 ); + unsigned char opaque = (unsigned char) (ALPHA_OPAQUE * 255.0 ); Vec4UB *colors = new Vec4UB[ num_pixels ]; unsigned i; diff --git a/src/osgPlugins/geo/osgGeoStructs.h b/src/osgPlugins/geo/osgGeoStructs.h index 6068e3232..15094f533 100644 --- a/src/osgPlugins/geo/osgGeoStructs.h +++ b/src/osgPlugins/geo/osgGeoStructs.h @@ -130,8 +130,8 @@ public: } } void readfile(std::ifstream &fin) { - osg::uchar tokid, type; - osg::ushort nits; + unsigned char tokid, type; + unsigned short nits; if (!fin.eof()) { fin.read((char *)&tokid,1);fin.read((char *)&type,1); fin.read((char *)&nits,sizeof(unsigned short)); @@ -147,15 +147,15 @@ public: } void writefile(std::ofstream &fout) { // write binary file if (numItems<32767 && tokenId<256) { - osg::uchar tokid=tokenId, type=TypeId; + unsigned char tokid=tokenId, type=TypeId; fout.write((char *)&tokid, 1);fout.write((char *)&type,1); fout.write((char *)&numItems,sizeof(unsigned short)); } else { } fout.write((char *)storage, storeSize*numItems); } - inline osg::uchar getToken() const { return tokenId;} - inline osg::uchar getType() const { return TypeId;} + inline unsigned char getToken() const { return tokenId;} + inline unsigned char getType() const { return TypeId;} inline unsigned short getNum() const { return numItems;} inline unsigned char *getstore (unsigned int i) const { return storage+i*storeSize; @@ -224,7 +224,7 @@ public: int *in; uint *uin; short *sh; - osg::ushort *ush; + unsigned short *ush; long *ln; unsigned long *uln; double *dbl; @@ -359,7 +359,7 @@ public: return output; // to enable cascading, monkey copy from osg\plane or \quat, Ubyte4, vec2,3,4,... } private: - osg::ushort tokenId, TypeId; // these are longer than standard field; are extended field length + unsigned short tokenId, TypeId; // these are longer than standard field; are extended field length uint numItems; unsigned char *storage; // data relating uint storeSize; // size*numItems in storage diff --git a/src/osgPlugins/osg/ConvexPlanarOccluder.cpp b/src/osgPlugins/osg/ConvexPlanarOccluder.cpp index 79d984801..cb7169600 100644 --- a/src/osgPlugins/osg/ConvexPlanarOccluder.cpp +++ b/src/osgPlugins/osg/ConvexPlanarOccluder.cpp @@ -3,7 +3,6 @@ #endif #include "osg/ConvexPlanarOccluder" -#include "osg/Types" #include "osg/Notify" #include "osgDB/Registry" diff --git a/src/osgPlugins/osg/GeoSet.cpp b/src/osgPlugins/osg/GeoSet.cpp index 2089ffd51..10ac414d1 100644 --- a/src/osgPlugins/osg/GeoSet.cpp +++ b/src/osgPlugins/osg/GeoSet.cpp @@ -3,7 +3,6 @@ #endif #include "osg/GeoSet" -#include "osg/Types" #include "osg/Notify" #include "osgDB/Registry" diff --git a/src/osgPlugins/osg/LineStipple.cpp b/src/osgPlugins/osg/LineStipple.cpp index 770d51257..f7e15820a 100644 --- a/src/osgPlugins/osg/LineStipple.cpp +++ b/src/osgPlugins/osg/LineStipple.cpp @@ -38,7 +38,7 @@ bool LineStipple_readLocalData(Object& obj, Input& fr) iteratorAdvanced = true; } - osg::uint mask = linestipple.getPattern(); + unsigned int mask = linestipple.getPattern(); if (fr[0].matchWord("functionMask") && fr[1].getUInt(mask)) { linestipple.setPattern(mask); diff --git a/src/osgPlugins/osg/StateSet.cpp b/src/osgPlugins/osg/StateSet.cpp index 6e368ab51..aba507f9c 100644 --- a/src/osgPlugins/osg/StateSet.cpp +++ b/src/osgPlugins/osg/StateSet.cpp @@ -526,7 +526,7 @@ bool StateSet_writeLocalData(const Object& obj, Output& fw) else { // no name defined for GLMode so just pass its value to fw. - fw.indent() << "0x" << hex << (osg::uint)mitr->first << dec <<" " << StateSet_getModeStr(mitr->second) << std::endl; + fw.indent() << "0x" << hex << (unsigned int)mitr->first << dec <<" " << StateSet_getModeStr(mitr->second) << std::endl; } } @@ -560,7 +560,7 @@ bool StateSet_writeLocalData(const Object& obj, Output& fw) else { // no name defined for GLMode so just pass its value to fw. - fw.indent() << "0x" << hex << (osg::uint)mitr->first << dec <<" " << StateSet_getModeStr(mitr->second) << std::endl; + fw.indent() << "0x" << hex << (unsigned int)mitr->first << dec <<" " << StateSet_getModeStr(mitr->second) << std::endl; } } } diff --git a/src/osgPlugins/osg/Stencil.cpp b/src/osgPlugins/osg/Stencil.cpp index 8d03efc14..02a75c2b8 100644 --- a/src/osgPlugins/osg/Stencil.cpp +++ b/src/osgPlugins/osg/Stencil.cpp @@ -52,7 +52,7 @@ bool Stencil_readLocalData(Object& obj, Input& fr) iteratorAdvanced = true; } - osg::uint mask = stencil.getFunctionMask(); + unsigned int mask = stencil.getFunctionMask(); if (fr[0].matchWord("functionMask") && fr[1].getUInt(mask)) { setFunction = true; diff --git a/src/osgUtil/TriStripVisitor.cpp b/src/osgUtil/TriStripVisitor.cpp index bd6636850..3b3706c2e 100644 --- a/src/osgUtil/TriStripVisitor.cpp +++ b/src/osgUtil/TriStripVisitor.cpp @@ -10,7 +10,6 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * OpenSceneGraph Public License for more details. */ -#include #include #include