chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-07 03:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Font Pruning

Browse Source
This commit is contained in:
Mark Watkins 2011-06-14 07:32:00 +10:00
parent 92fa12dc22
commit 5a33f01016
10 changed files with 41 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8306,7 +8306,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
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 1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -10921,7 +10921,7 @@
"texture-atlas.h" "texture-atlas.h"
"texture-glyph.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
<wx/gdicmn.h> <wx/gdicmn.h>
<vector> <vector>
@ -10930,9 +10930,9 @@
"text-markup.h" "text-markup.h"
"vertex-buffer.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
<Glut/glut.h> <Glut/glut.h>
<GL/glut.h> <GL/gl.h>
"freetype-gl/vector.h" "freetype-gl/vector.h"
1307960497 source:/home/mark/projects/git/sleepyhead/src/libs/freetype-gl/text-markup.c 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-font.h"
"freetype-gl/texture-atlas.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
<wx/log.h> <wx/log.h>
<fontconfig/fontconfig.h>
<assert.h>
<stdio.h> <stdio.h>
<wchar.h>
"font-manager.h" "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
<assert.h>
<stdlib.h>
<string.h>
"font-manager.h" "font-manager.h"
"text-markup.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
<Glut/glut.h> <Glut/glut.h>
<GL/glut.h> <GL/gl.h>
<limits.h>
"texture-atlas.h" "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
<ft2build.h> <ft2build.h>
<wx/log.h> <wx/log.h>
<stdint.h>
<stdlib.h>
<stdio.h>
<assert.h>
<math.h> <math.h>
"texture-font.h" "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
<Glut/glut.h> <Glut/glut.h>
<GL/glut.h> <GL/gl.h>
<assert.h>
<stdlib.h>
"texture-glyph.h" "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
<assert.h> <assert.h>
<string.h> <string.h>
<stdlib.h> <stdlib.h>
<stdio.h> <stdio.h>
"vertex-buffer.h" "vertex-buffer.h"
<GL/gl.h>
<GL/glext.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
<assert.h> <assert.h>
<stdlib.h> <stdlib.h>
<string.h> <string.h>
<stdio.h>
"freetype-gl/vector.h" "freetype-gl/vector.h"

10
src/libs/freetype-gl/font-manager.cpp
View File

@ -22,11 +22,11 @@
* ========================================================================= */ * ========================================================================= */
//#include <fontconfig/fontconfig.h>
#include <wx/log.h> #include <wx/log.h>
#include <fontconfig/fontconfig.h> //#include <assert.h>
#include <assert.h>
#include <stdio.h> #include <stdio.h>
#include <wchar.h> //#include <wchar.h>
#include "font-manager.h" #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) const wxString & FontManager::MatchDescription(const wxString & family, const float size, const int bold, const int italic)
{ {
static wxString filename=wxEmptyString; static wxString filename=wxEmptyString;
int weight = FC_WEIGHT_REGULAR; /*int weight = FC_WEIGHT_REGULAR;
int slant = FC_SLANT_ROMAN; int slant = FC_SLANT_ROMAN;
if (bold) { if (bold) {
weight = FC_WEIGHT_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); filename = wxString((char *)(value.u.s),wxConvUTF8);
} }
} }
FcPatternDestroy(match); FcPatternDestroy(match); */
return filename; return filename;
} }

6
src/libs/freetype-gl/text-markup.cpp
View File

@ -20,9 +20,9 @@
* You should have received a copy of the GNU General Public License along * You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
* ========================================================================= */ * ========================================================================= */
#include <assert.h> //#include <assert.h>
#include <stdlib.h> //#include <stdlib.h>
#include <string.h> //#include <string.h>
#include "font-manager.h" #include "font-manager.h"
#include "text-markup.h" #include "text-markup.h"

4
src/libs/freetype-gl/texture-atlas.cpp
View File

@ -23,10 +23,10 @@
#if defined(__APPLE__) #if defined(__APPLE__)
#include <Glut/glut.h> #include <Glut/glut.h>
#else #else
#include <GL/glut.h> #include <GL/gl.h>
#endif #endif
//#include <stdlib.h> //#include <stdlib.h>
#include <limits.h> //#include <limits.h>
#include "texture-atlas.h" #include "texture-atlas.h"
#define max(a,b) (a)>(b)?(a):(b) #define max(a,b) (a)>(b)?(a):(b)

8
src/libs/freetype-gl/texture-font.cpp
View File

@ -23,10 +23,10 @@
#include <ft2build.h> #include <ft2build.h>
#include FT_FREETYPE_H #include FT_FREETYPE_H
#include <wx/log.h> #include <wx/log.h>
#include <stdint.h> //#include <stdint.h>
#include <stdlib.h> //#include <stdlib.h>
#include <stdio.h> //#include <stdio.h>
#include <assert.h> //#include <assert.h>
#include <math.h> #include <math.h>
#include "texture-font.h" #include "texture-font.h"

6
src/libs/freetype-gl/texture-glyph.cpp
View File

@ -23,10 +23,10 @@
#if defined(__APPLE__) #if defined(__APPLE__)
#include <Glut/glut.h> #include <Glut/glut.h>
#else #else
#include <GL/glut.h> #include <GL/gl.h>
#endif #endif
#include <assert.h> //#include <assert.h>
#include <stdlib.h> //#include <stdlib.h>
#include "texture-glyph.h" #include "texture-glyph.h"

2
src/libs/freetype-gl/vector.cpp
View File

@ -22,7 +22,7 @@
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdio.h> //#include <stdio.h>
#include "freetype-gl/vector.h" #include "freetype-gl/vector.h"
Vector * Vector *

5
src/libs/freetype-gl/vertex-buffer.cpp
View File

@ -25,8 +25,9 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "vertex-buffer.h" #include "vertex-buffer.h"
#include <GL/gl.h> //#include <GL/gl.h>
#include <GL/glext.h> //#include <GL/glext.h>
VertexBuffer::VertexBuffer(char *_format ) VertexBuffer::VertexBuffer(char *_format )

2
src/libs/freetype-gl/vertex-buffer.h
View File

@ -30,7 +30,7 @@
#if defined(__APPLE__) #if defined(__APPLE__)
#include <Glut/glut.h> #include <Glut/glut.h>
#else #else
#include <GL/glut.h> #include <GL/gl.h>
#endif #endif
#include "freetype-gl/vector.h" // grrr.. nasty c programmers.. go learn a real OOPL. #include "freetype-gl/vector.h" // grrr.. nasty c programmers.. go learn a real OOPL.

12
src/version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type //Standard Version Type
static const long MAJOR = 0; static const long MAJOR = 0;
static const long MINOR = 7; static const long MINOR = 7;
static const long BUILD = 5568; static const long BUILD = 5584;
static const long REVISION = 13703; static const long REVISION = 13805;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 5690; static const long BUILDS_COUNT = 5725;
#define RC_FILEVERSION 0,7,5568,13703 #define RC_FILEVERSION 0,7,5584,13805
#define RC_FILEVERSION_STRING "0, 7, 5568, 13703\0" #define RC_FILEVERSION_STRING "0, 7, 5584, 13805\0"
static const char FULLVERSION_STRING[] = "0.7.5568.13703"; static const char FULLVERSION_STRING[] = "0.7.5584.13805";
//These values are to keep track of your versioning state, don't modify them. //These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0; static const long BUILD_HISTORY = 0;