From bdc8a72aae1c1c0c135d1012a33221b19de44d8a Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 11 Jul 2007 15:30:14 +0000 Subject: [PATCH] From Andre Garneau, minor warning fixes --- CMakeLists.txt | 1 + src/osgText/Font.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index df513e2c4..0557940f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,6 +89,7 @@ INCLUDE_DIRECTORIES( IF(WIN32) ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS) + ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE) #needed for net plugin SET (OSG_SOCKET_LIBS wsock32.lib) # Both Cygwin and Msys need -DNOMINMAX ??? diff --git a/src/osgText/Font.cpp b/src/osgText/Font.cpp index a674a6ea1..f121cba75 100644 --- a/src/osgText/Font.cpp +++ b/src/osgText/Font.cpp @@ -157,7 +157,7 @@ Font::Font(FontImplementation* implementation): char *ptr; 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<_textureHeightHint) _textureHeightHint = osg_max_size; @@ -236,7 +236,7 @@ void Font::setTextureSizeHint(unsigned int width,unsigned int height) char *ptr; 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<_textureHeightHint) _textureHeightHint = osg_max_size;