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

From Andre Garneau, minor warning fixes

Browse Source
This commit is contained in:
Robert Osfield 2007-07-11 15:30:14 +00:00
parent 8779813837
commit bdc8a72aae
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -89,6 +89,7 @@ INCLUDE_DIRECTORIES(
IF(WIN32) IF(WIN32)
ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS) ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
#needed for net plugin #needed for net plugin
SET (OSG_SOCKET_LIBS wsock32.lib) SET (OSG_SOCKET_LIBS wsock32.lib)
# Both Cygwin and Msys need -DNOMINMAX ??? # Both Cygwin and Msys need -DNOMINMAX ???

4
src/osgText/Font.cpp
View File

@ -157,7 +157,7 @@ Font::Font(FontImplementation* implementation):
char *ptr; char *ptr;
if( (ptr = getenv("OSG_MAX_TEXTURE_SIZE")) != 0) if( (ptr = getenv("OSG_MAX_TEXTURE_SIZE")) != 0)
{ {
GLint osg_max_size = atoi(ptr); unsigned int osg_max_size = atoi(ptr);
if (osg_max_size<_textureWidthHint) _textureWidthHint = osg_max_size; if (osg_max_size<_textureWidthHint) _textureWidthHint = osg_max_size;
if (osg_max_size<_textureHeightHint) _textureHeightHint = osg_max_size; if (osg_max_size<_textureHeightHint) _textureHeightHint = osg_max_size;
@ -236,7 +236,7 @@ void Font::setTextureSizeHint(unsigned int width,unsigned int height)
char *ptr; char *ptr;
if( (ptr = getenv("OSG_MAX_TEXTURE_SIZE")) != 0) if( (ptr = getenv("OSG_MAX_TEXTURE_SIZE")) != 0)
{ {
GLint osg_max_size = atoi(ptr); unsigned int osg_max_size = atoi(ptr);
if (osg_max_size<_textureWidthHint) _textureWidthHint = osg_max_size; if (osg_max_size<_textureWidthHint) _textureWidthHint = osg_max_size;
if (osg_max_size<_textureHeightHint) _textureHeightHint = osg_max_size; if (osg_max_size<_textureHeightHint) _textureHeightHint = osg_max_size;