From 102a369dcfb28d40e7cd8a9db40a3a7c31c53b8f Mon Sep 17 00:00:00 2001
From: Joris <joris.dauphin@gmail.com>
Date: Sat, 9 Feb 2013 04:47:52 +0100
Subject: [PATCH] Fix gcc warnings when !defined(USE_OPENGL) &&
!defined(USE_GLES)
---
src/video/font.cpp | 2 +-
src/video/graphic.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/video/font.cpp b/src/video/font.cpp
index 5f6f90c27..1e5be002d 100644
--- a/src/video/font.cpp
+++ b/src/video/font.cpp
@@ -1029,9 +1029,9 @@ CFontColor::~CFontColor()
void CFont::Clean()
{
+#if defined(USE_OPENGL) || defined(USE_GLES)
CFont *font = this;
-#if defined(USE_OPENGL) || defined(USE_GLES)
if (UseOpenGL) {
FontColorGraphicMap &fontColorGraphicMap = FontColorGraphics[font];
if (!fontColorGraphicMap.empty()) {
diff --git a/src/video/graphic.cpp b/src/video/graphic.cpp
index 64592944f..385826a2a 100644
--- a/src/video/graphic.cpp
+++ b/src/video/graphic.cpp
@@ -982,6 +982,8 @@ void CGraphic::UseDisplayFormat()
}
}
+#if defined(USE_OPENGL) || defined(USE_GLES)
+
/**
** Find the next power of 2 >= x
*/
@@ -992,8 +994,6 @@ static int PowerOf2(int x)
return i;
}
-#if defined(USE_OPENGL) || defined(USE_GLES)
-
/**
** Make an OpenGL texture or textures out of a graphic object.
**