From 2f6318d5598f33ce0dd19017148053518521bd0a Mon Sep 17 00:00:00 2001 From: Mathnerd314 Date: Thu, 18 Sep 2008 23:45:17 +0000 Subject: [PATCH] - svn:eol-style = native fixes - really annoying cast in font.cpp (they don't need to be floats!) - move #ifdef OPENGL inside header guards to enable optimization (some compilers are exactly half-stupid) SVN-Revision: 5774 --- src/video/font.cpp | 4 ++-- src/video/gl_texture.hpp | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/video/font.cpp b/src/video/font.cpp index 7ddebbd06..f938279f6 100644 --- a/src/video/font.cpp +++ b/src/video/font.cpp @@ -232,8 +232,8 @@ Font::loadFontSurface( for( unsigned int i = 0; i < chars.size(); i++) { for(UTF8Iterator chr(chars[i]); !chr.done(); ++chr) { - float y = row * char_height; - float x = col * char_width; + int y = row * char_height; + int x = col * char_width; if( ++col == wrap ) { col=0; row++; } if( *chr == 0x0020 && glyphs[0x20].surface_idx != -1) continue; diff --git a/src/video/gl_texture.hpp b/src/video/gl_texture.hpp index 14532ccbe..2bc3cc154 100644 --- a/src/video/gl_texture.hpp +++ b/src/video/gl_texture.hpp @@ -16,13 +16,13 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include - -#ifdef HAVE_OPENGL #ifndef __GL_TEXTURE_HPP__ #define __GL_TEXTURE_HPP__ +#ifdef HAVE_OPENGL + +#include #include #include "texture.hpp" @@ -95,3 +95,4 @@ namespace GL #endif #endif + -- 2.11.0