From 12e79ea1111b52f7aeeb4e661dff3877ea5147df Mon Sep 17 00:00:00 2001
From: mniip <mniip@mniip.com>
Date: Wed, 9 May 2018 19:05:39 +0300
Subject: [PATCH] Fix compilation on windows

---
 data/font.h                           | 12 ++++++------
 src/graphics/Font.cpp                 |  2 --
 src/graphics/{Font.h => FontReader.h} |  7 ++++---
 src/graphics/Graphics.cpp             |  2 +-
 src/graphics/OpenGLGraphics.cpp       |  2 +-
 src/graphics/RasterDrawMethods.inl    |  2 +-
 6 files changed, 13 insertions(+), 14 deletions(-)
 delete mode 100644 src/graphics/Font.cpp
 rename src/graphics/{Font.h => FontReader.h} (83%)

diff --git a/data/font.h b/data/font.h
index 4d0dcfd3e..8b58004a4 100644
--- a/data/font.h
+++ b/data/font.h
@@ -1,11 +1,11 @@
 #pragma once
 #define FONT_H 12
 #ifndef FONTEDITOR
-extern unsigned char font_data[];
-extern unsigned short font_ptrs[];
-extern unsigned int font_ranges[][2];
+extern const unsigned char font_data[];
+extern const unsigned short font_ptrs[];
+extern const unsigned int font_ranges[][2];
 #else
-extern unsigned char *font_data;
-extern unsigned short *font_ptrs;
-extern unsigned int (*font_ranges)[2];
+extern const unsigned char *font_data;
+extern const unsigned short *font_ptrs;
+extern const unsigned int (*font_ranges)[2];
 #endif
diff --git a/src/graphics/Font.cpp b/src/graphics/Font.cpp
deleted file mode 100644
index ee869789b..000000000
--- a/src/graphics/Font.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#define INCLUDE_FONTDATA
-#include "font.h"
diff --git a/src/graphics/Font.h b/src/graphics/FontReader.h
similarity index 83%
rename from src/graphics/Font.h
rename to src/graphics/FontReader.h
index d7640cc9c..89079a6b9 100644
--- a/src/graphics/Font.h
+++ b/src/graphics/FontReader.h
@@ -1,3 +1,4 @@
+#pragma once
 #include <cstddef>
 
 #include "common/String.h"
@@ -5,19 +6,19 @@
 
 class FontReader
 {
-	unsigned char *pointer;
+	unsigned char const *pointer;
 	int width;
 	int pixels;
 	int data;
 
-	inline FontReader(unsigned char *_pointer):
+	inline FontReader(unsigned char const *_pointer):
 		pointer(_pointer + 1),
 		width(*_pointer),
 		pixels(0),
 		data(0)
 	{}
 
-	static inline unsigned char *lookupChar(String::value_type ch)
+	static inline unsigned char const *lookupChar(String::value_type ch)
 	{
 		size_t offset = 0;
 		for(int i = 0; font_ranges[i][1]; i++)
diff --git a/src/graphics/Graphics.cpp b/src/graphics/Graphics.cpp
index 7d5700033..c44a2a751 100644
--- a/src/graphics/Graphics.cpp
+++ b/src/graphics/Graphics.cpp
@@ -5,7 +5,7 @@
 #include "Config.h"
 #include "Misc.h"
 #include "Graphics.h"
-#include "Font.h"
+#include "FontReader.h"
 #ifdef HIGH_QUALITY_RESAMPLE
 #include "resampler/resampler.h"
 #endif
diff --git a/src/graphics/OpenGLGraphics.cpp b/src/graphics/OpenGLGraphics.cpp
index 2651eb941..7aa1785e4 100644
--- a/src/graphics/OpenGLGraphics.cpp
+++ b/src/graphics/OpenGLGraphics.cpp
@@ -1,5 +1,5 @@
 #include "Graphics.h"
-#include "Font.h"
+#include "FontReader.h"
 #include "common/tpt-thread.h"
 #ifdef OGLI
 
diff --git a/src/graphics/RasterDrawMethods.inl b/src/graphics/RasterDrawMethods.inl
index bd565f367..1c9a31614 100644
--- a/src/graphics/RasterDrawMethods.inl
+++ b/src/graphics/RasterDrawMethods.inl
@@ -1,5 +1,5 @@
 #include <cmath>
-#include "Font.h"
+#include "FontReader.h"
 
 int PIXELMETHODS_CLASS::drawtext_outline(int x, int y, String s, int r, int g, int b, int a)
 {