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

Fixed warnings.

Browse Source
This commit is contained in:
Robert Osfield 2005-11-09 10:41:52 +00:00
parent 28d939e617
commit 6c70812928
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/osgdelaunay/osgdelaunay.cpp
View File

@ -1125,7 +1125,7 @@ osg::DrawArrays* LinearConstraint::makeRoad(void ) const
}
osg::Vec3Array *LinearConstraint::getRoadNormals(const osg::Vec3Array *points) const
osg::Vec3Array *LinearConstraint::getRoadNormals(const osg::Vec3Array*) const
{
osg::Vec3Array *nrms=new osg::Vec3Array;
for(unsigned int i=0;i<_midline->size();i++) {

2
src/osg/Texture.cpp
View File

@ -346,7 +346,7 @@ Texture::Texture():
_internalFormatMode(USE_IMAGE_DATA_FORMAT),
_internalFormat(0),
_sourceFormat(0),
_sourceType(GL_UNSIGNED_BYTE),
_sourceType(0),
_use_shadow_comparison(false),
_shadow_compare_func(LEQUAL),
_shadow_texture_mode(LUMINANCE),

16
src/osgPlugins/gdal/ReaderWriterGDAL.cpp
View File

@ -462,17 +462,17 @@ class ReaderWriterGDAL : public osgDB::ReaderWriter
G = Hue_2_RGB( var_1, var_2, H );
B = Hue_2_RGB( var_1, var_2, H - ( 1 / 3 ) );
}
imageData[4*i+0] = R;
imageData[4*i+1] = G;
imageData[4*i+2] = B;
imageData[4*i+3] = 1.0f;
imageData[4*i+0] = static_cast<unsigned char>(R*255.0f);
imageData[4*i+1] = static_cast<unsigned char>(G*255.0f);
imageData[4*i+2] = static_cast<unsigned char>(B*255.0f);
imageData[4*i+3] = static_cast<unsigned char>(255.0f);
}
else if (interp == GPI_Gray)
{
imageData[4*i+0] = colorEntry->c1;
imageData[4*i+1] = colorEntry->c1;
imageData[4*i+2] = colorEntry->c1;
imageData[4*i+3] = 1.0f;
imageData[4*i+0] = static_cast<unsigned char>(colorEntry->c1*255.0f);
imageData[4*i+1] = static_cast<unsigned char>(colorEntry->c1*255.0f);
imageData[4*i+2] = static_cast<unsigned char>(colorEntry->c1*255.0f);
imageData[4*i+3] = static_cast<unsigned char>(255.0f);
}
}
}