From 5a33f01016ee906eb1da178f3207c6b63d60d3ef Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Tue, 14 Jun 2011 07:32:00 +1000 Subject: [PATCH] Font Pruning --- Projects/CodeBlocks/SleepyHead.depend | 42 ++++++++------------------ src/libs/freetype-gl/font-manager.cpp | 10 +++--- src/libs/freetype-gl/text-markup.cpp | 6 ++-- src/libs/freetype-gl/texture-atlas.cpp | 4 +-- src/libs/freetype-gl/texture-font.cpp | 8 ++--- src/libs/freetype-gl/texture-glyph.cpp | 6 ++-- src/libs/freetype-gl/vector.cpp | 2 +- src/libs/freetype-gl/vertex-buffer.cpp | 5 +-- src/libs/freetype-gl/vertex-buffer.h | 2 +- src/version.h | 12 ++++---- 10 files changed, 41 insertions(+), 56 deletions(-) diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index ab046432..c42640d3 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8306,7 +8306,7 @@ -1307996397 /home/mark/projects/git/sleepyhead/src/version.h +1308000649 /home/mark/projects/git/sleepyhead/src/version.h 1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h "machine.h" @@ -10921,7 +10921,7 @@ "texture-atlas.h" "texture-glyph.h" -1307989095 /home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-atlas.h +1308000392 /home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-atlas.h @@ -10930,9 +10930,9 @@ "text-markup.h" "vertex-buffer.h" -1307988727 /home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vertex-buffer.h +1308000449 /home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vertex-buffer.h - + "freetype-gl/vector.h" 1307960497 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/text-markup.c @@ -11002,57 +11002,41 @@ "freetype-gl/texture-font.h" "freetype-gl/texture-atlas.h" -1307976336 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/font-manager.cpp +1307999759 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/font-manager.cpp - - - "font-manager.h" -1307994477 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/text-markup.cpp - - - +1307999783 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/text-markup.cpp "font-manager.h" "text-markup.h" -1307984359 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-atlas.cpp +1308000368 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-atlas.cpp - - + "texture-atlas.h" -1307974648 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-font.cpp +1307999961 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-font.cpp - - - - "texture-font.h" -1307974760 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-glyph.cpp +1308000410 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/texture-glyph.cpp - - - + "texture-glyph.h" -1307989346 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vertex-buffer.cpp +1308000067 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vertex-buffer.cpp "vertex-buffer.h" - - -1307976602 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vector.cpp +1308000005 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/vector.cpp - "freetype-gl/vector.h" diff --git a/src/libs/freetype-gl/font-manager.cpp b/src/libs/freetype-gl/font-manager.cpp index f193a23f..2c1f0234 100644 --- a/src/libs/freetype-gl/font-manager.cpp +++ b/src/libs/freetype-gl/font-manager.cpp @@ -22,11 +22,11 @@ * ========================================================================= */ +//#include #include -#include -#include +//#include #include -#include +//#include #include "font-manager.h" @@ -111,7 +111,7 @@ TextureFont * FontManager::GetFromMarkup(const TextMarkup *markup) const wxString & FontManager::MatchDescription(const wxString & family, const float size, const int bold, const int italic) { static wxString filename=wxEmptyString; - int weight = FC_WEIGHT_REGULAR; + /*int weight = FC_WEIGHT_REGULAR; int slant = FC_SLANT_ROMAN; if (bold) { weight = FC_WEIGHT_BOLD; @@ -146,7 +146,7 @@ const wxString & FontManager::MatchDescription(const wxString & family, const fl filename = wxString((char *)(value.u.s),wxConvUTF8); } } - FcPatternDestroy(match); + FcPatternDestroy(match); */ return filename; } diff --git a/src/libs/freetype-gl/text-markup.cpp b/src/libs/freetype-gl/text-markup.cpp index 9412c951..3064dfc0 100644 --- a/src/libs/freetype-gl/text-markup.cpp +++ b/src/libs/freetype-gl/text-markup.cpp @@ -20,9 +20,9 @@ * You should have received a copy of the GNU General Public License along * with this program. If not, see . * ========================================================================= */ -#include -#include -#include +//#include +//#include +//#include #include "font-manager.h" #include "text-markup.h" diff --git a/src/libs/freetype-gl/texture-atlas.cpp b/src/libs/freetype-gl/texture-atlas.cpp index eab2251c..3fad7850 100644 --- a/src/libs/freetype-gl/texture-atlas.cpp +++ b/src/libs/freetype-gl/texture-atlas.cpp @@ -23,10 +23,10 @@ #if defined(__APPLE__) #include #else - #include + #include #endif //#include -#include +//#include #include "texture-atlas.h" #define max(a,b) (a)>(b)?(a):(b) diff --git a/src/libs/freetype-gl/texture-font.cpp b/src/libs/freetype-gl/texture-font.cpp index fe7a1ff5..9114436f 100644 --- a/src/libs/freetype-gl/texture-font.cpp +++ b/src/libs/freetype-gl/texture-font.cpp @@ -23,10 +23,10 @@ #include #include FT_FREETYPE_H #include -#include -#include -#include -#include +//#include +//#include +//#include +//#include #include #include "texture-font.h" diff --git a/src/libs/freetype-gl/texture-glyph.cpp b/src/libs/freetype-gl/texture-glyph.cpp index 97ecfe80..7af774ff 100644 --- a/src/libs/freetype-gl/texture-glyph.cpp +++ b/src/libs/freetype-gl/texture-glyph.cpp @@ -23,10 +23,10 @@ #if defined(__APPLE__) #include #else - #include + #include #endif -#include -#include +//#include +//#include #include "texture-glyph.h" diff --git a/src/libs/freetype-gl/vector.cpp b/src/libs/freetype-gl/vector.cpp index 2d426495..eff3a080 100644 --- a/src/libs/freetype-gl/vector.cpp +++ b/src/libs/freetype-gl/vector.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +//#include #include "freetype-gl/vector.h" Vector * diff --git a/src/libs/freetype-gl/vertex-buffer.cpp b/src/libs/freetype-gl/vertex-buffer.cpp index 01b90267..30167ee3 100644 --- a/src/libs/freetype-gl/vertex-buffer.cpp +++ b/src/libs/freetype-gl/vertex-buffer.cpp @@ -25,8 +25,9 @@ #include #include #include "vertex-buffer.h" -#include -#include +//#include +//#include + VertexBuffer::VertexBuffer(char *_format ) diff --git a/src/libs/freetype-gl/vertex-buffer.h b/src/libs/freetype-gl/vertex-buffer.h index d16434f1..93c3785d 100644 --- a/src/libs/freetype-gl/vertex-buffer.h +++ b/src/libs/freetype-gl/vertex-buffer.h @@ -30,7 +30,7 @@ #if defined(__APPLE__) #include #else - #include + #include #endif #include "freetype-gl/vector.h" // grrr.. nasty c programmers.. go learn a real OOPL. diff --git a/src/version.h b/src/version.h index 2e56a417..b2e40b57 100644 --- a/src/version.h +++ b/src/version.h @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long MAJOR = 0; static const long MINOR = 7; - static const long BUILD = 5568; - static const long REVISION = 13703; + static const long BUILD = 5584; + static const long REVISION = 13805; //Miscellaneous Version Types - static const long BUILDS_COUNT = 5690; - #define RC_FILEVERSION 0,7,5568,13703 - #define RC_FILEVERSION_STRING "0, 7, 5568, 13703\0" - static const char FULLVERSION_STRING[] = "0.7.5568.13703"; + static const long BUILDS_COUNT = 5725; + #define RC_FILEVERSION 0,7,5584,13805 + #define RC_FILEVERSION_STRING "0, 7, 5584, 13805\0" + static const char FULLVERSION_STRING[] = "0.7.5584.13805"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;