diff options
| author | Diego Borghetti <bdiego@gmail.com> | 2009-05-06 03:10:32 +0400 |
|---|---|---|
| committer | Diego Borghetti <bdiego@gmail.com> | 2009-05-06 03:10:32 +0400 |
| commit | 405cf80eb8dc2df8ae160aee70aef34052add24a (patch) | |
| tree | f03cc27e95bdf91b25ea9d2a0dffb28ccef666be /source | |
| parent | 71c38978e14ebf3522fe60fc239ad04f10ef30ab (diff) | |
Big, big commit!!
1) Remove WITH_FREETYPE2 from code, so now blender always need freetype2
2) Remove the old bmfont
3) Remove ftfont and bFTGL library
4) Implement a new BLF_draw_default function for place that still need/use
the old BMF api.
I try to update both, scons and cmake, but I only can test with make, so
hope all work fine.
MSVC is broken, but I don't have Windows, things to search and fix are
any reference to WITH_FREETYPE2, FTGL and BMFONT (take in care that
blenkernel also have a BKE_bmfont.h, this don't have anything to do with bmfont).
Always have to link/include the freetype2 library
Remove any reference to libbmfont
Remove any reference to libftfont
Remove any reference to libbftgl (or libbFTGL)
Diffstat (limited to 'source')
115 files changed, 323 insertions, 4973 deletions
diff --git a/source/Makefile b/source/Makefile index 1173756cbcb..85486c3a81f 100644 --- a/source/Makefile +++ b/source/Makefile @@ -158,7 +158,6 @@ endif COMLIB += $(OCGDIR)/blender/makesdna/$(DEBUG_DIR)libdna.a COMLIB += $(NAN_GUARDEDALLOC)/lib/libguardedalloc.a COMLIB += $(NAN_MEMUTIL)/lib/libmemutil.a -COMLIB += $(NAN_BMFONT)/lib/$(DEBUG_DIR)libbmfont.a COMLIB += $(NAN_PNG)/lib/libpng.a COMLIB += $(OCGDIR)/blender/yafray/$(DEBUG_DIR)libyafrayexport.a @@ -184,22 +183,17 @@ ifeq ($(WITH_BINRELOC), true) COMLIB += $(OCGDIR)/extern/binreloc/$(DEBUG_DIR)libbinreloc.a endif -ifeq ($(WITH_FREETYPE2), true) - ifeq ($(OS), windows) - ifeq ($(FREE_WINDOWS), true) - COMLIB += $(NAN_FTGL)/lib/libftgl.a +ifeq ($(OS), windows) + ifeq ($(FREE_WINDOWS), true) COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a - else - COMLIB += $(NAN_FTGL)/lib/ftgl_static_ST.lib + else COMLIB += $(NAN_FREETYPE)/lib/freetype2ST.lib - endif + endif +else + ifeq ($(OS), irix) + COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a else - COMLIB += $(NAN_FTGL)/lib/$(DEBUG_DIR)libftgl.a - ifeq ($(OS), irix) COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a - else - COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a - endif endif endif diff --git a/source/blender/blenfont/BLF_api.h b/source/blender/blenfont/BLF_api.h index 510ff550acc..516ecd102d6 100644 --- a/source/blender/blenfont/BLF_api.h +++ b/source/blender/blenfont/BLF_api.h @@ -31,7 +31,7 @@ struct rctf; -int BLF_init(void); +int BLF_init(int points, int dpi); void BLF_exit(void); int BLF_load(char *name); @@ -43,15 +43,14 @@ int BLF_load_mem(char *name, unsigned char *mem, int mem_size); void BLF_set(int fontid); int BLF_get(void); -/* - * Return the font type, can be freetype2 or internal, -1 if - * some error happen (no current font). - */ -int BLF_type_get(void); - void BLF_aspect(float aspect); void BLF_position(float x, float y, float z); void BLF_size(int size, int dpi); + +/* Draw the string using the default font, size and dpi. */ +void BLF_draw_default(float x, float y, float z, char *str); + +/* Draw the string using the current font. */ void BLF_draw(char *str); /* @@ -69,6 +68,14 @@ float BLF_width(char *str); float BLF_height(char *str); /* + * and this two function return the width and height + * of the string, using the default font and both value + * are multiplied by the aspect of the font. + */ +float BLF_width_default(char *str); +float BLF_height_default(char *str); + +/* * By default, rotation and clipping are disable and * have to be enable/disable using BLF_enable/disable. */ @@ -112,8 +119,4 @@ void BLF_dir_free(char **dirs, int count); #define BLF_MODE_TEXTURE 0 #define BLF_MODE_BITMAP 1 -/* font->type */ -#define BLF_FONT_FREETYPE2 0 -#define BLF_FONT_INTERNAL 1 - #endif /* BLF_API_H */ diff --git a/source/blender/blenfont/CMakeLists.txt b/source/blender/blenfont/CMakeLists.txt index 4c21138f552..aef655ca0d1 100644 --- a/source/blender/blenfont/CMakeLists.txt +++ b/source/blender/blenfont/CMakeLists.txt @@ -26,18 +26,12 @@ FILE(GLOB SRC intern/*.c) SET(INC ../../../intern/guardedalloc ../blenlib ../makesdna ../editors/include - ../blenkernel ../ftfont ../../../extern/glew/include . + ../blenkernel ../../../extern/glew/include . ${FTGL_INC} ${FREETYPE_INC} ${GETTEXT_INC} ) -ADD_DEFINITIONS(-DFTGL_LIBRARY_STATIC) - -IF(WITH_INTERNATIONAL) - ADD_DEFINITIONS(-DWITH_FREETYPE2) -ENDIF(WITH_INTERNATIONAL) - IF(WIN32) ADD_DEFINITIONS(-D_WIN32 -DUSE_GETTEXT_DLL) ENDIF(WIN32) diff --git a/source/blender/blenfont/SConscript b/source/blender/blenfont/SConscript index 85797c3c23b..fa6fa19a9ef 100644 --- a/source/blender/blenfont/SConscript +++ b/source/blender/blenfont/SConscript @@ -4,19 +4,14 @@ Import ('env') sources = env.Glob('intern/*.c') -incs = '. intern #/intern/guardedalloc ../blenkernel ../blenlib ../makesdna ../ftfont ../editors/include' +incs = '. intern #/intern/guardedalloc ../blenkernel ../blenlib ../makesdna ../editors/include' incs += ' #/extern/glew/include' -incs += ' ' + env['BF_FTGL_INC'] incs += ' ' + env['BF_FREETYPE_INC'] incs += ' ' + env['BF_GETTEXT_INC'] defs = '' -defs += 'FTGL_STATIC_LIBRARY' if sys.platform == 'win32': defs += ' _WIN32 USE_GETTEXT_DLL' -if env['WITH_BF_INTERNATIONAL']: - defs += ' WITH_FREETYPE2' - env.BlenderLib ( 'bf_blenfont', sources, Split(incs), Split(defs), libtype=['core'], priority=[210] ) diff --git a/source/blender/blenfont/intern/Makefile b/source/blender/blenfont/intern/Makefile index 18bf42f3fa5..6e53ca959d3 100644 --- a/source/blender/blenfont/intern/Makefile +++ b/source/blender/blenfont/intern/Makefile @@ -60,16 +60,11 @@ ifeq ($(OS),linux) endif endif -ifeq ($(WITH_FREETYPE2), true) - CPPFLAGS += -DWITH_FREETYPE2 -endif - # Modules CPPFLAGS += -I../../editors/include CPPFLAGS += -I../../makesdna CPPFLAGS += -I../../blenlib CPPFLAGS += -I../../blenkernel -CPPFLAGS += -I../../ftfont # Memory allocator CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index e43d7905cf9..d49ca0bd0ac 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -31,15 +31,11 @@ #include <string.h> #include <math.h> -#ifdef WITH_FREETYPE2 - #include <ft2build.h> #include FT_FREETYPE_H #include FT_GLYPH_H -#endif /* WITH_FREETYPE2 */ - #include "MEM_guardedalloc.h" #include "DNA_listBase.h" @@ -75,14 +71,20 @@ int global_font_num= 0; /* Current font. */ int global_font_cur= 0; +/* Default size and dpi, for BLF_draw_default. */ +int global_font_default= -1; +int global_font_points= 11; +int global_font_dpi= 72; -int BLF_init(void) +int BLF_init(int points, int dpi) { int i; for (i= 0; i < BLF_MAX_FONT; i++) global_font[i]= NULL; + global_font_points= points; + global_font_dpi= dpi; return(blf_font_init()); } @@ -142,7 +144,6 @@ int BLF_load(char *name) return(-1); } -#ifdef WITH_FREETYPE2 font= blf_font_new(name, filename); MEM_freeN(filename); @@ -155,9 +156,6 @@ int BLF_load(char *name) i= global_font_num; global_font_num++; return(i); -#endif /* WITH_FREETYPE2 */ - - return(-1); } int BLF_load_mem(char *name, unsigned char *mem, int mem_size) @@ -181,21 +179,15 @@ int BLF_load_mem(char *name, unsigned char *mem, int mem_size) return(-1); } - font= blf_internal_new(name); - if (!font) { -#ifdef WITH_FREETYPE2 - if (!mem || !mem_size) { - printf("Can't load font: %s from memory!!\n", name); - return(-1); - } - - font= blf_font_new_from_mem(name, mem, mem_size); -#endif /* WITH_FREETYPE2 */ + if (!mem || !mem_size) { + printf("Can't load font: %s from memory!!\n", name); + return(-1); + } - if (!font) { - printf("Can't load font: %s from memory!!\n", name); - return(-1); - } + font= blf_font_new_from_mem(name, mem, mem_size); + if (!font) { + printf("Can't load font: %s from memory!!\n", name); + return(-1); } global_font[global_font_num]= font; @@ -215,16 +207,6 @@ int BLF_get(void) return(global_font_cur); } -int BLF_type_get(void) -{ - FontBLF *font; - - font= global_font[global_font_cur]; - if (font) - return(font->type); - return(-1); -} - void BLF_enable(int option) { FontBLF *font; @@ -299,6 +281,41 @@ void BLF_blur(int size) font->blur= size; } +void BLF_draw_default(float x, float y, float z, char *str) +{ + FontBLF *font; + int old_font, old_point, old_dpi; + + if (!str) + return; + + if (global_font_default == -1) + global_font_default= blf_search("default"); + + if (global_font_default == -1) { + printf("Warning: Can't found default font!!\n"); + return; + } + + font= global_font[global_font_cur]; + if (font) { + old_font= global_font_cur; + old_point= font->size; + old_dpi= font->dpi; + } + + global_font_cur= global_font_default; + BLF_size(global_font_points, global_font_dpi); + BLF_position(x, y, z); + BLF_draw(str); + + /* restore the old font. */ + if (font) { + global_font_cur= old_font; + BLF_size(old_point, old_dpi); + } +} + void BLF_draw(char *str) { FontBLF *font; @@ -363,6 +380,39 @@ float BLF_width(char *str) return(0.0f); } +float BLF_width_default(char *str) +{ + FontBLF *font; + float width; + int old_font, old_point, old_dpi; + + if (global_font_default == -1) + global_font_default= blf_search("default"); + + if (global_font_default == -1) { + printf("Error: Can't found default font!!\n"); + return(0.0f); + } + + font= global_font[global_font_cur]; + if (font) { + old_font= global_font_cur; + old_point= font->size; + old_dpi= font->dpi; + } + + global_font_cur= global_font_default; + BLF_size(global_font_points, global_font_dpi); + width= BLF_width(str); + + /* restore the old font. */ + if (font) { + global_font_cur= old_font; + BLF_size(old_point, old_dpi); + } + return(width); +} + float BLF_height(char *str) { FontBLF *font; @@ -373,6 +423,39 @@ float BLF_height(char *str) return(0.0f); } +float BLF_height_default(char *str) +{ + FontBLF *font; + float height; + int old_font, old_point, old_dpi; + + if (global_font_default == -1) + global_font_default= blf_search("default"); + + if (global_font_default == -1) { + printf("Error: Can't found default font!!\n"); + return(0.0f); + } + + font= global_font[global_font_cur]; + if (font) { + old_font= global_font_cur; + old_point= font->size; + old_dpi= font->dpi; + } + + global_font_cur= global_font_default; + BLF_size(global_font_points, global_font_dpi); + height= BLF_height(str); + + /* restore the old font. */ + if (font) { + global_font_cur= old_font; + BLF_size(old_point, old_dpi); + } + return(height); +} + void BLF_rotation(float angle) { FontBLF *font; diff --git a/source/blender/blenfont/intern/blf_dir.c b/source/blender/blenfont/intern/blf_dir.c index 1216c610515..d87262522d8 100644 --- a/source/blender/blenfont/intern/blf_dir.c +++ b/source/blender/blenfont/intern/blf_dir.c @@ -29,15 +29,11 @@ #include <stdlib.h> #include <string.h> -#ifdef WITH_FREETYPE2 - #include <ft2build.h> #include FT_FREETYPE_H #include FT_GLYPH_H -#endif /* WITH_FREETYPE2 */ - #include "MEM_guardedalloc.h" #include "DNA_listBase.h" diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c index 6d185378c25..02b21264115 100644 --- a/source/blender/blenfont/intern/blf_font.c +++ b/source/blender/blenfont/intern/blf_font.c @@ -30,15 +30,11 @@ #include <stdlib.h> #include <string.h> -#ifdef WITH_FREETYPE2 - #include <ft2build.h> #include FT_FREETYPE_H #include FT_GLYPH_H -#endif /* WITH_FREETYPE2 */ - #include "MEM_guardedalloc.h" #include "DNA_listBase.h" @@ -58,8 +54,6 @@ #include "blf_internal.h" -#ifdef WITH_FREETYPE2 - /* freetype2 handle. */ FT_Library global_ft_lib; @@ -294,7 +288,6 @@ void blf_font_free(FontBLF *font) void blf_font_fill(FontBLF *font) { - font->type= BLF_FONT_FREETYPE2; font->mode= BLF_MODE_TEXTURE; font->ref= 1; font->aspect= 1.0f; @@ -372,16 +365,3 @@ FontBLF *blf_font_new_from_mem(char *name, unsigned char *mem, int mem_size) blf_font_fill(font); return(font); } - -#else /* !WITH_FREETYPE2 */ - -int blf_font_init(void) -{ - return(0); -} - -void blf_font_exit(void) -{ -} - -#endif /* WITH_FREETYPE2 */ diff --git a/source/blender/blenfont/intern/blf_font_helv10.h b/source/blender/blenfont/intern/blf_font_helv10.h deleted file mode 100644 index 7a0a48d83bc..00000000000 --- a/source/blender/blenfont/intern/blf_font_helv10.h +++ /dev/null @@ -1,487 +0,0 @@ -/** - * $Id: - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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. - * - * The Original Code is Copyright (C) 2009 Blender Foundation. - * All rights reserved. - * - * - * Contributor(s): Blender Foundation - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef BLF_FONT_HELV10_H -#define BLF_FONT_HELV10_H - -static unsigned char helv10_bitmap_data[]= { - 0x80,0x00,0x80,0x80,0x80,0x80,0x80,0x80, - 0xa0,0xa0,0x50,0x50,0xf8,0x28,0x7c,0x28, - 0x28,0x20,0x70,0xa8,0x28,0x70,0xa0,0xa8, - 0x70,0x20,0x26,0x29,0x16,0x10,0x08,0x68, - 0x94,0x64,0x64,0x98,0x98,0xa4,0x60,0x50, - 0x50,0x20,0x80,0x40,0x40,0x20,0x40,0x40, - 0x80,0x80,0x80,0x80,0x40,0x40,0x20,0x80, - 0x40,0x40,0x20,0x20,0x20,0x20,0x40,0x40, - 0x80,0xa0,0x40,0xa0,0x20,0x20,0xf8,0x20, - 0x20,0x80,0x40,0x40,0xf8,0x80,0x80,0x80, - 0x40,0x40,0x40,0x40,0x20,0x20,0x70,0x88, - 0x88,0x88,0x88,0x88,0x88,0x70,0x40,0x40, - 0x40,0x40,0x40,0x40,0xc0,0x40,0xf8,0x80, - 0x40,0x30,0x08,0x08,0x88,0x70,0x70,0x88, - 0x08,0x08,0x30,0x08,0x88,0x70,0x10,0x10, - 0xf8,0x90,0x50,0x50,0x30,0x10,0x70,0x88, - 0x08,0x08,0xf0,0x80,0x80,0xf8,0x70,0x88, - 0x88,0xc8,0xb0,0x80,0x88,0x70,0x40,0x40, - 0x20,0x20,0x10,0x10,0x08,0xf8,0x70,0x88, - 0x88,0x88,0x70,0x88,0x88,0x70,0x70,0x88, - 0x08,0x68,0x98,0x88,0x88,0x70,0x80,0x00, - 0x00,0x00,0x00,0x80,0x80,0x40,0x40,0x00, - 0x00,0x00,0x00,0x40,0x20,0x40,0x80,0x40, - 0x20,0xf0,0x00,0xf0,0x80,0x40,0x20,0x40, - 0x80,0x40,0x00,0x40,0x40,0x20,0x10,0x90, - 0x60,0x3e,0x00,0x40,0x00,0x9b,0x00,0xa4, - 0x80,0xa4,0x80,0xa2,0x40,0x92,0x40,0x4d, - 0x40,0x20,0x80,0x1f,0x00,0x82,0x82,0x7c, - 0x44,0x28,0x28,0x10,0x10,0xf0,0x88,0x88, - 0x88,0xf0,0x88,0x88,0xf0,0x78,0x84,0x80, - 0x80,0x80,0x80,0x84,0x78,0xf0,0x88,0x84, - 0x84,0x84,0x84,0x88,0xf0,0xf8,0x80,0x80, - 0x80,0xf8,0x80,0x80,0xf8,0x80,0x80,0x80, - 0x80,0xf0,0x80,0x80,0xf8,0x74,0x8c,0x84, - 0x8c,0x80,0x80,0x84,0x78,0x84,0x84,0x84, - 0x84,0xfc,0x84,0x84,0x84,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x60,0x90,0x10, - 0x10,0x10,0x10,0x10,0x10,0x88,0x88,0x90, - 0x90,0xe0,0xa0,0x90,0x88,0xf0,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x92,0x92,0x92, - 0xaa,0xaa,0xc6,0xc6,0x82,0x8c,0x8c,0x94, - 0x94,0xa4,0xa4,0xc4,0xc4,0x78,0x84,0x84, - 0x84,0x84,0x84,0x84,0x78,0x80,0x80,0x80, - 0x80,0xf0,0x88,0x88,0xf0,0x02,0x7c,0x8c, - 0x94,0x84,0x84,0x84,0x84,0x78,0x88,0x88, - 0x88,0x88,0xf0,0x88,0x88,0xf0,0x70,0x88, - 0x88,0x08,0x70,0x80,0x88,0x70,0x20,0x20, - 0x20,0x20,0x20,0x20,0x20,0xf8,0x78,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x10,0x28, - 0x28,0x44,0x44,0x44,0x82,0x82,0x22,0x00, - 0x22,0x00,0x22,0x00,0x55,0x00,0x49,0x00, - 0x49,0x00,0x88,0x80,0x88,0x80,0x88,0x88, - 0x50,0x50,0x20,0x50,0x88,0x88,0x10,0x10, - 0x10,0x28,0x28,0x44,0x44,0x82,0xf8,0x80, - 0x40,0x20,0x20,0x10,0x08,0xf8,0xc0,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0xc0, - 0x20,0x20,0x40,0x40,0x40,0x40,0x80,0x80, - 0xc0,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x40,0xc0,0x88,0x50,0x50,0x20,0x20,0xfc, - 0x80,0x80,0x40,0x68,0x90,0x90,0x70,0x10, - 0xe0,0xb0,0xc8,0x88,0x88,0xc8,0xb0,0x80, - 0x80,0x60,0x90,0x80,0x80,0x90,0x60,0x68, - 0x98,0x88,0x88,0x98,0x68,0x08,0x08,0x60, - 0x90,0x80,0xf0,0x90,0x60,0x40,0x40,0x40, - 0x40,0x40,0xe0,0x40,0x30,0x70,0x08,0x68, - 0x98,0x88,0x88,0x98,0x68,0x88,0x88,0x88, - 0x88,0xc8,0xb0,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x00,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x00,0x80,0x90,0x90, - 0xa0,0xc0,0xa0,0x90,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x92,0x92, - 0x92,0x92,0x92,0xec,0x88,0x88,0x88,0x88, - 0xc8,0xb0,0x70,0x88,0x88,0x88,0x88,0x70, - 0x80,0x80,0xb0,0xc8,0x88,0x88,0xc8,0xb0, - 0x08,0x08,0x68,0x98,0x88,0x88,0x98,0x68, - 0x80,0x80,0x80,0x80,0xc0,0xa0,0x60,0x90, - 0x10,0x60,0x90,0x60,0x60,0x40,0x40,0x40, - 0x40,0xe0,0x40,0x40,0x70,0x90,0x90,0x90, - 0x90,0x90,0x20,0x20,0x50,0x50,0x88,0x88, - 0x28,0x28,0x54,0x54,0x92,0x92,0x88,0x88, - 0x50,0x20,0x50,0x88,0x80,0x40,0x40,0x60, - 0xa0,0xa0,0x90,0x90,0xf0,0x80,0x40,0x20, - 0x10,0xf0,0x20,0x40,0x40,0x40,0x40,0x80, - 0x40,0x40,0x40,0x20,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x40, - 0x40,0x40,0x40,0x20,0x40,0x40,0x40,0x80, - 0x98,0x64,0x80,0x80,0x80,0x80,0x80,0x80, - 0x00,0x80,0x40,0x70,0xa8,0xa0,0xa0,0xa8, - 0x70,0x10,0xb0,0x48,0x40,0x40,0xe0,0x40, - 0x48,0x30,0x90,0x60,0x90,0x90,0x60,0x90, - 0x20,0xf8,0x20,0xf8,0x50,0x50,0x88,0x88, - 0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x80, - 0x80,0x80,0x70,0x88,0x18,0x70,0xc8,0x98, - 0x70,0xc0,0x88,0x70,0xa0,0x38,0x44,0x9a, - 0xa2,0x9a,0x44,0x38,0xe0,0x00,0xa0,0x20, - 0xe0,0x28,0x50,0xa0,0x50,0x28,0x08,0x08, - 0xf8,0xe0,0x38,0x44,0xaa,0xb2,0xba,0x44, - 0x38,0xe0,0x60,0x90,0x90,0x60,0xf8,0x00, - 0x20,0x20,0xf8,0x20,0x20,0xe0,0x40,0xa0, - 0x60,0xc0,0x20,0x40,0xe0,0x80,0x40,0x80, - 0x80,0xf0,0x90,0x90,0x90,0x90,0x90,0x28, - 0x28,0x28,0x28,0x28,0x68,0xe8,0xe8,0xe8, - 0x7c,0xc0,0xc0,0x40,0x40,0x40,0xc0,0x40, - 0xe0,0x00,0xe0,0xa0,0xe0,0xa0,0x50,0x28, - 0x50,0xa0,0x21,0x00,0x17,0x80,0x13,0x00, - 0x09,0x00,0x48,0x00,0x44,0x00,0xc4,0x00, - 0x42,0x00,0x27,0x12,0x15,0x0b,0x48,0x44, - 0xc4,0x42,0x21,0x00,0x17,0x80,0x13,0x00, - 0x09,0x00,0xc8,0x00,0x24,0x00,0x44,0x00, - 0xe2,0x00,0x60,0x90,0x80,0x40,0x20,0x20, - 0x00,0x20,0x82,0x82,0x7c,0x44,0x28,0x28, - 0x10,0x10,0x00,0x10,0x20,0x82,0x82,0x7c, - 0x44,0x28,0x28,0x10,0x10,0x00,0x10,0x08, - 0x82,0x82,0x7c,0x44,0x28,0x28,0x10,0x10, - 0x00,0x28,0x10,0x82,0x82,0x7c,0x44,0x28, - 0x28,0x10,0x10,0x00,0x28,0x14,0x82,0x82, - 0x7c,0x44,0x28,0x28,0x10,0x10,0x00,0x28, - 0x82,0x82,0x7c,0x44,0x28,0x28,0x10,0x10, - 0x10,0x28,0x10,0x8f,0x80,0x88,0x00,0x78, - 0x00,0x48,0x00,0x2f,0x80,0x28,0x00,0x18, - 0x00,0x1f,0x80,0x30,0x10,0x78,0x84,0x80, - 0x80,0x80,0x80,0x84,0x78,0xf8,0x80,0x80, - 0x80,0xf8,0x80,0x80,0xf8,0x00,0x20,0x40, - 0xf8,0x80,0x80,0x80,0xf8,0x80,0x80,0xf8, - 0x00,0x20,0x10,0xf8,0x80,0x80,0xf8,0x80, - 0x80,0x80,0xf8,0x00,0x50,0x20,0xf8,0x80, - 0x80,0x80,0xf8,0x80,0x80,0xf8,0x00,0x50, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x00,0x40,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x00,0x80,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x40,0x00,0xa0, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x40,0x00,0xa0,0x78,0x44,0x42,0x42,0xf2, - 0x42,0x44,0x78,0x8c,0x8c,0x94,0x94,0xa4, - 0xa4,0xc4,0xc4,0x00,0x50,0x28,0x78,0x84, - 0x84,0x84,0x84,0x84,0x84,0x78,0x00,0x10, - 0x20,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x78,0x00,0x10,0x08,0x78,0x84,0x84,0x84, - 0x84,0x84,0x84,0x78,0x00,0x28,0x10,0x78, - 0x84,0x84,0x84,0x84,0x84,0x84,0x78,0x00, - 0x50,0x28,0x78,0x84,0x84,0x84,0x84,0x84, - 0x84,0x78,0x00,0x48,0x88,0x50,0x20,0x50, - 0x88,0x80,0x78,0xc4,0xa4,0xa4,0x94,0x94, - 0x8c,0x78,0x04,0x78,0x84,0x84,0x84,0x84, - 0x84,0x84,0x84,0x00,0x10,0x20,0x78,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x00,0x20, - 0x10,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x84,0x00,0x28,0x10,0x78,0x84,0x84,0x84, - 0x84,0x84,0x84,0x84,0x00,0x48,0x10,0x10, - 0x10,0x28,0x28,0x44,0x44,0x82,0x00,0x10, - 0x08,0x80,0x80,0xf0,0x88,0x88,0xf0,0x80, - 0x80,0xa0,0x90,0x90,0x90,0xa0,0x90,0x90, - 0x60,0x68,0x90,0x90,0x70,0x10,0xe0,0x00, - 0x20,0x40,0x68,0x90,0x90,0x70,0x10,0xe0, - 0x00,0x20,0x10,0x68,0x90,0x90,0x70,0x10, - 0xe0,0x00,0x50,0x20,0x68,0x90,0x90,0x70, - 0x10,0xe0,0x00,0xa0,0x50,0x68,0x90,0x90, - 0x70,0x10,0xe0,0x00,0x50,0x68,0x90,0x90, - 0x70,0x10,0xe0,0x20,0x50,0x20,0x6c,0x92, - 0x90,0x7e,0x12,0xec,0x60,0x20,0x60,0x90, - 0x80,0x80,0x90,0x60,0x60,0x90,0x80,0xf0, - 0x90,0x60,0x00,0x20,0x40,0x60,0x90,0x80, - 0xf0,0x90,0x60,0x00,0x40,0x20,0x60,0x90, - 0x80,0xf0,0x90,0x60,0x00,0x50,0x20,0x60, - 0x90,0x80,0xf0,0x90,0x60,0x00,0x50,0x40, - 0x40,0x40,0x40,0x40,0x40,0x00,0x40,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x80, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00, - 0xa0,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x00,0xa0,0x70,0x88,0x88,0x88,0x88,0x78, - 0x90,0x60,0x50,0x90,0x90,0x90,0x90,0x90, - 0xe0,0x00,0xa0,0x50,0x70,0x88,0x88,0x88, - 0x88,0x70,0x00,0x20,0x40,0x70,0x88,0x88, - 0x88,0x88,0x70,0x00,0x20,0x10,0x70,0x88, - 0x88,0x88,0x88,0x70,0x00,0x50,0x20,0x70, - 0x88,0x88,0x88,0x88,0x70,0x00,0x50,0x28, - 0x70,0x88,0x88,0x88,0x88,0x70,0x00,0x50, - 0x20,0x00,0xf8,0x00,0x20,0x70,0x88,0xc8, - 0xa8,0x98,0x74,0x70,0x90,0x90,0x90,0x90, - 0x90,0x00,0x20,0x40,0x70,0x90,0x90,0x90, - 0x90,0x90,0x00,0x40,0x20,0x70,0x90,0x90, - 0x90,0x90,0x90,0x00,0x50,0x20,0x70,0x90, - 0x90,0x90,0x90,0x90,0x00,0x50,0x80,0x40, - 0x40,0x60,0xa0,0xa0,0x90,0x90,0x00,0x20, - 0x10,0x80,0x80,0xb0,0xc8,0x88,0x88,0xc8, - 0xb0,0x80,0x80,0x80,0x40,0x40,0x60,0xa0, - 0xa0,0x90,0x90,0x00,0x50, -}; - -FontDataBLF blf_font_helv10 = { - -1, -2, - 10, 11, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 12, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 3, -1}, - {1, 8, -1, 0, 3, 0}, - {3, 2, -1, -6, 4, 8}, - {6, 7, 0, 0, 6, 10}, - {5, 9, 0, 1, 6, 17}, - {8, 8, 0, 0, 9, 26}, - {6, 8, -1, 0, 8, 34}, - {2, 3, -1, -5, 3, 42}, - {3, 10, 0, 2, 4, 45}, - {3, 10, -1, 2, 4, 55}, - {3, 3, 0, -5, 4, 65}, - {5, 5, 0, -1, 6, 68}, - {2, 3, 0, 2, 3, 73}, - {5, 1, -1, -3, 7, 76}, - {1, 1, -1, 0, 3, 77}, - {3, 8, 0, 0, 3, 78}, - {5, 8, 0, 0, 6, 86}, - {2, 8, -1, 0, 6, 94}, - {5, 8, 0, 0, 6, 102}, - {5, 8, 0, 0, 6, 110}, - {5, 8, 0, 0, 6, 118}, - {5, 8, 0, 0, 6, 126}, - {5, 8, 0, 0, 6, 134}, - {5, 8, 0, 0, 6, 142}, - {5, 8, 0, 0, 6, 150}, - {5, 8, 0, 0, 6, 158}, - {1, 6, -1, 0, 3, 166}, - {2, 8, 0, 2, 3, 172}, - {3, 5, -1, -1, 6, 180}, - {4, 3, 0, -2, 5, 185}, - {3, 5, -1, -1, 6, 188}, - {4, 8, -1, 0, 6, 193}, - {10, 10, 0, 2, 11, 201}, - {7, 8, 0, 0, 7, 221}, - {5, 8, -1, 0, 7, 229}, - {6, 8, -1, 0, 8, 237}, - {6, 8, -1, 0, 8, 245}, - {5, 8, -1, 0, 7, 253}, - {5, 8, -1, 0, 6, 261}, - {6, 8, -1, 0, 8, 269}, - {6, 8, -1, 0, 8, 277}, - {1, 8, -1, 0, 3, 285}, - {4, 8, 0, 0, 5, 293}, - {5, 8, -1, 0, 7, 301}, - {4, 8, -1, 0, 6, 309}, - {7, 8, -1, 0, 9, 317}, - {6, 8, -1, 0, 8, 325}, - {6, 8, -1, 0, 8, 333}, - {5, 8, -1, 0, 7, 341}, - {7, 9, -1, 1, 8, 349}, - {5, 8, -1, 0, 7, 358}, - {5, 8, -1, 0, 7, 366}, - {5, 8, 0, 0, 5, 374}, - {6, 8, -1, 0, 8, 382}, - {7, 8, 0, 0, 7, 390}, - {9, 8, 0, 0, 9, 398}, - {5, 8, -1, 0, 7, 414}, - {7, 8, 0, 0, 7, 422}, - {5, 8, -1, 0, 7, 430}, - {2, 10, -1, 2, 3, 438}, - {3, 8, 0, 0, 3, 448}, - {2, 10, 0, 2, 3, 456}, - {5, 5, 0, -3, 6, 466}, - {6, 1, 0, 2, 6, 471}, - {2, 3, 0, -5, 3, 472}, - {5, 6, 0, 0, 5, 475}, - {5, 8, 0, 0, 6, 481}, - {4, 6, 0, 0, 5, 489}, - {5, 8, 0, 0, 6, 495}, - {4, 6, 0, 0, 5, 503}, - {4, 8, 0, 0, 4, 509}, - {5, 8, 0, 2, 6, 517}, - {5, 8, 0, 0, 6, 525}, - {1, 8, 0, 0, 2, 533}, - {1, 9, 0, 1, 2, 541}, - {4, 8, 0, 0, 5, 550}, - {1, 8, 0, 0, 2, 558}, - {7, 6, 0, 0, 8, 566}, - {5, 6, 0, 0, 6, 572}, - {5, 6, 0, 0, 6, 578}, - {5, 8, 0, 2, 6, 584}, - {5, 8, 0, 2, 6, 592}, - {3, 6, 0, 0, 4, 600}, - {4, 6, 0, 0, 5, 606}, - {3, 8, 0, 0, 4, 612}, - {4, 6, 0, 0, 5, 620}, - {5, 6, 0, 0, 6, 626}, - {7, 6, 0, 0, 8, 632}, - {5, 6, 0, 0, 6, 638}, - {4, 8, 0, 2, 5, 644}, - {4, 6, 0, 0, 5, 652}, - {3, 10, 0, 2, 3, 658}, - {1, 10, -1, 2, 3, 668}, - {3, 10, 0, 2, 3, 678}, - {6, 2, 0, -3, 7, 688}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 3, -1}, - {1, 8, -1, 2, 3, 690}, - {5, 8, 0, 1, 6, 698}, - {5, 8, 0, 0, 6, 706}, - {4, 6, 0, -1, 5, 714}, - {5, 8, 0, 0, 6, 720}, - {1, 10, -1, 2, 3, 728}, - {5, 10, 0, 2, 6, 738}, - {3, 1, 0, -7, 3, 748}, - {7, 7, -1, 0, 9, 749}, - {3, 5, 0, -3, 4, 756}, - {5, 5, 0, 0, 6, 761}, - {5, 3, -1, -2, 7, 766}, - {3, 1, 0, -3, 4, 769}, - {7, 7, -1, 0, 9, 770}, - {3, 1, 0, -7, 3, 777}, - {4, 4, 0, -3, 4, 778}, - {5, 7, 0, 0, 6, 782}, - {3, 4, 0, -3, 3, 789}, - {3, 4, 0, -3, 3, 793}, - {2, 2, 0, -6, 3, 797}, - {4, 8, 0, 2, 5, 799}, - {6, 10, 0, 2, 6, 807}, - {2, 1, 0, -3, 3, 817}, - {2, 2, 0, 2, 3, 818}, - {2, 4, 0, -3, 3, 820}, - {3, 5, 0, -3, 4, 824}, - {5, 5, 0, 0, 6, 829}, - {9, 8, 0, 0, 9, 834}, - {8, 8, 0, 0, 9, 850}, - {9, 8, 0, 0, 9, 858}, - {4, 8, -1, 2, 6, 874}, - {7, 11, 0, 0, 7, 882}, - {7, 11, 0, 0, 7, 893}, - {7, 11, 0, 0, 7, 904}, - {7, 11, 0, 0, 7, 915}, - {7, 10, 0, 0, 7, 926}, - {7, 11, 0, 0, 7, 936}, - {9, 8, 0, 0, 10, 947}, - {6, 10, -1, 2, 8, 963}, - {5, 11, -1, 0, 7, 973}, - {5, 11, -1, 0, 7, 984}, - {5, 11, -1, 0, 7, 995}, - {5, 10, -1, 0, 7, 1006}, - {2, 11, 0, 0, 3, 1016}, - {2, 11, -1, 0, 3, 1027}, - {3, 11, 0, 0, 3, 1038}, - {3, 10, 0, 0, 3, 1049}, - {7, 8, 0, 0, 8, 1059}, - {6, 11, -1, 0, 8, 1067}, - {6, 11, -1, 0, 8, 1078}, - {6, 11, -1, 0, 8, 1089}, - {6, 11, -1, 0, 8, 1100}, - {6, 11, -1, 0, 8, 1111}, - {6, 10, -1, 0, 8, 1122}, - {5, 5, 0, -1, 6, 1132}, - {6, 10, -1, 1, 8, 1137}, - {6, 11, -1, 0, 8, 1147}, - {6, 11, -1, 0, 8, 1158}, - {6, 11, -1, 0, 8, 1169}, - {6, 10, -1, 0, 8, 1180}, - {7, 11, 0, 0, 7, 1190}, - {5, 8, -1, 0, 7, 1201}, - {4, 8, 0, 0, 5, 1209}, - {5, 9, 0, 0, 5, 1217}, - {5, 9, 0, 0, 5, 1226}, - {5, 9, 0, 0, 5, 1235}, - {5, 9, 0, 0, 5, 1244}, - {5, 8, 0, 0, 5, 1253}, - {5, 9, 0, 0, 5, 1261}, - {7, 6, 0, 0, 8, 1270}, - {4, 8, 0, 2, 5, 1276}, - {4, 9, 0, 0, 5, 1284}, - {4, 9, 0, 0, 5, 1293}, - {4, 9, 0, 0, 5, 1302}, - {4, 8, 0, 0, 5, 1311}, - {2, 9, 1, 0, 2, 1319}, - {2, 9, 0, 0, 2, 1328}, - {3, 9, 1, 0, 2, 1337}, - {3, 8, 0, 0, 2, 1346}, - {5, 9, 0, 0, 6, 1354}, - {4, 9, 0, 0, 5, 1363}, - {5, 9, 0, 0, 6, 1372}, - {5, 9, 0, 0, 6, 1381}, - {5, 9, 0, 0, 6, 1390}, - {5, 9, 0, 0, 6, 1399}, - {5, 8, 0, 0, 6, 1408}, - {5, 5, 0, -1, 6, 1416}, - {6, 6, 0, 0, 6, 1421}, - {4, 9, 0, 0, 5, 1427}, - {4, 9, 0, 0, 5, 1436}, - {4, 9, 0, 0, 5, 1445}, - {4, 8, 0, 0, 5, 1454}, - {4, 11, 0, 2, 5, 1462}, - {5, 10, 0, 2, 6, 1473}, - {4, 10, 0, 2, 5, 1483}, - }, - helv10_bitmap_data, - 0 -}; - -#endif /* BLF_FONT_HELV10_H */ diff --git a/source/blender/blenfont/intern/blf_font_helv12.h b/source/blender/blenfont/intern/blf_font_helv12.h deleted file mode 100644 index 8ba38ca1cee..00000000000 --- a/source/blender/blenfont/intern/blf_font_helv12.h +++ /dev/null @@ -1,519 +0,0 @@ -/** - * $Id: - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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. - * - * The Original Code is Copyright (C) 2009 Blender Foundation. - * All rights reserved. - * - * - * Contributor(s): Blender Foundation - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef BLF_FONT_HELV12_H -#define BLF_FONT_HELV12_H - -static unsigned char helv12_bitmap_data[]= { - 0x80,0x00,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0xa0,0xa0,0xa0,0x50,0x50,0x50,0xfc, - 0x28,0xfc,0x28,0x28,0x20,0x70,0xa8,0xa8, - 0x28,0x70,0xa0,0xa8,0x70,0x20,0x23,0x00, - 0x14,0x80,0x14,0x80,0x13,0x00,0x08,0x00, - 0x68,0x00,0x94,0x00,0x94,0x00,0x62,0x00, - 0x72,0x8c,0x84,0x8a,0x50,0x30,0x48,0x48, - 0x30,0x80,0x40,0xc0,0x20,0x40,0x40,0x80, - 0x80,0x80,0x80,0x80,0x80,0x40,0x40,0x20, - 0x80,0x40,0x40,0x20,0x20,0x20,0x20,0x20, - 0x20,0x40,0x40,0x80,0xa0,0x40,0xa0,0x20, - 0x20,0xf8,0x20,0x20,0x80,0x40,0x40,0xf8, - 0x80,0x80,0x80,0x40,0x40,0x40,0x20,0x20, - 0x10,0x10,0x70,0x88,0x88,0x88,0x88,0x88, - 0x88,0x88,0x70,0x20,0x20,0x20,0x20,0x20, - 0x20,0x20,0xe0,0x20,0xf8,0x80,0x80,0x40, - 0x20,0x10,0x08,0x88,0x70,0x70,0x88,0x88, - 0x08,0x08,0x30,0x08,0x88,0x70,0x08,0x08, - 0xfc,0x88,0x48,0x28,0x28,0x18,0x08,0x70, - 0x88,0x88,0x08,0x08,0xf0,0x80,0x80,0xf8, - 0x70,0x88,0x88,0x88,0xc8,0xb0,0x80,0x88, - 0x70,0x40,0x40,0x20,0x20,0x20,0x10,0x10, - 0x08,0xf8,0x70,0x88,0x88,0x88,0x88,0x70, - 0x88,0x88,0x70,0x70,0x88,0x08,0x08,0x78, - 0x88,0x88,0x88,0x70,0x80,0x00,0x00,0x00, - 0x00,0x80,0x80,0x40,0x40,0x00,0x00,0x00, - 0x00,0x40,0x0c,0x30,0xc0,0x30,0x0c,0xf8, - 0x00,0xf8,0xc0,0x30,0x0c,0x30,0xc0,0x20, - 0x00,0x20,0x20,0x10,0x10,0x88,0x88,0x70, - 0x3e,0x00,0x40,0x00,0x9b,0x00,0xa6,0x80, - 0xa2,0x40,0xa2,0x40,0x92,0x40,0x4d,0x40, - 0x60,0x80,0x1f,0x00,0x82,0x82,0x82,0x7c, - 0x44,0x44,0x28,0x28,0x10,0xf8,0x84,0x84, - 0x84,0xf8,0x84,0x84,0x84,0xf8,0x3c,0x42, - 0x80,0x80,0x80,0x80,0x80,0x42,0x3c,0xf8, - 0x84,0x82,0x82,0x82,0x82,0x82,0x84,0xf8, - 0xfc,0x80,0x80,0x80,0xfc,0x80,0x80,0x80, - 0xfc,0x80,0x80,0x80,0x80,0xf8,0x80,0x80, - 0x80,0xfc,0x3a,0x46,0x82,0x82,0x8e,0x80, - 0x80,0x42,0x3c,0x82,0x82,0x82,0x82,0xfe, - 0x82,0x82,0x82,0x82,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x70,0x88,0x88, - 0x08,0x08,0x08,0x08,0x08,0x08,0x82,0x84, - 0x88,0x90,0xe0,0xa0,0x90,0x88,0x84,0xf8, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x88,0x80,0x88,0x80,0x94,0x80,0x94,0x80, - 0xa2,0x80,0xa2,0x80,0xc1,0x80,0xc1,0x80, - 0x80,0x80,0x82,0x86,0x8a,0x8a,0x92,0xa2, - 0xa2,0xc2,0x82,0x3c,0x42,0x81,0x81,0x81, - 0x81,0x81,0x42,0x3c,0x80,0x80,0x80,0x80, - 0xf8,0x84,0x84,0x84,0xf8,0x3d,0x42,0x85, - 0x89,0x81,0x81,0x81,0x42,0x3c,0x84,0x84, - 0x84,0x88,0xf8,0x84,0x84,0x84,0xf8,0x78, - 0x84,0x84,0x04,0x18,0x60,0x80,0x84,0x78, - 0x10,0x10,0x10,0x10,0x10,0x10,0x10,0x10, - 0xfe,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x84,0x84,0x10,0x10,0x28,0x28,0x44,0x44, - 0x44,0x82,0x82,0x22,0x00,0x22,0x00,0x22, - 0x00,0x55,0x00,0x55,0x00,0x49,0x00,0x88, - 0x80,0x88,0x80,0x88,0x80,0x82,0x44,0x44, - 0x28,0x10,0x28,0x44,0x44,0x82,0x10,0x10, - 0x10,0x10,0x28,0x44,0x44,0x82,0x82,0xfe, - 0x80,0x40,0x20,0x10,0x08,0x04,0x02,0xfe, - 0xc0,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0xc0,0x10,0x10,0x20,0x20, - 0x20,0x40,0x40,0x80,0x80,0xc0,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0xc0,0x88,0x50,0x20,0xfe,0xc0,0x80,0x40, - 0x74,0x88,0x88,0x78,0x08,0x88,0x70,0xb0, - 0xc8,0x88,0x88,0x88,0xc8,0xb0,0x80,0x80, - 0x70,0x88,0x80,0x80,0x80,0x88,0x70,0x68, - 0x98,0x88,0x88,0x88,0x98,0x68,0x08,0x08, - 0x70,0x88,0x80,0xf8,0x88,0x88,0x70,0x40, - 0x40,0x40,0x40,0x40,0x40,0xe0,0x40,0x30, - 0x70,0x88,0x08,0x68,0x98,0x88,0x88,0x88, - 0x98,0x68,0x88,0x88,0x88,0x88,0x88,0xc8, - 0xb0,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x00,0x80,0x80,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x40, - 0x88,0x90,0xa0,0xc0,0xc0,0xa0,0x90,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x92,0x92,0x92,0x92,0x92,0xda, - 0xa4,0x88,0x88,0x88,0x88,0x88,0xc8,0xb0, - 0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x80, - 0x80,0x80,0xb0,0xc8,0x88,0x88,0x88,0xc8, - 0xb0,0x08,0x08,0x08,0x68,0x98,0x88,0x88, - 0x88,0x98,0x68,0x80,0x80,0x80,0x80,0x80, - 0xc0,0xa0,0x60,0x90,0x10,0x60,0x80,0x90, - 0x60,0x60,0x40,0x40,0x40,0x40,0x40,0xe0, - 0x40,0x40,0x68,0x98,0x88,0x88,0x88,0x88, - 0x88,0x20,0x20,0x50,0x50,0x88,0x88,0x88, - 0x22,0x00,0x22,0x00,0x55,0x00,0x49,0x00, - 0x49,0x00,0x88,0x80,0x88,0x80,0x84,0x84, - 0x48,0x30,0x30,0x48,0x84,0x80,0x40,0x20, - 0x20,0x50,0x50,0x90,0x88,0x88,0x88,0xf0, - 0x80,0x40,0x40,0x20,0x10,0xf0,0x30,0x40, - 0x40,0x40,0x40,0x40,0x80,0x40,0x40,0x40, - 0x40,0x30,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0xc0,0x20, - 0x20,0x20,0x20,0x20,0x10,0x20,0x20,0x20, - 0x20,0xc0,0x98,0x64,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x00,0x80,0x40,0x70, - 0xc8,0xa0,0xa0,0xa0,0xa8,0x70,0x10,0xb0, - 0x48,0x20,0x20,0xf0,0x40,0x40,0x48,0x30, - 0x84,0x78,0x48,0x48,0x78,0x84,0x20,0x20, - 0xf8,0x20,0xf8,0x20,0x50,0x88,0x88,0x80, - 0x80,0x80,0x80,0x00,0x00,0x00,0x80,0x80, - 0x80,0x80,0x70,0x88,0x08,0x30,0x48,0x88, - 0x88,0x90,0x60,0x80,0x88,0x70,0xa0,0x3e, - 0x00,0x41,0x00,0x9c,0x80,0xa2,0x80,0xa0, - 0x80,0xa2,0x80,0x9c,0x80,0x41,0x00,0x3e, - 0x00,0xe0,0x00,0xa0,0x20,0xe0,0x28,0x50, - 0xa0,0x50,0x28,0x04,0x04,0x04,0xfc,0xf0, - 0x3e,0x00,0x41,0x00,0x94,0x80,0x94,0x80, - 0x98,0x80,0x94,0x80,0x9c,0x80,0x41,0x00, - 0x3e,0x00,0xf0,0x60,0x90,0x90,0x60,0xf8, - 0x00,0x20,0x20,0xf8,0x20,0x20,0xf0,0x40, - 0x20,0x90,0x60,0xc0,0x20,0x40,0x20,0xe0, - 0x80,0x40,0x80,0x80,0x80,0xe8,0x98,0x88, - 0x88,0x88,0x88,0x88,0x28,0x28,0x28,0x28, - 0x28,0x28,0x68,0xe8,0xe8,0xe8,0x68,0x3c, - 0x80,0xc0,0x20,0x20,0x40,0x40,0x40,0x40, - 0xc0,0x40,0xe0,0x00,0xe0,0xa0,0xe0,0xa0, - 0x50,0x28,0x50,0xa0,0x41,0x00,0x27,0x80, - 0x15,0x00,0x13,0x00,0x49,0x00,0x44,0x00, - 0x44,0x00,0xc2,0x00,0x41,0x00,0x47,0x80, - 0x22,0x00,0x11,0x00,0x14,0x80,0x4b,0x00, - 0x48,0x00,0x44,0x00,0xc2,0x00,0x41,0x00, - 0x21,0x00,0x17,0x80,0x15,0x00,0x0b,0x00, - 0xc9,0x00,0x24,0x00,0x44,0x00,0x22,0x00, - 0xe1,0x00,0x70,0x88,0x88,0x40,0x40,0x20, - 0x20,0x00,0x20,0x82,0x82,0x82,0x7c,0x44, - 0x44,0x28,0x10,0x10,0x00,0x10,0x20,0x82, - 0x82,0x82,0x7c,0x44,0x44,0x28,0x10,0x10, - 0x00,0x10,0x08,0x82,0x82,0x82,0x7c,0x44, - 0x44,0x28,0x10,0x10,0x00,0x28,0x10,0x82, - 0x82,0x82,0x7c,0x44,0x44,0x28,0x10,0x10, - 0x00,0x28,0x14,0x82,0x82,0x82,0x7c,0x44, - 0x44,0x28,0x10,0x10,0x00,0x28,0x82,0x82, - 0x82,0x7c,0x44,0x44,0x28,0x10,0x10,0x10, - 0x28,0x10,0x8f,0x80,0x88,0x00,0x88,0x00, - 0x78,0x00,0x4f,0x80,0x48,0x00,0x28,0x00, - 0x28,0x00,0x1f,0x80,0x30,0x08,0x08,0x3c, - 0x42,0x80,0x80,0x80,0x80,0x80,0x42,0x3c, - 0xfc,0x80,0x80,0x80,0xfc,0x80,0x80,0x80, - 0xfc,0x00,0x10,0x20,0xfc,0x80,0x80,0x80, - 0xfc,0x80,0x80,0x80,0xfc,0x00,0x10,0x08, - 0xfc,0x80,0x80,0x80,0xfc,0x80,0x80,0x80, - 0xfc,0x00,0x28,0x10,0xfc,0x80,0x80,0x80, - 0xfc,0x80,0x80,0x80,0xfc,0x00,0x28,0x40, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x00,0x40,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x00,0x80,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, - 0x00,0xa0,0x40,0x40,0x40,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x00,0xa0,0x7c,0x42, - 0x41,0x41,0xf1,0x41,0x41,0x42,0x7c,0x82, - 0x86,0x8a,0x8a,0x92,0xa2,0xa2,0xc2,0x82, - 0x00,0x28,0x14,0x3c,0x42,0x81,0x81,0x81, - 0x81,0x81,0x42,0x3c,0x00,0x08,0x10,0x3c, - 0x42,0x81,0x81,0x81,0x81,0x81,0x42,0x3c, - 0x00,0x08,0x04,0x3c,0x42,0x81,0x81,0x81, - 0x81,0x81,0x42,0x3c,0x00,0x14,0x08,0x3c, - 0x42,0x81,0x81,0x81,0x81,0x81,0x42,0x3c, - 0x00,0x28,0x14,0x3c,0x42,0x81,0x81,0x81, - 0x81,0x81,0x42,0x3c,0x00,0x24,0x88,0x50, - 0x20,0x50,0x88,0x80,0x00,0x5e,0x00,0x21, - 0x00,0x50,0x80,0x48,0x80,0x44,0x80,0x44, - 0x80,0x42,0x80,0x21,0x00,0x1e,0x80,0x00, - 0x40,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x84,0x84,0x00,0x10,0x20,0x78,0x84,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x00,0x10, - 0x08,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x84,0x84,0x00,0x28,0x10,0x78,0x84,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x00,0x48, - 0x10,0x10,0x10,0x10,0x28,0x44,0x44,0x82, - 0x82,0x00,0x10,0x08,0x80,0x80,0xf8,0x84, - 0x84,0x84,0xf8,0x80,0x80,0xb0,0x88,0x88, - 0x88,0xb0,0x88,0x88,0x88,0x70,0x74,0x88, - 0x88,0x78,0x08,0x88,0x70,0x00,0x10,0x20, - 0x74,0x88,0x88,0x78,0x08,0x88,0x70,0x00, - 0x20,0x10,0x74,0x88,0x88,0x78,0x08,0x88, - 0x70,0x00,0x50,0x20,0x74,0x88,0x88,0x78, - 0x08,0x88,0x70,0x00,0x50,0x28,0x74,0x88, - 0x88,0x78,0x08,0x88,0x70,0x00,0x50,0x74, - 0x88,0x88,0x78,0x08,0x88,0x70,0x30,0x48, - 0x30,0x77,0x00,0x88,0x80,0x88,0x00,0x7f, - 0x80,0x08,0x80,0x88,0x80,0x77,0x00,0x60, - 0x10,0x20,0x70,0x88,0x80,0x80,0x80,0x88, - 0x70,0x70,0x88,0x80,0xf8,0x88,0x88,0x70, - 0x00,0x20,0x40,0x70,0x88,0x80,0xf8,0x88, - 0x88,0x70,0x00,0x20,0x10,0x70,0x88,0x80, - 0xf8,0x88,0x88,0x70,0x00,0x50,0x20,0x70, - 0x88,0x80,0xf8,0x88,0x88,0x70,0x00,0x50, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00, - 0x40,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x00,0x80,0x40,0x40,0x40,0x40,0x40, - 0x40,0x40,0x40,0x00,0xa0,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x00,0xa0,0x70, - 0x88,0x88,0x88,0x88,0x78,0x08,0x50,0x30, - 0x68,0x88,0x88,0x88,0x88,0x88,0xc8,0xb0, - 0x00,0x50,0x28,0x70,0x88,0x88,0x88,0x88, - 0x88,0x70,0x00,0x20,0x40,0x70,0x88,0x88, - 0x88,0x88,0x88,0x70,0x00,0x20,0x10,0x70, - 0x88,0x88,0x88,0x88,0x88,0x70,0x00,0x50, - 0x20,0x70,0x88,0x88,0x88,0x88,0x88,0x70, - 0x00,0x50,0x28,0x70,0x88,0x88,0x88,0x88, - 0x88,0x70,0x00,0x50,0x20,0x00,0xf8,0x00, - 0x20,0xb8,0x44,0x64,0x54,0x4c,0x44,0x3a, - 0x68,0x98,0x88,0x88,0x88,0x88,0x88,0x00, - 0x20,0x40,0x68,0x98,0x88,0x88,0x88,0x88, - 0x88,0x00,0x20,0x10,0x68,0x98,0x88,0x88, - 0x88,0x88,0x88,0x00,0x50,0x20,0x68,0x98, - 0x88,0x88,0x88,0x88,0x88,0x00,0x50,0x80, - 0x40,0x20,0x20,0x50,0x50,0x90,0x88,0x88, - 0x88,0x00,0x20,0x10,0x80,0x80,0x80,0xb0, - 0xc8,0x88,0x88,0x88,0xc8,0xb0,0x80,0x80, - 0xc0,0x20,0x20,0x20,0x30,0x50,0x50,0x48, - 0x88,0x88,0x00,0x50, -}; - -FontDataBLF blf_font_helv12 = { - 0, -3, - 11, 12, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 16, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 4, -1}, - {1, 9, -1, 0, 3, 0}, - {3, 3, -1, -6, 5, 9}, - {6, 8, 0, 0, 7, 12}, - {5, 10, -1, 1, 7, 20}, - {9, 9, -1, 0, 11, 30}, - {7, 9, -1, 0, 9, 48}, - {2, 3, -1, -6, 3, 57}, - {3, 12, -1, 3, 4, 60}, - {3, 12, 0, 3, 4, 72}, - {3, 3, -1, -6, 5, 84}, - {5, 5, -1, -1, 7, 87}, - {2, 3, -1, 2, 4, 92}, - {5, 1, -1, -3, 8, 95}, - {1, 1, -1, 0, 3, 96}, - {4, 9, 0, 0, 4, 97}, - {5, 9, -1, 0, 7, 106}, - {3, 9, -1, 0, 7, 115}, - {5, 9, -1, 0, 7, 124}, - {5, 9, -1, 0, 7, 133}, - {6, 9, 0, 0, 7, 142}, - {5, 9, -1, 0, 7, 151}, - {5, 9, -1, 0, 7, 160}, - {5, 9, -1, 0, 7, 169}, - {5, 9, -1, 0, 7, 178}, - {5, 9, -1, 0, 7, 187}, - {1, 6, -1, 0, 3, 196}, - {2, 8, 0, 2, 3, 202}, - {6, 5, 0, -1, 7, 210}, - {5, 3, -1, -2, 7, 215}, - {6, 5, -1, -1, 7, 218}, - {5, 9, -1, 0, 7, 223}, - {10, 10, -1, 1, 12, 232}, - {7, 9, -1, 0, 9, 252}, - {6, 9, -1, 0, 8, 261}, - {7, 9, -1, 0, 9, 270}, - {7, 9, -1, 0, 9, 279}, - {6, 9, -1, 0, 8, 288}, - {6, 9, -1, 0, 8, 297}, - {7, 9, -1, 0, 9, 306}, - {7, 9, -1, 0, 9, 315}, - {1, 9, -1, 0, 3, 324}, - {5, 9, -1, 0, 7, 333}, - {7, 9, -1, 0, 8, 342}, - {5, 9, -1, 0, 7, 351}, - {9, 9, -1, 0, 11, 360}, - {7, 9, -1, 0, 9, 378}, - {8, 9, -1, 0, 10, 387}, - {6, 9, -1, 0, 8, 396}, - {8, 9, -1, 0, 10, 405}, - {6, 9, -1, 0, 8, 414}, - {6, 9, -1, 0, 8, 423}, - {7, 9, 0, 0, 7, 432}, - {6, 9, -1, 0, 8, 441}, - {7, 9, -1, 0, 9, 450}, - {9, 9, -1, 0, 11, 459}, - {7, 9, -1, 0, 9, 477}, - {7, 9, -1, 0, 9, 486}, - {7, 9, -1, 0, 9, 495}, - {2, 12, -1, 3, 3, 504}, - {4, 9, 0, 0, 4, 516}, - {2, 12, 0, 3, 3, 525}, - {5, 3, 0, -5, 6, 537}, - {7, 1, 0, 2, 7, 540}, - {2, 3, 0, -6, 3, 541}, - {6, 7, -1, 0, 7, 544}, - {5, 9, -1, 0, 7, 551}, - {5, 7, -1, 0, 7, 560}, - {5, 9, -1, 0, 7, 567}, - {5, 7, -1, 0, 7, 576}, - {4, 9, 0, 0, 3, 583}, - {5, 10, -1, 3, 7, 592}, - {5, 9, -1, 0, 7, 602}, - {1, 9, -1, 0, 3, 611}, - {2, 12, 0, 3, 3, 620}, - {5, 9, -1, 0, 6, 632}, - {1, 9, -1, 0, 3, 641}, - {7, 7, -1, 0, 9, 650}, - {5, 7, -1, 0, 7, 657}, - {5, 7, -1, 0, 7, 664}, - {5, 10, -1, 3, 7, 671}, - {5, 10, -1, 3, 7, 681}, - {3, 7, -1, 0, 4, 691}, - {4, 7, -1, 0, 6, 698}, - {3, 9, 0, 0, 3, 705}, - {5, 7, -1, 0, 7, 714}, - {5, 7, -1, 0, 7, 721}, - {9, 7, 0, 0, 9, 728}, - {6, 7, 0, 0, 6, 742}, - {5, 10, -1, 3, 7, 749}, - {4, 7, -1, 0, 6, 759}, - {4, 12, 0, 3, 4, 766}, - {1, 12, -1, 3, 3, 778}, - {4, 12, 0, 3, 4, 790}, - {6, 2, 0, -3, 7, 802}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 4, -1}, - {1, 10, -1, 3, 3, 804}, - {5, 9, -1, 1, 7, 814}, - {5, 9, -1, 0, 7, 823}, - {6, 6, 0, -1, 7, 832}, - {5, 9, -1, 0, 7, 838}, - {1, 11, -1, 2, 3, 847}, - {5, 12, 0, 3, 6, 858}, - {3, 1, 0, -8, 3, 870}, - {9, 9, -1, 0, 11, 871}, - {3, 5, -1, -4, 5, 889}, - {5, 5, -1, -1, 7, 894}, - {6, 4, -1, -2, 8, 899}, - {4, 1, 0, -3, 5, 903}, - {9, 9, -1, 0, 11, 904}, - {4, 1, 0, -8, 4, 922}, - {4, 4, 0, -4, 5, 923}, - {5, 7, -1, 0, 7, 927}, - {4, 5, 0, -3, 4, 934}, - {3, 5, 0, -3, 4, 939}, - {2, 2, 0, -8, 2, 944}, - {5, 10, -1, 3, 7, 946}, - {6, 12, 0, 3, 7, 956}, - {1, 1, -1, -3, 3, 968}, - {3, 4, 0, 3, 3, 969}, - {2, 5, -1, -3, 4, 973}, - {3, 5, -1, -4, 5, 978}, - {5, 5, -1, -1, 7, 983}, - {9, 9, 0, 0, 10, 988}, - {9, 9, 0, 0, 10, 1006}, - {9, 9, 0, 0, 10, 1024}, - {5, 9, -1, 3, 7, 1042}, - {7, 12, -1, 0, 9, 1051}, - {7, 12, -1, 0, 9, 1063}, - {7, 12, -1, 0, 9, 1075}, - {7, 12, -1, 0, 9, 1087}, - {7, 11, -1, 0, 9, 1099}, - {7, 12, -1, 0, 9, 1110}, - {9, 9, -1, 0, 11, 1122}, - {7, 12, -1, 3, 9, 1140}, - {6, 12, -1, 0, 8, 1152}, - {6, 12, -1, 0, 8, 1164}, - {6, 12, -1, 0, 8, 1176}, - {6, 11, -1, 0, 8, 1188}, - {2, 12, 0, 0, 3, 1199}, - {2, 12, -1, 0, 3, 1211}, - {3, 12, 0, 0, 3, 1223}, - {3, 11, 0, 0, 3, 1235}, - {8, 9, 0, 0, 9, 1246}, - {7, 12, -1, 0, 9, 1255}, - {8, 12, -1, 0, 10, 1267}, - {8, 12, -1, 0, 10, 1279}, - {8, 12, -1, 0, 10, 1291}, - {8, 12, -1, 0, 10, 1303}, - {8, 11, -1, 0, 10, 1315}, - {5, 5, -1, -1, 7, 1326}, - {10, 11, 0, 1, 10, 1331}, - {6, 12, -1, 0, 8, 1353}, - {6, 12, -1, 0, 8, 1365}, - {6, 12, -1, 0, 8, 1377}, - {6, 11, -1, 0, 8, 1389}, - {7, 12, -1, 0, 9, 1400}, - {6, 9, -1, 0, 8, 1412}, - {5, 9, -1, 0, 7, 1421}, - {6, 10, -1, 0, 7, 1430}, - {6, 10, -1, 0, 7, 1440}, - {6, 10, -1, 0, 7, 1450}, - {6, 10, -1, 0, 7, 1460}, - {6, 9, -1, 0, 7, 1470}, - {6, 10, -1, 0, 7, 1479}, - {9, 7, -1, 0, 11, 1489}, - {5, 10, -1, 3, 7, 1503}, - {5, 10, -1, 0, 7, 1513}, - {5, 10, -1, 0, 7, 1523}, - {5, 10, -1, 0, 7, 1533}, - {5, 9, -1, 0, 7, 1543}, - {2, 10, 0, 0, 3, 1552}, - {2, 10, -1, 0, 3, 1562}, - {3, 10, 0, 0, 3, 1572}, - {3, 9, 0, 0, 3, 1582}, - {5, 10, -1, 0, 7, 1591}, - {5, 10, -1, 0, 7, 1601}, - {5, 10, -1, 0, 7, 1611}, - {5, 10, -1, 0, 7, 1621}, - {5, 10, -1, 0, 7, 1631}, - {5, 10, -1, 0, 7, 1641}, - {5, 9, -1, 0, 7, 1651}, - {5, 5, -1, -1, 7, 1660}, - {7, 7, 0, 0, 7, 1665}, - {5, 10, -1, 0, 7, 1672}, - {5, 10, -1, 0, 7, 1682}, - {5, 10, -1, 0, 7, 1692}, - {5, 9, -1, 0, 7, 1702}, - {5, 13, -1, 3, 7, 1711}, - {5, 12, -1, 3, 7, 1724}, - {5, 12, -1, 3, 7, 1736}, - }, - helv12_bitmap_data, - 0 -}; - -#endif /* BLF_FONT_HELV12_H */ diff --git a/source/blender/blenfont/intern/blf_font_helvb10.h b/source/blender/blenfont/intern/blf_font_helvb10.h deleted file mode 100644 index 35744946ef0..00000000000 --- a/source/blender/blenfont/intern/blf_font_helvb10.h +++ /dev/null @@ -1,487 +0,0 @@ -/** - * $Id: - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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. - * - * The Original Code is Copyright (C) 2009 Blender Foundation. - * All rights reserved. - * - * - * Contributor(s): Blender Foundation - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef BLF_FONT_HELVB10_H -#define BLF_FONT_HELVB10_H - -static unsigned char helvb10_bitmap_data[]= { - 0x00,0xc0,0x00,0x80,0x80,0xc0,0xc0,0xc0, - 0xc0,0xa0,0xa0,0xa0,0x50,0x50,0xfc,0x28, - 0x7e,0x28,0x28,0x20,0x70,0xa8,0x28,0x38, - 0x70,0xe0,0xa8,0x70,0x20,0x8c,0x56,0x2c, - 0x10,0x10,0x68,0xb4,0x62,0x76,0xdc,0xcc, - 0xde,0x70,0xd8,0xd8,0x70,0x80,0x40,0xc0, - 0xc0,0x20,0x60,0x40,0xc0,0xc0,0xc0,0xc0, - 0x40,0x60,0x20,0x80,0xc0,0x40,0x60,0x60, - 0x60,0x60,0x40,0xc0,0x80,0xa0,0x40,0xa0, - 0x30,0x30,0xfc,0x30,0x30,0x80,0x40,0xc0, - 0xc0,0xf8,0xc0,0xc0,0x80,0x80,0x40,0x40, - 0x20,0x20,0x10,0x10,0x70,0xd8,0xd8,0xd8, - 0xd8,0xd8,0xd8,0x70,0x60,0x60,0x60,0x60, - 0x60,0x60,0xe0,0x60,0xf8,0xc0,0x60,0x30, - 0x18,0x18,0xd8,0x70,0x70,0xd8,0x18,0x18, - 0x30,0x18,0xd8,0x70,0x18,0x18,0xfc,0x98, - 0x58,0x38,0x18,0x08,0x70,0xd8,0x98,0x18, - 0xf0,0xc0,0xc0,0xf8,0x70,0xd8,0xd8,0xd8, - 0xf0,0xc0,0xd8,0x70,0x60,0x60,0x60,0x30, - 0x30,0x18,0x18,0xf8,0x70,0xd8,0xd8,0xd8, - 0x70,0xd8,0xd8,0x70,0x70,0xd8,0x18,0x78, - 0xd8,0xd8,0xd8,0x70,0xc0,0xc0,0x00,0x00, - 0xc0,0xc0,0x80,0x40,0xc0,0xc0,0x00,0x00, - 0xc0,0xc0,0x30,0x60,0xc0,0x60,0x30,0xf8, - 0x00,0xf8,0xc0,0x60,0x30,0x60,0xc0,0x60, - 0x00,0x60,0x60,0x30,0x18,0xd8,0x70,0x3e, - 0x00,0x40,0x00,0x9b,0x00,0xa4,0x80,0xa2, - 0x40,0x92,0x40,0x4d,0x40,0x60,0x80,0x1f, - 0x00,0xc6,0xc6,0xfe,0x6c,0x6c,0x6c,0x38, - 0x38,0xf8,0xcc,0xcc,0xcc,0xf8,0xcc,0xcc, - 0xf8,0x3c,0x66,0xc2,0xc0,0xc0,0xc2,0x66, - 0x3c,0xf0,0xd8,0xcc,0xcc,0xcc,0xcc,0xd8, - 0xf0,0xf8,0xc0,0xc0,0xc0,0xf8,0xc0,0xc0, - 0xf8,0xc0,0xc0,0xc0,0xc0,0xf0,0xc0,0xc0, - 0xf8,0x3a,0x66,0xc6,0xce,0xc0,0xc2,0x66, - 0x3c,0xcc,0xcc,0xcc,0xcc,0xfc,0xcc,0xcc, - 0xcc,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0x70,0xd8,0x18,0x18,0x18,0x18,0x18, - 0x18,0xc6,0xcc,0xd8,0xf0,0xe0,0xf0,0xd8, - 0xcc,0xf8,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc9,0x80,0xc9,0x80,0xdd,0x80,0xd5, - 0x80,0xf7,0x80,0xe3,0x80,0xe3,0x80,0xc1, - 0x80,0xc6,0xce,0xce,0xd6,0xd6,0xe6,0xe6, - 0xc6,0x38,0x6c,0xc6,0xc6,0xc6,0xc6,0x6c, - 0x38,0xc0,0xc0,0xc0,0xf8,0xcc,0xcc,0xcc, - 0xf8,0x02,0x3c,0x6c,0xd6,0xc6,0xc6,0xc6, - 0x6c,0x38,0xcc,0xcc,0xcc,0xf8,0xcc,0xcc, - 0xcc,0xf8,0x78,0xcc,0x8c,0x1c,0x78,0xe0, - 0xcc,0x78,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0xfc,0x78,0xcc,0xcc,0xcc,0xcc,0xcc, - 0xcc,0xcc,0x10,0x38,0x38,0x6c,0x6c,0x6c, - 0xc6,0xc6,0x33,0x00,0x33,0x00,0x7f,0x80, - 0x6d,0x80,0x6d,0x80,0xcc,0xc0,0xcc,0xc0, - 0xcc,0xc0,0xc6,0xc6,0x6c,0x38,0x38,0x6c, - 0xc6,0xc6,0x18,0x18,0x18,0x3c,0x66,0x66, - 0xc3,0xc3,0xfc,0xc0,0x60,0x70,0x30,0x18, - 0x0c,0xfc,0xe0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xe0,0x10,0x10,0x20,0x20, - 0x40,0x40,0x80,0x80,0xe0,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0xe0,0x90,0x90, - 0xf0,0x60,0xfc,0xc0,0xc0,0x80,0x40,0x6c, - 0xd8,0xd8,0x78,0x98,0x70,0xf0,0xd8,0xd8, - 0xd8,0xd8,0xf0,0xc0,0xc0,0x70,0xd0,0xc0, - 0xc0,0xd0,0x70,0x78,0xd8,0xd8,0xd8,0xd8, - 0x78,0x18,0x18,0x70,0xd8,0xc0,0xf8,0xd8, - 0x70,0x60,0x60,0x60,0x60,0x60,0xf0,0x60, - 0x38,0x70,0x18,0x78,0xd8,0xd8,0xd8,0xd8, - 0x68,0xd8,0xd8,0xd8,0xd8,0xd8,0xf0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00, - 0xc0,0xc0,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x00,0x60,0xcc,0xd8,0xf0,0xe0,0xf0, - 0xd8,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xdb,0xdb,0xdb,0xdb,0xdb, - 0xb6,0xd8,0xd8,0xd8,0xd8,0xd8,0xb0,0x70, - 0xd8,0xd8,0xd8,0xd8,0x70,0xc0,0xc0,0xf0, - 0xd8,0xd8,0xd8,0xd8,0xb0,0x18,0x18,0x78, - 0xd8,0xd8,0xd8,0xd8,0x68,0xc0,0xc0,0xc0, - 0xc0,0xe0,0xb0,0x70,0xd8,0x18,0x70,0xd8, - 0x70,0x30,0x60,0x60,0x60,0x60,0xf0,0x60, - 0x60,0x68,0xd8,0xd8,0xd8,0xd8,0xd8,0x20, - 0x70,0x50,0xd8,0xd8,0xd8,0x6c,0x6c,0x6c, - 0xd6,0xd6,0xd6,0xcc,0xcc,0x78,0x30,0x78, - 0xcc,0x60,0x30,0x30,0x78,0xd8,0xd8,0xd8, - 0xd8,0xf8,0xc0,0x60,0x30,0x18,0xf8,0x30, - 0x60,0x60,0x60,0x60,0xc0,0x60,0x60,0x60, - 0x30,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0xc0,0x60,0x60,0x60,0x60, - 0x30,0x60,0x60,0x60,0xc0,0xb0,0x68,0x00, - 0xc0,0xc0,0xc0,0xc0,0x40,0x40,0x00,0xc0, - 0x40,0x70,0xd8,0xa0,0xa0,0xd8,0x70,0x10, - 0xd8,0x68,0x60,0x60,0xf0,0x60,0x68,0x38, - 0x84,0x78,0x48,0x48,0x78,0x84,0x30,0xfc, - 0x30,0xfc,0x48,0xcc,0x84,0x84,0x80,0x80, - 0x80,0x80,0x00,0x00,0x80,0x80,0x80,0x80, - 0x70,0x98,0x38,0x70,0xc8,0x98,0x70,0xe0, - 0xc8,0x70,0xa0,0x3c,0x42,0x9d,0xa1,0xa5, - 0x99,0x42,0x3c,0xe0,0x00,0xa0,0x20,0xe0, - 0x6c,0xd8,0x6c,0x08,0x08,0xf8,0xf0,0x3c, - 0x42,0xa5,0xb9,0xa5,0xbd,0x42,0x3c,0xe0, - 0xc0,0xa0,0x60,0xfc,0x00,0x30,0x30,0xfc, - 0x30,0x30,0xe0,0x40,0xa0,0x60,0xc0,0x20, - 0x40,0xe0,0x80,0x40,0xc0,0xc0,0xe8,0xd8, - 0xd8,0xd8,0xd8,0xd8,0x28,0x28,0x28,0x28, - 0x28,0x68,0xe8,0xe8,0xe8,0x7c,0xc0,0xc0, - 0x40,0x40,0x40,0xc0,0x40,0xe0,0x00,0xe0, - 0xa0,0xe0,0xd8,0x6c,0xd8,0x42,0x2f,0x26, - 0x12,0x48,0x48,0xc4,0x44,0x4e,0x24,0x2a, - 0x16,0x48,0x48,0xc4,0x44,0x42,0x2f,0x26, - 0x12,0xc8,0x28,0x44,0xe4,0x70,0xd8,0xc0, - 0x60,0x30,0x30,0x00,0x30,0xc6,0xc6,0xfe, - 0x6c,0x6c,0x6c,0x38,0x38,0x00,0x10,0x20, - 0xc6,0xc6,0xfe,0x6c,0x6c,0x6c,0x38,0x38, - 0x00,0x10,0x08,0xc6,0xc6,0xfe,0x6c,0x6c, - 0x6c,0x38,0x38,0x00,0x28,0x10,0xc6,0xc6, - 0xfe,0x6c,0x6c,0x6c,0x38,0x38,0x00,0x28, - 0x14,0xc6,0xc6,0xfe,0x6c,0x6c,0x6c,0x38, - 0x38,0x00,0x28,0xc6,0xc6,0xfe,0x6c,0x6c, - 0x6c,0x38,0x38,0x10,0x28,0x10,0xcf,0x80, - 0xcc,0x00,0xfc,0x00,0x6c,0x00,0x6f,0x80, - 0x6c,0x00,0x3c,0x00,0x3f,0x80,0x30,0x10, - 0x3c,0x66,0xc2,0xc0,0xc0,0xc2,0x66,0x3c, - 0xf8,0xc0,0xc0,0xc0,0xf8,0xc0,0xc0,0xf8, - 0x00,0x20,0x40,0xf8,0xc0,0xc0,0xc0,0xf8, - 0xc0,0xc0,0xf8,0x00,0x20,0x10,0xf8,0xc0, - 0xc0,0xc0,0xf8,0xc0,0xc0,0xf8,0x00,0x50, - 0x20,0xf8,0xc0,0xc0,0xc0,0xf8,0xc0,0xc0, - 0xf8,0x00,0x50,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0x00,0x40,0x80,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00,0x80, - 0x40,0x60,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x00,0xa0,0x40,0x60,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x00,0x90,0x78,0x6c, - 0x66,0x66,0xf6,0x66,0x6c,0x78,0xc6,0xce, - 0xce,0xd6,0xd6,0xe6,0xe6,0xc6,0x00,0x28, - 0x14,0x38,0x6c,0xc6,0xc6,0xc6,0xc6,0x6c, - 0x38,0x00,0x08,0x10,0x38,0x6c,0xc6,0xc6, - 0xc6,0xc6,0x6c,0x38,0x00,0x10,0x08,0x38, - 0x6c,0xc6,0xc6,0xc6,0xc6,0x6c,0x38,0x00, - 0x28,0x10,0x38,0x6c,0xc6,0xc6,0xc6,0xc6, - 0x6c,0x38,0x00,0x28,0x14,0x38,0x6c,0xc6, - 0xc6,0xc6,0xc6,0x6c,0x38,0x00,0x28,0xcc, - 0x78,0x30,0x78,0xcc,0xb8,0x6c,0xe6,0xd6, - 0xd6,0xce,0x6c,0x3a,0x78,0xcc,0xcc,0xcc, - 0xcc,0xcc,0xcc,0xcc,0x00,0x10,0x20,0x78, - 0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0x00, - 0x10,0x08,0x78,0xcc,0xcc,0xcc,0xcc,0xcc, - 0xcc,0xcc,0x00,0x50,0x20,0x78,0xcc,0xcc, - 0xcc,0xcc,0xcc,0xcc,0xcc,0x00,0x48,0x18, - 0x18,0x18,0x3c,0x66,0x66,0xc3,0xc3,0x00, - 0x08,0x04,0xc0,0xc0,0xf8,0xcc,0xcc,0xcc, - 0xf8,0xc0,0xd0,0xc8,0xc8,0xc8,0xd0,0xc8, - 0xc8,0x70,0x6c,0xd8,0xd8,0x78,0x98,0x70, - 0x00,0x10,0x20,0x6c,0xd8,0xd8,0x78,0x98, - 0x70,0x00,0x20,0x10,0x6c,0xd8,0xd8,0x78, - 0x98,0x70,0x00,0x50,0x20,0x6c,0xd8,0xd8, - 0x78,0x98,0x70,0x00,0x50,0x28,0x6c,0xd8, - 0xd8,0x78,0x98,0x70,0x00,0x50,0x6c,0xd8, - 0xd8,0x78,0x98,0x70,0x20,0x50,0x20,0x6e, - 0xdb,0xd8,0x7f,0x9b,0x7e,0x60,0x20,0x70, - 0xd0,0xc0,0xc0,0xd0,0x70,0x70,0xd8,0xc0, - 0xf8,0xd8,0x70,0x00,0x20,0x40,0x70,0xd8, - 0xc0,0xf8,0xd8,0x70,0x00,0x20,0x10,0x70, - 0xd8,0xc0,0xf8,0xd8,0x70,0x00,0x50,0x20, - 0x70,0xd8,0xc0,0xf8,0xd8,0x70,0x00,0x50, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00,0x40, - 0x80,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00, - 0x80,0x40,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0x00,0xa0,0x40,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0x00,0xa0,0x70,0xd8,0xd8,0xd8,0xd8, - 0x70,0xa0,0x60,0x50,0xd8,0xd8,0xd8,0xd8, - 0xd8,0xb0,0x00,0xa0,0x50,0x70,0xd8,0xd8, - 0xd8,0xd8,0x70,0x00,0x20,0x40,0x70,0xd8, - 0xd8,0xd8,0xd8,0x70,0x00,0x20,0x10,0x70, - 0xd8,0xd8,0xd8,0xd8,0x70,0x00,0x50,0x20, - 0x70,0xd8,0xd8,0xd8,0xd8,0x70,0x00,0xa0, - 0x50,0x70,0xd8,0xd8,0xd8,0xd8,0x70,0x00, - 0x50,0x30,0x00,0xfc,0x00,0x30,0xb8,0x6c, - 0x6c,0x7c,0x6c,0x3a,0x68,0xd8,0xd8,0xd8, - 0xd8,0xd8,0x00,0x20,0x40,0x68,0xd8,0xd8, - 0xd8,0xd8,0xd8,0x00,0x20,0x10,0x68,0xd8, - 0xd8,0xd8,0xd8,0xd8,0x00,0x50,0x20,0x68, - 0xd8,0xd8,0xd8,0xd8,0xd8,0x00,0x50,0x60, - 0x30,0x30,0x78,0xd8,0xd8,0xd8,0xd8,0x00, - 0x20,0x10,0xc0,0xc0,0xf0,0xd8,0xc8,0xc8, - 0xd8,0xf0,0xc0,0xc0,0x60,0x30,0x30,0x78, - 0xd8,0xd8,0xd8,0xd8,0x00,0x50, -}; - -FontDataBLF blf_font_helvb10 = { - -1, -2, - 10, 11, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 12, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 3, 0}, - {2, 8, -1, 0, 4, 1}, - {3, 3, -1, -5, 5, 9}, - {7, 7, 1, 0, 6, 12}, - {5, 10, 0, 1, 6, 19}, - {7, 8, 0, 0, 8, 29}, - {7, 8, 0, 0, 8, 37}, - {2, 4, 0, -4, 3, 45}, - {3, 10, 0, 2, 4, 49}, - {3, 10, 0, 2, 4, 59}, - {3, 3, 0, -5, 4, 69}, - {6, 5, 0, -1, 6, 72}, - {2, 4, 0, 2, 3, 77}, - {5, 1, -1, -3, 7, 81}, - {2, 2, 0, 0, 3, 82}, - {4, 8, 0, 0, 4, 84}, - {5, 8, 0, 0, 6, 92}, - {3, 8, -1, 0, 6, 100}, - {5, 8, 0, 0, 6, 108}, - {5, 8, 0, 0, 6, 116}, - {6, 8, 0, 0, 6, 124}, - {5, 8, 0, 0, 6, 132}, - {5, 8, 0, 0, 6, 140}, - {5, 8, 0, 0, 6, 148}, - {5, 8, 0, 0, 6, 156}, - {5, 8, 0, 0, 6, 164}, - {2, 6, 0, 0, 3, 172}, - {2, 8, 0, 2, 3, 178}, - {4, 5, 0, -1, 5, 186}, - {5, 3, 0, -2, 6, 191}, - {4, 5, 0, -1, 5, 194}, - {5, 8, 0, 0, 6, 199}, - {10, 9, 0, 1, 11, 207}, - {7, 8, 0, 0, 8, 225}, - {6, 8, 0, 0, 7, 233}, - {7, 8, 0, 0, 8, 241}, - {6, 8, 0, 0, 7, 249}, - {5, 8, 0, 0, 6, 257}, - {5, 8, 0, 0, 6, 265}, - {7, 8, 0, 0, 8, 273}, - {6, 8, 0, 0, 7, 281}, - {2, 8, 0, 0, 3, 289}, - {5, 8, 0, 0, 6, 297}, - {7, 8, 0, 0, 7, 305}, - {5, 8, 0, 0, 6, 313}, - {9, 8, 0, 0, 10, 321}, - {7, 8, 0, 0, 8, 337}, - {7, 8, 0, 0, 8, 345}, - {6, 8, 0, 0, 7, 353}, - {7, 9, 0, 1, 8, 361}, - {6, 8, 0, 0, 7, 370}, - {6, 8, 0, 0, 7, 378}, - {6, 8, 0, 0, 7, 386}, - {6, 8, 0, 0, 7, 394}, - {7, 8, 0, 0, 8, 402}, - {10, 8, 0, 0, 11, 410}, - {7, 8, 0, 0, 8, 426}, - {8, 8, 0, 0, 9, 434}, - {6, 8, 0, 0, 7, 442}, - {3, 10, 0, 2, 4, 450}, - {4, 8, 0, 0, 4, 460}, - {3, 10, 0, 2, 4, 468}, - {4, 4, 0, -4, 5, 478}, - {6, 1, 0, 2, 6, 482}, - {2, 4, 0, -4, 3, 483}, - {6, 6, 0, 0, 6, 487}, - {5, 8, 0, 0, 6, 493}, - {4, 6, 0, 0, 5, 501}, - {5, 8, 0, 0, 6, 507}, - {5, 6, 0, 0, 6, 515}, - {5, 8, 1, 0, 4, 521}, - {5, 8, 0, 2, 6, 529}, - {5, 8, 0, 0, 6, 537}, - {2, 8, 0, 0, 3, 545}, - {3, 10, 1, 2, 3, 553}, - {6, 8, 0, 0, 6, 563}, - {2, 8, 0, 0, 3, 571}, - {8, 6, 0, 0, 9, 579}, - {5, 6, 0, 0, 6, 585}, - {5, 6, 0, 0, 6, 591}, - {5, 8, 0, 2, 6, 597}, - {5, 8, 0, 2, 6, 605}, - {4, 6, 0, 0, 4, 613}, - {5, 6, 0, 0, 6, 619}, - {4, 8, 1, 0, 4, 625}, - {5, 6, 0, 0, 6, 633}, - {5, 6, 0, 0, 6, 639}, - {7, 6, 0, 0, 8, 645}, - {6, 6, 0, 0, 7, 651}, - {5, 8, 0, 2, 6, 657}, - {5, 6, 0, 0, 6, 665}, - {4, 10, 0, 2, 5, 671}, - {1, 10, -1, 2, 3, 681}, - {4, 10, 0, 2, 5, 691}, - {5, 2, 0, -3, 6, 701}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 3, 703}, - {2, 8, -1, 2, 4, 704}, - {5, 8, 0, 1, 6, 712}, - {5, 8, 0, 0, 6, 720}, - {6, 6, 0, -1, 6, 728}, - {6, 8, 0, 0, 7, 734}, - {1, 10, -1, 2, 3, 742}, - {5, 10, 0, 2, 6, 752}, - {3, 1, 0, -7, 3, 762}, - {8, 8, -1, 0, 10, 763}, - {3, 5, -1, -3, 5, 771}, - {6, 3, 0, -1, 7, 776}, - {5, 3, -1, -2, 7, 779}, - {4, 1, 0, -3, 5, 782}, - {8, 8, -1, 0, 10, 783}, - {3, 1, 0, -7, 3, 791}, - {3, 3, 0, -5, 4, 792}, - {6, 7, 0, 0, 6, 795}, - {3, 4, 0, -4, 3, 802}, - {3, 4, 0, -4, 3, 806}, - {2, 2, 0, -7, 3, 810}, - {5, 8, 0, 2, 6, 812}, - {6, 10, 0, 2, 6, 820}, - {2, 1, 0, -3, 3, 830}, - {2, 2, 0, 2, 3, 831}, - {2, 4, 0, -4, 3, 833}, - {3, 5, -1, -3, 5, 837}, - {6, 3, 0, -1, 7, 842}, - {8, 8, 0, 0, 9, 845}, - {7, 8, 0, 0, 9, 853}, - {8, 8, 0, 0, 9, 861}, - {5, 8, 0, 2, 6, 869}, - {7, 11, 0, 0, 8, 877}, - {7, 11, 0, 0, 8, 888}, - {7, 11, 0, 0, 8, 899}, - {7, 11, 0, 0, 8, 910}, - {7, 10, 0, 0, 8, 921}, - {7, 11, 0, 0, 8, 931}, - {9, 8, 0, 0, 10, 942}, - {7, 10, 0, 2, 8, 958}, - {5, 11, 0, 0, 6, 968}, - {5, 11, 0, 0, 6, 979}, - {5, 11, 0, 0, 6, 990}, - {5, 10, 0, 0, 6, 1001}, - {2, 11, 0, 0, 3, 1011}, - {2, 11, 0, 0, 3, 1022}, - {3, 11, 1, 0, 3, 1033}, - {4, 10, 1, 0, 3, 1044}, - {7, 8, 1, 0, 7, 1054}, - {7, 11, 0, 0, 8, 1062}, - {7, 11, 0, 0, 8, 1073}, - {7, 11, 0, 0, 8, 1084}, - {7, 11, 0, 0, 8, 1095}, - {7, 11, 0, 0, 8, 1106}, - {7, 10, 0, 0, 8, 1117}, - {6, 5, 0, -1, 6, 1127}, - {7, 8, 0, 0, 8, 1132}, - {6, 11, 0, 0, 7, 1140}, - {6, 11, 0, 0, 7, 1151}, - {6, 11, 0, 0, 7, 1162}, - {6, 10, 0, 0, 7, 1173}, - {8, 11, 0, 0, 9, 1183}, - {6, 8, 0, 0, 7, 1194}, - {5, 8, 0, 0, 6, 1202}, - {6, 9, 0, 0, 6, 1210}, - {6, 9, 0, 0, 6, 1219}, - {6, 9, 0, 0, 6, 1228}, - {6, 9, 0, 0, 6, 1237}, - {6, 8, 0, 0, 6, 1246}, - {6, 9, 0, 0, 6, 1254}, - {8, 6, 0, 0, 9, 1263}, - {4, 8, 0, 2, 5, 1269}, - {5, 9, 0, 0, 6, 1277}, - {5, 9, 0, 0, 6, 1286}, - {5, 9, 0, 0, 6, 1295}, - {5, 8, 0, 0, 6, 1304}, - {2, 9, 0, 0, 3, 1312}, - {2, 9, 0, 0, 3, 1321}, - {3, 9, 0, 0, 3, 1330}, - {3, 8, 0, 0, 3, 1339}, - {5, 9, 0, 0, 6, 1347}, - {5, 9, 0, 0, 6, 1356}, - {5, 9, 0, 0, 6, 1365}, - {5, 9, 0, 0, 6, 1374}, - {5, 9, 0, 0, 6, 1383}, - {5, 9, 0, 0, 6, 1392}, - {5, 8, 0, 0, 6, 1401}, - {6, 5, 0, -1, 6, 1409}, - {7, 6, 1, 0, 6, 1414}, - {5, 9, 0, 0, 6, 1420}, - {5, 9, 0, 0, 6, 1429}, - {5, 9, 0, 0, 6, 1438}, - {5, 8, 0, 0, 6, 1447}, - {5, 11, 0, 2, 6, 1455}, - {5, 10, 0, 2, 6, 1466}, - {5, 10, 0, 2, 6, 1476}, - }, - helvb10_bitmap_data, - 0 -}; - -#endif - diff --git a/source/blender/blenfont/intern/blf_font_helvb12.h b/source/blender/blenfont/intern/blf_font_helvb12.h deleted file mode 100644 index c8ac2d224b4..00000000000 --- a/source/blender/blenfont/intern/blf_font_helvb12.h +++ /dev/null @@ -1,559 +0,0 @@ -/** - * $Id: - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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. - * - * The Original Code is Copyright (C) 2009 Blender Foundation. - * All rights reserved. - * - * - * Contributor(s): Blender Foundation - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef BLF_FONT_HELVB12_H -#define BLF_FONT_HELVB12_H - -static unsigned char helvb12_bitmap_data[]= { - 0x00,0xc0,0xc0,0x00,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xa0,0xa0,0xa0,0x6c, - 0x00,0x6c,0x00,0x6c,0x00,0xff,0x00,0x36, - 0x00,0x36,0x00,0x36,0x00,0x7f,0x80,0x1b, - 0x00,0x1b,0x00,0x1b,0x00,0x30,0x30,0x78, - 0xec,0xac,0x3c,0x38,0x70,0xf0,0xd4,0xdc, - 0x78,0x30,0x63,0x80,0x37,0xc0,0x36,0xc0, - 0x1f,0xc0,0x1b,0x80,0x0c,0x00,0x76,0x00, - 0xfe,0x00,0xdb,0x00,0xfb,0x00,0x71,0x80, - 0x73,0x80,0xff,0x00,0xce,0x00,0xcf,0x00, - 0xdd,0x80,0x79,0x80,0x38,0x00,0x6c,0x00, - 0x6c,0x00,0x7c,0x00,0x38,0x00,0x80,0x40, - 0xc0,0xc0,0x30,0x60,0x60,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0x60,0x60,0x30, - 0xc0,0x60,0x60,0x30,0x30,0x30,0x30,0x30, - 0x30,0x30,0x30,0x60,0x60,0xc0,0xd8,0x70, - 0x70,0xf8,0x20,0x30,0x30,0xfc,0xfc,0x30, - 0x30,0x80,0x40,0xc0,0xc0,0xfc,0xfc,0xc0, - 0xc0,0xc0,0xc0,0xc0,0x60,0x60,0x60,0x20, - 0x30,0x30,0x30,0x18,0x18,0x18,0x78,0xfc, - 0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xcc,0xfc, - 0x78,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0xf0,0xf0,0x30,0xfc,0xfc,0xc0,0x60, - 0x70,0x38,0x18,0xcc,0xcc,0xfc,0x78,0x78, - 0xfc,0xcc,0xcc,0x0c,0x38,0x38,0x0c,0xcc, - 0xfc,0x78,0x0c,0x0c,0xfe,0xfe,0xcc,0x6c, - 0x6c,0x3c,0x3c,0x1c,0x1c,0x78,0xfc,0xcc, - 0xcc,0x0c,0xfc,0xf8,0xc0,0xc0,0xfc,0xfc, - 0x78,0xfc,0xcc,0xcc,0xcc,0xfc,0xf8,0xc0, - 0xcc,0xfc,0x78,0x60,0x60,0x60,0x30,0x30, - 0x30,0x18,0x18,0x0c,0xfc,0xfc,0x78,0xfc, - 0xcc,0xcc,0xcc,0x78,0x78,0xcc,0xcc,0xfc, - 0x78,0x78,0xfc,0xcc,0x0c,0x7c,0xfc,0xcc, - 0xcc,0xcc,0xfc,0x78,0xc0,0xc0,0x00,0x00, - 0x00,0x00,0xc0,0xc0,0x80,0x40,0xc0,0xc0, - 0x00,0x00,0x00,0x00,0xc0,0xc0,0x0c,0x38, - 0xe0,0xe0,0x38,0x0c,0xfc,0xfc,0x00,0xfc, - 0xfc,0xc0,0x70,0x1c,0x1c,0x70,0xc0,0x30, - 0x30,0x00,0x30,0x30,0x38,0x1c,0xcc,0xcc, - 0xfc,0x78,0x1f,0x00,0x71,0x80,0x40,0x00, - 0xdd,0x80,0xb6,0xc0,0xb2,0x40,0xb3,0x60, - 0xdb,0x20,0x4d,0xa0,0x60,0x40,0x39,0xc0, - 0x0f,0x00,0xc3,0xc3,0xff,0x7e,0x66,0x66, - 0x3c,0x3c,0x3c,0x18,0x18,0xf8,0xfc,0xcc, - 0xcc,0xcc,0xf8,0xf8,0xcc,0xcc,0xfc,0xf8, - 0x78,0xfc,0xcc,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xcc,0xfc,0x78,0xf8,0xfc,0xce,0xc6,0xc6, - 0xc6,0xc6,0xc6,0xce,0xfc,0xf8,0xfc,0xfc, - 0xc0,0xc0,0xc0,0xf8,0xf8,0xc0,0xc0,0xfc, - 0xfc,0xc0,0xc0,0xc0,0xc0,0xc0,0xf8,0xf8, - 0xc0,0xc0,0xfc,0xfc,0x76,0xfe,0xc6,0xc6, - 0xde,0xde,0xc0,0xc0,0xc6,0xfe,0x7c,0xc6, - 0xc6,0xc6,0xc6,0xc6,0xfe,0xfe,0xc6,0xc6, - 0xc6,0xc6,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0x70,0xf8,0xd8, - 0x18,0x18,0x18,0x18,0x18,0x18,0x18,0x18, - 0xc6,0xce,0xcc,0xd8,0xf8,0xf0,0xf0,0xd8, - 0xcc,0xcc,0xc6,0xfc,0xfc,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc9,0x80, - 0xc9,0x80,0xdd,0x80,0xdd,0x80,0xf7,0x80, - 0xf7,0x80,0xe3,0x80,0xe3,0x80,0xe3,0x80, - 0xc1,0x80,0xc1,0x80,0xc6,0xc6,0xce,0xce, - 0xde,0xd6,0xf6,0xe6,0xe6,0xc6,0xc6,0x7c, - 0xfe,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6, - 0xfe,0x7c,0xc0,0xc0,0xc0,0xc0,0xfc,0xfe, - 0xc6,0xc6,0xc6,0xfe,0xfc,0x06,0x7e,0xfc, - 0xce,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0xfe, - 0x7c,0xc6,0xc6,0xc6,0xce,0xfc,0xfc,0xc6, - 0xc6,0xc6,0xfe,0xfc,0x78,0xfc,0xcc,0x0c, - 0x1c,0x78,0xe0,0xc0,0xcc,0xfc,0x78,0x30, - 0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0xfc,0xfc,0x7c,0xfe,0xc6,0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6,0xc6,0xc6,0x18,0x18,0x18, - 0x3c,0x3c,0x3c,0x66,0x66,0x66,0xc3,0xc3, - 0x33,0x00,0x33,0x00,0x33,0x00,0x3b,0x00, - 0x7f,0x80,0x6d,0x80,0x6d,0x80,0x6d,0x80, - 0xcc,0xc0,0xcc,0xc0,0xcc,0xc0,0xc3,0xc3, - 0x66,0x7e,0x3c,0x18,0x3c,0x7e,0x66,0xc3, - 0xc3,0x18,0x18,0x18,0x18,0x18,0x3c,0x3c, - 0x66,0x66,0xc3,0xc3,0xfe,0xfe,0xc0,0x60, - 0x60,0x30,0x18,0x18,0x0c,0xfe,0xfe,0xe0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xe0,0x30,0x30,0x30, - 0x70,0x60,0x60,0x60,0xe0,0xc0,0xc0,0xc0, - 0xe0,0x60,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0xe0,0x88,0xd8, - 0x70,0x70,0x20,0xfe,0xc0,0xc0,0x80,0x40, - 0x76,0xfc,0xcc,0xfc,0x7c,0x8c,0xfc,0x78, - 0xd8,0xfc,0xcc,0xcc,0xcc,0xcc,0xfc,0xd8, - 0xc0,0xc0,0xc0,0x78,0xfc,0xcc,0xc0,0xc0, - 0xcc,0xfc,0x78,0x6c,0xfc,0xcc,0xcc,0xcc, - 0xcc,0xfc,0x6c,0x0c,0x0c,0x0c,0x78,0xfc, - 0xc0,0xfc,0xfc,0xcc,0xfc,0x78,0x60,0x60, - 0x60,0x60,0x60,0x60,0xf0,0xf0,0x60,0x70, - 0x30,0x78,0xfc,0x0c,0x6c,0xfc,0xcc,0xcc, - 0xcc,0xcc,0xfc,0x6c,0xcc,0xcc,0xcc,0xcc, - 0xcc,0xec,0xfc,0xd8,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0x00, - 0xc0,0xc0,0xc0,0x60,0x60,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0x00,0x60,0x60, - 0xcc,0xd8,0xd8,0xf0,0xe0,0xf0,0xd8,0xcc, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0xc0,0xcc,0xc0, - 0xcc,0xc0,0xcc,0xc0,0xcc,0xc0,0xcc,0xc0, - 0xee,0xc0,0xff,0xc0,0xbb,0x80,0xcc,0xcc, - 0xcc,0xcc,0xcc,0xec,0xfc,0xd8,0x78,0xfc, - 0xcc,0xcc,0xcc,0xcc,0xfc,0x78,0xc0,0xc0, - 0xc0,0xd8,0xfc,0xcc,0xcc,0xcc,0xcc,0xfc, - 0xd8,0x0c,0x0c,0x0c,0x6c,0xfc,0xcc,0xcc, - 0xcc,0xcc,0xfc,0x6c,0xc0,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xe0,0xb0,0x78,0xfc,0xcc,0x1c, - 0x78,0xe0,0xfc,0x78,0x30,0x70,0x60,0x60, - 0x60,0x60,0xf0,0xf0,0x60,0x60,0x6c,0xfc, - 0xdc,0xcc,0xcc,0xcc,0xcc,0xcc,0x30,0x30, - 0x78,0x78,0x78,0xcc,0xcc,0xcc,0x24,0x24, - 0x76,0x76,0x7e,0xdb,0xdb,0xdb,0xcc,0xcc, - 0x78,0x38,0x70,0x78,0xcc,0xcc,0xe0,0xf0, - 0x30,0x30,0x38,0x78,0x78,0x48,0xcc,0xcc, - 0xcc,0xfc,0xfc,0x60,0x30,0x30,0x18,0xfc, - 0xfc,0x30,0x60,0x60,0x60,0x60,0x60,0x40, - 0x80,0x40,0x60,0x60,0x60,0x60,0x30,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0xc0,0x60,0x60,0x60, - 0x60,0x60,0x20,0x10,0x20,0x60,0x60,0x60, - 0x60,0xc0,0x98,0xfc,0x64,0xc0,0xc0,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xc0,0x00,0xc0,0xc0, - 0xc0,0x78,0xfc,0xec,0xe0,0xd0,0xd4,0xfc, - 0x78,0x0c,0xdc,0xfe,0x60,0x30,0x30,0xfc, - 0x30,0x60,0x64,0x7c,0x38,0xcc,0x78,0xcc, - 0xcc,0x78,0xcc,0x18,0x18,0x18,0x7e,0x18, - 0x7e,0x3c,0x66,0x66,0xc3,0xc3,0x80,0x80, - 0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x80, - 0x80,0x80,0x80,0x78,0xfc,0xcc,0x1c,0x38, - 0x6c,0xcc,0xcc,0xd8,0x70,0xe0,0xcc,0xfc, - 0x78,0xd8,0xd8,0x1f,0x00,0x71,0xc0,0x6e, - 0xc0,0xdb,0x60,0xdb,0x60,0xd8,0x60,0xdb, - 0x60,0xdb,0x60,0x6e,0xc0,0x71,0xc0,0x1f, - 0x00,0xf0,0x00,0xd0,0xb0,0x70,0xb0,0x60, - 0x36,0x6c,0xd8,0x6c,0x36,0x0c,0x0c,0xfc, - 0xfc,0xe0,0xe0,0x1f,0x00,0x71,0xc0,0x7b, - 0xc0,0xdb,0x60,0xdf,0x60,0xde,0x60,0xdb, - 0x60,0xdb,0x60,0x7e,0xc0,0x71,0xc0,0x1f, - 0x00,0xf0,0xf0,0x60,0x90,0x90,0x60,0xfc, - 0xfc,0x00,0x30,0x30,0xfc,0xfc,0x30,0x30, - 0xf0,0x40,0x20,0x10,0x90,0x60,0x60,0x90, - 0x10,0x20,0x90,0x60,0xc0,0x70,0x30,0xc0, - 0xc0,0xc0,0xec,0xfc,0xdc,0xcc,0xcc,0xcc, - 0xcc,0xcc,0x36,0x36,0x36,0x36,0x36,0x36, - 0x36,0x36,0x76,0xf6,0xf6,0xf6,0xfe,0x7e, - 0xc0,0xc0,0xc0,0x60,0x40,0x40,0x40,0x40, - 0x40,0xc0,0x40,0xf8,0x00,0x70,0xd8,0xd8, - 0xd8,0x70,0xd8,0x6c,0x36,0x6c,0xd8,0x20, - 0x80,0x27,0xc0,0x12,0x80,0x12,0x80,0x09, - 0x80,0x4c,0x80,0x44,0x00,0x42,0x00,0x42, - 0x00,0xc1,0x00,0x41,0x00,0x23,0xc0,0x21, - 0x00,0x10,0x80,0x10,0x40,0x0a,0x40,0x4d, - 0x80,0x44,0x00,0x42,0x00,0x42,0x00,0xc1, - 0x00,0x41,0x00,0x20,0x80,0x27,0xc0,0x12, - 0x80,0x12,0x80,0x09,0x80,0x6c,0x80,0x94, - 0x00,0x12,0x00,0x22,0x00,0x91,0x00,0x61, - 0x00,0x78,0xfc,0xcc,0xcc,0xe0,0x70,0x30, - 0x30,0x00,0x30,0x30,0xc3,0xc3,0x7e,0x7e, - 0x24,0x3c,0x18,0x18,0x00,0x0c,0x38,0x30, - 0xc3,0xc3,0x7e,0x7e,0x24,0x3c,0x18,0x18, - 0x00,0x30,0x1c,0x0c,0xc3,0xc3,0x7e,0x7e, - 0x24,0x3c,0x18,0x18,0x00,0x66,0x3c,0x18, - 0xc3,0xc3,0x7e,0x7e,0x24,0x3c,0x18,0x18, - 0x00,0x2c,0x3e,0x1a,0xc3,0xc3,0x7e,0x7e, - 0x24,0x3c,0x18,0x18,0x00,0x6c,0x6c,0xc3, - 0xc3,0x7e,0x7e,0x24,0x3c,0x18,0x18,0x00, - 0x18,0x34,0x18,0xc7,0xe0,0xc7,0xe0,0xfe, - 0x00,0x7e,0x00,0x66,0x00,0x67,0xc0,0x37, - 0xc0,0x36,0x00,0x3e,0x00,0x1f,0xe0,0x1f, - 0xe0,0x60,0x30,0x20,0x78,0xfc,0xcc,0xc0, - 0xc0,0xc0,0xc0,0xc0,0xcc,0xfc,0x78,0xfc, - 0xfc,0xc0,0xf8,0xf8,0xc0,0xfc,0xfc,0x00, - 0x18,0x70,0x60,0xfc,0xfc,0xc0,0xf8,0xf8, - 0xc0,0xfc,0xfc,0x00,0x60,0x38,0x18,0xfc, - 0xfc,0xc0,0xf8,0xf8,0xc0,0xfc,0xfc,0x00, - 0xcc,0x78,0x30,0xfc,0xfc,0xc0,0xf8,0xf8, - 0xc0,0xfc,0xfc,0x00,0xd8,0xd8,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0x60,0x00,0x30, - 0xe0,0xc0,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x60,0x00,0xc0,0x70,0x30,0x30,0x30, - 0x30,0x30,0x30,0x30,0x30,0x30,0x00,0xcc, - 0x78,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0x30,0x00,0xd8,0xd8,0x7c,0x7e,0x67, - 0x63,0x63,0xfb,0xfb,0x63,0x67,0x7e,0x7c, - 0xc6,0xce,0xce,0xde,0xf6,0xe6,0xe6,0xc6, - 0x00,0x58,0x7c,0x34,0x7c,0xfe,0xc6,0xc6, - 0xc6,0xc6,0xfe,0x7c,0x00,0x18,0x70,0x60, - 0x7c,0xfe,0xc6,0xc6,0xc6,0xc6,0xfe,0x7c, - 0x00,0x30,0x1c,0x0c,0x7c,0xfe,0xc6,0xc6, - 0xc6,0xc6,0xfe,0x7c,0x00,0xcc,0x78,0x30, - 0x7c,0xfe,0xc6,0xc6,0xc6,0xc6,0xfe,0x7c, - 0x00,0x58,0x7c,0x34,0x7c,0xfe,0xc6,0xc6, - 0xc6,0xc6,0xfe,0x7c,0x00,0x6c,0x6c,0xcc, - 0x78,0x30,0x30,0x78,0xcc,0xde,0x00,0x7f, - 0x00,0x63,0x00,0x73,0x00,0x7b,0x00,0x6b, - 0x00,0x6f,0x00,0x67,0x00,0x63,0x00,0x7f, - 0x00,0x3d,0x80,0x7c,0xfe,0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6,0x00,0x18,0x70,0x60,0x7c, - 0xfe,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x00, - 0x30,0x1c,0x0c,0x7c,0xfe,0xc6,0xc6,0xc6, - 0xc6,0xc6,0xc6,0x00,0xcc,0x78,0x30,0x7c, - 0xfe,0xc6,0xc6,0xc6,0xc6,0xc6,0xc6,0x00, - 0x6c,0x6c,0x18,0x18,0x18,0x18,0x3c,0x7e, - 0xe7,0xc3,0x00,0x30,0x1c,0x0c,0xc0,0xc0, - 0xfc,0xfe,0xc6,0xc6,0xc6,0xfe,0xfc,0xc0, - 0xc0,0xd8,0xdc,0xcc,0xcc,0xcc,0xd8,0xd8, - 0xcc,0xcc,0xfc,0x78,0x76,0xfc,0xcc,0xfc, - 0x7c,0x8c,0xfc,0x78,0x00,0x18,0x70,0x60, - 0x76,0xfc,0xcc,0xfc,0x7c,0x8c,0xfc,0x78, - 0x00,0x60,0x38,0x18,0x76,0xfc,0xcc,0xfc, - 0x7c,0x8c,0xfc,0x78,0x00,0xcc,0x78,0x30, - 0x76,0xfc,0xcc,0xfc,0x7c,0x8c,0xfc,0x78, - 0x00,0x58,0x7c,0x34,0x76,0xfc,0xcc,0xfc, - 0x7c,0x8c,0xfc,0x78,0x00,0xd8,0xd8,0x76, - 0xfc,0xcc,0xfc,0x7c,0x8c,0xfc,0x78,0x00, - 0x30,0x68,0x30,0x77,0x80,0xff,0xc0,0xcc, - 0x00,0xff,0xc0,0x7f,0xc0,0x8c,0xc0,0xff, - 0xc0,0x7b,0x80,0x60,0x30,0x20,0x78,0xfc, - 0xcc,0xc0,0xc0,0xcc,0xfc,0x78,0x78,0xfc, - 0xc0,0xfc,0xfc,0xcc,0xfc,0x78,0x00,0x18, - 0x70,0x60,0x78,0xfc,0xc0,0xfc,0xfc,0xcc, - 0xfc,0x78,0x00,0x60,0x38,0x18,0x78,0xfc, - 0xc0,0xfc,0xfc,0xcc,0xfc,0x78,0x00,0xcc, - 0x78,0x30,0x78,0xfc,0xc0,0xfc,0xfc,0xcc, - 0xfc,0x78,0x00,0xd8,0xd8,0x60,0x60,0x60, - 0x60,0x60,0x60,0x60,0x60,0x00,0x30,0xe0, - 0xc0,0x60,0x60,0x60,0x60,0x60,0x60,0x60, - 0x60,0x00,0xc0,0x70,0x30,0x30,0x30,0x30, - 0x30,0x30,0x30,0x30,0x30,0x00,0xcc,0x78, - 0x30,0x30,0x30,0x30,0x30,0x30,0x30,0x30, - 0x30,0x00,0xd8,0xd8,0x78,0xfc,0xcc,0xcc, - 0xcc,0xcc,0xfc,0x78,0xb0,0x60,0xd0,0xcc, - 0xcc,0xcc,0xcc,0xcc,0xec,0xfc,0xd8,0x00, - 0xb0,0xf8,0x68,0x78,0xfc,0xcc,0xcc,0xcc, - 0xcc,0xfc,0x78,0x00,0x18,0x70,0x60,0x78, - 0xfc,0xcc,0xcc,0xcc,0xcc,0xfc,0x78,0x00, - 0x60,0x38,0x18,0x78,0xfc,0xcc,0xcc,0xcc, - 0xcc,0xfc,0x78,0x00,0xcc,0x78,0x30,0x78, - 0xfc,0xcc,0xcc,0xcc,0xcc,0xfc,0x78,0x00, - 0xb0,0xf8,0x68,0x78,0xfc,0xcc,0xcc,0xcc, - 0xcc,0xfc,0x78,0x00,0xd8,0xd8,0x30,0x30, - 0x00,0xfc,0xfc,0x00,0x30,0x30,0xc0,0x78, - 0xfc,0xcc,0xec,0xdc,0xcc,0xfc,0x78,0x0c, - 0x6c,0xfc,0xdc,0xcc,0xcc,0xcc,0xcc,0xcc, - 0x00,0x18,0x70,0x60,0x6c,0xfc,0xdc,0xcc, - 0xcc,0xcc,0xcc,0xcc,0x00,0x60,0x38,0x18, - 0x6c,0xfc,0xdc,0xcc,0xcc,0xcc,0xcc,0xcc, - 0x00,0xcc,0x78,0x30,0x6c,0xfc,0xdc,0xcc, - 0xcc,0xcc,0xcc,0xcc,0x00,0xd8,0xd8,0xe0, - 0xf0,0x30,0x30,0x38,0x78,0x78,0x48,0xcc, - 0xcc,0xcc,0x00,0x60,0x38,0x18,0xc0,0xc0, - 0xc0,0xd8,0xfc,0xcc,0xcc,0xcc,0xcc,0xfc, - 0xd8,0xc0,0xc0,0xc0,0xe0,0xf0,0x30,0x30, - 0x38,0x78,0x78,0x48,0xcc,0xcc,0xcc,0x00, - 0xd8,0xd8, -}; - -FontDataBLF blf_font_helvb12 = { - -1, -3, - 11, 12, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 12, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 3, 0}, - {2, 11, -1, 0, 4, 1}, - {3, 3, 0, -8, 4, 12}, - {9, 11, 1, 0, 7, 15}, - {6, 13, 0, 2, 7, 37}, - {10, 11, 0, 0, 11, 50}, - {9, 11, 0, 0, 9, 72}, - {2, 4, 0, -7, 3, 94}, - {4, 14, 0, 3, 4, 98}, - {4, 14, 1, 3, 4, 112}, - {5, 5, 0, -6, 6, 126}, - {6, 6, 0, -1, 7, 131}, - {2, 4, 0, 2, 3, 137}, - {6, 2, -1, -3, 9, 141}, - {2, 2, 0, 0, 3, 143}, - {5, 13, 1, 2, 4, 145}, - {6, 11, 0, 0, 7, 158}, - {4, 11, 0, 0, 6, 169}, - {6, 11, 0, 0, 7, 180}, - {6, 11, 0, 0, 7, 191}, - {7, 11, 0, 0, 7, 202}, - {6, 11, 0, 0, 7, 213}, - {6, 11, 0, 0, 7, 224}, - {6, 11, 0, 0, 7, 235}, - {6, 11, 0, 0, 7, 246}, - {6, 11, 0, 0, 7, 257}, - {2, 8, -1, 0, 4, 268}, - {2, 10, -1, 2, 4, 276}, - {6, 6, 0, -1, 7, 286}, - {6, 5, 0, -2, 7, 292}, - {6, 6, 0, -1, 7, 297}, - {6, 11, 0, 0, 7, 303}, - {11, 12, 0, 1, 12, 314}, - {8, 11, 0, 0, 8, 338}, - {6, 11, -1, 0, 8, 349}, - {6, 11, -1, 0, 8, 360}, - {7, 11, -1, 0, 9, 371}, - {6, 11, -1, 0, 8, 382}, - {6, 11, -1, 0, 7, 393}, - {7, 11, -1, 0, 9, 404}, - {7, 11, -1, 0, 9, 415}, - {2, 11, -2, 0, 6, 426}, - {5, 11, 0, 0, 6, 437}, - {7, 11, -1, 0, 8, 448}, - {6, 11, -1, 0, 7, 459}, - {9, 11, -1, 0, 11, 470}, - {7, 11, -1, 0, 9, 492}, - {7, 11, -1, 0, 9, 503}, - {7, 11, -1, 0, 9, 514}, - {7, 12, -1, 1, 9, 525}, - {7, 11, -1, 0, 9, 537}, - {6, 11, -1, 0, 8, 548}, - {6, 11, 0, 0, 6, 559}, - {7, 11, -1, 0, 9, 570}, - {8, 11, 0, 0, 8, 581}, - {10, 11, 0, 0, 10, 592}, - {8, 11, 0, 0, 8, 614}, - {8, 11, 0, 0, 8, 625}, - {7, 11, 0, 0, 7, 636}, - {3, 14, 0, 3, 4, 647}, - {4, 11, 0, 0, 5, 661}, - {3, 14, 0, 3, 4, 672}, - {5, 5, 0, -6, 7, 686}, - {7, 1, 0, 2, 7, 691}, - {2, 4, 0, -7, 3, 692}, - {7, 8, 0, 0, 7, 696}, - {6, 11, 0, 0, 7, 704}, - {6, 8, 0, 0, 7, 715}, - {6, 11, 0, 0, 7, 723}, - {6, 8, 0, 0, 7, 734}, - {4, 11, 0, 0, 5, 742}, - {6, 11, 0, 3, 7, 753}, - {6, 11, 0, 0, 7, 764}, - {2, 11, -1, 0, 5, 775}, - {3, 14, 0, 3, 5, 786}, - {6, 11, 0, 0, 6, 800}, - {2, 11, -1, 0, 5, 811}, - {10, 8, 0, 0, 11, 822}, - {6, 8, 0, 0, 7, 838}, - {6, 8, 0, 0, 7, 846}, - {6, 11, 0, 3, 7, 854}, - {6, 11, 0, 3, 7, 865}, - {4, 8, 0, 0, 4, 876}, - {6, 8, 0, 0, 7, 884}, - {4, 10, 0, 0, 5, 892}, - {6, 8, 0, 0, 7, 902}, - {6, 8, 0, 0, 7, 910}, - {8, 8, 0, 0, 9, 918}, - {6, 8, 0, 0, 7, 926}, - {6, 11, 0, 3, 7, 934}, - {6, 8, 0, 0, 7, 945}, - {4, 14, 0, 3, 4, 953}, - {1, 13, -1, 2, 3, 967}, - {4, 14, 0, 3, 4, 980}, - {6, 3, 0, -3, 7, 994}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {2, 11, 0, 3, 3, 997}, - {6, 10, 0, 1, 7, 1008}, - {7, 11, 0, 0, 7, 1018}, - {6, 6, 0, -3, 7, 1029}, - {8, 11, 1, 0, 7, 1035}, - {1, 13, -1, 2, 3, 1046}, - {6, 14, 0, 3, 7, 1059}, - {5, 2, 0, -9, 5, 1073}, - {11, 11, 0, 0, 12, 1075}, - {4, 7, 0, -4, 5, 1097}, - {7, 5, 0, -2, 8, 1104}, - {6, 4, -1, -3, 9, 1109}, - {3, 2, 0, -3, 4, 1113}, - {11, 11, 0, 0, 12, 1115}, - {4, 2, 0, -9, 4, 1137}, - {4, 4, -1, -7, 6, 1139}, - {6, 9, 0, -1, 7, 1143}, - {4, 6, 0, -5, 4, 1152}, - {4, 6, 0, -5, 4, 1158}, - {4, 3, -1, -9, 4, 1164}, - {6, 11, 0, 3, 7, 1167}, - {7, 14, -1, 3, 10, 1178}, - {2, 2, 0, -5, 3, 1192}, - {3, 3, -1, 3, 5, 1194}, - {2, 6, 0, -5, 4, 1197}, - {5, 7, 0, -4, 6, 1203}, - {7, 5, 0, -2, 8, 1210}, - {10, 11, 0, 0, 11, 1215}, - {10, 11, 0, 0, 11, 1237}, - {10, 11, 0, 0, 11, 1259}, - {6, 11, 0, 3, 7, 1281}, - {8, 12, 0, 0, 8, 1292}, - {8, 12, 0, 0, 8, 1304}, - {8, 12, 0, 0, 8, 1316}, - {8, 12, 0, 0, 8, 1328}, - {8, 11, 0, 0, 8, 1340}, - {8, 12, 0, 0, 8, 1351}, - {11, 11, 0, 0, 12, 1363}, - {6, 14, -1, 3, 8, 1385}, - {6, 12, -1, 0, 8, 1399}, - {6, 12, -1, 0, 8, 1411}, - {6, 12, -1, 0, 8, 1423}, - {6, 11, -1, 0, 8, 1435}, - {4, 12, -1, 0, 6, 1446}, - {4, 12, -1, 0, 6, 1458}, - {6, 12, 0, 0, 6, 1470}, - {5, 11, 0, 0, 6, 1482}, - {8, 11, 0, 0, 9, 1493}, - {7, 12, -1, 0, 9, 1504}, - {7, 12, -1, 0, 9, 1516}, - {7, 12, -1, 0, 9, 1528}, - {7, 12, -1, 0, 9, 1540}, - {7, 12, -1, 0, 9, 1552}, - {7, 11, -1, 0, 9, 1564}, - {6, 6, 0, -1, 7, 1575}, - {9, 11, 0, 0, 9, 1581}, - {7, 12, -1, 0, 9, 1603}, - {7, 12, -1, 0, 9, 1615}, - {7, 12, -1, 0, 9, 1627}, - {7, 11, -1, 0, 9, 1639}, - {8, 12, 0, 0, 8, 1650}, - {7, 11, -1, 0, 9, 1662}, - {6, 11, 0, 0, 7, 1673}, - {7, 12, 0, 0, 7, 1684}, - {7, 12, 0, 0, 7, 1696}, - {7, 12, 0, 0, 7, 1708}, - {7, 12, 0, 0, 7, 1720}, - {7, 11, 0, 0, 7, 1732}, - {7, 12, 0, 0, 7, 1743}, - {10, 8, 0, 0, 11, 1755}, - {6, 11, 0, 3, 7, 1771}, - {6, 12, 0, 0, 7, 1782}, - {6, 12, 0, 0, 7, 1794}, - {6, 12, 0, 0, 7, 1806}, - {6, 11, 0, 0, 7, 1818}, - {4, 12, 0, 0, 5, 1829}, - {4, 12, 0, 0, 5, 1841}, - {6, 12, 1, 0, 5, 1853}, - {5, 11, 1, 0, 5, 1865}, - {6, 11, 0, 0, 7, 1876}, - {6, 12, 0, 0, 7, 1887}, - {6, 12, 0, 0, 7, 1899}, - {6, 12, 0, 0, 7, 1911}, - {6, 12, 0, 0, 7, 1923}, - {6, 12, 0, 0, 7, 1935}, - {6, 11, 0, 0, 7, 1947}, - {6, 8, 0, 0, 7, 1958}, - {6, 10, 0, 1, 7, 1966}, - {6, 12, 0, 0, 7, 1976}, - {6, 12, 0, 0, 7, 1988}, - {6, 12, 0, 0, 7, 2000}, - {6, 11, 0, 0, 7, 2012}, - {6, 15, 0, 3, 7, 2023}, - {6, 14, 0, 3, 7, 2038}, - {6, 14, 0, 3, 7, 2052}, - }, - helvb12_bitmap_data, - 0 -}; - -#endif /* BLF_FONT_HELVB12_H */ diff --git a/source/blender/blenfont/intern/blf_font_helvb8.h b/source/blender/blenfont/intern/blf_font_helvb8.h deleted file mode 100644 index 1e4682f1f5b..00000000000 --- a/source/blender/blenfont/intern/blf_font_helvb8.h +++ /dev/null @@ -1,449 +0,0 @@ -/** - * $Id: - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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. - * - * The Original Code is Copyright (C) 2009 Blender Foundation. - * All rights reserved. - * - * - * Contributor(s): Blender Foundation - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef BLF_FONT_HELVB8_H -#define BLF_FONT_HELVB8_H - -static unsigned char helvb8_bitmap_data[]= { - 0x00,0x80,0x00,0x80,0x80,0x80,0x80,0xa0, - 0xa0,0xa0,0x50,0xf8,0x50,0xf8,0x50,0x40, - 0xe0,0x10,0x60,0x80,0x70,0x20,0x5c,0x54, - 0x2c,0xd0,0xa8,0xe8,0x58,0xb0,0xa8,0x48, - 0xa0,0x40,0x80,0x80,0x80,0x40,0x80,0x80, - 0x80,0x80,0x80,0x40,0x80,0x40,0x40,0x40, - 0x40,0x40,0x80,0x40,0xe0,0x40,0x20,0x20, - 0xf8,0x20,0x20,0x80,0x40,0x40,0xf0,0x80, - 0x80,0x80,0x80,0x80,0x40,0x40,0x40,0x60, - 0x90,0x90,0x90,0x90,0x60,0x40,0x40,0x40, - 0x40,0xc0,0x40,0xf0,0x40,0x20,0x10,0x90, - 0x60,0xc0,0x20,0x20,0xc0,0x20,0xc0,0x20, - 0x20,0xf0,0x60,0x20,0x20,0xc0,0x20,0x20, - 0xc0,0x80,0xe0,0x60,0x90,0x90,0xe0,0x80, - 0x70,0x40,0x40,0x40,0x20,0x10,0xf0,0x60, - 0x90,0x90,0x60,0x90,0x60,0x60,0x10,0x70, - 0x90,0x90,0x60,0x80,0x00,0x00,0x80,0x80, - 0x40,0x40,0x00,0x00,0x40,0x20,0x40,0x80, - 0x40,0x20,0xe0,0x00,0xe0,0x80,0x40,0x20, - 0x40,0x80,0x40,0x00,0x40,0x20,0xc0,0x78, - 0x80,0x9e,0xa5,0x99,0x41,0x3e,0x88,0x88, - 0x70,0x50,0x20,0x20,0xe0,0x90,0x90,0xe0, - 0x90,0xe0,0x70,0x88,0x80,0x80,0x88,0x70, - 0xf0,0x88,0x88,0x88,0x88,0xf0,0xf0,0x80, - 0x80,0xe0,0x80,0xf0,0x80,0x80,0x80,0xe0, - 0x80,0xf0,0x70,0x88,0x88,0x98,0x80,0x70, - 0x88,0x88,0x88,0xf8,0x88,0x88,0x80,0x80, - 0x80,0x80,0x80,0x80,0x40,0xa0,0x20,0x20, - 0x20,0x20,0x90,0x90,0xe0,0xc0,0xa0,0x90, - 0xe0,0x80,0x80,0x80,0x80,0x80,0xa8,0xa8, - 0xa8,0xa8,0xd8,0x88,0x88,0x98,0xa8,0xa8, - 0xc8,0x88,0x70,0x88,0x88,0x88,0x88,0x70, - 0x80,0x80,0xe0,0x90,0x90,0xe0,0x10,0x20, - 0x70,0x88,0x88,0x88,0x88,0x70,0x90,0x90, - 0xe0,0x90,0x90,0xe0,0xe0,0x10,0x10,0xe0, - 0x80,0x70,0x40,0x40,0x40,0x40,0x40,0xe0, - 0x70,0x88,0x88,0x88,0x88,0x88,0x40,0xa0, - 0x90,0x90,0x90,0x90,0x48,0x48,0x6c,0x92, - 0x92,0x92,0x90,0x90,0x60,0x60,0x90,0x90, - 0x20,0x20,0x30,0x48,0x48,0xc8,0xf0,0x80, - 0x40,0x20,0x10,0xf0,0xc0,0x80,0x80,0x80, - 0x80,0x80,0xc0,0x40,0x40,0x40,0x40,0x80, - 0x80,0x80,0xc0,0x40,0x40,0x40,0x40,0x40, - 0xc0,0x88,0x50,0x20,0xf8,0x80,0x80,0x80, - 0xd0,0xa0,0xe0,0x20,0xc0,0xe0,0x90,0x90, - 0x90,0xe0,0x80,0x80,0x60,0x80,0x80,0x80, - 0x60,0x70,0x90,0x90,0x90,0x70,0x10,0x10, - 0x60,0x80,0xe0,0xa0,0x40,0x40,0x40,0x40, - 0x40,0xe0,0x40,0x20,0x60,0x10,0x70,0x90, - 0x90,0x70,0x90,0x90,0x90,0x90,0xe0,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x80, - 0x80,0x40,0x40,0x40,0x40,0x40,0x40,0x00, - 0x40,0xa0,0xa0,0xc0,0xc0,0xa0,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0xa8, - 0xa8,0xa8,0xa8,0xf0,0x90,0x90,0x90,0x90, - 0xe0,0x60,0x90,0x90,0x90,0x60,0x80,0xe0, - 0x90,0x90,0x90,0xe0,0x10,0x70,0x90,0x90, - 0x90,0x70,0x80,0x80,0x80,0xc0,0xa0,0xc0, - 0x20,0x60,0x80,0x60,0x40,0x40,0x40,0x40, - 0xe0,0x40,0x40,0x60,0xa0,0xa0,0xa0,0xa0, - 0x40,0xa0,0x90,0x90,0x90,0x50,0x50,0xa8, - 0xa8,0xa8,0x90,0x90,0x60,0x90,0x90,0x80, - 0x40,0x60,0x90,0x90,0x90,0xe0,0x80,0x40, - 0x20,0xe0,0x20,0x40,0x40,0xc0,0x40,0x40, - 0x20,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x40,0x40,0x60,0x40,0x40,0x80,0xb0, - 0x48,0x00,0x80,0x80,0x80,0x80,0x80,0x00, - 0x80,0x40,0x40,0xa0,0x80,0xa0,0x40,0x40, - 0xf0,0x40,0x40,0xe0,0x40,0x30,0x88,0x70, - 0x50,0x70,0x88,0x20,0x20,0xf8,0x50,0x88, - 0x80,0x80,0x80,0x00,0x80,0x80,0x80,0xe0, - 0x10,0x30,0x60,0x90,0x60,0x80,0x70,0x90, - 0x78,0x84,0xb4,0xa4,0xb4,0x84,0x78,0xe0, - 0x00,0xe0,0x20,0xc0,0x50,0xa0,0x50,0x10, - 0x10,0xf0,0xc0,0x78,0x84,0xac,0xb4,0xb4, - 0x84,0x78,0xe0,0x40,0xa0,0x40,0xf0,0x00, - 0x20,0xf0,0x20,0xc0,0x80,0x40,0x80,0xc0, - 0x20,0x60,0xe0,0x80,0x40,0x80,0x80,0xe0, - 0xa0,0xa0,0xa0,0x50,0x50,0x50,0x50,0xd0, - 0xd0,0xd0,0x78,0x80,0x80,0x80,0x40,0x40, - 0x40,0xc0,0x40,0xe0,0x00,0xe0,0xa0,0xe0, - 0xa0,0x50,0xa0,0x04,0x5e,0x2c,0x54,0x48, - 0xc4,0x40,0x0e,0x44,0x22,0x5c,0x48,0xc4, - 0x40,0x04,0x5e,0x2c,0xd4,0x28,0x64,0xe0, - 0x60,0x90,0x40,0x20,0x00,0x20,0x88,0x88, - 0x70,0x50,0x20,0x20,0x00,0x20,0x40,0x88, - 0x88,0x70,0x50,0x20,0x20,0x00,0x20,0x10, - 0x88,0x88,0x70,0x50,0x20,0x20,0x00,0x50, - 0x20,0x88,0x88,0x70,0x50,0x20,0x20,0x00, - 0x50,0x28,0x88,0x88,0x70,0x50,0x20,0x20, - 0x00,0x50,0x88,0x88,0x70,0x50,0x20,0x20, - 0x20,0x50,0x20,0x9e,0x90,0x7c,0x50,0x30, - 0x3e,0x80,0x40,0x70,0x88,0x80,0x88,0x88, - 0x70,0xf0,0x80,0x80,0xe0,0x80,0xf0,0x00, - 0x20,0x40,0xf0,0x80,0x80,0xe0,0x80,0xf0, - 0x00,0x40,0x20,0xf0,0x80,0x80,0xe0,0x80, - 0xf0,0x00,0xa0,0x40,0xf0,0x80,0x80,0xe0, - 0x80,0xf0,0x00,0xa0,0x40,0x40,0x40,0x40, - 0x40,0x40,0x00,0x40,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x00,0x80,0x40,0x40,0x40, - 0x40,0x40,0x40,0x40,0x00,0xa0,0x40,0x40, - 0x40,0x40,0x40,0x40,0x40,0x00,0xa0,0x70, - 0x48,0x48,0xe8,0x48,0x70,0x88,0x98,0xa8, - 0xa8,0xc8,0x88,0x00,0x50,0x28,0x70,0x88, - 0x88,0x88,0x88,0x70,0x00,0x20,0x40,0x70, - 0x88,0x88,0x88,0x88,0x70,0x00,0x20,0x10, - 0x70,0x88,0x88,0x88,0x88,0x70,0x00,0x50, - 0x20,0x70,0x88,0x88,0x88,0x88,0x70,0x00, - 0x50,0x28,0x70,0x88,0x88,0x88,0x88,0x70, - 0x00,0x50,0x90,0x60,0x60,0x90,0x80,0xf0, - 0xc8,0xa8,0x98,0x88,0x78,0x08,0x70,0x88, - 0x88,0x88,0x88,0x88,0x00,0x20,0x40,0x70, - 0x88,0x88,0x88,0x88,0x88,0x00,0x20,0x10, - 0x70,0x88,0x88,0x88,0x88,0x88,0x00,0x50, - 0x20,0x70,0x88,0x88,0x88,0x88,0x88,0x00, - 0x50,0x20,0x20,0x30,0x48,0x48,0xc8,0x00, - 0x10,0x08,0x80,0xf0,0x88,0x88,0xf0,0x80, - 0x80,0xa0,0x90,0x90,0xa0,0x90,0x60,0xd0, - 0xa0,0xe0,0x20,0xc0,0x00,0x40,0x80,0xd0, - 0xa0,0xe0,0x20,0xc0,0x00,0x40,0x20,0xd0, - 0xa0,0xe0,0x20,0xc0,0x00,0xa0,0x40,0x68, - 0x50,0x70,0x10,0x60,0x00,0xb0,0x68,0xd0, - 0xa0,0xe0,0x20,0xc0,0x00,0xa0,0xd0,0xa0, - 0xe0,0x20,0xc0,0x40,0xa0,0x40,0xd8,0xa0, - 0xf8,0x28,0xd0,0x80,0x40,0x60,0x80,0x80, - 0x80,0x60,0x60,0x80,0xe0,0xa0,0x40,0x00, - 0x20,0x40,0x60,0x80,0xe0,0xa0,0x40,0x00, - 0x40,0x20,0x60,0x80,0xe0,0xa0,0x40,0x00, - 0xa0,0x40,0x60,0x80,0xe0,0xa0,0x40,0x00, - 0xa0,0x40,0x40,0x40,0x40,0x40,0x00,0x40, - 0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x80, - 0x40,0x40,0x40,0x40,0x40,0x40,0x00,0xa0, - 0x40,0x40,0x40,0x40,0x40,0x40,0x00,0xa0, - 0x60,0x90,0x90,0x90,0x70,0xa0,0x60,0x90, - 0x90,0x90,0x90,0x90,0xe0,0x00,0xa0,0x50, - 0x60,0x90,0x90,0x90,0x60,0x00,0x20,0x40, - 0x60,0x90,0x90,0x90,0x60,0x00,0x20,0x10, - 0x60,0x90,0x90,0x90,0x60,0x00,0xa0,0x40, - 0x60,0x90,0x90,0x90,0x60,0x00,0xa0,0x50, - 0x60,0x90,0x90,0x90,0x60,0x00,0x90,0x20, - 0x00,0xf0,0x00,0x20,0x80,0x70,0x68,0x58, - 0x48,0x3c,0x02,0x60,0xa0,0xa0,0xa0,0xa0, - 0x00,0x40,0x80,0x60,0xa0,0xa0,0xa0,0xa0, - 0x00,0x40,0x20,0x60,0xa0,0xa0,0xa0,0xa0, - 0x00,0xa0,0x40,0x60,0xa0,0xa0,0xa0,0xa0, - 0x00,0xa0,0x80,0x40,0x60,0x90,0x90,0x90, - 0x00,0x20,0x10,0x80,0xe0,0x90,0x90,0x90, - 0xe0,0x80,0x80,0x40,0x60,0x90,0x90,0x90, - 0x00,0x50, -}; - -FontDataBLF blf_font_helvb8 = { - 0, -2, - 9, 9, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 8, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 2, 0}, - {1, 6, -1, 0, 2, 1}, - {3, 3, -1, -3, 3, 7}, - {5, 5, 0, 0, 5, 10}, - {4, 7, -1, 1, 5, 15}, - {6, 6, -1, 0, 7, 22}, - {5, 6, -1, 0, 6, 28}, - {1, 3, -1, -3, 2, 34}, - {2, 7, -1, 1, 3, 37}, - {2, 7, -1, 1, 3, 44}, - {3, 3, -1, -2, 3, 51}, - {5, 5, -1, 0, 5, 54}, - {2, 3, 0, 2, 2, 59}, - {4, 1, -2, -2, 6, 62}, - {1, 1, -1, 0, 2, 63}, - {2, 7, -1, 1, 2, 64}, - {4, 6, -1, 0, 5, 71}, - {2, 6, -2, 0, 5, 77}, - {4, 6, -1, 0, 5, 83}, - {3, 6, -2, 0, 5, 89}, - {4, 6, -1, 0, 5, 95}, - {3, 6, -2, 0, 5, 101}, - {4, 6, -1, 0, 5, 107}, - {4, 6, -1, 0, 5, 113}, - {4, 6, -1, 0, 5, 119}, - {4, 6, -1, 0, 5, 125}, - {1, 4, -1, 0, 2, 131}, - {2, 6, 0, 2, 2, 135}, - {3, 5, -1, 0, 5, 141}, - {3, 3, -1, -1, 4, 146}, - {3, 5, -2, 0, 5, 149}, - {3, 5, -2, 0, 5, 154}, - {8, 7, -1, 1, 9, 159}, - {5, 6, -1, 0, 6, 166}, - {4, 6, -2, 0, 6, 172}, - {5, 6, -1, 0, 6, 178}, - {5, 6, -1, 0, 6, 184}, - {4, 6, -2, 0, 6, 190}, - {4, 6, -2, 0, 5, 196}, - {5, 6, -1, 0, 6, 202}, - {5, 6, -1, 0, 6, 208}, - {1, 6, -1, 0, 2, 214}, - {3, 6, -1, 0, 4, 220}, - {4, 6, -2, 0, 6, 226}, - {3, 6, -2, 0, 5, 232}, - {5, 6, -2, 0, 7, 238}, - {5, 6, -1, 0, 6, 244}, - {5, 6, -1, 0, 6, 250}, - {4, 6, -2, 0, 6, 256}, - {5, 8, -1, 2, 6, 262}, - {4, 6, -2, 0, 6, 270}, - {4, 6, -2, 0, 6, 276}, - {3, 6, -1, 0, 4, 282}, - {5, 6, -1, 0, 6, 288}, - {4, 6, -2, 0, 6, 294}, - {7, 6, -1, 0, 7, 300}, - {4, 6, -2, 0, 6, 306}, - {5, 6, -1, 0, 6, 312}, - {4, 6, -2, 0, 6, 318}, - {2, 7, -1, 1, 2, 324}, - {2, 7, 0, 1, 2, 331}, - {2, 7, 0, 1, 2, 338}, - {5, 3, 0, -2, 5, 345}, - {5, 1, 0, 1, 5, 348}, - {1, 3, -1, -3, 2, 349}, - {4, 5, -1, 0, 4, 352}, - {4, 7, -1, 0, 5, 357}, - {3, 5, -1, 0, 4, 364}, - {4, 7, -1, 0, 5, 369}, - {3, 5, -1, 0, 4, 376}, - {3, 7, -1, 0, 3, 381}, - {4, 6, -1, 1, 5, 388}, - {4, 7, -1, 0, 5, 394}, - {1, 7, -1, 0, 2, 401}, - {2, 9, 0, 2, 2, 408}, - {3, 7, -1, 0, 4, 417}, - {1, 7, -1, 0, 2, 424}, - {5, 5, -1, 0, 6, 431}, - {4, 5, -1, 0, 5, 436}, - {4, 5, -1, 0, 5, 441}, - {4, 6, -1, 1, 5, 446}, - {4, 6, -1, 1, 5, 452}, - {3, 5, -1, 0, 3, 458}, - {3, 5, -1, 0, 4, 463}, - {3, 7, -1, 0, 3, 468}, - {3, 5, -1, 0, 4, 475}, - {4, 5, -1, 0, 5, 480}, - {5, 5, -1, 0, 6, 485}, - {4, 5, -1, 0, 5, 490}, - {4, 6, -1, 1, 4, 495}, - {3, 5, -1, 0, 4, 501}, - {3, 7, 0, 1, 2, 506}, - {1, 7, -1, 1, 2, 513}, - {3, 7, 0, 1, 2, 520}, - {5, 2, -1, -2, 6, 527}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 1, 0, 0, 2, 529}, - {1, 7, -1, 2, 2, 530}, - {3, 7, -1, 1, 5, 537}, - {4, 6, -1, 0, 5, 544}, - {5, 5, 0, 0, 4, 550}, - {5, 5, -1, 0, 6, 555}, - {1, 7, -1, 1, 2, 560}, - {4, 8, -1, 2, 5, 567}, - {4, 1, 0, -5, 2, 575}, - {6, 7, -1, 1, 7, 576}, - {3, 5, 0, -1, 3, 583}, - {4, 3, -1, -1, 5, 588}, - {4, 3, -1, -1, 6, 591}, - {2, 1, 0, -2, 3, 594}, - {6, 7, -1, 1, 7, 595}, - {3, 1, 0, -5, 2, 602}, - {3, 3, -1, -3, 3, 603}, - {4, 5, -1, 0, 5, 606}, - {2, 4, -1, -2, 2, 611}, - {3, 4, 0, -2, 2, 615}, - {2, 2, 0, -4, 2, 619}, - {3, 6, -1, 2, 4, 621}, - {5, 8, 0, 2, 5, 627}, - {1, 2, -1, -1, 2, 635}, - {2, 2, 0, 2, 2, 637}, - {2, 4, 0, -2, 2, 639}, - {3, 5, 0, -1, 3, 643}, - {4, 3, -1, -1, 5, 648}, - {7, 7, 0, 1, 7, 651}, - {7, 7, 0, 1, 7, 658}, - {7, 7, 0, 1, 7, 665}, - {4, 6, -1, 1, 5, 672}, - {5, 9, -1, 0, 6, 678}, - {5, 9, -1, 0, 6, 687}, - {5, 9, -1, 0, 6, 696}, - {5, 9, -1, 0, 6, 705}, - {5, 8, -1, 0, 6, 714}, - {5, 9, -1, 0, 6, 722}, - {7, 6, -1, 0, 8, 731}, - {5, 8, -1, 2, 6, 737}, - {4, 9, -2, 0, 6, 745}, - {4, 9, -2, 0, 6, 754}, - {4, 9, -2, 0, 6, 763}, - {4, 8, -2, 0, 6, 772}, - {2, 9, 0, 0, 2, 780}, - {2, 9, -1, 0, 2, 789}, - {3, 9, 0, 0, 2, 798}, - {3, 8, 0, 0, 2, 807}, - {5, 6, -1, 0, 6, 815}, - {5, 9, -1, 0, 6, 821}, - {5, 9, -1, 0, 6, 830}, - {5, 9, -1, 0, 6, 839}, - {5, 9, -1, 0, 6, 848}, - {5, 9, -1, 0, 6, 857}, - {5, 8, -1, 0, 6, 866}, - {4, 4, -1, 0, 5, 874}, - {5, 8, -1, 1, 6, 878}, - {5, 9, -1, 0, 6, 886}, - {5, 9, -1, 0, 6, 895}, - {5, 9, -1, 0, 6, 904}, - {5, 8, -1, 0, 6, 913}, - {5, 9, -1, 0, 6, 921}, - {5, 6, -1, 0, 6, 930}, - {4, 7, -2, 1, 6, 936}, - {4, 8, -1, 0, 4, 943}, - {4, 8, -1, 0, 4, 951}, - {4, 8, -1, 0, 4, 959}, - {5, 8, 0, 0, 4, 967}, - {4, 7, -1, 0, 4, 975}, - {4, 8, -1, 0, 4, 982}, - {5, 5, -1, 0, 6, 990}, - {3, 7, -1, 2, 4, 995}, - {3, 8, -1, 0, 4, 1002}, - {3, 8, -1, 0, 4, 1010}, - {3, 8, -1, 0, 4, 1018}, - {3, 7, -1, 0, 4, 1026}, - {2, 8, 0, 0, 2, 1033}, - {2, 8, -1, 0, 2, 1041}, - {3, 8, 0, 0, 2, 1049}, - {3, 7, 0, 0, 2, 1057}, - {4, 8, -1, 0, 5, 1064}, - {4, 8, -1, 0, 5, 1072}, - {4, 8, -1, 0, 5, 1080}, - {4, 8, -1, 0, 5, 1088}, - {4, 8, -1, 0, 5, 1096}, - {4, 8, -1, 0, 5, 1104}, - {4, 7, -1, 0, 5, 1112}, - {4, 5, -1, 0, 5, 1119}, - {7, 7, 0, 1, 5, 1124}, - {3, 8, -1, 0, 4, 1131}, - {3, 8, -1, 0, 4, 1139}, - {3, 8, -1, 0, 4, 1147}, - {3, 7, -1, 0, 4, 1155}, - {4, 9, -1, 1, 4, 1162}, - {4, 7, -1, 1, 5, 1171}, - {4, 8, -1, 1, 4, 1178}, - }, - helvb8_bitmap_data, - 0 -}; - -#endif /* BLF_FONT_HELVB8_H */ diff --git a/source/blender/blenfont/intern/blf_font_scr12.h b/source/blender/blenfont/intern/blf_font_scr12.h deleted file mode 100644 index 6460cf6f501..00000000000 --- a/source/blender/blenfont/intern/blf_font_scr12.h +++ /dev/null @@ -1,479 +0,0 @@ -/** - * $Id: - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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. - * - * The Original Code is Copyright (C) 2009 Blender Foundation. - * All rights reserved. - * - * - * Contributor(s): Blender Foundation - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef BLF_FONT_SCR12_H -#define BLF_FONT_SCR12_H - -static unsigned char scr12_bitmap_data[]= { - 0x80,0x80,0x00,0x80,0x80,0x80,0x80,0x80, - 0xa0,0xa0,0xa0,0xa0,0x50,0x50,0xfc,0x28, - 0x28,0x7e,0x14,0x14,0x20,0x70,0xa8,0x28, - 0x70,0xa0,0xa8,0x70,0x20,0x98,0x54,0x54, - 0x2c,0xd0,0xa8,0xa8,0x64,0x74,0x88,0x8c, - 0x50,0x20,0x50,0x48,0x30,0x80,0x40,0x20, - 0x20,0x20,0x40,0x40,0x80,0x80,0x80,0x80, - 0x40,0x40,0x20,0x80,0x40,0x40,0x20,0x20, - 0x20,0x20,0x40,0x40,0x80,0x20,0xa8,0x70, - 0xa8,0x20,0x20,0x20,0xf8,0x20,0x20,0x80, - 0x40,0x40,0xc0,0xf8,0x80,0x80,0x80,0x80, - 0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08, - 0x70,0x88,0x88,0xc8,0xa8,0x98,0x88,0x70, - 0xe0,0x40,0x40,0x40,0x40,0x40,0xc0,0x40, - 0xf8,0x80,0x40,0x20,0x10,0x08,0x88,0x70, - 0x70,0x88,0x08,0x08,0x70,0x08,0x88,0x70, - 0x10,0x10,0x10,0xf8,0x90,0x50,0x30,0x10, - 0x70,0x88,0x08,0x08,0xf0,0x80,0x80,0xf8, - 0x70,0x88,0x88,0x88,0xf0,0x80,0x88,0x70, - 0x40,0x40,0x20,0x20,0x10,0x10,0x08,0xf8, - 0x70,0x88,0x88,0x88,0x70,0x88,0x88,0x70, - 0x70,0x88,0x08,0x78,0x88,0x88,0x88,0x70, - 0x80,0x80,0x00,0x00,0x80,0x80,0x80,0x40, - 0x40,0xc0,0x00,0x00,0x40,0x40,0x08,0x10, - 0x20,0x40,0x80,0x40,0x20,0x10,0x08,0xf8, - 0x00,0xf8,0x80,0x40,0x20,0x10,0x08,0x10, - 0x20,0x40,0x80,0x20,0x00,0x20,0x20,0x10, - 0x88,0x88,0x70,0x38,0x40,0x98,0xa8,0xa8, - 0x98,0x48,0x30,0x88,0x88,0xf8,0x88,0x50, - 0x50,0x20,0x20,0xf0,0x88,0x88,0x88,0xf0, - 0x88,0x88,0xf0,0x70,0x88,0x80,0x80,0x80, - 0x80,0x88,0x70,0xf0,0x88,0x88,0x88,0x88, - 0x88,0x88,0xf0,0xf8,0x80,0x80,0x80,0xf0, - 0x80,0x80,0xf8,0x80,0x80,0x80,0x80,0xf0, - 0x80,0x80,0xf8,0x68,0x98,0x88,0x88,0x98, - 0x80,0x88,0x70,0x88,0x88,0x88,0x88,0xf8, - 0x88,0x88,0x88,0xe0,0x40,0x40,0x40,0x40, - 0x40,0x40,0xe0,0x70,0x88,0x88,0x08,0x08, - 0x08,0x08,0x08,0x88,0x88,0x90,0xa0,0xc0, - 0xa0,0x90,0x88,0xf8,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x88,0x88,0xa8,0xa8,0xd8, - 0xd8,0x88,0x88,0x88,0x98,0x98,0xa8,0xa8, - 0xc8,0xc8,0x88,0x70,0x88,0x88,0x88,0x88, - 0x88,0x88,0x70,0x80,0x80,0x80,0x80,0xf0, - 0x88,0x88,0xf0,0x08,0x10,0x70,0xa8,0x88, - 0x88,0x88,0x88,0x88,0x70,0x88,0x90,0x90, - 0xa0,0xf0,0x88,0x88,0xf0,0x70,0x88,0x88, - 0x08,0x70,0x80,0x88,0x70,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0xf8,0x70,0x88,0x88, - 0x88,0x88,0x88,0x88,0x88,0x20,0x20,0x50, - 0x50,0x50,0x88,0x88,0x88,0x50,0x50,0xf8, - 0xa8,0xa8,0xa8,0x88,0x88,0x88,0x88,0x50, - 0x20,0x20,0x50,0x88,0x88,0x20,0x20,0x20, - 0x20,0x50,0x50,0x88,0x88,0xf8,0x80,0x40, - 0x40,0x20,0x10,0x08,0xf8,0xe0,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0xe0,0x08,0x08, - 0x10,0x10,0x20,0x20,0x40,0x40,0x80,0x80, - 0xe0,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0xe0,0x88,0x50,0x20,0xfe,0x20,0x40,0x80, - 0x80,0x68,0x98,0x88,0x78,0x08,0x70,0xb0, - 0xc8,0x88,0x88,0xc8,0xb0,0x80,0x80,0x70, - 0x88,0x80,0x80,0x88,0x70,0x68,0x98,0x88, - 0x88,0x98,0x68,0x08,0x08,0x70,0x88,0x80, - 0xf8,0x88,0x70,0x40,0x40,0x40,0x40,0x40, - 0xf0,0x40,0x38,0xf0,0x08,0x68,0x98,0x88, - 0x88,0x98,0x68,0x88,0x88,0x88,0x88,0xc8, - 0xb0,0x80,0x80,0x20,0x20,0x20,0x20,0x20, - 0xe0,0x00,0x20,0x60,0x90,0x10,0x10,0x10, - 0x10,0x10,0x70,0x00,0x10,0x88,0x90,0xa0, - 0xc0,0xa0,0x90,0x80,0x80,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0xa8,0xa8,0xa8, - 0xa8,0xa8,0xd0,0x88,0x88,0x88,0x88,0xc8, - 0xb0,0x70,0x88,0x88,0x88,0x88,0x70,0x80, - 0x80,0xb0,0xc8,0x88,0x88,0xc8,0xb0,0x08, - 0x08,0x68,0x98,0x88,0x88,0x98,0x68,0x80, - 0x80,0x80,0x80,0xc8,0xb0,0x70,0x88,0x10, - 0x60,0x88,0x70,0x30,0x40,0x40,0x40,0x40, - 0xf0,0x40,0x68,0x98,0x88,0x88,0x88,0x88, - 0x20,0x20,0x50,0x50,0x88,0x88,0x50,0xa8, - 0xa8,0xa8,0x88,0x88,0x88,0x88,0x50,0x20, - 0x50,0x88,0xf0,0x08,0x68,0x98,0x88,0x88, - 0x88,0x88,0xf8,0x80,0x40,0x20,0x10,0xf8, - 0x18,0x20,0x20,0x20,0x20,0xc0,0x20,0x20, - 0x20,0x18,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0xc0,0x20,0x20,0x20, - 0x20,0x18,0x20,0x20,0x20,0xc0,0x98,0xb4, - 0x64,0x80,0x80,0x80,0x80,0x80,0x00,0x80, - 0x80,0x20,0x20,0x70,0x88,0x80,0x88,0x70, - 0x20,0x20,0xb0,0x48,0x40,0xf0,0x40,0x40, - 0x48,0x30,0x90,0x60,0x90,0x90,0x60,0x90, - 0x20,0x70,0x20,0x70,0x20,0x50,0x88,0x88, - 0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x80, - 0x80,0x80,0x70,0x88,0x10,0x28,0x48,0x90, - 0xa0,0x40,0x88,0x70,0xa0,0x78,0x84,0xb4, - 0xa4,0xb4,0x84,0x78,0xf0,0x90,0x70,0x10, - 0x60,0x14,0x28,0x50,0xa0,0x50,0x28,0x14, - 0x08,0xf8,0xf0,0x78,0x84,0xac,0xb4,0xb4, - 0x84,0x78,0xe0,0x60,0x90,0x60,0xf8,0x00, - 0x20,0x20,0xf8,0x20,0x20,0xe0,0x40,0x20, - 0xa0,0x40,0xc0,0x20,0x40,0x20,0xc0,0x80, - 0x40,0x80,0xe8,0x90,0x90,0x90,0x90,0x28, - 0x28,0x28,0x28,0x68,0xa8,0xa8,0xa8,0x7c, - 0x80,0x80,0xc0,0x40,0xe0,0x40,0x40,0xc0, - 0x40,0xf0,0x60,0x90,0x90,0x60,0xa0,0x50, - 0x28,0x14,0x28,0x50,0xa0,0x08,0x38,0xa8, - 0x58,0x28,0xf0,0x48,0x40,0xc0,0x40,0x38, - 0x10,0x88,0x68,0x30,0xf0,0x48,0x40,0xc0, - 0x40,0x08,0x38,0xa8,0x58,0x28,0xd0,0x28, - 0x40,0x20,0xc0,0x70,0x88,0x88,0x40,0x20, - 0x20,0x00,0x20,0x88,0x88,0xf8,0x88,0x50, - 0x50,0x20,0x00,0x20,0x40,0x88,0x88,0xf8, - 0x50,0x50,0x20,0x20,0x00,0x20,0x10,0x88, - 0x88,0xf8,0x50,0x50,0x20,0x20,0x00,0x50, - 0x20,0x88,0x88,0xf8,0x50,0x50,0x20,0x20, - 0x00,0xb0,0x68,0x88,0x88,0xf8,0x50,0x50, - 0x20,0x20,0x00,0x50,0x88,0x88,0xf8,0x50, - 0x50,0x20,0x20,0x20,0x50,0x20,0x9c,0x90, - 0xf0,0x50,0x5c,0x30,0x30,0x1c,0x60,0x20, - 0x70,0x88,0x80,0x80,0x80,0x80,0x88,0x70, - 0xf8,0x80,0x80,0xf0,0x80,0x80,0xf8,0x00, - 0x20,0x40,0xf8,0x80,0x80,0xf0,0x80,0x80, - 0xf8,0x00,0x20,0x10,0xf8,0x80,0x80,0xf0, - 0x80,0x80,0xf8,0x00,0x50,0x20,0xf8,0x80, - 0x80,0xf0,0x80,0x80,0xf8,0x00,0x50,0xe0, - 0x40,0x40,0x40,0x40,0x40,0xe0,0x00,0x40, - 0x80,0xe0,0x40,0x40,0x40,0x40,0x40,0xe0, - 0x00,0x40,0x20,0xe0,0x40,0x40,0x40,0x40, - 0x40,0xe0,0x00,0xa0,0x40,0xe0,0x40,0x40, - 0x40,0x40,0x40,0xe0,0x00,0xa0,0x78,0x44, - 0x44,0xf4,0x44,0x44,0x44,0x78,0x88,0x98, - 0x98,0xa8,0xc8,0xc8,0x88,0x00,0xb0,0x68, - 0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x00, - 0x20,0x40,0x70,0x88,0x88,0x88,0x88,0x88, - 0x70,0x00,0x20,0x10,0x70,0x88,0x88,0x88, - 0x88,0x88,0x70,0x00,0x50,0x20,0x70,0x88, - 0x88,0x88,0x88,0x88,0x70,0x00,0xb0,0x68, - 0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x00, - 0x50,0x88,0x50,0x20,0x50,0x88,0xb8,0x44, - 0x64,0x54,0x4c,0x44,0x3a,0x70,0x88,0x88, - 0x88,0x88,0x88,0x88,0x00,0x20,0x40,0x70, - 0x88,0x88,0x88,0x88,0x88,0x88,0x00,0x20, - 0x10,0x70,0x88,0x88,0x88,0x88,0x88,0x88, - 0x00,0x50,0x20,0x70,0x88,0x88,0x88,0x88, - 0x88,0x88,0x00,0x50,0x20,0x20,0x20,0x50, - 0x50,0x88,0x88,0x00,0x20,0x10,0x80,0x80, - 0xf0,0x88,0x88,0x88,0xf0,0x80,0x80,0xb0, - 0x88,0x88,0x88,0x90,0xa0,0x90,0x60,0x78, - 0x88,0x78,0x08,0x70,0x00,0x20,0x40,0x78, - 0x88,0x78,0x08,0x70,0x00,0x20,0x10,0x78, - 0x88,0x78,0x08,0x70,0x00,0x50,0x20,0x78, - 0x88,0x78,0x08,0x70,0x00,0xb0,0x68,0x78, - 0x88,0x78,0x08,0x70,0x00,0x50,0x78,0x88, - 0x78,0x08,0x70,0x00,0x20,0x50,0x20,0x6c, - 0x90,0x7c,0x12,0x6c,0x60,0x20,0x70,0x88, - 0x80,0x80,0x88,0x70,0x78,0x80,0xf8,0x88, - 0x70,0x00,0x20,0x40,0x78,0x80,0xf8,0x88, - 0x70,0x00,0x20,0x10,0x78,0x80,0xf8,0x88, - 0x70,0x00,0x50,0x20,0x78,0x80,0xf8,0x88, - 0x70,0x00,0x50,0x20,0x20,0x20,0x20,0xe0, - 0x00,0x40,0x80,0x20,0x20,0x20,0x20,0xe0, - 0x00,0x40,0x20,0x20,0x20,0x20,0x20,0xe0, - 0x00,0xa0,0x40,0x20,0x20,0x20,0x20,0xe0, - 0x00,0xa0,0x70,0x88,0x88,0x88,0x78,0x08, - 0x90,0x60,0xd0,0x88,0x88,0x88,0xc8,0xb0, - 0x00,0xb0,0x68,0x70,0x88,0x88,0x88,0x70, - 0x00,0x20,0x40,0x70,0x88,0x88,0x88,0x70, - 0x00,0x20,0x10,0x70,0x88,0x88,0x88,0x70, - 0x00,0x50,0x20,0x70,0x88,0x88,0x88,0x70, - 0x00,0xb0,0x68,0x70,0x88,0x88,0x88,0x70, - 0x00,0x50,0x20,0x00,0xf8,0x00,0x20,0xb8, - 0x64,0x54,0x4c,0x3a,0x68,0x98,0x88,0x88, - 0x88,0x00,0x20,0x40,0x68,0x98,0x88,0x88, - 0x88,0x00,0x20,0x10,0x68,0x98,0x88,0x88, - 0x88,0x00,0x50,0x20,0x68,0x98,0x88,0x88, - 0x88,0x00,0x50,0xf0,0x08,0x68,0x98,0x88, - 0x88,0x88,0x00,0x20,0x10,0x80,0x80,0xb0, - 0xc8,0x88,0x88,0xc8,0xb0,0x80,0x80,0xf0, - 0x08,0x68,0x98,0x88,0x88,0x88,0x00,0xd8, -}; - -FontDataBLF blf_font_scr12 = { - 0, -2, - 7, 10, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 16, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 7, -1}, - {1, 8, -3, 0, 7, 0}, - {3, 4, -2, -5, 7, 8}, - {7, 8, 0, 0, 7, 12}, - {5, 9, -1, 1, 7, 20}, - {6, 8, 0, 0, 7, 29}, - {6, 8, 0, 0, 7, 37}, - {3, 4, -2, -5, 7, 45}, - {3, 10, -2, 2, 7, 49}, - {3, 10, -2, 2, 7, 59}, - {5, 5, -1, -3, 7, 69}, - {5, 5, -1, -1, 7, 74}, - {2, 4, -2, 2, 7, 79}, - {5, 1, -1, -3, 7, 83}, - {1, 2, -3, 0, 7, 84}, - {5, 10, -1, 1, 7, 86}, - {5, 8, -1, 0, 7, 96}, - {3, 8, -2, 0, 7, 104}, - {5, 8, -1, 0, 7, 112}, - {5, 8, -1, 0, 7, 120}, - {5, 8, -1, 0, 7, 128}, - {5, 8, -1, 0, 7, 136}, - {5, 8, -1, 0, 7, 144}, - {5, 8, -1, 0, 7, 152}, - {5, 8, -1, 0, 7, 160}, - {5, 8, -1, 0, 7, 168}, - {1, 6, -3, 0, 7, 176}, - {2, 8, -2, 2, 7, 182}, - {5, 9, -1, 1, 7, 190}, - {5, 3, -1, -2, 7, 199}, - {5, 9, -1, 1, 7, 202}, - {5, 8, -1, 0, 7, 211}, - {5, 8, -1, 0, 7, 219}, - {5, 8, -1, 0, 7, 227}, - {5, 8, -1, 0, 7, 235}, - {5, 8, -1, 0, 7, 243}, - {5, 8, -1, 0, 7, 251}, - {5, 8, -1, 0, 7, 259}, - {5, 8, -1, 0, 7, 267}, - {5, 8, -1, 0, 7, 275}, - {5, 8, -1, 0, 7, 283}, - {3, 8, -2, 0, 7, 291}, - {5, 8, -1, 0, 7, 299}, - {5, 8, -1, 0, 7, 307}, - {5, 8, -1, 0, 7, 315}, - {5, 8, -1, 0, 7, 323}, - {5, 8, -1, 0, 7, 331}, - {5, 8, -1, 0, 7, 339}, - {5, 8, -1, 0, 7, 347}, - {5, 10, -1, 2, 7, 355}, - {5, 8, -1, 0, 7, 365}, - {5, 8, -1, 0, 7, 373}, - {5, 8, -1, 0, 7, 381}, - {5, 8, -1, 0, 7, 389}, - {5, 8, -1, 0, 7, 397}, - {5, 8, -1, 0, 7, 405}, - {5, 8, -1, 0, 7, 413}, - {5, 8, -1, 0, 7, 421}, - {5, 8, -1, 0, 7, 429}, - {3, 9, -2, 1, 7, 437}, - {5, 10, -1, 1, 7, 446}, - {3, 9, -2, 1, 7, 456}, - {5, 3, -1, -5, 7, 465}, - {7, 1, 0, 1, 7, 468}, - {3, 4, -2, -5, 7, 469}, - {5, 6, -1, 0, 7, 473}, - {5, 8, -1, 0, 7, 479}, - {5, 6, -1, 0, 7, 487}, - {5, 8, -1, 0, 7, 493}, - {5, 6, -1, 0, 7, 501}, - {5, 8, -1, 0, 7, 507}, - {5, 8, -1, 2, 7, 515}, - {5, 8, -1, 0, 7, 523}, - {3, 8, -2, 0, 7, 531}, - {4, 10, -1, 2, 7, 539}, - {5, 8, -1, 0, 7, 549}, - {3, 8, -2, 0, 7, 557}, - {5, 6, -1, 0, 7, 565}, - {5, 6, -1, 0, 7, 571}, - {5, 6, -1, 0, 7, 577}, - {5, 8, -1, 2, 7, 583}, - {5, 8, -1, 2, 7, 591}, - {5, 6, -1, 0, 7, 599}, - {5, 6, -1, 0, 7, 605}, - {4, 7, -1, 0, 7, 611}, - {5, 6, -1, 0, 7, 618}, - {5, 6, -1, 0, 7, 624}, - {5, 6, -1, 0, 7, 630}, - {5, 6, -1, 0, 7, 636}, - {5, 8, -1, 2, 7, 642}, - {5, 6, -1, 0, 7, 650}, - {5, 10, -1, 2, 7, 656}, - {1, 10, -3, 1, 7, 666}, - {5, 10, -1, 2, 7, 676}, - {6, 3, 0, -2, 7, 686}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 8, -3, 2, 7, 689}, - {5, 9, -1, 0, 7, 697}, - {5, 8, -1, 0, 7, 706}, - {4, 6, -1, -2, 7, 714}, - {5, 8, -1, 0, 7, 720}, - {1, 10, -3, 1, 7, 728}, - {5, 10, -1, 1, 7, 738}, - {3, 1, -2, -7, 7, 748}, - {6, 7, 0, 0, 7, 749}, - {4, 5, -1, -4, 7, 756}, - {6, 7, 0, 0, 7, 761}, - {5, 2, -1, -3, 7, 768}, - {4, 1, -1, -3, 7, 770}, - {6, 7, 0, 0, 7, 771}, - {3, 1, -2, -7, 7, 778}, - {4, 3, -1, -4, 7, 779}, - {5, 7, -1, 0, 7, 782}, - {3, 5, -2, -4, 7, 789}, - {3, 5, -2, -4, 7, 794}, - {2, 2, -2, -7, 7, 799}, - {5, 6, -1, 1, 7, 801}, - {6, 9, 0, 1, 7, 807}, - {1, 2, -3, -3, 7, 816}, - {2, 2, -2, 2, 7, 818}, - {3, 5, -2, -4, 7, 820}, - {4, 5, -1, -4, 7, 825}, - {6, 7, 0, 0, 7, 830}, - {5, 10, -1, 1, 7, 837}, - {5, 10, -1, 1, 7, 847}, - {5, 10, -1, 1, 7, 857}, - {5, 8, -1, 2, 7, 867}, - {5, 10, -1, 0, 7, 875}, - {5, 10, -1, 0, 7, 885}, - {5, 10, -1, 0, 7, 895}, - {5, 10, -1, 0, 7, 905}, - {5, 9, -1, 0, 7, 915}, - {5, 10, -1, 0, 7, 924}, - {6, 8, 0, 0, 7, 934}, - {5, 10, -1, 2, 7, 942}, - {5, 10, -1, 0, 7, 952}, - {5, 10, -1, 0, 7, 962}, - {5, 10, -1, 0, 7, 972}, - {5, 9, -1, 0, 7, 982}, - {3, 10, -2, 0, 7, 991}, - {3, 10, -2, 0, 7, 1001}, - {3, 10, -2, 0, 7, 1011}, - {3, 9, -2, 0, 7, 1021}, - {6, 8, 0, 0, 7, 1030}, - {5, 10, -1, 0, 7, 1038}, - {5, 10, -1, 0, 7, 1048}, - {5, 10, -1, 0, 7, 1058}, - {5, 10, -1, 0, 7, 1068}, - {5, 10, -1, 0, 7, 1078}, - {5, 9, -1, 0, 7, 1088}, - {5, 5, -1, -1, 7, 1097}, - {7, 7, 0, 0, 7, 1102}, - {5, 10, -1, 0, 7, 1109}, - {5, 10, -1, 0, 7, 1119}, - {5, 10, -1, 0, 7, 1129}, - {5, 9, -1, 0, 7, 1139}, - {5, 10, -1, 0, 7, 1148}, - {5, 9, -1, 0, 7, 1158}, - {5, 8, -1, 0, 7, 1167}, - {5, 8, -1, 0, 7, 1175}, - {5, 8, -1, 0, 7, 1183}, - {5, 8, -1, 0, 7, 1191}, - {5, 8, -1, 0, 7, 1199}, - {5, 7, -1, 0, 7, 1207}, - {5, 9, -1, 0, 7, 1214}, - {7, 5, 0, 0, 7, 1223}, - {5, 8, -1, 2, 7, 1228}, - {5, 8, -1, 0, 7, 1236}, - {5, 8, -1, 0, 7, 1244}, - {5, 8, -1, 0, 7, 1252}, - {5, 7, -1, 0, 7, 1260}, - {3, 8, -2, 0, 7, 1267}, - {3, 8, -2, 0, 7, 1275}, - {3, 8, -2, 0, 7, 1283}, - {3, 7, -2, 0, 7, 1291}, - {5, 9, -1, 0, 7, 1298}, - {5, 8, -1, 0, 7, 1307}, - {5, 8, -1, 0, 7, 1315}, - {5, 8, -1, 0, 7, 1323}, - {5, 8, -1, 0, 7, 1331}, - {5, 8, -1, 0, 7, 1339}, - {5, 7, -1, 0, 7, 1347}, - {5, 5, -1, -1, 7, 1354}, - {7, 5, 0, 0, 7, 1359}, - {5, 8, -1, 0, 7, 1364}, - {5, 8, -1, 0, 7, 1372}, - {5, 8, -1, 0, 7, 1380}, - {5, 7, -1, 0, 7, 1388}, - {5, 10, -1, 2, 7, 1395}, - {5, 10, -1, 2, 7, 1405}, - {5, 9, -1, 2, 7, 1415}, - }, - scr12_bitmap_data, - 0 -}; - -#endif - diff --git a/source/blender/blenfont/intern/blf_font_scr14.h b/source/blender/blenfont/intern/blf_font_scr14.h deleted file mode 100644 index d9cc0b84e14..00000000000 --- a/source/blender/blenfont/intern/blf_font_scr14.h +++ /dev/null @@ -1,504 +0,0 @@ -/** - * $Id: - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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. - * - * The Original Code is Copyright (C) 2009 Blender Foundation. - * All rights reserved. - * - * - * Contributor(s): Blender Foundation - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef BLF_FONT_SCR14_H -#define BLF_FONT_SCR14_H - -static unsigned char scr14_bitmap_data[]= { - 0x80,0x80,0x00,0x80,0x80,0x80,0x80,0x80, - 0x80,0xa0,0xa0,0xa0,0xa0,0x50,0x50,0xfc, - 0x28,0x28,0x28,0x7e,0x14,0x14,0x20,0x70, - 0xa8,0x28,0x30,0x60,0xa0,0xa8,0x70,0x20, - 0x98,0x54,0x54,0x2c,0x10,0x68,0x54,0x54, - 0x32,0x74,0x88,0x8c,0x90,0x60,0x20,0x50, - 0x48,0x30,0x80,0x40,0x20,0x20,0x20,0x40, - 0x40,0x80,0x80,0x80,0x80,0x80,0x40,0x40, - 0x20,0x80,0x40,0x40,0x20,0x20,0x20,0x20, - 0x20,0x40,0x40,0x80,0x20,0xa8,0x70,0x70, - 0xa8,0x20,0x20,0x20,0xf8,0x20,0x20,0x80, - 0x40,0x40,0xc0,0xf8,0x80,0x80,0x80,0x80, - 0x40,0x40,0x20,0x20,0x10,0x10,0x08,0x08, - 0x70,0x88,0x88,0xc8,0xa8,0x98,0x88,0x88, - 0x70,0xe0,0x40,0x40,0x40,0x40,0x40,0x40, - 0xc0,0x40,0xf8,0x80,0x40,0x20,0x10,0x08, - 0x88,0x88,0x70,0x70,0x88,0x08,0x08,0x70, - 0x08,0x08,0x88,0x70,0x10,0x10,0x10,0xf8, - 0x90,0x50,0x50,0x30,0x10,0x70,0x88,0x08, - 0x08,0x08,0xf0,0x80,0x80,0xf8,0x70,0x88, - 0x88,0x88,0x88,0xf0,0x80,0x88,0x70,0x40, - 0x40,0x40,0x20,0x20,0x10,0x10,0x08,0xf8, - 0x70,0x88,0x88,0x88,0x70,0x88,0x88,0x88, - 0x70,0x70,0x88,0x08,0x08,0x78,0x88,0x88, - 0x88,0x70,0x80,0x80,0x00,0x00,0x80,0x80, - 0x80,0x40,0x40,0xc0,0x00,0x00,0x40,0x40, - 0x08,0x10,0x20,0x40,0x80,0x40,0x20,0x10, - 0x08,0xf8,0x00,0xf8,0x80,0x40,0x20,0x10, - 0x08,0x10,0x20,0x40,0x80,0x20,0x20,0x00, - 0x20,0x20,0x10,0x88,0x88,0x70,0x38,0x40, - 0x98,0xa8,0xa8,0x98,0x88,0x48,0x30,0x88, - 0x88,0xf8,0x88,0x50,0x50,0x50,0x20,0x20, - 0xf0,0x88,0x88,0x88,0xf0,0x88,0x88,0x88, - 0xf0,0x70,0x88,0x80,0x80,0x80,0x80,0x80, - 0x88,0x70,0xf0,0x88,0x88,0x88,0x88,0x88, - 0x88,0x88,0xf0,0xf8,0x80,0x80,0x80,0xf0, - 0x80,0x80,0x80,0xf8,0x80,0x80,0x80,0x80, - 0xf0,0x80,0x80,0x80,0xf8,0x68,0x98,0x88, - 0x88,0x98,0x80,0x80,0x88,0x70,0x88,0x88, - 0x88,0x88,0xf8,0x88,0x88,0x88,0x88,0xe0, - 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0xe0, - 0x70,0x88,0x88,0x08,0x08,0x08,0x08,0x08, - 0x08,0x88,0x88,0x90,0xa0,0xc0,0xa0,0x90, - 0x88,0x88,0xf8,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x88,0x88,0x88,0xa8,0xa8, - 0xd8,0xd8,0x88,0x88,0x88,0x98,0x98,0xa8, - 0xa8,0xc8,0xc8,0x88,0x88,0x70,0x88,0x88, - 0x88,0x88,0x88,0x88,0x88,0x70,0x80,0x80, - 0x80,0x80,0xf0,0x88,0x88,0x88,0xf0,0x08, - 0x10,0x70,0xa8,0x88,0x88,0x88,0x88,0x88, - 0x88,0x70,0x88,0x88,0x90,0xa0,0xf0,0x88, - 0x88,0x88,0xf0,0x70,0x88,0x08,0x08,0x70, - 0x80,0x80,0x88,0x70,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0xf8,0x70,0x88,0x88, - 0x88,0x88,0x88,0x88,0x88,0x88,0x20,0x20, - 0x50,0x50,0x50,0x88,0x88,0x88,0x88,0x50, - 0x50,0xf8,0xa8,0xa8,0x88,0x88,0x88,0x88, - 0x88,0x88,0x50,0x50,0x20,0x50,0x50,0x88, - 0x88,0x20,0x20,0x20,0x20,0x20,0x50,0x50, - 0x88,0x88,0xf8,0x80,0x40,0x40,0x20,0x10, - 0x10,0x08,0xf8,0xf0,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0xf0,0x08,0x08, - 0x10,0x10,0x20,0x20,0x40,0x40,0x80,0x80, - 0xf0,0x10,0x10,0x10,0x10,0x10,0x10,0x10, - 0x10,0x10,0xf0,0x88,0x50,0x20,0xfe,0x20, - 0x40,0x80,0x80,0x68,0x98,0x88,0x78,0x08, - 0x88,0x70,0xb0,0xc8,0x88,0x88,0x88,0xc8, - 0xb0,0x80,0x80,0x70,0x88,0x80,0x80,0x80, - 0x88,0x70,0x68,0x98,0x88,0x88,0x88,0x98, - 0x68,0x08,0x08,0x70,0x88,0x80,0xf8,0x88, - 0x88,0x70,0x40,0x40,0x40,0x40,0x40,0x40, - 0xf0,0x40,0x38,0x70,0x88,0x08,0x68,0x98, - 0x88,0x88,0x88,0x98,0x68,0x88,0x88,0x88, - 0x88,0x88,0xc8,0xb0,0x80,0x80,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0x00,0x20,0x60, - 0x90,0x10,0x10,0x10,0x10,0x10,0x10,0x10, - 0x70,0x00,0x10,0x88,0x88,0x90,0xe0,0xa0, - 0x90,0x88,0x80,0x80,0x20,0x20,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0xa8,0xa8,0xa8, - 0xa8,0xa8,0xa8,0xd0,0x88,0x88,0x88,0x88, - 0x88,0xc8,0xb0,0x70,0x88,0x88,0x88,0x88, - 0x88,0x70,0x80,0x80,0x80,0xb0,0xc8,0x88, - 0x88,0x88,0xc8,0xb0,0x08,0x08,0x08,0x68, - 0x98,0x88,0x88,0x88,0x98,0x68,0x80,0x80, - 0x80,0x80,0x80,0xc8,0xb0,0x70,0x88,0x08, - 0x70,0x80,0x88,0x70,0x30,0x40,0x40,0x40, - 0x40,0x40,0xf0,0x40,0x40,0x68,0x98,0x88, - 0x88,0x88,0x88,0x88,0x20,0x20,0x50,0x50, - 0x88,0x88,0x88,0x50,0xa8,0xa8,0xa8,0xa8, - 0x88,0x88,0x88,0x88,0x50,0x20,0x50,0x88, - 0x88,0x70,0x88,0x08,0x68,0x98,0x88,0x88, - 0x88,0x88,0x88,0xf8,0x80,0x40,0x20,0x10, - 0x08,0xf8,0x18,0x20,0x20,0x20,0x20,0x20, - 0xc0,0x20,0x20,0x20,0x20,0x18,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0xc0,0x20,0x20,0x20,0x20,0x20, - 0x18,0x20,0x20,0x20,0x20,0xc0,0x98,0xb4, - 0x64,0x80,0x80,0x80,0x80,0x80,0x80,0x00, - 0x80,0x80,0x20,0x20,0x70,0x88,0x80,0x80, - 0x88,0x70,0x20,0x20,0xb0,0x48,0x40,0x40, - 0xf0,0x40,0x40,0x48,0x30,0x88,0x70,0x88, - 0x88,0x70,0x88,0x70,0x20,0xf8,0x20,0xf8, - 0x50,0x50,0x88,0x88,0x80,0x80,0x80,0x80, - 0x80,0x00,0x00,0x80,0x80,0x80,0x80,0x80, - 0x70,0x88,0x10,0x28,0x48,0x88,0x90,0xa0, - 0x40,0x88,0x70,0xd8,0x38,0x44,0x92,0xaa, - 0xa2,0xaa,0x92,0x44,0x38,0xf8,0x00,0x68, - 0x90,0x70,0x10,0x60,0x12,0x24,0x48,0x90, - 0x48,0x24,0x12,0x08,0x08,0xf8,0xf0,0x38, - 0x44,0xaa,0xaa,0xb2,0xaa,0xb2,0x44,0x38, - 0xe0,0x60,0x90,0x90,0x60,0xf8,0x00,0x20, - 0x20,0xf8,0x20,0x20,0xe0,0x40,0x20,0xa0, - 0x40,0xc0,0x20,0x40,0x20,0xc0,0x80,0x40, - 0x80,0x80,0xb4,0xc8,0x88,0x88,0x88,0x88, - 0x28,0x28,0x28,0x28,0x28,0x68,0xa8,0xa8, - 0xa8,0x7c,0x80,0x80,0xc0,0x20,0x40,0xe0, - 0x40,0x40,0xc0,0x40,0xf8,0x00,0x70,0x88, - 0x88,0x88,0x70,0x90,0x48,0x24,0x12,0x24, - 0x48,0x90,0x04,0x9e,0x54,0x2c,0x14,0xe8, - 0x44,0x40,0xc0,0x40,0x1c,0x08,0x84,0x54, - 0x28,0x10,0xe8,0x44,0x40,0xc0,0x40,0x04, - 0x9e,0x54,0x2c,0xd4,0x28,0x44,0x20,0xc0, - 0x70,0x88,0x80,0x40,0x20,0x20,0x00,0x00, - 0x20,0x20,0x88,0x88,0xf8,0x88,0x50,0x50, - 0x20,0x20,0x00,0x20,0x40,0x88,0x88,0xf8, - 0x88,0x50,0x50,0x20,0x20,0x00,0x20,0x10, - 0x88,0x88,0xf8,0x88,0x50,0x50,0x20,0x20, - 0x00,0x50,0x20,0x88,0x88,0xf8,0x88,0x50, - 0x50,0x20,0x20,0x00,0xb0,0x68,0x88,0x88, - 0xf8,0x88,0x50,0x50,0x20,0x20,0x00,0xd8, - 0x88,0x88,0xf8,0x88,0x50,0x50,0x20,0x20, - 0x20,0x50,0x20,0x9c,0x90,0xf0,0x90,0x5c, - 0x50,0x30,0x30,0x1c,0x60,0x10,0x20,0x70, - 0x88,0x80,0x80,0x80,0x80,0x80,0x88,0x70, - 0xf8,0x80,0x80,0x80,0xf0,0x80,0x80,0xf8, - 0x00,0x20,0x40,0xf8,0x80,0x80,0x80,0xf0, - 0x80,0x80,0xf8,0x00,0x20,0x10,0xf8,0x80, - 0x80,0x80,0xf0,0x80,0x80,0xf8,0x00,0x50, - 0x20,0xf8,0x80,0x80,0x80,0xf0,0x80,0x80, - 0xf8,0x00,0xd8,0xe0,0x40,0x40,0x40,0x40, - 0x40,0x40,0xe0,0x00,0x40,0x80,0xe0,0x40, - 0x40,0x40,0x40,0x40,0x40,0xe0,0x00,0x40, - 0x20,0xe0,0x40,0x40,0x40,0x40,0x40,0x40, - 0xe0,0x00,0xa0,0x40,0x70,0x20,0x20,0x20, - 0x20,0x20,0x20,0x70,0x00,0xd8,0x78,0x44, - 0x44,0x44,0xf4,0x44,0x44,0x44,0x78,0x88, - 0x98,0x98,0xa8,0xa8,0xc8,0xc8,0x88,0x00, - 0xb0,0x68,0x70,0x88,0x88,0x88,0x88,0x88, - 0x88,0x70,0x00,0x20,0x40,0x70,0x88,0x88, - 0x88,0x88,0x88,0x88,0x70,0x00,0x20,0x10, - 0x70,0x88,0x88,0x88,0x88,0x88,0x88,0x70, - 0x00,0x50,0x20,0x70,0x88,0x88,0x88,0x88, - 0x88,0x88,0x70,0x00,0xb0,0x68,0x70,0x88, - 0x88,0x88,0x88,0x88,0x88,0x70,0x00,0xd8, - 0x88,0x50,0x20,0x50,0x88,0xb8,0x44,0x64, - 0x64,0x54,0x4c,0x4c,0x44,0x3a,0x70,0x88, - 0x88,0x88,0x88,0x88,0x88,0x88,0x00,0x20, - 0x40,0x70,0x88,0x88,0x88,0x88,0x88,0x88, - 0x88,0x00,0x20,0x10,0x70,0x88,0x88,0x88, - 0x88,0x88,0x88,0x88,0x00,0x50,0x20,0x70, - 0x88,0x88,0x88,0x88,0x88,0x88,0x88,0x00, - 0xd8,0x20,0x20,0x20,0x20,0x50,0x50,0x88, - 0x88,0x00,0x20,0x10,0xe0,0x40,0x78,0x44, - 0x44,0x44,0x78,0x40,0xe0,0xb0,0x88,0x88, - 0x88,0x90,0xa0,0x90,0x90,0x60,0x68,0x98, - 0x88,0x78,0x08,0x88,0x70,0x00,0x20,0x40, - 0x68,0x98,0x88,0x78,0x08,0x88,0x70,0x00, - 0x20,0x10,0x68,0x98,0x88,0x78,0x08,0x88, - 0x70,0x00,0x50,0x20,0x68,0x98,0x88,0x78, - 0x08,0x88,0x70,0x00,0xb0,0x68,0x68,0x98, - 0x88,0x78,0x08,0x88,0x70,0x00,0xd8,0x68, - 0x98,0x88,0x78,0x08,0x88,0x70,0x00,0x20, - 0x50,0x20,0x6c,0x92,0x90,0x7e,0x12,0x92, - 0x6c,0x60,0x10,0x20,0x70,0x88,0x80,0x80, - 0x80,0x88,0x70,0x70,0x88,0x80,0xf8,0x88, - 0x88,0x70,0x00,0x20,0x40,0x70,0x88,0x80, - 0xf8,0x88,0x88,0x70,0x00,0x20,0x10,0x70, - 0x88,0x80,0xf8,0x88,0x88,0x70,0x00,0x50, - 0x20,0x70,0x88,0x80,0xf8,0x88,0x88,0x70, - 0x00,0xd8,0x20,0x20,0x20,0x20,0x20,0x20, - 0xe0,0x00,0x20,0x40,0x20,0x20,0x20,0x20, - 0x20,0x20,0xe0,0x00,0x20,0x10,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0x00,0xa0,0x40, - 0x20,0x20,0x20,0x20,0x20,0x20,0xe0,0x00, - 0xd8,0x70,0x88,0x88,0x88,0x88,0x88,0x78, - 0x10,0xd0,0x20,0xd0,0x88,0x88,0x88,0x88, - 0x88,0xc8,0xb0,0x00,0xb0,0x68,0x70,0x88, - 0x88,0x88,0x88,0x88,0x70,0x00,0x20,0x40, - 0x70,0x88,0x88,0x88,0x88,0x88,0x70,0x00, - 0x20,0x10,0x70,0x88,0x88,0x88,0x88,0x88, - 0x70,0x00,0x50,0x20,0x70,0x88,0x88,0x88, - 0x88,0x88,0x70,0x00,0xb0,0x68,0x70,0x88, - 0x88,0x88,0x88,0x88,0x70,0x00,0xd8,0x10, - 0x10,0x00,0xfe,0x00,0x10,0x10,0xb8,0x44, - 0x64,0x54,0x4c,0x44,0x3a,0x68,0x98,0x88, - 0x88,0x88,0x88,0x88,0x00,0x20,0x40,0x68, - 0x98,0x88,0x88,0x88,0x88,0x88,0x00,0x20, - 0x10,0x68,0x98,0x88,0x88,0x88,0x88,0x88, - 0x00,0x50,0x20,0x68,0x98,0x88,0x88,0x88, - 0x88,0x88,0x00,0xd8,0x70,0x88,0x08,0x68, - 0x98,0x88,0x88,0x88,0x88,0x88,0x00,0x20, - 0x10,0xe0,0x40,0x58,0x64,0x44,0x44,0x44, - 0x64,0x58,0x40,0xc0,0x70,0x88,0x08,0x68, - 0x98,0x88,0x88,0x88,0x88,0x88,0x00,0xd8, -}; - -FontDataBLF blf_font_scr14 = { - 0, -3, - 7, 11, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 16, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 7, -1}, - {1, 9, -3, 0, 7, 0}, - {3, 4, -2, -5, 7, 9}, - {7, 9, 0, 0, 7, 13}, - {5, 10, -1, 1, 7, 22}, - {7, 9, 0, 0, 7, 32}, - {6, 9, 0, 0, 7, 41}, - {3, 4, -2, -5, 7, 50}, - {3, 11, -2, 1, 7, 54}, - {3, 11, -2, 1, 7, 65}, - {5, 6, -1, -2, 7, 76}, - {5, 5, -1, -2, 7, 82}, - {2, 4, -2, 2, 7, 87}, - {5, 1, -1, -4, 7, 91}, - {1, 2, -3, 0, 7, 92}, - {5, 10, -1, 0, 7, 94}, - {5, 9, -1, 0, 7, 104}, - {3, 9, -2, 0, 7, 113}, - {5, 9, -1, 0, 7, 122}, - {5, 9, -1, 0, 7, 131}, - {5, 9, -1, 0, 7, 140}, - {5, 9, -1, 0, 7, 149}, - {5, 9, -1, 0, 7, 158}, - {5, 9, -1, 0, 7, 167}, - {5, 9, -1, 0, 7, 176}, - {5, 9, -1, 0, 7, 185}, - {1, 6, -3, 0, 7, 194}, - {2, 8, -2, 1, 7, 200}, - {5, 9, -1, 0, 7, 208}, - {5, 3, -1, -3, 7, 217}, - {5, 9, -1, 0, 7, 220}, - {5, 9, -1, 0, 7, 229}, - {5, 9, -1, 0, 7, 238}, - {5, 9, -1, 0, 7, 247}, - {5, 9, -1, 0, 7, 256}, - {5, 9, -1, 0, 7, 265}, - {5, 9, -1, 0, 7, 274}, - {5, 9, -1, 0, 7, 283}, - {5, 9, -1, 0, 7, 292}, - {5, 9, -1, 0, 7, 301}, - {5, 9, -1, 0, 7, 310}, - {3, 9, -2, 0, 7, 319}, - {5, 9, -1, 0, 7, 328}, - {5, 9, -1, 0, 7, 337}, - {5, 9, -1, 0, 7, 346}, - {5, 9, -1, 0, 7, 355}, - {5, 9, -1, 0, 7, 364}, - {5, 9, -1, 0, 7, 373}, - {5, 9, -1, 0, 7, 382}, - {5, 11, -1, 2, 7, 391}, - {5, 9, -1, 0, 7, 402}, - {5, 9, -1, 0, 7, 411}, - {5, 9, -1, 0, 7, 420}, - {5, 9, -1, 0, 7, 429}, - {5, 9, -1, 0, 7, 438}, - {5, 9, -1, 0, 7, 447}, - {5, 9, -1, 0, 7, 456}, - {5, 9, -1, 0, 7, 465}, - {5, 9, -1, 0, 7, 474}, - {4, 11, -2, 1, 7, 483}, - {5, 10, -1, 0, 7, 494}, - {4, 11, -1, 1, 7, 504}, - {5, 3, -1, -6, 7, 515}, - {7, 1, 0, 2, 7, 518}, - {3, 4, -2, -5, 7, 519}, - {5, 7, -1, 0, 7, 523}, - {5, 9, -1, 0, 7, 530}, - {5, 7, -1, 0, 7, 539}, - {5, 9, -1, 0, 7, 546}, - {5, 7, -1, 0, 7, 555}, - {5, 9, -1, 0, 7, 562}, - {5, 10, -1, 3, 7, 571}, - {5, 9, -1, 0, 7, 581}, - {3, 9, -2, 0, 7, 590}, - {4, 12, -1, 3, 7, 599}, - {5, 9, -1, 0, 7, 611}, - {3, 9, -2, 0, 7, 620}, - {5, 7, -1, 0, 7, 629}, - {5, 7, -1, 0, 7, 636}, - {5, 7, -1, 0, 7, 643}, - {5, 10, -1, 3, 7, 650}, - {5, 10, -1, 3, 7, 660}, - {5, 7, -1, 0, 7, 670}, - {5, 7, -1, 0, 7, 677}, - {4, 9, -1, 0, 7, 684}, - {5, 7, -1, 0, 7, 693}, - {5, 7, -1, 0, 7, 700}, - {5, 7, -1, 0, 7, 707}, - {5, 7, -1, 0, 7, 714}, - {5, 10, -1, 3, 7, 721}, - {5, 7, -1, 0, 7, 731}, - {5, 12, -1, 2, 7, 738}, - {1, 12, -3, 2, 7, 750}, - {5, 12, -1, 2, 7, 762}, - {6, 3, 0, -3, 7, 774}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {1, 9, -3, 2, 7, 777}, - {5, 10, -1, 0, 7, 786}, - {5, 9, -1, 0, 7, 796}, - {5, 6, -1, -3, 7, 805}, - {5, 9, -1, 0, 7, 811}, - {1, 12, -3, 2, 7, 820}, - {5, 11, -1, 2, 7, 832}, - {5, 1, -1, -8, 7, 843}, - {7, 9, 0, 0, 7, 844}, - {5, 7, -1, -2, 7, 853}, - {7, 7, 0, 0, 7, 860}, - {5, 3, -1, -3, 7, 867}, - {4, 1, -1, -4, 7, 870}, - {7, 9, 0, 0, 7, 871}, - {3, 1, -2, -8, 7, 880}, - {4, 4, -1, -4, 7, 881}, - {5, 7, -1, 0, 7, 885}, - {3, 5, -2, -5, 7, 892}, - {3, 5, -2, -5, 7, 897}, - {2, 2, -3, -8, 7, 902}, - {6, 8, -1, 2, 7, 904}, - {6, 10, 0, 1, 7, 912}, - {1, 2, -3, -3, 7, 922}, - {3, 3, -2, 3, 7, 924}, - {3, 5, -2, -5, 7, 927}, - {5, 7, -1, -2, 7, 932}, - {7, 7, 0, 0, 7, 939}, - {7, 10, 0, 0, 7, 946}, - {6, 11, 0, 1, 7, 956}, - {7, 9, 0, -1, 7, 967}, - {5, 10, -1, 3, 7, 976}, - {5, 11, -1, 0, 7, 986}, - {5, 11, -1, 0, 7, 997}, - {5, 11, -1, 0, 7, 1008}, - {5, 11, -1, 0, 7, 1019}, - {5, 10, -1, 0, 7, 1030}, - {5, 11, -1, 0, 7, 1040}, - {6, 9, 0, 0, 7, 1051}, - {5, 12, -1, 3, 7, 1060}, - {5, 11, -1, 0, 7, 1072}, - {5, 11, -1, 0, 7, 1083}, - {5, 11, -1, 0, 7, 1094}, - {5, 10, -1, 0, 7, 1105}, - {3, 11, -2, 0, 7, 1115}, - {3, 11, -2, 0, 7, 1126}, - {3, 11, -2, 0, 7, 1137}, - {5, 10, -1, 0, 7, 1148}, - {6, 9, 0, 0, 7, 1158}, - {5, 11, -1, 0, 7, 1167}, - {5, 11, -1, 0, 7, 1178}, - {5, 11, -1, 0, 7, 1189}, - {5, 11, -1, 0, 7, 1200}, - {5, 11, -1, 0, 7, 1211}, - {5, 10, -1, 0, 7, 1222}, - {5, 5, -1, -1, 7, 1232}, - {7, 9, 0, 0, 7, 1237}, - {5, 11, -1, 0, 7, 1246}, - {5, 11, -1, 0, 7, 1257}, - {5, 11, -1, 0, 7, 1268}, - {5, 10, -1, 0, 7, 1279}, - {5, 11, -1, 0, 7, 1289}, - {6, 9, 0, 0, 7, 1300}, - {5, 9, -1, 0, 7, 1309}, - {5, 10, -1, 0, 7, 1318}, - {5, 10, -1, 0, 7, 1328}, - {5, 10, -1, 0, 7, 1338}, - {5, 10, -1, 0, 7, 1348}, - {5, 9, -1, 0, 7, 1358}, - {5, 11, -1, 0, 7, 1367}, - {7, 7, 0, 0, 7, 1378}, - {5, 10, -1, 3, 7, 1385}, - {5, 10, -1, 0, 7, 1395}, - {5, 10, -1, 0, 7, 1405}, - {5, 10, -1, 0, 7, 1415}, - {5, 9, -1, 0, 7, 1425}, - {3, 10, -2, 0, 7, 1434}, - {4, 10, -2, 0, 7, 1444}, - {3, 10, -2, 0, 7, 1454}, - {5, 9, -2, 0, 7, 1464}, - {5, 11, -1, 0, 7, 1473}, - {5, 10, -1, 0, 7, 1484}, - {5, 10, -1, 0, 7, 1494}, - {5, 10, -1, 0, 7, 1504}, - {5, 10, -1, 0, 7, 1514}, - {5, 10, -1, 0, 7, 1524}, - {5, 9, -1, 0, 7, 1534}, - {7, 7, 0, 0, 7, 1543}, - {7, 7, 0, 0, 7, 1550}, - {5, 10, -1, 0, 7, 1557}, - {5, 10, -1, 0, 7, 1567}, - {5, 10, -1, 0, 7, 1577}, - {5, 9, -1, 0, 7, 1587}, - {5, 13, -1, 3, 7, 1596}, - {6, 11, 0, 2, 7, 1609}, - {5, 12, -1, 3, 7, 1620}, - }, - scr14_bitmap_data, - 0 -}; - -#endif /* BLF_FONT_SCR14_H */ diff --git a/source/blender/blenfont/intern/blf_font_scr15.h b/source/blender/blenfont/intern/blf_font_scr15.h deleted file mode 100644 index f7719cdd051..00000000000 --- a/source/blender/blenfont/intern/blf_font_scr15.h +++ /dev/null @@ -1,519 +0,0 @@ -/** - * $Id: - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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. - * - * The Original Code is Copyright (C) 2009 Blender Foundation. - * All rights reserved. - * - * - * Contributor(s): Blender Foundation - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef BLF_FONT_SCR15_H -#define BLF_FONT_SCR15_H - -static unsigned char scr15_bitmap_data[]= { - 0x80,0x80,0x00,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x90,0x90,0x90,0x90,0x48,0x48, - 0x48,0xfe,0x24,0x24,0x24,0x7f,0x12,0x12, - 0x20,0x70,0xa8,0xa8,0x28,0x30,0x60,0xa0, - 0xa8,0xa8,0x70,0x20,0x8c,0x52,0x52,0x2c, - 0x10,0x10,0x68,0x94,0x94,0x62,0x72,0x8c, - 0x84,0x8a,0x50,0x20,0x30,0x48,0x48,0x30, - 0x80,0x40,0x60,0x60,0x10,0x20,0x40,0x40, - 0x80,0x80,0x80,0x80,0x80,0x40,0x40,0x20, - 0x10,0x80,0x40,0x20,0x20,0x10,0x10,0x10, - 0x10,0x10,0x20,0x20,0x40,0x80,0x20,0xa8, - 0x70,0x70,0xa8,0x20,0x10,0x10,0x10,0xfe, - 0x10,0x10,0x10,0x80,0x40,0x20,0x60,0x60, - 0xfc,0xc0,0xc0,0x80,0x80,0x40,0x40,0x20, - 0x20,0x10,0x10,0x08,0x08,0x04,0x04,0x78, - 0x84,0x84,0xc4,0xa4,0x94,0x8c,0x84,0x84, - 0x78,0xe0,0x40,0x40,0x40,0x40,0x40,0x40, - 0x40,0xc0,0x40,0xfc,0x80,0x40,0x20,0x10, - 0x08,0x04,0x84,0x84,0x78,0x78,0x84,0x04, - 0x04,0x04,0x38,0x04,0x04,0x84,0x78,0x08, - 0x08,0x08,0xfc,0x88,0x48,0x48,0x28,0x18, - 0x08,0x78,0x84,0x04,0x04,0x04,0xf8,0x80, - 0x80,0x80,0xfc,0x78,0x84,0x84,0x84,0x84, - 0xf8,0x80,0x80,0x84,0x78,0x20,0x20,0x20, - 0x10,0x10,0x08,0x08,0x04,0x04,0xfc,0x78, - 0x84,0x84,0x84,0x84,0x78,0x84,0x84,0x84, - 0x78,0x78,0x84,0x04,0x04,0x7c,0x84,0x84, - 0x84,0x84,0x78,0xc0,0xc0,0x00,0x00,0x00, - 0xc0,0xc0,0x80,0x40,0xc0,0xc0,0x00,0x00, - 0x00,0xc0,0xc0,0x04,0x08,0x10,0x20,0x40, - 0x80,0x40,0x20,0x10,0x08,0x04,0xfc,0x00, - 0x00,0xfc,0x80,0x40,0x20,0x10,0x08,0x04, - 0x08,0x10,0x20,0x40,0x80,0x10,0x10,0x00, - 0x10,0x10,0x08,0x04,0x84,0x84,0x78,0x38, - 0x44,0x80,0x98,0xa4,0xa4,0x9c,0x84,0x48, - 0x30,0x84,0x84,0xfc,0x84,0x48,0x48,0x48, - 0x30,0x30,0x30,0xf8,0x84,0x84,0x84,0x84, - 0xf8,0x84,0x84,0x84,0xf8,0x78,0x84,0x84, - 0x80,0x80,0x80,0x80,0x84,0x84,0x78,0xf0, - 0x88,0x84,0x84,0x84,0x84,0x84,0x84,0x88, - 0xf0,0xfc,0x80,0x80,0x80,0x80,0xf8,0x80, - 0x80,0x80,0xfc,0x80,0x80,0x80,0x80,0x80, - 0xf8,0x80,0x80,0x80,0xfc,0x74,0x8c,0x84, - 0x84,0x84,0x9c,0x80,0x80,0x84,0x78,0x84, - 0x84,0x84,0x84,0x84,0xfc,0x84,0x84,0x84, - 0x84,0xe0,0x40,0x40,0x40,0x40,0x40,0x40, - 0x40,0x40,0xe0,0x70,0x88,0x88,0x08,0x08, - 0x08,0x08,0x08,0x08,0x08,0x84,0x84,0x88, - 0x90,0xa0,0xc0,0xa0,0x90,0x88,0x84,0xfc, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x82,0x82,0x92,0x92,0xaa,0xaa,0xc6, - 0xc6,0x82,0x82,0x84,0x8c,0x8c,0x94,0x94, - 0xa4,0xa4,0xc4,0xc4,0x84,0x78,0x84,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x78,0x80, - 0x80,0x80,0x80,0xf8,0x84,0x84,0x84,0x84, - 0xf8,0x04,0x08,0x10,0x78,0xa4,0x84,0x84, - 0x84,0x84,0x84,0x84,0x84,0x78,0x84,0x84, - 0x88,0x90,0xf8,0x84,0x84,0x84,0x84,0xf8, - 0x78,0x84,0x84,0x04,0x18,0x60,0x80,0x84, - 0x84,0x78,0x10,0x10,0x10,0x10,0x10,0x10, - 0x10,0x10,0x10,0xfe,0x78,0x84,0x84,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x30,0x30, - 0x30,0x48,0x48,0x48,0x84,0x84,0x84,0x84, - 0x44,0x44,0x44,0xaa,0xaa,0xaa,0x92,0x92, - 0x92,0x82,0x84,0x84,0x48,0x48,0x30,0x30, - 0x48,0x48,0x84,0x84,0x10,0x10,0x10,0x10, - 0x10,0x28,0x44,0x44,0x82,0x82,0xfc,0x80, - 0x40,0x40,0x20,0x10,0x08,0x08,0x04,0xfc, - 0xf0,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0xf0,0x04,0x04,0x08, - 0x08,0x10,0x10,0x20,0x20,0x40,0x40,0x80, - 0x80,0xf0,0x10,0x10,0x10,0x10,0x10,0x10, - 0x10,0x10,0x10,0x10,0x10,0xf0,0x88,0x50, - 0x20,0xff,0x20,0x40,0xc0,0xc0,0x74,0x88, - 0x88,0x78,0x08,0x88,0x70,0xb8,0xc4,0x84, - 0x84,0x84,0xc4,0xb8,0x80,0x80,0x80,0x78, - 0x84,0x80,0x80,0x80,0x84,0x78,0x74,0x8c, - 0x84,0x84,0x84,0x8c,0x74,0x04,0x04,0x04, - 0x78,0x84,0x80,0xfc,0x84,0x84,0x78,0x20, - 0x20,0x20,0x20,0x20,0x20,0xf8,0x20,0x20, - 0x1c,0x78,0x84,0x04,0x04,0x74,0x8c,0x84, - 0x84,0x84,0x8c,0x74,0x84,0x84,0x84,0x84, - 0x84,0xc4,0xb8,0x80,0x80,0x80,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0x00,0x20,0x20, - 0x70,0x88,0x08,0x08,0x08,0x08,0x08,0x08, - 0x08,0x08,0x38,0x00,0x08,0x08,0x84,0x88, - 0x90,0xe0,0xa0,0x90,0x88,0x80,0x80,0x80, - 0x20,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0x20,0xe0,0x92,0x92,0x92,0x92,0x92,0x92, - 0xec,0x84,0x84,0x84,0x84,0x84,0xc4,0xb8, - 0x78,0x84,0x84,0x84,0x84,0x84,0x78,0x80, - 0x80,0x80,0x80,0xb8,0xc4,0x84,0x84,0x84, - 0xc4,0xb8,0x04,0x04,0x04,0x04,0x74,0x8c, - 0x84,0x84,0x84,0x8c,0x74,0x80,0x80,0x80, - 0x80,0x80,0xc4,0xb8,0x78,0x84,0x04,0x78, - 0x80,0x84,0x78,0x1c,0x20,0x20,0x20,0x20, - 0x20,0xf8,0x20,0x20,0x74,0x8c,0x84,0x84, - 0x84,0x84,0x84,0x30,0x30,0x48,0x48,0x84, - 0x84,0x84,0x6c,0x92,0x92,0x92,0x92,0x82, - 0x82,0x84,0x84,0x48,0x30,0x48,0x84,0x84, - 0x78,0x84,0x04,0x04,0x74,0x8c,0x84,0x84, - 0x84,0x84,0x84,0xfc,0x80,0x40,0x20,0x10, - 0x08,0xfc,0x1c,0x20,0x20,0x20,0x20,0x20, - 0xc0,0x20,0x20,0x20,0x20,0x20,0x1c,0x80, - 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x80,0xe0,0x10,0x10, - 0x10,0x10,0x10,0x0c,0x10,0x10,0x10,0x10, - 0x10,0xe0,0x98,0xb4,0x64,0x80,0x80,0x80, - 0x80,0x80,0x80,0x80,0x00,0x80,0x80,0x20, - 0x20,0x70,0x88,0x80,0x80,0x88,0x70,0x20, - 0x20,0xb8,0x44,0x40,0x40,0xf0,0x40,0x40, - 0x40,0x48,0x30,0x84,0x78,0x84,0x84,0x84, - 0x78,0x84,0x38,0x10,0x7c,0x10,0x7c,0x28, - 0x44,0x44,0x82,0x82,0x80,0x80,0x80,0x80, - 0x80,0x80,0x00,0x00,0x80,0x80,0x80,0x80, - 0x80,0x80,0x78,0x84,0x04,0x18,0x24,0x44, - 0x84,0x88,0x90,0x60,0x80,0x84,0x78,0xd8, - 0x38,0x44,0x92,0xaa,0xa2,0xaa,0x92,0x44, - 0x38,0xf8,0x00,0x68,0x90,0x70,0x10,0x60, - 0x09,0x12,0x24,0x48,0x90,0x48,0x24,0x12, - 0x09,0x04,0x04,0xfc,0xfc,0x38,0x44,0xaa, - 0xaa,0xb2,0xaa,0xb2,0x44,0x38,0xf0,0x60, - 0x90,0x90,0x60,0xfe,0x00,0x10,0x10,0x10, - 0xfe,0x10,0x10,0x10,0xf0,0x40,0x20,0x90, - 0x60,0xe0,0x10,0x60,0x10,0xe0,0x80,0x40, - 0x80,0x80,0x80,0xb4,0xc8,0x88,0x88,0x88, - 0x88,0x88,0x24,0x24,0x24,0x24,0x24,0x24, - 0x64,0xa4,0xa4,0xa4,0xa4,0x7e,0xc0,0xc0, - 0x20,0x40,0xe0,0x40,0x40,0xc0,0x40,0xf8, - 0x00,0x70,0x88,0x88,0x88,0x70,0x90,0x48, - 0x24,0x12,0x09,0x12,0x24,0x48,0x90,0x04, - 0x9e,0x54,0x2c,0x14,0xe8,0x44,0x42,0xc0, - 0x40,0x1e,0x08,0x84,0x52,0x2c,0x10,0xe8, - 0x44,0x42,0xc0,0x40,0x04,0x9e,0x54,0x2c, - 0xd4,0x28,0x44,0x22,0xc0,0x78,0x84,0x84, - 0x80,0x40,0x20,0x20,0x00,0x20,0x20,0x84, - 0x84,0xfc,0x84,0x48,0x48,0x30,0x30,0x00, - 0x20,0x40,0x84,0x84,0xfc,0x84,0x48,0x48, - 0x30,0x30,0x00,0x10,0x08,0x84,0x84,0xfc, - 0x84,0x48,0x48,0x30,0x30,0x00,0x48,0x30, - 0x84,0x84,0xfc,0x84,0x48,0x48,0x30,0x30, - 0x00,0x98,0x64,0x84,0x84,0xfc,0x84,0x48, - 0x48,0x30,0x30,0x00,0x6c,0x84,0x84,0xfc, - 0x84,0x48,0x48,0x30,0x30,0x30,0x48,0x30, - 0x9e,0x90,0x90,0xf0,0x90,0x5c,0x50,0x50, - 0x30,0x1e,0x30,0x08,0x10,0x78,0x84,0x84, - 0x80,0x80,0x80,0x80,0x84,0x84,0x78,0xfc, - 0x80,0x80,0x80,0xf8,0x80,0x80,0xfc,0x00, - 0x20,0x40,0xfc,0x80,0x80,0x80,0xf8,0x80, - 0x80,0xfc,0x00,0x10,0x08,0xfc,0x80,0x80, - 0x80,0xf8,0x80,0x80,0xfc,0x00,0x48,0x30, - 0xfc,0x80,0x80,0x80,0xf8,0x80,0x80,0xfc, - 0x00,0x6c,0xe0,0x40,0x40,0x40,0x40,0x40, - 0x40,0xe0,0x00,0x40,0x80,0xe0,0x40,0x40, - 0x40,0x40,0x40,0x40,0xe0,0x00,0x40,0x20, - 0xe0,0x40,0x40,0x40,0x40,0x40,0x40,0xe0, - 0x00,0x90,0x60,0x70,0x20,0x20,0x20,0x20, - 0x20,0x20,0x70,0x00,0xd8,0x78,0x44,0x42, - 0x42,0x42,0xf2,0x42,0x42,0x44,0x78,0x84, - 0x8c,0x94,0x94,0xa4,0xa4,0xc4,0x84,0x00, - 0x98,0x64,0x78,0x84,0x84,0x84,0x84,0x84, - 0x84,0x78,0x00,0x20,0x40,0x78,0x84,0x84, - 0x84,0x84,0x84,0x84,0x78,0x00,0x10,0x08, - 0x78,0x84,0x84,0x84,0x84,0x84,0x84,0x78, - 0x00,0x48,0x30,0x78,0x84,0x84,0x84,0x84, - 0x84,0x84,0x78,0x00,0x98,0x64,0x78,0x84, - 0x84,0x84,0x84,0x84,0x84,0x78,0x00,0x6c, - 0x84,0x48,0x30,0x30,0x48,0x84,0xbc,0x42, - 0x62,0x52,0x52,0x4a,0x4a,0x46,0x42,0x3d, - 0x78,0x84,0x84,0x84,0x84,0x84,0x84,0x84, - 0x00,0x20,0x40,0x78,0x84,0x84,0x84,0x84, - 0x84,0x84,0x84,0x00,0x10,0x08,0x78,0x84, - 0x84,0x84,0x84,0x84,0x84,0x84,0x00,0x48, - 0x30,0x78,0x84,0x84,0x84,0x84,0x84,0x84, - 0x84,0x00,0x6c,0x10,0x10,0x10,0x10,0x28, - 0x44,0x44,0x82,0x00,0x10,0x08,0xe0,0x40, - 0x7c,0x42,0x42,0x42,0x42,0x7c,0x40,0xe0, - 0x98,0xa4,0x84,0x84,0x84,0x88,0xb0,0x88, - 0x88,0x70,0x74,0x88,0x88,0x78,0x08,0x88, - 0x70,0x00,0x20,0x40,0x74,0x88,0x88,0x78, - 0x08,0x88,0x70,0x00,0x20,0x10,0x74,0x88, - 0x88,0x78,0x08,0x88,0x70,0x00,0x48,0x30, - 0x74,0x88,0x88,0x78,0x08,0x88,0x70,0x00, - 0x98,0x64,0x74,0x88,0x88,0x78,0x08,0x88, - 0x70,0x00,0xd8,0x74,0x88,0x88,0x78,0x08, - 0x88,0x70,0x00,0x30,0x48,0x30,0x6c,0x92, - 0x90,0x7e,0x12,0x92,0x6c,0x30,0x08,0x10, - 0x78,0x84,0x80,0x80,0x80,0x84,0x78,0x78, - 0x84,0x80,0xfc,0x84,0x84,0x78,0x00,0x20, - 0x40,0x78,0x84,0x80,0xfc,0x84,0x84,0x78, - 0x00,0x10,0x08,0x78,0x84,0x80,0xfc,0x84, - 0x84,0x78,0x00,0x48,0x30,0x78,0x84,0x80, - 0xfc,0x84,0x84,0x78,0x00,0x6c,0x20,0x20, - 0x20,0x20,0x20,0x20,0xe0,0x00,0x40,0x80, - 0x20,0x20,0x20,0x20,0x20,0x20,0xe0,0x00, - 0x40,0x20,0x20,0x20,0x20,0x20,0x20,0x20, - 0xe0,0x00,0x90,0x60,0x10,0x10,0x10,0x10, - 0x10,0x10,0x70,0x00,0xd8,0x78,0x84,0x84, - 0x84,0x84,0x84,0x7c,0x04,0xc8,0x30,0xc8, - 0x84,0x84,0x84,0x84,0x84,0xc4,0xb8,0x00, - 0x98,0x64,0x78,0x84,0x84,0x84,0x84,0x84, - 0x78,0x00,0x20,0x40,0x78,0x84,0x84,0x84, - 0x84,0x84,0x78,0x00,0x10,0x08,0x78,0x84, - 0x84,0x84,0x84,0x84,0x78,0x00,0x48,0x30, - 0x78,0x84,0x84,0x84,0x84,0x84,0x78,0x00, - 0x98,0x64,0x78,0x84,0x84,0x84,0x84,0x84, - 0x78,0x00,0x00,0x6c,0x30,0x00,0x00,0xfc, - 0x00,0x00,0x30,0xbc,0x62,0x52,0x4a,0x46, - 0x42,0x3d,0x74,0x8c,0x84,0x84,0x84,0x84, - 0x84,0x00,0x20,0x40,0x74,0x8c,0x84,0x84, - 0x84,0x84,0x84,0x00,0x20,0x10,0x74,0x8c, - 0x84,0x84,0x84,0x84,0x84,0x00,0x48,0x30, - 0x74,0x8c,0x84,0x84,0x84,0x84,0x84,0x00, - 0x00,0x6c,0x78,0x84,0x04,0x04,0x74,0x8c, - 0x84,0x84,0x84,0x84,0x84,0x00,0x20,0x10, - 0xe0,0x40,0x40,0x5c,0x62,0x42,0x42,0x42, - 0x62,0x5c,0x40,0x40,0xc0,0x78,0x84,0x04, - 0x04,0x74,0x8c,0x84,0x84,0x84,0x84,0x84, - 0x00,0x00,0x6c, -}; - -FontDataBLF blf_font_scr15 = { - 0, -4, - 8, 11, - { - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 20, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 8, -1}, - {1, 10, -3, 0, 8, 0}, - {4, 4, -2, -6, 8, 10}, - {8, 10, 0, 0, 8, 14}, - {5, 12, -1, 1, 8, 24}, - {7, 10, 0, 0, 8, 36}, - {7, 10, 0, 0, 8, 46}, - {3, 4, -2, -6, 8, 56}, - {4, 13, -2, 2, 8, 60}, - {4, 13, -2, 2, 8, 73}, - {5, 6, -1, -2, 8, 86}, - {7, 7, 0, -1, 8, 92}, - {3, 5, -2, 3, 8, 99}, - {6, 1, -1, -4, 8, 104}, - {2, 2, -3, 0, 8, 105}, - {6, 12, -1, 1, 8, 107}, - {6, 10, -1, 0, 8, 119}, - {3, 10, -3, 0, 8, 129}, - {6, 10, -1, 0, 8, 139}, - {6, 10, -1, 0, 8, 149}, - {6, 10, -1, 0, 8, 159}, - {6, 10, -1, 0, 8, 169}, - {6, 10, -1, 0, 8, 179}, - {6, 10, -1, 0, 8, 189}, - {6, 10, -1, 0, 8, 199}, - {6, 10, -1, 0, 8, 209}, - {2, 7, -3, 0, 8, 219}, - {2, 9, -3, 2, 8, 226}, - {6, 11, -1, 1, 8, 235}, - {6, 4, -1, -3, 8, 246}, - {6, 11, -1, 1, 8, 250}, - {6, 10, -1, 0, 8, 261}, - {6, 10, -1, 0, 8, 271}, - {6, 10, -1, 0, 8, 281}, - {6, 10, -1, 0, 8, 291}, - {6, 10, -1, 0, 8, 301}, - {6, 10, -1, 0, 8, 311}, - {6, 10, -1, 0, 8, 321}, - {6, 10, -1, 0, 8, 331}, - {6, 10, -1, 0, 8, 341}, - {6, 10, -1, 0, 8, 351}, - {3, 10, -2, 0, 8, 361}, - {5, 10, -1, 0, 8, 371}, - {6, 10, -1, 0, 8, 381}, - {6, 10, -1, 0, 8, 391}, - {7, 10, 0, 0, 8, 401}, - {6, 10, -1, 0, 8, 411}, - {6, 10, -1, 0, 8, 421}, - {6, 10, -1, 0, 8, 431}, - {6, 13, -1, 3, 8, 441}, - {6, 10, -1, 0, 8, 454}, - {6, 10, -1, 0, 8, 464}, - {7, 10, 0, 0, 8, 474}, - {6, 10, -1, 0, 8, 484}, - {6, 10, -1, 0, 8, 494}, - {7, 10, 0, 0, 8, 504}, - {6, 10, -1, 0, 8, 514}, - {7, 10, 0, 0, 8, 524}, - {6, 10, -1, 0, 8, 534}, - {4, 13, -2, 2, 8, 544}, - {6, 12, -1, 1, 8, 557}, - {4, 13, -2, 2, 8, 569}, - {5, 3, -1, -6, 8, 582}, - {8, 1, 0, 3, 8, 585}, - {3, 4, -2, -6, 8, 586}, - {6, 7, -1, 0, 8, 590}, - {6, 10, -1, 0, 8, 597}, - {6, 7, -1, 0, 8, 607}, - {6, 10, -1, 0, 8, 614}, - {6, 7, -1, 0, 8, 624}, - {6, 10, -1, 0, 8, 631}, - {6, 11, -1, 4, 8, 641}, - {6, 10, -1, 0, 8, 652}, - {3, 10, -2, 0, 8, 662}, - {5, 14, -1, 4, 8, 672}, - {6, 10, -1, 0, 8, 686}, - {3, 10, -2, 0, 8, 696}, - {7, 7, 0, 0, 8, 706}, - {6, 7, -1, 0, 8, 713}, - {6, 7, -1, 0, 8, 720}, - {6, 11, -1, 4, 8, 727}, - {6, 11, -1, 4, 8, 738}, - {6, 7, -1, 0, 8, 749}, - {6, 7, -1, 0, 8, 756}, - {6, 9, -1, 0, 8, 763}, - {6, 7, -1, 0, 8, 772}, - {6, 7, -1, 0, 8, 779}, - {7, 7, 0, 0, 8, 786}, - {6, 7, -1, 0, 8, 793}, - {6, 11, -1, 4, 8, 800}, - {6, 7, -1, 0, 8, 811}, - {6, 13, -1, 2, 8, 818}, - {1, 14, -3, 3, 8, 831}, - {6, 13, -1, 2, 8, 845}, - {6, 3, -1, -3, 8, 858}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0,0,0,0,0, -1}, - {0, 0, 0, 0, 8, -1}, - {1, 10, -3, 3, 8, 861}, - {5, 10, -1, 0, 8, 871}, - {6, 10, -1, 0, 8, 881}, - {6, 7, -1, -2, 8, 891}, - {7, 10, 0, 0, 8, 898}, - {1, 14, -3, 3, 8, 908}, - {6, 13, -1, 3, 8, 922}, - {5, 1, -1, -9, 8, 935}, - {7, 9, 0, 0, 8, 936}, - {5, 7, -1, -3, 8, 945}, - {8, 9, 0, 0, 8, 952}, - {6, 3, -1, -3, 8, 961}, - {6, 1, -1, -4, 8, 964}, - {7, 9, 0, 0, 8, 965}, - {4, 1, -2, -9, 8, 974}, - {4, 4, -2, -4, 8, 975}, - {7, 9, 0, 0, 8, 979}, - {4, 5, -2, -5, 8, 988}, - {4, 5, -2, -5, 8, 993}, - {2, 2, -3, -9, 8, 998}, - {6, 10, -1, 3, 8, 1000}, - {7, 12, 0, 2, 8, 1010}, - {2, 1, -3, -4, 8, 1022}, - {3, 3, -3, 3, 8, 1023}, - {3, 5, -3, -5, 8, 1026}, - {5, 7, -1, -3, 8, 1031}, - {8, 9, 0, 0, 8, 1038}, - {7, 10, 0, 0, 8, 1047}, - {7, 11, 0, 1, 8, 1057}, - {7, 9, 0, -1, 8, 1068}, - {6, 10, -1, 2, 8, 1077}, - {6, 11, -1, 0, 8, 1087}, - {6, 11, -1, 0, 8, 1098}, - {6, 11, -1, 0, 8, 1109}, - {6, 11, -1, 0, 8, 1120}, - {6, 10, -1, 0, 8, 1131}, - {6, 11, -1, 0, 8, 1141}, - {7, 10, 0, 0, 8, 1152}, - {6, 13, -1, 3, 8, 1162}, - {6, 11, -1, 0, 8, 1175}, - {6, 11, -1, 0, 8, 1186}, - {6, 11, -1, 0, 8, 1197}, - {6, 10, -1, 0, 8, 1208}, - {3, 11, -2, 0, 8, 1218}, - {3, 11, -2, 0, 8, 1229}, - {4, 11, -2, 0, 8, 1240}, - {5, 10, -1, 0, 8, 1251}, - {7, 10, 0, 0, 8, 1261}, - {6, 11, -1, 0, 8, 1271}, - {6, 11, -1, 0, 8, 1282}, - {6, 11, -1, 0, 8, 1293}, - {6, 11, -1, 0, 8, 1304}, - {6, 11, -1, 0, 8, 1315}, - {6, 10, -1, 0, 8, 1326}, - {6, 6, -1, -1, 8, 1336}, - {8, 10, 0, 0, 8, 1342}, - {6, 11, -1, 0, 8, 1352}, - {6, 11, -1, 0, 8, 1363}, - {6, 11, -1, 0, 8, 1374}, - {6, 10, -1, 0, 8, 1385}, - {7, 11, 0, 0, 8, 1395}, - {7, 10, 0, 0, 8, 1406}, - {6, 10, -1, 0, 8, 1416}, - {6, 10, -1, 0, 8, 1426}, - {6, 10, -1, 0, 8, 1436}, - {6, 10, -1, 0, 8, 1446}, - {6, 10, -1, 0, 8, 1456}, - {6, 9, -1, 0, 8, 1466}, - {6, 11, -1, 0, 8, 1475}, - {7, 7, 0, 0, 8, 1486}, - {6, 10, -1, 3, 8, 1493}, - {6, 10, -1, 0, 8, 1503}, - {6, 10, -1, 0, 8, 1513}, - {6, 10, -1, 0, 8, 1523}, - {6, 9, -1, 0, 8, 1533}, - {3, 10, -2, 0, 8, 1542}, - {3, 10, -2, 0, 8, 1552}, - {4, 10, -2, 0, 8, 1562}, - {5, 9, -1, 0, 8, 1572}, - {6, 11, -1, 0, 8, 1581}, - {6, 10, -1, 0, 8, 1592}, - {6, 10, -1, 0, 8, 1602}, - {6, 10, -1, 0, 8, 1612}, - {6, 10, -1, 0, 8, 1622}, - {6, 10, -1, 0, 8, 1632}, - {6, 10, -1, 0, 8, 1642}, - {6, 7, -1, 0, 8, 1652}, - {8, 7, 0, 0, 8, 1659}, - {6, 10, -1, 0, 8, 1666}, - {6, 10, -1, 0, 8, 1676}, - {6, 10, -1, 0, 8, 1686}, - {6, 10, -1, 0, 8, 1696}, - {6, 14, -1, 4, 8, 1706}, - {7, 13, 0, 3, 8, 1720}, - {6, 14, -1, 4, 8, 1733}, - }, - scr15_bitmap_data, - 0 -}; - -#endif /* BLF_FONT_SCR15_H */ diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c index 510204b0f51..551db2cdaa9 100644 --- a/source/blender/blenfont/intern/blf_glyph.c +++ b/source/blender/blenfont/intern/blf_glyph.c @@ -31,16 +31,12 @@ #include <string.h> #include <math.h> -#ifdef WITH_FREETYPE2 - #include <ft2build.h> #include FT_FREETYPE_H #include FT_GLYPH_H #include FT_OUTLINE_H -#endif /* WITH_FREETYPE2 */ - #include "MEM_guardedalloc.h" #include "DNA_listBase.h" @@ -59,8 +55,6 @@ #include "blf_internal.h" -#ifdef WITH_FREETYPE2 - GlyphCacheBLF *blf_glyph_cache_find(FontBLF *font, int size, int dpi) { GlyphCacheBLF *p; @@ -433,6 +427,67 @@ void blf_glyph_free(GlyphBLF *g) MEM_freeN(g); } +static void blf_texture_draw(float uv[2][2], float dx, float y1, float dx1, float y2) +{ + + glBegin(GL_QUADS); + glTexCoord2f(uv[0][0], uv[0][1]); + glVertex2f(dx, y1); + + glTexCoord2f(uv[0][0], uv[1][1]); + glVertex2f(dx, y2); + + glTexCoord2f(uv[1][0], uv[1][1]); + glVertex2f(dx1, y2); + + glTexCoord2f(uv[1][0], uv[0][1]); + glVertex2f(dx1, y1); + glEnd(); + +} + +static void blf_texture5_draw(float uv[2][2], float x1, float y1, float x2, float y2) +{ + float soft[25]= { + 1/60.0f, 1/60.0f, 2/60.0f, 1/60.0f, 1/60.0f, + 1/60.0f, 3/60.0f, 5/60.0f, 3/60.0f, 1/60.0f, + 2/60.0f, 5/60.0f, 8/60.0f, 5/60.0f, 2/60.0f, + 1/60.0f, 3/60.0f, 5/60.0f, 3/60.0f, 1/60.0f, + 1/60.0f, 1/60.0f, 2/60.0f, 1/60.0f, 1/60.0f}; + + float color[4], *fp= soft; + int dx, dy; + + glGetFloatv(GL_CURRENT_COLOR, color); + + for(dx=-2; dx<3; dx++) { + for(dy=-2; dy<3; dy++, fp++) { + glColor4f(color[0], color[1], color[2], fp[0]*color[3]); + blf_texture_draw(uv, x1+dx, y1+dy, x2+dx, y2+dy); + } + } + + glColor4fv(color); +} + +static void blf_texture3_draw(float uv[2][2], float x1, float y1, float x2, float y2) +{ + float soft[9]= {1/16.0f, 2/16.0f, 1/16.0f, 2/16.0f, 4/16.0f, 2/16.0f, 1/16.0f, 2/16.0f, 1/16.0f}; + float color[4], *fp= soft; + int dx, dy; + + glGetFloatv(GL_CURRENT_COLOR, color); + + for(dx=-1; dx<2; dx++) { + for(dy=-1; dy<2; dy++, fp++) { + glColor4f(color[0], color[1], color[2], fp[0]*color[3]); + blf_texture_draw(uv, x1+dx, y1+dy, x2+dx, y2+dy); + } + } + + glColor4fv(color); +} + int blf_glyph_texture_render(FontBLF *font, GlyphBLF *g, float x, float y) { GlyphTextureBLF *gt; @@ -504,5 +559,3 @@ int blf_glyph_render(FontBLF *font, GlyphBLF *g, float x, float y) return(blf_glyph_bitmap_render(font, g, x, y)); return(blf_glyph_texture_render(font, g, x, y)); } - -#endif /* WITH_FREETYPE2 */ diff --git a/source/blender/blenfont/intern/blf_internal.c b/source/blender/blenfont/intern/blf_internal.c deleted file mode 100644 index 414ec5abead..00000000000 --- a/source/blender/blenfont/intern/blf_internal.c +++ /dev/null @@ -1,435 +0,0 @@ -/** - * $Id: - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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. - * - * The Original Code is Copyright (C) 2009 Blender Foundation. - * All rights reserved. - * - * - * Contributor(s): Blender Foundation - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -#ifdef WITH_FREETYPE2 - -#include <ft2build.h> - -#include FT_FREETYPE_H -#include FT_GLYPH_H - -#endif /* WITH_FREETYPE2 */ - -#include "MEM_guardedalloc.h" - -#include "DNA_listBase.h" -#include "DNA_vec_types.h" - -#include "BKE_utildefines.h" - -#include "BLI_blenlib.h" -#include "BLI_linklist.h" /* linknode */ -#include "BLI_string.h" -#include "BLI_arithb.h" - -#include "BIF_gl.h" -#include "BLF_api.h" - -#include "blf_internal_types.h" -#include "blf_internal.h" -#include "blf_font_helv10.h" - -#ifndef BLF_INTERNAL_MINIMAL -#include "blf_font_helv12.h" -#include "blf_font_helvb8.h" -#include "blf_font_helvb10.h" -#include "blf_font_helvb12.h" -#include "blf_font_scr12.h" -#include "blf_font_scr14.h" -#include "blf_font_scr15.h" -#endif - -int blf_internal_get_texture(FontBLF *font) -{ - FontDataBLF *data; - CharDataBLF *cd; - int width; - int height; - int c_rows, c_cols, c_width, c_height; - int i_width, i_height; - GLubyte *img, *img_row, *chr_row, *img_pxl; - int base_line, i, cell_x, cell_y, y, x; - int byte_idx, bit_idx; - - data= (FontDataBLF *)font->engine; - if (data->texid != 0) - return(0); - - width= data->xmax - data->xmin; - height= data->ymax - data->ymin; - c_rows= 16; - c_cols= 16; - c_width= 16; - c_height= 16; - i_width= c_cols * c_width; - i_height= c_rows * c_height; - base_line= -(data->ymin); - img= (GLubyte *)malloc(i_height * i_width); - memset((void *)img, 0, i_height * i_width); - - if (width >= 16 || height >= 16) { - printf("Warning: Bad font size for: %s\n", font->name); - return(-1); - } - - for (i= 0; i < 256; i++) { - cd= &data->chars[i]; - - if (cd->data_offset != -1) { - cell_x= i%16; - cell_y= i/16; - - for (y= 0; y < cd->height; y++) { - img_row = &img[(cell_y*c_height + y + base_line - cd->yorig)*i_width]; - chr_row = &data->bitmap_data[cd->data_offset + ((cd->width+7)/8)*y]; - - for (x= 0; x < cd->width; x++) { - img_pxl= &img_row[(cell_x*c_width + x - cd->xorig)]; - byte_idx= x/8; - bit_idx= 7 - (x%8); - - if (chr_row[byte_idx]&(1<<bit_idx)) { - img_pxl[0]= 255; - } - } - } - } - } - - glGenTextures(1, &data->texid); - glBindTexture(GL_TEXTURE_2D, data->texid); - glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA4, i_width, i_height, 0, GL_ALPHA, GL_UNSIGNED_BYTE, img); - if (glGetError()) { - glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE4_ALPHA4, i_width, i_height, 0, GL_ALPHA, GL_UNSIGNED_BYTE, img); - } - - glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - free((void *)img); - return(0); -} - -void blf_internal_size(FontBLF *font, int size, int dpi) -{ - /* dpi don't work here and size is limit to: - * helv: 10, 12 - * helvb: 8, 10, 12 - * scr: 12, 14, 15 - */ - font->dpi= dpi; - - if (font->size != size) { - if (!strcmp(font->name, "helv")) { - if (size == 12) { - font->engine= (void *)&blf_font_helv12; - font->size= 12; - } - else { - font->engine= (void *)&blf_font_helv10; - font->size= 10; - } - } - else if (!strcmp(font->name, "helvb")) { - if (size == 10) { - font->engine= (void *)&blf_font_helvb10; - font->size= 10; - } - else if (size == 12) { - font->engine= (void *)&blf_font_helvb12; - font->size= 12; - } - else { - font->engine= (void *)&blf_font_helvb8; - font->size= 8; - } - } - else { /* scr */ - if (size == 14) { - font->engine= (void *)&blf_font_scr14; - font->size= 14; - } - else if (size == 15) { - font->engine= (void *)&blf_font_scr15; - font->size= 15; - } - else { - font->engine= (void *)&blf_font_scr12; - font->size= 12; - } - } - - if (font->mode == BLF_MODE_TEXTURE) { - if (blf_internal_get_texture(font) != 0) - printf("Can't create texture font!!\n"); - } - } -} - -void blf_internal_texture_draw(FontBLF *font, char *str) -{ - FontDataBLF *data; - CharDataBLF *cd; - unsigned char c; - float pos, x, y; - float uv[2][2]; - int base_line; - GLint cur_tex; - float dx, dx1, dy, dy1; - - data= (FontDataBLF *)font->engine; - base_line= -(data->ymin); - pos= 0; - x= 0.0f; - y= 0.0f; - - glGetIntegerv(GL_TEXTURE_2D_BINDING_EXT, &cur_tex); - if (cur_tex != data->texid) - glBindTexture(GL_TEXTURE_2D, data->texid); - - while ((c= (unsigned char) *str++)) { - cd= &data->chars[c]; - - if (cd->data_offset != -1) { - uv[0][0]= ((c%16)/16.0) + 1.0/16.0; - uv[0][1]= (c/16)/16.0; - uv[1][0]= (c%16)/16.0; - uv[1][1]= ((c/16)/16.0) + 1.0/16.0; - - dx= x + pos + 16.0; - dx1= x + pos + 0.0; - dy= -base_line + y + 0.0; - dy1= -base_line + y + 16.0; - - if (font->flags & BLF_CLIPPING) { - /* Don't return, just skip this character and check the others. */ - if (!BLI_in_rctf(&font->clip_rec, dx + font->pos[0], dy + font->pos[1])) - goto next_tex_char; - if (!BLI_in_rctf(&font->clip_rec, dx + font->pos[0], dy1 + font->pos[1])) - goto next_tex_char; - if (!BLI_in_rctf(&font->clip_rec, dx1 + font->pos[0], dy1 + font->pos[1])) - goto next_tex_char; - if (!BLI_in_rctf(&font->clip_rec, dx1 + font->pos[0], dy + font->pos[1])) - goto next_tex_char; - } - - if (font->blur == 3) - blf_texture3_draw(uv, dx, dy, dx1, dy1); - else if (font->blur == 5) - blf_texture5_draw(uv, dx, dy, dx1, dy1); - else - blf_texture_draw(uv, dx, dy, dx1, dy1); - } -next_tex_char: - pos += cd->advance; - } -} - -void blf_internal_bitmap_draw(FontBLF *font, char *str) -{ - FontDataBLF *data; - CharDataBLF *cd; - unsigned char c; - GLint alignment; - float dx; - - data= (FontDataBLF *)font->engine; - - glGetIntegerv(GL_UNPACK_ALIGNMENT, &alignment); - glPixelStorei(GL_UNPACK_ALIGNMENT, 1); - dx= 0; - - while ((c= (unsigned char) *str++)) { - cd= &data->chars[c]; - - if (font->flags & BLF_CLIPPING) { - /* The same here, always check all the characters. */ - if (!BLI_in_rctf(&font->clip_rec, dx + font->pos[0], font->pos[1])) - goto next_bitmap_char; - if (!BLI_in_rctf(&font->clip_rec, dx + font->pos[0], cd->height + font->pos[1])) - goto next_bitmap_char; - if (!BLI_in_rctf(&font->clip_rec, dx + cd->width + font->pos[0], cd->height + font->pos[1])) - goto next_bitmap_char; - if (!BLI_in_rctf(&font->clip_rec, dx + cd->width + font->pos[0], font->pos[1])) - goto next_bitmap_char; - } - - if (cd->data_offset==-1) { - GLubyte nullBitmap= 0; - glBitmap(1, 1, 0, 0, cd->advance, 0, &nullBitmap); - } else { - GLubyte *bitmap= &data->bitmap_data[cd->data_offset]; - glBitmap(cd->width, cd->height, cd->xorig, cd->yorig, cd->advance, 0, bitmap); - } -next_bitmap_char: - dx += cd->advance; - } - - glPixelStorei(GL_UNPACK_ALIGNMENT, alignment); -} - -void blf_internal_draw(FontBLF *font, char *str) -{ - if (font->mode == BLF_MODE_BITMAP) - blf_internal_bitmap_draw(font, str); - else - blf_internal_texture_draw(font, str); -} - -void blf_internal_boundbox(FontBLF *font, char *str, rctf *box) -{ - FontDataBLF *data; - unsigned char c; - int length= 0; - int ascent= 0; - int descent= 0; - int a=0, d=0; - - data= (FontDataBLF *)font->engine; - while ((c= (unsigned char) *str++)) { - length += data->chars[c].advance; - d = data->chars[c].yorig; - a = data->chars[c].height - data->chars[c].yorig; - if (a > ascent) - ascent= a; - if (d > descent) - descent= d; - } - box->xmin = (float)0; - box->ymin = (float)-descent * font->aspect; - box->xmax = (float)length * font->aspect; - box->ymax = (float)ascent * font->aspect; -} - -float blf_internal_width(FontBLF *font, char *str) -{ - FontDataBLF *data; - unsigned char c; - int length= 0; - - data= (FontDataBLF *)font->engine; - while ((c= (unsigned char) *str++)) { - length += data->chars[c].advance; - } - - return((float)(length * font->aspect)); -} - -float blf_internal_height(FontBLF *font, char *str) -{ - FontDataBLF *data; - - data= (FontDataBLF *)font->engine; - return(((float)(data->ymax - data->ymin)) * font->aspect); -} - -void blf_internal_free(FontBLF *font) -{ - FontDataBLF *data; - - data= (FontDataBLF *)font->engine; - if (data->texid != 0) { - glDeleteTextures(1, &data->texid); - data->texid= 0; - } - - MEM_freeN(font->name); - MEM_freeN(font); -} - -FontBLF *blf_internal_new(char *name) -{ - FontBLF *font; - - font= (FontBLF *)MEM_mallocN(sizeof(FontBLF), "blf_internal_new"); - font->name= BLI_strdup(name); - font->filename= NULL; - - if (!strcmp(name, "helv")) { - font->engine= (void *)&blf_font_helv10; - font->size= 10; - } -#ifndef BLF_INTERNAL_MINIMAL - else if (!strcmp(name, "helvb")) { - font->engine= (void *)&blf_font_helvb8; - font->size= 8; - } - else if (!strcmp(name, "scr")) { - font->engine= (void *)&blf_font_scr12; - font->size= 12; - } -#endif - else - font->engine= NULL; - - if (!font->engine) { - MEM_freeN(font->name); - MEM_freeN(font); - return(NULL); - } - - font->type= BLF_FONT_INTERNAL; - font->ref= 1; - font->mode= BLF_MODE_TEXTURE; - font->aspect= 1.0f; - font->pos[0]= 0.0f; - font->pos[1]= 0.0f; - font->angle= 0.0f; - Mat4One(font->mat); - font->clip_rec.xmin= 0.0f; - font->clip_rec.xmax= 0.0f; - font->clip_rec.ymin= 0.0f; - font->clip_rec.ymax= 0.0f; - font->flags= 0; - font->dpi= 72; - font->cache.first= NULL; - font->cache.last= NULL; - font->glyph_cache= NULL; - glGetIntegerv(GL_MAX_TEXTURE_SIZE, (GLint *)&font->max_tex_size); - - font->size_set= blf_internal_size; - font->draw= blf_internal_draw; - font->boundbox_get= blf_internal_boundbox; - font->width_get= blf_internal_width; - font->height_get= blf_internal_height; - font->free= blf_internal_free; - - if (font->mode == BLF_MODE_TEXTURE) { - if (blf_internal_get_texture(font) != 0) { - MEM_freeN(font->name); - MEM_freeN(font); - return(NULL); - } - } - - return(font); -} diff --git a/source/blender/blenfont/intern/blf_internal.h b/source/blender/blenfont/intern/blf_internal.h index a042eefb4d9..af49dda0023 100644 --- a/source/blender/blenfont/intern/blf_internal.h +++ b/source/blender/blenfont/intern/blf_internal.h @@ -32,20 +32,12 @@ unsigned int blf_next_p2(unsigned int x); unsigned int blf_hash(unsigned int val); int blf_utf8_next(unsigned char *buf, int *iindex); -void blf_texture_draw(float uv[2][2], float dx, float y1, float dx1, float y2); -void blf_texture5_draw(float uv[2][2], float x1, float y1, float x2, float y2); -void blf_texture3_draw(float uv[2][2], float x1, float y1, float x2, float y2); - char *blf_dir_search(const char *file); int blf_dir_split(const char *str, char *file, int *size); int blf_font_init(void); void blf_font_exit(void); -FontBLF *blf_internal_new(char *name); - -#ifdef WITH_FREETYPE2 - FontBLF *blf_font_new(char *name, char *filename); FontBLF *blf_font_new_from_mem(char *name, unsigned char *mem, int mem_size); @@ -59,5 +51,4 @@ GlyphBLF *blf_glyph_add(FontBLF *font, FT_UInt index, unsigned int c); void blf_glyph_free(GlyphBLF *g); int blf_glyph_render(FontBLF *font, GlyphBLF *g, float x, float y); -#endif /* WITH_FREETYPE2 */ #endif /* BLF_INTERNAL_H */ diff --git a/source/blender/blenfont/intern/blf_internal_types.h b/source/blender/blenfont/intern/blf_internal_types.h index da2d3c17f79..9d762a7e155 100644 --- a/source/blender/blenfont/intern/blf_internal_types.h +++ b/source/blender/blenfont/intern/blf_internal_types.h @@ -140,9 +140,6 @@ typedef struct FontBLF { /* filename or NULL. */ char *filename; - /* font type, can be freetype2 or internal. */ - int type; - /* draw mode, texture or bitmap. */ int mode; @@ -197,24 +194,6 @@ typedef struct FontBLF { void (*free)(struct FontBLF *); } FontBLF; -typedef struct CharDataBLF { - signed char width, height; - signed char xorig, yorig; - signed char advance; - - short data_offset; -} CharDataBLF; - -typedef struct FontDataBLF { - int xmin, ymin; - int xmax, ymax; - - CharDataBLF chars[256]; - unsigned char *bitmap_data; - - GLuint texid; -} FontDataBLF; - typedef struct DirBLF { struct DirBLF *next; struct DirBLF *prev; diff --git a/source/blender/blenfont/intern/blf_util.c b/source/blender/blenfont/intern/blf_util.c index 8de6aea754b..03e1066caa1 100644 --- a/source/blender/blenfont/intern/blf_util.c +++ b/source/blender/blenfont/intern/blf_util.c @@ -76,34 +76,30 @@ int blf_utf8_next(unsigned char *buf, int *iindex) * * Returns 0 to indicate an error (e.g. invalid UTF8) */ - int index= *iindex, r; - unsigned char d= buf[index++], d2, d3, d4; + int index= *iindex, len, r; + unsigned char d, d2, d3, d4; + d= buf[index++]; if (!d) return(0); - if (d < 0x80) { - *iindex= index; - return(d); - } + while (buf[index] && ((buf[index] & 0xc0) == 0x80)) + index++; - if ((d & 0xe0) == 0xc0) { + len= index - *iindex; + if (len == 1) + r= d; + else if (len == 2) { /* 2 byte */ - d2= buf[index++]; - if ((d2 & 0xc0) != 0x80) - return(0); + d2= buf[*iindex + 1]; r= d & 0x1f; /* copy lower 5 */ r <<= 6; r |= (d2 & 0x3f); /* copy lower 6 */ } - else if ((d & 0xf0) == 0xe0) { + else if (len == 3) { /* 3 byte */ - d2= buf[index++]; - d3= buf[index++]; - - if ((d2 & 0xc0) != 0x80 || (d3 & 0xc0) != 0x80) - return(0); - + d2= buf[*iindex + 1]; + d3= buf[*iindex + 2]; r= d & 0x0f; /* copy lower 4 */ r <<= 6; r |= (d2 & 0x3f); @@ -112,14 +108,9 @@ int blf_utf8_next(unsigned char *buf, int *iindex) } else { /* 4 byte */ - d2= buf[index++]; - d3= buf[index++]; - d4= buf[index++]; - - if ((d2 & 0xc0) != 0x80 || (d3 & 0xc0) != 0x80 || - (d4 & 0xc0) != 0x80) - return(0); - + d2= buf[*iindex + 1]; + d3= buf[*iindex + 2]; + d4= buf[*iindex + 3]; r= d & 0x0f; /* copy lower 4 */ r <<= 6; r |= (d2 & 0x3f); @@ -131,64 +122,3 @@ int blf_utf8_next(unsigned char *buf, int *iindex) *iindex= index; return(r); } - -void blf_texture_draw(float uv[2][2], float dx, float y1, float dx1, float y2) -{ - - glBegin(GL_QUADS); - glTexCoord2f(uv[0][0], uv[0][1]); - glVertex2f(dx, y1); - - glTexCoord2f(uv[0][0], uv[1][1]); - glVertex2f(dx, y2); - - glTexCoord2f(uv[1][0], uv[1][1]); - glVertex2f(dx1, y2); - - glTexCoord2f(uv[1][0], uv[0][1]); - glVertex2f(dx1, y1); - glEnd(); - -} - -void blf_texture5_draw(float uv[2][2], float x1, float y1, float x2, float y2) -{ - float soft[25]= { - 1/60.0f, 1/60.0f, 2/60.0f, 1/60.0f, 1/60.0f, - 1/60.0f, 3/60.0f, 5/60.0f, 3/60.0f, 1/60.0f, - 2/60.0f, 5/60.0f, 8/60.0f, 5/60.0f, 2/60.0f, - 1/60.0f, 3/60.0f, 5/60.0f, 3/60.0f, 1/60.0f, - 1/60.0f, 1/60.0f, 2/60.0f, 1/60.0f, 1/60.0f}; - - float color[4], *fp= soft; - int dx, dy; - - glGetFloatv(GL_CURRENT_COLOR, color); - - for(dx=-2; dx<3; dx++) { - for(dy=-2; dy<3; dy++, fp++) { - glColor4f(color[0], color[1], color[2], fp[0]*color[3]); - blf_texture_draw(uv, x1+dx, y1+dy, x2+dx, y2+dy); - } - } - - glColor4fv(color); -} - -void blf_texture3_draw(float uv[2][2], float x1, float y1, float x2, float y2) -{ - float soft[9]= {1/16.0f, 2/16.0f, 1/16.0f, 2/16.0f, 4/16.0f, 2/16.0f, 1/16.0f, 2/16.0f, 1/16.0f}; - float color[4], *fp= soft; - int dx, dy; - - glGetFloatv(GL_CURRENT_COLOR, color); - - for(dx=-1; dx<2; dx++) { - for(dy=-1; dy<2; dy++, fp++) { - glColor4f(color[0], color[1], color[2], fp[0]*color[3]); - blf_texture_draw(uv, x1+dx, y1+dy, x2+dx, y2+dy); - } - } - - glColor4fv(color); -} diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index ac161caeb2e..4b7ddf43647 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -45,7 +45,6 @@ extern "C" { struct Main; struct Object; struct bSoundListener; -struct BMF_Font; struct BME_Glob; typedef struct Global { @@ -53,9 +52,6 @@ typedef struct Global { /* active pointers */ struct Main *main; - /* fonts, allocated global data */ - struct BMF_Font *font, *fonts, *fontss; - /* strings: lastsaved */ char ima[256], sce[256], lib[256]; diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 5a612df2589..ebe0ea74c28 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -31,7 +31,7 @@ SET(INC ../render/extern/include ../../../intern/decimation/extern ../imbuf ../avi ../../../intern/elbeem/extern ../../../intern/opennl/extern ../../../intern/iksolver/extern ../blenloader ../quicktime - ../../../intern/bmfont ../../../extern/bullet2/src + ../../../extern/bullet2/src ../nodes ../../../extern/glew/include ../gpu ../makesrna ../../../intern/bsp/extern ${SDL_INC} @@ -66,10 +66,6 @@ ELSE(WITH_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON) ENDIF(WITH_PYTHON) -IF(WITH_INTERNATIONAL) - ADD_DEFINITIONS(-DWITH_FREETYPE2) -ENDIF(WITH_INTERNATIONAL) - IF(NOT WITH_ELBEEM) ADD_DEFINITIONS(-DDISABLE_ELBEEM) ENDIF(NOT WITH_ELBEEM) diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index 86ff3a43045..19d150b34a8 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -8,7 +8,6 @@ incs += ' ../render/extern/include #/intern/decimation/extern ../makesrna' incs += ' ../imbuf ../avi #/intern/elbeem/extern ../nodes' incs += ' #/intern/iksolver/extern ../blenloader' incs += ' #/extern/bullet2/src' -incs += ' #/intern/bmfont' incs += ' #/intern/opennl/extern #/intern/bsp/extern' incs += ' ../gpu #/extern/glew/include' @@ -33,9 +32,6 @@ if env['WITH_BF_SDL']: else: defs.append('DISABLE_SDL') -if env['WITH_BF_INTERNATIONAL']: - defs.append('WITH_FREETYPE2') - if env['WITH_BF_OPENEXR']: defs.append('WITH_OPENEXR') diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile index 6554c93662d..1528ec1c86e 100644 --- a/source/blender/blenkernel/intern/Makefile +++ b/source/blender/blenkernel/intern/Makefile @@ -59,8 +59,6 @@ CPPFLAGS += -I../../editors/include # to include the render stuff: CPPFLAGS += -I../../render/extern/include -# for image stamping -CPPFLAGS += -I$(NAN_BMFONT)/include # for sound #CPPFLAGS += -I../../../kernel/gen_system CPPFLAGS += $(NAN_SDLCFLAGS) @@ -85,12 +83,8 @@ CPPFLAGS += -I.. # path to bullet2, for cloth CPPFLAGS += -I../../../../extern/bullet2/src - -ifeq ($(WITH_FREETYPE2), true) - CPPFLAGS += -DWITH_FREETYPE2 - CPPFLAGS += -I$(NAN_FREETYPE)/include - CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2 -endif +CPPFLAGS += -I$(NAN_FREETYPE)/include +CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2 ifeq ($(WITH_FFMPEG),true) CPPFLAGS += -DWITH_FFMPEG diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index 8bd848ea9e6..dfe3b7ea279 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -33,8 +33,6 @@ #include "BLI_winstuff.h" #endif -//#include "BMF_Api.h" - #include "BLI_blenlib.h" #include "BLI_arithb.h" diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index ced8d3bdebb..b94652eb7c3 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -355,11 +355,7 @@ static VFontData *vfont_get_data(VFont *vfont) } if (pf) { -#ifdef WITH_FREETYPE2 vfont->data= BLI_vfontdata_from_freetypefont(pf); -#else - vfont->data= BLI_vfontdata_from_psfont(pf); -#endif if (pf != vfont->packedfile) { freePackedFile(pf); } @@ -398,12 +394,7 @@ VFont *load_vfont(char *name) if (pf) { VFontData *vfd; -#ifdef WITH_FREETYPE2 vfd= BLI_vfontdata_from_freetypefont(pf); -#else - vfd= BLI_vfontdata_from_psfont(pf); -#endif - if (vfd) { vfont = alloc_libblock(&G.main->vfont, ID_VF, filename); vfont->data = vfd; @@ -755,21 +746,22 @@ struct chartrans *BKE_text_to_curve(Scene *scene, Object *ob, int mode) che = che->next; } -#ifdef WITH_FREETYPE2 - // The character wasn't in the current curve base so load it - // But if the font is <builtin> then do not try loading since whole font is in the memory already + /* + * The character wasn't in the current curve base so load it + * But if the font is <builtin> then do not try loading since + * whole font is in the memory already + */ if(che == NULL && strcmp(vfont->name, "<builtin>")) { BLI_vfontchar_from_freetypefont(vfont, ascii); } - // Try getting the character again from the list + /* Try getting the character again from the list */ che = vfd->characters.first; while(che) { if(che->index == ascii) break; che = che->next; } -#endif /* No VFont found */ if (vfont==0) { diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c index 99ec7ce1cc8..6086aa58d40 100644 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@ -33,8 +33,6 @@ #include "MEM_guardedalloc.h" -#include "BMF_Api.h" - #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 53b805f5f4c..629f34518b9 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -77,9 +77,6 @@ #include "RE_pipeline.h" -/* for stamp drawing to an image */ -#include "BMF_Api.h" - #include "GPU_extensions.h" #include "GPU_draw.h" @@ -1069,6 +1066,9 @@ static void stampdata(Scene *scene, StampData *stamp_data, int do_prefix) void BKE_stamp_buf(Scene *scene, unsigned char *rect, float *rectf, int width, int height, int channels) { +#if 0 +// XXX +// This go back when BLF_draw_buffer is implemented - Diego struct StampData stamp_data; int x=1,y=1; @@ -1188,7 +1188,7 @@ void BKE_stamp_buf(Scene *scene, unsigned char *rect, float *rectf, int width, i buf_rectfill_area(rect, rectf, width, height, scene->r.bg_stamp, x-1, y-1, x+text_width+text_pad+1, y+font_height+1); BMF_DrawStringBuf(font, stamp_data.strip, x+(text_pad/2), y, scene->r.fg_stamp, rect, rectf, width, height, channels); } - +#endif // 0 XXX } void BKE_stamp_info(Scene *scene, struct ImBuf *ibuf) diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index b22e7b1dd70..334c8e6906b 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -40,10 +40,6 @@ SET(INC ) ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") -IF(WITH_INTERNATIONAL) - ADD_DEFINITIONS(-DWITH_FREETYPE2) -ENDIF(WITH_INTERNATIONAL) - IF(WIN32) SET(INC ${INC} ${PTHREADS_INC}) ENDIF(WIN32) diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index d0084be0d56..e0411a6fc80 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -12,9 +12,6 @@ defs = '' if env['WITH_BF_SDL']: incs += ' ' + env['BF_SDL_INC'] -if env['WITH_BF_INTERNATIONAL']: - defs = 'WITH_FREETYPE2' - if env['OURPLATFORM'] == 'linux2': cflags='-pthread' incs += ' ../../../extern/binreloc/include' diff --git a/source/blender/blenlib/intern/Makefile b/source/blender/blenlib/intern/Makefile index f92fa0a7e25..f729a4e3fe0 100644 --- a/source/blender/blenlib/intern/Makefile +++ b/source/blender/blenlib/intern/Makefile @@ -53,9 +53,6 @@ CPPFLAGS += -I$(NAN_ZLIB)/include ifdef NAN_PTHREADS CPPFLAGS += -I$(NAN_PTHREADS)/include endif -ifeq ($(WITH_FREETYPE2), true) - CPPFLAGS += -DWITH_FREETYPE2 -endif ifeq ($(OS),linux) CPPFLAGS += -I$(OCGDIR)/extern/binreloc/include endif diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c index 4b7b5914b60..0f2a6179964 100644 --- a/source/blender/blenlib/intern/freetypefont.c +++ b/source/blender/blenlib/intern/freetypefont.c @@ -30,8 +30,6 @@ * Code that uses exotic character maps is present but commented out. */ -#ifdef WITH_FREETYPE2 - #ifdef WIN32 #pragma warning (disable:4244) #endif @@ -514,10 +512,6 @@ int BLI_vfontchar_from_freetypefont(VFont *vfont, unsigned long character) return TRUE; } -#endif // WITH_FREETYPE2 - - - #if 0 // Freetype2 Outline struct diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt index 06b0fb4ab41..914fdaa4bc6 100644 --- a/source/blender/editors/CMakeLists.txt +++ b/source/blender/editors/CMakeLists.txt @@ -30,7 +30,7 @@ SET(INC ../windowmanager ../editors/include ../../../intern/guardedalloc ../../../intern/memutil ../blenlib ../makesdna ../makesrna ../blenkernel - ../include ../../../intern/bmfont ../imbuf ../render/extern/include + ../include ../imbuf ../render/extern/include ../../../intern/bsp/extern ../radiosity/extern/include ../../../intern/decimation/extern ../blenloader ../python ../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue @@ -43,9 +43,7 @@ SET(INC ../windowmanager ) IF(WITH_INTERNATIONAL) - SET(INC ${INC} ../ftfont) ADD_DEFINITIONS(-DINTERNATIONAL) - ADD_DEFINITIONS(-DFTGL_STATIC_LIBRARY) ENDIF(WITH_INTERNATIONAL) IF(WITH_OPENEXR) diff --git a/source/blender/editors/armature/Makefile b/source/blender/editors/armature/Makefile index f8cbb5ab37e..6c7ce81a8a1 100644 --- a/source/blender/editors/armature/Makefile +++ b/source/blender/editors/armature/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_OPENNL)/include # not very neat.... diff --git a/source/blender/editors/armature/SConscript b/source/blender/editors/armature/SConscript index e4e42a27b36..f96d25b0fe0 100644 --- a/source/blender/editors/armature/SConscript +++ b/source/blender/editors/armature/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' ../../render/extern/include #/intern/guardedalloc #intern/bmfont' +incs += ' ../../render/extern/include #/intern/guardedalloc' incs += ' ../../gpu ../../makesrna #/intern/opennl/extern' env.BlenderLib ( 'bf_editors_armature', sources, Split(incs), [], libtype=['core'], priority=[44] ) diff --git a/source/blender/editors/armature/editarmature.c b/source/blender/editors/armature/editarmature.c index ca0694a7ece..98f51a4015d 100644 --- a/source/blender/editors/armature/editarmature.c +++ b/source/blender/editors/armature/editarmature.c @@ -33,8 +33,6 @@ #include "MEM_guardedalloc.h" -#include "BMF_Api.h" - #include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" diff --git a/source/blender/editors/armature/reeb.c b/source/blender/editors/armature/reeb.c index 5a636672f29..7e6c84764ae 100644 --- a/source/blender/editors/armature/reeb.c +++ b/source/blender/editors/armature/reeb.c @@ -53,8 +53,6 @@ //#include "BDR_editobject.h" -#include "BMF_Api.h" - #include "ED_mesh.h" #include "ED_armature.h" //#include "BIF_interface.h" diff --git a/source/blender/editors/curve/Makefile b/source/blender/editors/curve/Makefile index b27749ce6fd..6b1f628f231 100644 --- a/source/blender/editors/curve/Makefile +++ b/source/blender/editors/curve/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I$(NAN_ELBEEM)/include diff --git a/source/blender/editors/curve/SConscript b/source/blender/editors/curve/SConscript index 92c982db611..3a1930899d3 100644 --- a/source/blender/editors/curve/SConscript +++ b/source/blender/editors/curve/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' #/intern/guardedalloc #intern/bmfont ../../gpu' +incs += ' #/intern/guardedalloc ../../gpu' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' env.BlenderLib ( 'bf_editors_curve', sources, Split(incs), [], libtype=['core'], priority=[45] ) diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 78b86ad7f32..c60007680ba 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -38,8 +38,6 @@ #include <stdlib.h> #include "MEM_guardedalloc.h" -#include "BMF_Api.h" - #include "BLI_blenlib.h" #include "BLI_arithb.h" #include "BLI_dynstr.h" diff --git a/source/blender/editors/gpencil/Makefile b/source/blender/editors/gpencil/Makefile index bb76c9c2b23..f4c1cd246f4 100644 --- a/source/blender/editors/gpencil/Makefile +++ b/source/blender/editors/gpencil/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I$(NAN_ELBEEM)/include diff --git a/source/blender/editors/gpencil/SConscript b/source/blender/editors/gpencil/SConscript index 6c47b2f69ff..af3cbdb901d 100644 --- a/source/blender/editors/gpencil/SConscript +++ b/source/blender/editors/gpencil/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' #/intern/guardedalloc #intern/bmfont ../../gpu' +incs += ' #/intern/guardedalloc ../../gpu' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' env.BlenderLib ( 'bf_editors_gpencil', sources, Split(incs), [], libtype=['core'], priority=[45] ) diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index fd59539bb56..5c6294022ee 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -37,8 +37,6 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "BMF_Api.h" - #include "BLI_arithb.h" #include "BLI_blenlib.h" @@ -907,8 +905,7 @@ static void gp_draw_data (bGPdata *gpd, int offsx, int offsy, int winx, int winy /* only draw it if view is wide enough (assume padding of 20 is enough for now) */ if (winx > (xmax + 20)) { - glRasterPos2i(winx-xmax, winy-20); - BMF_DrawString(G.fonts, printable); + BLF_draw_default(winx-xmax, winy-20, 0.0f, printable); } } diff --git a/source/blender/editors/gpencil/editaction_gpencil.c b/source/blender/editors/gpencil/editaction_gpencil.c index 28748d4a631..8be56dc416e 100644 --- a/source/blender/editors/gpencil/editaction_gpencil.c +++ b/source/blender/editors/gpencil/editaction_gpencil.c @@ -33,8 +33,6 @@ #include "MEM_guardedalloc.h" -#include "BMF_Api.h" - #include "BLI_arithb.h" #include "BLI_blenlib.h" diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index a745e5f4084..d84b93267a6 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -33,8 +33,6 @@ #include "MEM_guardedalloc.h" -#include "BMF_Api.h" - #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/interface/Makefile b/source/blender/editors/interface/Makefile index fa9550041c5..dfc8187de49 100644 --- a/source/blender/editors/interface/Makefile +++ b/source/blender/editors/interface/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I../../windowmanager @@ -48,7 +47,6 @@ CPPFLAGS += -I../../blenlib CPPFLAGS += -I../../makesdna CPPFLAGS += -I../../makesrna CPPFLAGS += -I../../imbuf -CPPFLAGS += -I../../ftfont CPPFLAGS += -I../../blenfont # own include diff --git a/source/blender/editors/interface/SConscript b/source/blender/editors/interface/SConscript index fa89cd4891c..bac3742c12f 100644 --- a/source/blender/editors/interface/SConscript +++ b/source/blender/editors/interface/SConscript @@ -7,14 +7,12 @@ for source in env.Glob('*_api.c'): sources.remove(source) incs = '../include ../../blenlib ../../blenfont ../../blenkernel ../../makesdna ../../imbuf' -incs += ' ../../makesrna ../../windowmanager #/intern/guardedalloc #intern/bmfont' +incs += ' ../../makesrna ../../windowmanager #/intern/guardedalloc' incs += ' #/extern/glew/include' defs = [] if env['WITH_BF_INTERNATIONAL']: - incs += ' ../../ftfont' defs.append('INTERNATIONAL') - defs.append('FTGL_STATIC_LIBRARY') env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), Split(defs), libtype=['core'], priority=[110] ) diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c index 8c07a6ea0ab..d0361174e70 100644 --- a/source/blender/editors/interface/interface_style.c +++ b/source/blender/editors/interface/interface_style.c @@ -171,11 +171,7 @@ void uiStyleFontDraw(uiFontStyle *fs, rcti *rect, char *str) xofs= rect->xmax - rect->xmin - BLF_width(str); /* clip is very strict, so we give it some space */ - if (BLF_type_get() == BLF_FONT_INTERNAL) - BLF_clipping(rect->xmin-4, rect->ymin-4, rect->xmax+8, rect->ymax+4); - else - BLF_clipping(rect->xmin-4, rect->ymin-4, rect->xmax+4, rect->ymax+4); - + BLF_clipping(rect->xmin-4, rect->ymin-4, rect->xmax+4, rect->ymax+4); BLF_enable(BLF_CLIPPING); if(fs->shadow) @@ -240,18 +236,13 @@ void uiStyleInit(void) font->blf_id= BLF_load_mem("default", (unsigned char*)datatoc_bfont_ttf, datatoc_bfont_ttf_size); } - if (font->blf_id == -1) { - /* when all fail, we go back to the internal font. */ - font->blf_id= BLF_load_mem("helv", NULL, 0); - } - if (font->blf_id == -1) printf("uiStyleInit error, no fonts available\n"); else { BLF_set(font->blf_id); /* ? just for speed to initialize? - * Yes but only if we used the freetype2 library, - * this build the glyph cache and create the texture. + * Yes, this build the glyph cache and create + * the texture. */ BLF_size(11, U.dpi); BLF_size(12, U.dpi); diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 3b503f00fd3..6107aa4ccc8 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -49,8 +49,6 @@ #include "ED_screen.h" -#include "BMF_Api.h" - #include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" @@ -1391,8 +1389,7 @@ static void scroll_printstr(View2DScrollers *scrollers, Scene *scene, float x, f } /* draw it */ - glRasterPos2f(x, y); - BMF_DrawString(G.fonts, str); // XXX check this again when new text-drawing api is done + BLF_draw_default(x, y, 0.0f, str); } /* local defines for scrollers drawing */ diff --git a/source/blender/editors/mesh/Makefile b/source/blender/editors/mesh/Makefile index 60b1fa1c329..650771519cd 100644 --- a/source/blender/editors/mesh/Makefile +++ b/source/blender/editors/mesh/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I$(NAN_ELBEEM)/include diff --git a/source/blender/editors/mesh/SConscript b/source/blender/editors/mesh/SConscript index e99351e1a70..df1f297698d 100644 --- a/source/blender/editors/mesh/SConscript +++ b/source/blender/editors/mesh/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' #/intern/guardedalloc #intern/bmfont ../../gpu' +incs += ' #/intern/guardedalloc ../../gpu' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' env.BlenderLib ( 'bf_editors_mesh', sources, Split(incs), [], libtype=['core'], priority=[45] ) diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 90b26d0f425..b6e679468e0 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -82,8 +82,6 @@ editmesh_tool.c: UI called tools for editmesh, geometry changes here, otherwise #include "WM_api.h" #include "WM_types.h" -#include "BMF_Api.h" - #include "ED_mesh.h" #include "ED_view3d.h" #include "ED_util.h" diff --git a/source/blender/editors/object/Makefile b/source/blender/editors/object/Makefile index 9011f566bc6..c0312023bfd 100644 --- a/source/blender/editors/object/Makefile +++ b/source/blender/editors/object/Makefile @@ -37,7 +37,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I../../windowmanager diff --git a/source/blender/editors/object/SConscript b/source/blender/editors/object/SConscript index 5cd7a3b91af..3371e172a82 100644 --- a/source/blender/editors/object/SConscript +++ b/source/blender/editors/object/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc' -incs += ' #/intern/guardedalloc #intern/bmfont' +incs += ' #/intern/guardedalloc' incs += ' ../../makesrna ../../python' defs = [] diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index a7e2ce34443..68a2cf04692 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -120,8 +120,6 @@ #include "ED_util.h" #include "ED_view3d.h" -#include "BMF_Api.h" - #include "BIF_transform.h" #include "UI_interface.h" diff --git a/source/blender/editors/physics/Makefile b/source/blender/editors/physics/Makefile index bd2dbc65f91..a71ea9e2083 100644 --- a/source/blender/editors/physics/Makefile +++ b/source/blender/editors/physics/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I$(NAN_ELBEEM)/include diff --git a/source/blender/editors/physics/SConscript b/source/blender/editors/physics/SConscript index 241962442d4..5718ae0c217 100644 --- a/source/blender/editors/physics/SConscript +++ b/source/blender/editors/physics/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' #/intern/guardedalloc #intern/bmfont ../../gpu' +incs += ' #/intern/guardedalloc ../../gpu' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' env.BlenderLib ( 'bf_editors_physics', sources, Split(incs), [], libtype=['core'], priority=[45] ) diff --git a/source/blender/editors/preview/Makefile b/source/blender/editors/preview/Makefile index 84514d73570..c44da6753f3 100644 --- a/source/blender/editors/preview/Makefile +++ b/source/blender/editors/preview/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I$(NAN_ELBEEM)/include diff --git a/source/blender/editors/preview/SConscript b/source/blender/editors/preview/SConscript index dcc80e8c626..922232822ff 100644 --- a/source/blender/editors/preview/SConscript +++ b/source/blender/editors/preview/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' #/intern/guardedalloc #intern/bmfont ../../gpu' +incs += ' #/intern/guardedalloc ../../gpu' incs += ' ../../makesrna ../../render/extern/include #/intern/elbeem/extern' incs += ' ../../blenloader' diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt index 42480f65268..4ed1e59a87f 100644 --- a/source/blender/editors/screen/CMakeLists.txt +++ b/source/blender/editors/screen/CMakeLists.txt @@ -33,7 +33,7 @@ SET(INC ../../windowmanager ../../editors/include ../../../../intern/guardedalloc ../../../../intern/memutil ../../blenlib ../../makesdna ../../makesrna ../../blenkernel - ../../include ../../../../intern/bmfont ../../imbuf + ../../include ../../imbuf ../../render/extern/include ../../../../intern/bsp/extern ../../radiosity/extern/include ../../../intern/decimation/extern ../../blenloader @@ -45,9 +45,7 @@ SET(INC ../../windowmanager ) IF(WITH_INTERNATIONAL) - SET(INC ${INC} ../../ftfont) ADD_DEFINITIONS(-DINTERNATIONAL) - ADD_DEFINITIONS(-DFTGL_STATIC_LIBRARY) ENDIF(WITH_INTERNATIONAL) IF(WITH_OPENEXR) diff --git a/source/blender/editors/screen/Makefile b/source/blender/editors/screen/Makefile index d18d15d00d9..cf6e692c304 100644 --- a/source/blender/editors/screen/Makefile +++ b/source/blender/editors/screen/Makefile @@ -37,7 +37,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include # not very neat.... CPPFLAGS += -I../../windowmanager @@ -49,6 +48,7 @@ CPPFLAGS += -I../../makesrna CPPFLAGS += -I../../imbuf CPPFLAGS += -I../../python CPPFLAGS += -I../../render/extern/include +CPPFLAGS += -I../../blenfont CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include # own include diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript index c291533790a..d00c01a040c 100644 --- a/source/blender/editors/screen/SConscript +++ b/source/blender/editors/screen/SConscript @@ -6,7 +6,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../blenloader ../../windowmanager ../../python ../../makesrna' incs += ' ../../render/extern/include' -incs += ' #/intern/guardedalloc #/extern/glew/include #intern/bmfont' +incs += ' #/intern/guardedalloc #/extern/glew/include' defs = '' diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 9956b8eabcb..6b7b7a914f4 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -50,13 +50,12 @@ #include "BIF_gl.h" #include "BIF_glutil.h" +#include "BLF_api.h" #include "UI_interface.h" #include "UI_resources.h" #include "UI_view2d.h" -#include "BMF_Api.h" - #ifndef DISABLE_PYTHON #include "BPY_extern.h" #endif @@ -270,8 +269,7 @@ void ED_region_do_draw(bContext *C, ARegion *ar) glClear(GL_COLOR_BUFFER_BIT); UI_ThemeColor(TH_TEXT); - glRasterPos2i(20, 6); - BMF_DrawString(G.font, ar->headerstr); + BLF_draw_default(20, 6, 0.0f, ar->headerstr); } else if(at->draw) { at->draw(C, ar); diff --git a/source/blender/editors/sculpt_paint/Makefile b/source/blender/editors/sculpt_paint/Makefile index e810f7efbe4..9353116a4bc 100644 --- a/source/blender/editors/sculpt_paint/Makefile +++ b/source/blender/editors/sculpt_paint/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I$(NAN_ELBEEM)/include diff --git a/source/blender/editors/sculpt_paint/SConscript b/source/blender/editors/sculpt_paint/SConscript index 3e00453e049..01e1d80c24c 100644 --- a/source/blender/editors/sculpt_paint/SConscript +++ b/source/blender/editors/sculpt_paint/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' ../../render/extern/include #/intern/guardedalloc #intern/bmfont' +incs += ' ../../render/extern/include #/intern/guardedalloc' incs += ' ../../gpu ../../makesrna' env.BlenderLib ( 'bf_editors_sculpt_paint', sources, Split(incs), [], libtype=['core'], priority=[40] ) diff --git a/source/blender/editors/space_file/Makefile b/source/blender/editors/space_file/Makefile index 480a4ee3889..c8f2af9c2e8 100644 --- a/source/blender/editors/space_file/Makefile +++ b/source/blender/editors/space_file/Makefile @@ -37,7 +37,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include # not very neat.... CPPFLAGS += -I../../windowmanager diff --git a/source/blender/editors/space_file/SConscript b/source/blender/editors/space_file/SConscript index 8302d6eecef..699b988f50f 100644 --- a/source/blender/editors/space_file/SConscript +++ b/source/blender/editors/space_file/SConscript @@ -4,7 +4,7 @@ Import ('env') sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' -incs += ' ../../blenloader #intern/bmfont ../../makesrna' +incs += ' ../../blenloader ../../makesrna' incs += ' ../../render/extern/include ' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' diff --git a/source/blender/editors/space_file/file_draw.c b/source/blender/editors/space_file/file_draw.c index 84e0f264275..dafb254f4bc 100644 --- a/source/blender/editors/space_file/file_draw.c +++ b/source/blender/editors/space_file/file_draw.c @@ -37,7 +37,6 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "BMF_Api.h" #include "BKE_colortools.h" #include "BKE_context.h" diff --git a/source/blender/editors/space_node/Makefile b/source/blender/editors/space_node/Makefile index 233572dbfb1..60f81255a74 100644 --- a/source/blender/editors/space_node/Makefile +++ b/source/blender/editors/space_node/Makefile @@ -37,7 +37,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include # not very neat.... CPPFLAGS += -I../../windowmanager diff --git a/source/blender/editors/space_node/SConscript b/source/blender/editors/space_node/SConscript index babd8dc9080..ad57970950d 100644 --- a/source/blender/editors/space_node/SConscript +++ b/source/blender/editors/space_node/SConscript @@ -4,7 +4,7 @@ Import ('env') sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../makesrna ../../imbuf' -incs += ' ../../nodes #intern/bmfont ../../render/extern/include' +incs += ' ../../nodes ../../render/extern/include' incs += ' ../../windowmanager #intern/guardedalloc #extern/glew/include' defs = [] cf = [] diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 25693009bf2..9c2cf5dc5dd 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -71,8 +71,6 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "BMF_Api.h" - #include "MEM_guardedalloc.h" #include "ED_node.h" diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index ab6d3c245f1..0670dd9e01f 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -68,7 +68,6 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "BMF_Api.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index ae986d71258..7104fad1767 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -3988,6 +3988,9 @@ static void outliner_draw_tree(Scene *scene, ARegion *ar, SpaceOops *soops) float col[4]; #if 0 // XXX was #ifdef INTERNATIONAL + /* Maybe the INTERNATIONAL was really for check about freetype2 ? + * anyway I think that we can remove this now - Diego + */ FTF_SetFontSize('l'); BIF_SetScale(1.0); #endif diff --git a/source/blender/editors/space_sequencer/Makefile b/source/blender/editors/space_sequencer/Makefile index c04202cba73..80699db4baa 100644 --- a/source/blender/editors/space_sequencer/Makefile +++ b/source/blender/editors/space_sequencer/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include # not very neat.... CPPFLAGS += -I../../windowmanager @@ -49,6 +48,7 @@ CPPFLAGS += -I../../makesdna CPPFLAGS += -I../../makesrna CPPFLAGS += -I../../imbuf CPPFLAGS += -I../../python +CPPFLAGS += -I../../blenfont CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include # own include diff --git a/source/blender/editors/space_sequencer/SConscript b/source/blender/editors/space_sequencer/SConscript index 1794ef29257..8a8c4963003 100644 --- a/source/blender/editors/space_sequencer/SConscript +++ b/source/blender/editors/space_sequencer/SConscript @@ -5,6 +5,6 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' #intern/bmfont ../../makesrna' +incs += ' ../../makesrna' env.BlenderLib ( 'bf_editors_space_sequencer', sources, Split(incs), [], libtype=['core'], priority=[100] ) diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index e71abec8e4b..5e07689f536 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -30,8 +30,6 @@ #include "MEM_guardedalloc.h" -#include "BMF_Api.h" - #include "BLI_blenlib.h" #include "BLI_arithb.h" @@ -57,6 +55,7 @@ #include "BIF_gl.h" #include "BIF_glutil.h" +#include "BLF_api.h" #include "ED_anim_api.h" #include "ED_space_api.h" @@ -404,12 +403,14 @@ static void draw_seq_handle(SpaceSeq *sseq, Sequence *seq, float pixelx, short d cpack(0xFFFFFF); if (direction == SEQ_LEFTHANDLE) { sprintf(str, "%d", seq->startdisp); - glRasterPos3f(rx1, y1-0.15, 0.0); + x1= rx1; + y1 -= 0.15; } else { sprintf(str, "%d", seq->enddisp - 1); - glRasterPos3f((x2-BMF_GetStringWidth(G.fonts, str)*pixelx), y2+0.05, 0.0); + x1= x2 - BLF_width_default(str) * pixelx; + y1= y2 + 0.05; } - BMF_DrawString(G.fonts, str); + BLF_draw_default(x1, y1, 0.0f, str); } } @@ -572,8 +573,9 @@ static void draw_seq_text(View2D *v2d, Sequence *seq, float x1, float x2, float } strp= str; - - while( (len= BMF_GetStringWidth(G.font, strp)) > size) { + // XXX + /* The correct thing is used a Styla and set the clipping region. */ + while( (len= BLF_width_default(strp)) > size) { if(len < 10) break; if(strp[1]==0) break; strp++; @@ -590,8 +592,7 @@ static void draw_seq_text(View2D *v2d, Sequence *seq, float x1, float x2, float }else{ cpack(0); } - glRasterPos3f(x1, y1+SEQ_STRIP_OFSBOTTOM, 0.0); - BMF_DrawString(G.font, strp); + BLF_draw_default(x1, y1+SEQ_STRIP_OFSBOTTOM, 0.0, strp); } /* draws a shaded strip, made from gradient + flat color + gradient */ diff --git a/source/blender/editors/space_text/SConscript b/source/blender/editors/space_text/SConscript index 3d5ccc318e1..09ba961bfce 100644 --- a/source/blender/editors/space_text/SConscript +++ b/source/blender/editors/space_text/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') defs = [] incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' #/intern/bmfont ../../python ../../makesrna ../../blenfont' +incs += ' ../../python ../../makesrna ../../blenfont' if not env['WITH_BF_PYTHON']: defs.append('DISABLE_PYTHON') diff --git a/source/blender/editors/space_text/text_intern.h b/source/blender/editors/space_text/text_intern.h index 50109ba8c42..259811aee0f 100644 --- a/source/blender/editors/space_text/text_intern.h +++ b/source/blender/editors/space_text/text_intern.h @@ -33,7 +33,6 @@ struct ARegion; struct ARegionType; struct bContext; -struct BMF_Font; struct ReportList; struct ScrArea; struct SpaceText; diff --git a/source/blender/editors/space_view3d/Makefile b/source/blender/editors/space_view3d/Makefile index 442ab502e65..dd4eab89411 100644 --- a/source/blender/editors/space_view3d/Makefile +++ b/source/blender/editors/space_view3d/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include # not very neat.... CPPFLAGS += -I../../windowmanager @@ -51,6 +50,7 @@ CPPFLAGS += -I../../python CPPFLAGS += -I../../gpu CPPFLAGS += -I../../makesrna CPPFLAGS += -I../../render/extern/include +CPPFLAGS += -I../../blenfont CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include # own include diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript index c9b29f61e44..b771095c781 100644 --- a/source/blender/editors/space_view3d/SConscript +++ b/source/blender/editors/space_view3d/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' ../../render/extern/include #/intern/guardedalloc #intern/bmfont' -incs += ' ../../gpu ../../makesrna' +incs += ' ../../render/extern/include #/intern/guardedalloc' +incs += ' ../../gpu ../../makesrna ../../blenfont' env.BlenderLib ( 'bf_editors_space_view3d', sources, Split(incs), [], libtype=['core'], priority=[40] ) diff --git a/source/blender/editors/space_view3d/drawarmature.c b/source/blender/editors/space_view3d/drawarmature.c index 5d130cee48d..dfdd70b11e7 100644 --- a/source/blender/editors/space_view3d/drawarmature.c +++ b/source/blender/editors/space_view3d/drawarmature.c @@ -37,8 +37,6 @@ #include "MEM_guardedalloc.h" -#include "BMF_Api.h" - #include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" @@ -74,6 +72,7 @@ #include "WM_api.h" #include "WM_types.h" +#include "BLF_api.h" #include "UI_resources.h" @@ -1806,9 +1805,8 @@ static void draw_pose_channels(Scene *scene, View3D *v3d, RegionView3D *rv3d, Ba /* Draw names of bone */ if (arm->flag & ARM_DRAWNAMES) { VecMidf(vec, pchan->pose_head, pchan->pose_tail); - glRasterPos3fv(vec); - BMF_DrawString(G.font, " "); - BMF_DrawString(G.font, pchan->name); + BLF_draw_default(vec[0], vec[1], vec[2], " "); + BLF_draw_default(vec[0] + BLF_width_default(" "), vec[1], vec[2], pchan->name); } /* Draw additional axes on the bone tail */ @@ -1993,8 +1991,8 @@ static void draw_ebones(View3D *v3d, RegionView3D *rv3d, Object *ob, int dt) if (arm->flag & ARM_DRAWNAMES) { VecMidf(vec, eBone->head, eBone->tail); glRasterPos3fv(vec); - BMF_DrawString(G.font, " "); - BMF_DrawString(G.font, eBone->name); + BLF_draw_default(vec[0], vec[1], vec[2], " "); + BLF_draw_default(vec[0] + BLF_width_default(" "), vec[1], vec[2], eBone->name); } /* Draw additional axes */ if (arm->flag & ARM_DRAWAXES) { @@ -2155,15 +2153,13 @@ static void draw_pose_paths(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec /* only draw framenum if several consecutive highlighted points don't occur on same point */ if (a == 0) { - glRasterPos3fv(fp); sprintf(str, " %d\n", (a+sfra)); - BMF_DrawString(G.font, str); + BLF_draw_default(fp[0], fp[1], fp[2], str); } else if ((a > stepsize) && (a < len-stepsize)) { if ((VecEqual(fp, fp-(stepsize*3))==0) || (VecEqual(fp, fp+(stepsize*3))==0)) { - glRasterPos3fv(fp); sprintf(str, " %d\n", (a+sfra)); - BMF_DrawString(G.font, str); + BLF_draw_default(fp[0], fp[1], fp[2], str); } } } @@ -2205,9 +2201,8 @@ static void draw_pose_paths(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec if (ak->cfra == (a+sfra)) { char str[32]; - glRasterPos3fv(fp); sprintf(str, " %d\n", (a+sfra)); - BMF_DrawString(G.font, str); + BLF_draw_default(fp[0], fp[1], fp[2], str); } } } diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 10edd4eccb5..3725fc24b6c 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -34,8 +34,6 @@ #include "MEM_guardedalloc.h" -#include "BMF_Api.h" - #include "IMB_imbuf.h" @@ -107,6 +105,7 @@ #include "UI_interface_icons.h" #include "WM_api.h" +#include "BLF_api.h" #include "view3d_intern.h" // own include @@ -361,16 +360,15 @@ void drawaxes(float size, int flag, char drawtype) glEnd(); v2[axis]+= size*0.125; - glRasterPos3fv(v2); // patch for 3d cards crashing on glSelect for text drawing (IBM) if((flag & DRAW_PICKING) == 0) { if (axis==0) - BMF_DrawString(G.font, "x"); + BLF_draw_default(v2[0], v2[1], v2[2], "x"); else if (axis==1) - BMF_DrawString(G.font, "y"); + BLF_draw_default(v2[0], v2[1], v2[2], "y"); else - BMF_DrawString(G.font, "z"); + BLF_draw_default(v2[0], v2[1], v2[2], "z"); } } break; @@ -1778,7 +1776,7 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E Mesh *me= ob->data; EditEdge *eed; EditFace *efa; - float v1[3], v2[3], v3[3], v4[3]; + float v1[3], v2[3], v3[3], v4[3], x, y, z; float fvec[3]; char val[32]; /* Stores the measurement display text here */ char conv_float[5]; /* Use a float conversion matching the grid size */ @@ -1818,7 +1816,9 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E VECCOPY(v1, eed->v1->co); VECCOPY(v2, eed->v2->co); - glRasterPos3f( 0.5*(v1[0]+v2[0]), 0.5*(v1[1]+v2[1]), 0.5*(v1[2]+v2[2])); + x= 0.5*(v1[0]+v2[0]); + y= 0.5*(v1[1]+v2[1]); + z= 0.5*(v1[2]+v2[2]); if(v3d->flag & V3D_GLOBAL_STATS) { Mat4MulVecfl(ob->obmat, v1); @@ -1826,7 +1826,7 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E } sprintf(val, conv_float, VecLenf(v1, v2)); - BMF_DrawString( G.fonts, val); + BLF_draw_default(x, y, z, val); } } } @@ -1861,8 +1861,7 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E area = AreaT3Dfl(v1, v2, v3); sprintf(val, conv_float, area); - glRasterPos3fv(efa->cent); - BMF_DrawString( G.fonts, val); + BLF_draw_default(efa->cent[0], efa->cent[1], efa->cent[2], val); } } } @@ -1904,15 +1903,13 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E /* Vec 1 */ sprintf(val,"%.3f", VecAngle3(v4, v1, v2)); VecLerpf(fvec, efa->cent, efa->v1->co, 0.8); - glRasterPos3fv(fvec); - BMF_DrawString( G.fonts, val); + BLF_draw_default(efa->cent[0], efa->cent[1], efa->cent[2], val); } if( (e1->f & e2->f & SELECT) || (G.moving && (efa->v2->f & SELECT)) ) { /* Vec 2 */ sprintf(val,"%.3f", VecAngle3(v1, v2, v3)); VecLerpf(fvec, efa->cent, efa->v2->co, 0.8); - glRasterPos3fv(fvec); - BMF_DrawString( G.fonts, val); + BLF_draw_default(fvec[0], fvec[1], fvec[2], val); } if( (e2->f & e3->f & SELECT) || (G.moving && (efa->v3->f & SELECT)) ) { /* Vec 3 */ @@ -1921,16 +1918,14 @@ static void draw_em_measure_stats(View3D *v3d, RegionView3D *rv3d, Object *ob, E else sprintf(val,"%.3f", VecAngle3(v2, v3, v1)); VecLerpf(fvec, efa->cent, efa->v3->co, 0.8); - glRasterPos3fv(fvec); - BMF_DrawString( G.fonts, val); + BLF_draw_default(fvec[0], fvec[1], fvec[2], val); } /* Vec 4 */ if(efa->v4) { if( (e3->f & e4->f & SELECT) || (G.moving && (efa->v4->f & SELECT)) ) { sprintf(val,"%.3f", VecAngle3(v3, v4, v1)); VecLerpf(fvec, efa->cent, efa->v4->co, 0.8); - glRasterPos3fv(fvec); - BMF_DrawString( G.fonts, val); + BLF_draw_default(fvec[0], fvec[1], fvec[2], val); } } } @@ -3257,9 +3252,8 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv if(part->draw&PART_DRAW_NUM && !(G.f & G_RENDER_SHADOW)){ /* in path drawing state.co is the end point */ - glRasterPos3f(state.co[0], state.co[1], state.co[2]); sprintf(val," %i",a); - BMF_DrawString(G.font, val); + BLF_draw_default(state.co[0], state.co[1], state.co[2], val); } } } @@ -3574,9 +3568,8 @@ static void draw_particle_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Ob for(k=0, key=edit->keys[i]+k; k<pa->totkey; k++, key++){ if(key->flag & PEK_HIDE) continue; - glRasterPos3fv(key->world_co); sprintf(val," %.1f",*key->time); - BMF_DrawString(G.font, val); + BLF_draw_default(key->world_co[0], key->world_co[1], key->world_co[2], val); } } } @@ -3598,9 +3591,8 @@ static void draw_particle_edit(Scene *scene, View3D *v3d, RegionView3D *rv3d, Ob glEnd(); if((pset->flag & PE_SHOW_TIME) && !(G.f & G_RENDER_SHADOW)){ - glRasterPos3fv(key->world_co); sprintf(val," %.1f",*key->time); - BMF_DrawString(G.font, val); + BLF_draw_default(key->world_co[0], key->world_co[1], key->world_co[2], val); } } } @@ -4625,13 +4617,12 @@ void drawRBpivot(bRigidBodyJointConstraint *data) glVertex3fv(v1); glVertex3fv(v); glEnd(); - glRasterPos3fv(v); if (axis==0) - BMF_DrawString(G.font, "px"); + BLF_draw_default(v[0], v[1], v[2], "px"); else if (axis==1) - BMF_DrawString(G.font, "py"); + BLF_draw_default(v[0], v[1], v[2], "py"); else - BMF_DrawString(G.font, "pz"); + BLF_draw_default(v[0], v[1], v[2], "pz"); } glLineWidth (1.0f); setlinestyle(0); @@ -5051,10 +5042,8 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag) /* but, we also dont draw names for sets or duplicators */ if(flag == 0) { if(v3d->zbuf) glDisable(GL_DEPTH_TEST); - glRasterPos3f(0.0, 0.0, 0.0); - - BMF_DrawString(G.font, " "); - BMF_DrawString(G.font, ob->id.name+2); + BLF_draw_default(0.0, 0.0, 0.0, " "); + BLF_draw_default(0.0 + BLF_width_default(" "), 0.0, 0.0, ob->id.name+2); if(v3d->zbuf) glEnable(GL_DEPTH_TEST); } } diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index cb67a1fc9aa..bbf0279692a 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -69,9 +69,9 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "BMF_Api.h" #include "WM_api.h" +#include "BLF_api.h" #include "ED_armature.h" #include "ED_keyframing.h" @@ -558,8 +558,7 @@ static void draw_view_axis(RegionView3D *rv3d) dy = vec[1] * k; fdrawline(start, start + ydisp, start + dx, start + dy + ydisp); if (fabs(dx) > toll || fabs(dy) > toll) { - glRasterPos2i(start + dx + 2, start + dy + ydisp + 2); - BMF_DrawString(G.fonts, "x"); + BLF_draw_default(start + dx + 2, start + dy + ydisp + 2, 0.0f, "x"); } /* Y */ @@ -579,8 +578,7 @@ static void draw_view_axis(RegionView3D *rv3d) dy = vec[1] * k; fdrawline(start, start + ydisp, start + dx, start + dy + ydisp); if (fabs(dx) > toll || fabs(dy) > toll) { - glRasterPos2i(start + dx + 2, start + dy + ydisp + 2); - BMF_DrawString(G.fonts, "y"); + BLF_draw_default(start + dx + 2, start + dy + ydisp + 2, 0.0f, "y"); } /* Z */ @@ -600,8 +598,7 @@ static void draw_view_axis(RegionView3D *rv3d) dy = vec[1] * k; fdrawline(start, start + ydisp, start + dx, start + dy + ydisp); if (fabs(dx) > toll || fabs(dy) > toll) { - glRasterPos2i(start + dx + 2, start + dy + ydisp + 2); - BMF_DrawString(G.fonts, "z"); + BLF_draw_default(start + dx + 2, start + dy + ydisp + 2, 0.0f, "z"); } /* restore line-width */ @@ -693,8 +690,7 @@ static void draw_viewport_name(ARegion *ar, View3D *v3d) if (printable) { UI_ThemeColor(TH_TEXT_HI); - glRasterPos2i(10, ar->winy-20); - BMF_DrawString(G.fonts, printable); + BLF_draw_default(10, ar->winy-20, 0.0f, printable); } if (v3d->localview) { @@ -799,7 +795,7 @@ static void draw_selected_name(Scene *scene, Object *ob, View3D *v3d) } /* colour depends on whether there is a keyframe */ - if (id_frame_has_keyframe((ID *)ob, /*frame_to_float(scene, CFRA)*/(float)(CFRA), v3d->keyflags)) + if (id_frame_has_keyframe((ID *)ob, /*frame_to_float(scene, CFRA)*/(float)(CFRA), v3d->keyflags)) UI_ThemeColor(TH_VERTEX_SELECT); else UI_ThemeColor(TH_TEXT_HI); @@ -817,9 +813,8 @@ static void draw_selected_name(Scene *scene, Object *ob, View3D *v3d) if (U.uiflag & USER_SHOW_ROTVIEWICON) offset = 14 + (U.rvisize * 2); - - glRasterPos2i(offset, 10); - BMF_DrawString(G.fonts, info); + + BLF_draw_default(offset, 10, 0.0f, info); } static void view3d_get_viewborder_size(Scene *scene, ARegion *ar, float size_r[2]) @@ -999,9 +994,7 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d) /* camera name - draw in highlighted text color */ if (ca && (ca->flag & CAM_SHOWNAME)) { UI_ThemeColor(TH_TEXT_HI); - glRasterPos2f(x1, y1-15); - - BMF_DrawString(G.font, v3d->camera->id.name+2); + BLF_draw_default(x1, y1-15, 0.0f, v3d->camera->id.name+2); UI_ThemeColor(TH_WIRE); } diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index fba8e0c4eb7..24d211d81ab 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -92,8 +92,6 @@ #include "UI_resources.h" #include "UI_view2d.h" -#include "BMF_Api.h" - #include "view3d_intern.h" diff --git a/source/blender/editors/transform/Makefile b/source/blender/editors/transform/Makefile index 36758190b52..bc3e08a2ae8 100644 --- a/source/blender/editors/transform/Makefile +++ b/source/blender/editors/transform/Makefile @@ -38,7 +38,6 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I../../windowmanager diff --git a/source/blender/editors/transform/SConscript b/source/blender/editors/transform/SConscript index 2c44204afa9..b2dee8c3358 100644 --- a/source/blender/editors/transform/SConscript +++ b/source/blender/editors/transform/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' -incs += ' ../../render/extern/include #/intern/guardedalloc #intern/bmfont' +incs += ' ../../render/extern/include #/intern/guardedalloc' incs += ' ../../gpu ../../makesrna' env.BlenderLib ( 'bf_editors_transform', sources, Split(incs), [], libtype=['core'], priority=[40] )
\ No newline at end of file diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 1f76cd0b424..a4d5b0f0ed2 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -55,9 +55,5 @@ ELSE(WITH_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON) ENDIF(WITH_PYTHON) -IF(WITH_INTERNATIONAL) - ADD_DEFINITIONS(-DWITH_FREETYPE2) -ENDIF(WITH_INTERNATIONAL) - BLENDERLIB(bf_nodes "${SRC}" "${INC}") diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript index a9f303c8dd3..164e30c7d05 100644 --- a/source/blender/nodes/SConscript +++ b/source/blender/nodes/SConscript @@ -27,9 +27,6 @@ if env['WITH_BF_PYTHON']: else: defs.append('DISABLE_PYTHON') -if env['WITH_BF_INTERNATIONAL']: - defs.append('WITH_FREETYPE2') - if env['WITH_BF_OPENEXR']: defs.append('WITH_OPENEXR') diff --git a/source/blender/python/CMakeLists.txt b/source/blender/python/CMakeLists.txt index b94ae8749df..d15970e1df4 100644 --- a/source/blender/python/CMakeLists.txt +++ b/source/blender/python/CMakeLists.txt @@ -47,8 +47,3 @@ ENDIF(WITH_FFMPEG) ADD_DEFINITIONS(-DWITH_CCGSUBSURF) BLENDERLIB(bf_python "${SRC}" "${INC}") - -IF(WITH_INTERNATIONAL) - ADD_DEFINITIONS(-DWITH_FREETYPE2) -ENDIF(WITH_INTERNATIONAL) - diff --git a/source/blender/python/intern/Makefile b/source/blender/python/intern/Makefile index ea08ecac945..3e28f5aac31 100644 --- a/source/blender/python/intern/Makefile +++ b/source/blender/python/intern/Makefile @@ -42,7 +42,6 @@ CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) # PreProcessor stuff CPPFLAGS += -I$(NAN_GHOST)/include -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include $(NAN_SDLCFLAGS) # modules diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index f9dd6a19fb7..088bdc99687 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -30,7 +30,7 @@ SET(INC . ../editors/include ../../../intern/guardedalloc ../../../intern/memutil ../blenlib ../makesdna ../makesrna ../blenkernel - ../include ../../../intern/bmfont ../imbuf ../render/extern/include + ../include ../imbuf ../render/extern/include ../../../intern/bsp/extern ../radiosity/extern/include ../../../intern/decimation/extern ../blenloader ../../kernel/gen_system ../../../intern/SoundSystem ../readstreamglue @@ -43,9 +43,7 @@ SET(INC . ) IF(WITH_INTERNATIONAL) - SET(INC ${INC} ../ftfont) ADD_DEFINITIONS(-DINTERNATIONAL) - ADD_DEFINITIONS(-DFTGL_STATIC_LIBRARY) ENDIF(WITH_INTERNATIONAL) IF(WITH_OPENEXR) diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index 862235d7b4b..91635904524 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -8,10 +8,10 @@ sources = env.Glob('intern/*.c') incs = '. ../editors/include ../python ../makesdna ../blenlib ../blenkernel' incs += ' ../nodes ../imbuf ../blenloader ../render/extern/include' -incs += ' ../ftfont ../radiosity/extern/include ../../kernel/gen_system' +incs += ' ../radiosity/extern/include ../../kernel/gen_system' incs += ' ../makesrna ../gpu ../blenfont' -incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost #/intern/bmfont' +incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost' incs += ' #/intern/elbeem #/extern/glew/include' defs = [] diff --git a/source/blender/windowmanager/intern/Makefile b/source/blender/windowmanager/intern/Makefile index 0bf161e3250..80ae58f9398 100644 --- a/source/blender/windowmanager/intern/Makefile +++ b/source/blender/windowmanager/intern/Makefile @@ -43,7 +43,6 @@ CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) # PreProcessor stuff CPPFLAGS += -I$(NAN_GHOST)/include -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_ELBEEM)/include CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include $(NAN_SDLCFLAGS) @@ -59,7 +58,6 @@ CPPFLAGS += -I../../imbuf CPPFLAGS += -I../../blenloader CPPFLAGS += -I../../gpu CPPFLAGS += -I../../render/extern/include -CPPFLAGS += -I../../ftfont CPPFLAGS += -I../../radiosity/extern/include CPPFLAGS += -I../../../kernel/gen_system CPPFLAGS += -I../../blenfont diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index d394a4d6eee..adbc43e439d 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -54,8 +54,6 @@ #include "BKE_utildefines.h" #include "BKE_packedFile.h" -#include "BMF_Api.h" - #include "BLI_blenlib.h" #include "RE_pipeline.h" /* RE_ free stuff */ @@ -120,7 +118,7 @@ void WM_init(bContext *C) ED_file_init(); /* for fsmenu */ ED_init_node_butfuncs(); - BLF_init(); + BLF_init(11, U.dpi); BLF_lang_init(); init_builtin_keyingsets(); /* editors/animation/keyframing.c */ @@ -130,11 +128,6 @@ void WM_init(bContext *C) UI_init(); - /* goes away */ - G.font= BMF_GetFont(BMF_kHelvetica12); - G.fonts= BMF_GetFont(BMF_kHelvetica10); - G.fontss= BMF_GetFont(BMF_kHelveticaBold8); - // clear_matcopybuf(); /* XXX */ // glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 14263580c4a..fe0f741bb96 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -243,11 +243,8 @@ IF(UNIX) bf_guardedalloc blender_CTR bf_moto - bf_bmfont bf_windowmanager - bf_editors - bf_ftfont - extern_ftgl + bf_editors bf_blroutines bf_converter bf_dummy diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt index e090a4b9c56..107ef9b4b87 100644 --- a/source/gameengine/BlenderRoutines/CMakeLists.txt +++ b/source/gameengine/BlenderRoutines/CMakeLists.txt @@ -7,7 +7,6 @@ SET(INC ../../../intern/string ../../../intern/guardedalloc ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer - ../../../intern/bmfont ../../../source/gameengine/Converter ../../../source/blender/imbuf ../../../intern/ghost/include diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp index 648ad79210e..b08eaf6e026 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp @@ -42,8 +42,6 @@ #include <stdlib.h> #include <string.h> -#include "BMF_Api.h" - #include "GL/glew.h" #include "BL_Material.h" // MAXTEX @@ -148,8 +146,7 @@ void BL_print_gamedebug_line(char* text, int xco, int yco, int width, int height /* the actual drawing */ glColor3ub(255, 255, 255); - glRasterPos2s(xco, height-yco); - BMF_DrawString(G.fonts, text); + BLF_draw_default(xco, height-yco, 0.0f, text); glMatrixMode(GL_TEXTURE); glPopMatrix(); @@ -184,11 +181,9 @@ void BL_print_gamedebug_line_padded(char* text, int xco, int yco, int width, int /* draw in black first*/ glColor3ub(0, 0, 0); - glRasterPos2s(xco+1, height-yco-1); - BMF_DrawString(G.fonts, text); + BLF_draw_default(xco+1, height-yco-1, 0.0f, text); glColor3ub(255, 255, 255); - glRasterPos2s(xco, height-yco); - BMF_DrawString(G.fonts, text); + BLF_draw_default(xco, height-yco, 0.0f, text); glMatrixMode(GL_TEXTURE); glPopMatrix(); diff --git a/source/gameengine/BlenderRoutines/Makefile b/source/gameengine/BlenderRoutines/Makefile index 03a7a247727..3a2c30672cc 100644 --- a/source/gameengine/BlenderRoutines/Makefile +++ b/source/gameengine/BlenderRoutines/Makefile @@ -40,7 +40,6 @@ CPPFLAGS += -I$(NAN_SUMO)/include -I$(NAN_SOLID)/include CPPFLAGS += -I$(NAN_SOLID) CPPFLAGS += -I$(NAN_STRING)/include CPPFLAGS += -I$(NAN_MOTO)/include -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_FUZZICS)/include CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include CPPFLAGS += -I$(NAN_GLEW)/include diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript index 020402e9bcd..684b80dceee 100644 --- a/source/gameengine/BlenderRoutines/SConscript +++ b/source/gameengine/BlenderRoutines/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.cpp') defs = [] incs = '. #source/kernel/gen_system #intern/string #intern/guardedalloc' -incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #intern/bmfont' +incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer' incs += ' #source/gameengine/Converter #source/blender/imbuf' incs += ' #intern/ghost/include' incs += ' #intern/moto/include #source/gameengine/Ketsji #source/blender/blenlib' diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt index a5219b9e759..44692241e6f 100644 --- a/source/gameengine/Converter/CMakeLists.txt +++ b/source/gameengine/Converter/CMakeLists.txt @@ -32,7 +32,6 @@ SET(INC ../../../intern/string ../../../intern/guardedalloc ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer - ../../../intern/bmfont ../../../intern/SoundSystem ../../../intern/SoundSystem/include ../../../intern/SoundSystem/openal diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript index 98b7c71bad2..af0d39771de 100644 --- a/source/gameengine/Converter/SConscript +++ b/source/gameengine/Converter/SConscript @@ -5,7 +5,7 @@ sources = env.Glob('*.cpp') defs = [] incs = '. #source/kernel/gen_system #intern/string #intern/guardedalloc' -incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #intern/bmfont' +incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer' incs += ' #intern/SoundSystem #intern/SoundSystem/include #intern/SoundSystem/openal' incs += ' #intern/SoundSystem/dummy #intern/SoundSystem/intern #source/gameengine/Converter' incs += ' #source/gameengine/BlenderRoutines #source/blender/imbuf' diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt index 0c6c4179e2d..ce1cd217f60 100644 --- a/source/gameengine/GamePlayer/common/CMakeLists.txt +++ b/source/gameengine/GamePlayer/common/CMakeLists.txt @@ -42,7 +42,6 @@ SET(INC ../../../../intern/string ../../../../intern/ghost ../../../../intern/guardedalloc - ../../../../intern/bmfont ../../../../intern/moto/include ../../../../intern/SoundSystem ../../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp index eafdb8a96bb..a036f9821a4 100644 --- a/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp +++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp @@ -29,8 +29,6 @@ #include "GL/glew.h" -#include "BMF_Api.h" - #include "DNA_scene_types.h" #include "RAS_IRenderTools.h" @@ -61,7 +59,7 @@ unsigned int GPC_RenderTools::m_numgllights; GPC_RenderTools::GPC_RenderTools() { - m_font = BMF_GetFont(BMF_kHelvetica10); +// XXX m_font = BMF_GetFont(BMF_kHelvetica10); glGetIntegerv(GL_MAX_LIGHTS, (GLint*) &m_numgllights); if (m_numgllights < 8) diff --git a/source/gameengine/GamePlayer/common/GPC_RenderTools.h b/source/gameengine/GamePlayer/common/GPC_RenderTools.h index 316860a7d43..478d8b1a3c5 100644 --- a/source/gameengine/GamePlayer/common/GPC_RenderTools.h +++ b/source/gameengine/GamePlayer/common/GPC_RenderTools.h @@ -38,8 +38,6 @@ #include "RAS_IRenderTools.h" -#include "BMF_Api.h" - struct KX_ClientObjectInfo; class KX_RayCast; @@ -57,7 +55,7 @@ class GPC_RenderTools : public RAS_IRenderTools void *m_lastauxinfo; static unsigned int m_numgllights; - BMF_Font* m_font; +// XXX BMF_Font* m_font; public: GPC_RenderTools(); diff --git a/source/gameengine/GamePlayer/common/Makefile b/source/gameengine/GamePlayer/common/Makefile index 6a12e659be6..84b4a4170a9 100644 --- a/source/gameengine/GamePlayer/common/Makefile +++ b/source/gameengine/GamePlayer/common/Makefile @@ -56,7 +56,6 @@ CPPFLAGS += -I$(NAN_PNG)/include CPPFLAGS += -I$(NAN_ZLIB)/include CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include CPPFLAGS += -I../../../gameengine/Converter CPPFLAGS += -I../../../gameengine/Expressions diff --git a/source/gameengine/GamePlayer/common/SConscript b/source/gameengine/GamePlayer/common/SConscript index 23ad413350b..e96b2c5400b 100644 --- a/source/gameengine/GamePlayer/common/SConscript +++ b/source/gameengine/GamePlayer/common/SConscript @@ -18,7 +18,6 @@ incs = ['.', '#intern/string', '#intern/ghost', '#intern/guardedalloc', - '#intern/bmfont', '#intern/moto/include', '#intern/SoundSystem', '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer', diff --git a/source/gameengine/GamePlayer/common/unix/Makefile b/source/gameengine/GamePlayer/common/unix/Makefile index 3d44a41afee..90342c7b735 100644 --- a/source/gameengine/GamePlayer/common/unix/Makefile +++ b/source/gameengine/GamePlayer/common/unix/Makefile @@ -60,7 +60,6 @@ CPPFLAGS += -I$(NAN_FUZZICS)/include CPPFLAGS += -I$(NAN_SUMO)/include CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include CPPFLAGS += -I$(NAN_MOTO)/include -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_SOLID)/include # Blender stuff diff --git a/source/gameengine/GamePlayer/common/windows/Makefile b/source/gameengine/GamePlayer/common/windows/Makefile index f35642f9651..b622ee974c8 100644 --- a/source/gameengine/GamePlayer/common/windows/Makefile +++ b/source/gameengine/GamePlayer/common/windows/Makefile @@ -48,7 +48,6 @@ CPPFLAGS += -I$(SRCHOME)/gameengine/Physics/Sumo/include CPPFLAGS += -I$(NAN_MOTO)/include CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include CPPFLAGS += -I$(NAN_GLEW)/include diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt index a3cd8296da3..71961f27339 100644 --- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt +++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt @@ -37,7 +37,6 @@ SET(INC ../../../../intern/string ../../../../intern/ghost ../../../../intern/guardedalloc - ../../../../intern/bmfont ../../../../intern/moto/include ../../../../intern/SoundSystem ../../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer diff --git a/source/gameengine/GamePlayer/ghost/Makefile b/source/gameengine/GamePlayer/ghost/Makefile index 5f90d804611..c82edca0d45 100644 --- a/source/gameengine/GamePlayer/ghost/Makefile +++ b/source/gameengine/GamePlayer/ghost/Makefile @@ -39,7 +39,6 @@ CCFLAGS += $(LEVEL_1_CPP_WARNINGS) CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_BMFONT)/include CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript index 9b17ed3757b..1cb7c9f2457 100644 --- a/source/gameengine/GamePlayer/ghost/SConscript +++ b/source/gameengine/GamePlayer/ghost/SConscript @@ -12,7 +12,6 @@ incs = ['.', '#intern/string', '#intern/ghost', '#intern/guardedalloc', - '#intern/bmfont', '#intern/moto/include', '#intern/SoundSystem', '#source/gameengine/Rasterizer/RAS_OpenGLRasterizer', diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt index 73d7191ffde..ca9ce4dc50c 100644 --- a/source/gameengine/Ketsji/CMakeLists.txt +++ b/source/gameengine/Ketsji/CMakeLists.txt @@ -47,7 +47,6 @@ SET(INC ../../../intern/string ../../../intern/guardedalloc ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer - ../../../intern/bmfont ../../../source/gameengine/Converter ../../../source/blender/imbuf ../../../intern/ghost/include diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript index 0e888edd43b..921aba9c11f 100644 --- a/source/gameengine/Ketsji/SConscript +++ b/source/gameengine/Ketsji/SConscript @@ -31,7 +31,7 @@ defs = '' incs = '. #source/blender/python/api2_2x' # Only for Mathutils! and bpy_internal_import.h, be very careful incs += ' #source/kernel/gen_system #intern/string #intern/guardedalloc' -incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer #intern/bmfont' +incs += ' #source/gameengine/Rasterizer/RAS_OpenGLRasterizer' incs += ' #intern/SoundSystem #intern/SoundSystem/include #intern/SoundSystem/openal' incs += ' #intern/SoundSystem/dummy #intern/SoundSystem/intern #source/gameengine/Converter' incs += ' #source/gameengine/BlenderRoutines #source/blender/imbuf #intern/moto/include' diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index eadc334431d..ba2f8f04233 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -106,17 +106,14 @@ endif export NAN_ACTION ?= $(LCGDIR)/action export NAN_GHOST ?= $(LCGDIR)/ghost export NAN_TEST_VERBOSITY ?= 1 - export NAN_BMFONT ?= $(LCGDIR)/bmfont export NAN_OPENNL ?= $(LCGDIR)/opennl export NAN_ELBEEM ?= $(LCGDIR)/elbeem export NAN_SUPERLU ?= $(LCGDIR)/superlu export NAN_GLEW ?= $(LCGDIR)/glew ifeq ($(FREE_WINDOWS), true) - export NAN_FTGL ?= $(LCGDIR)/gcc/ftgl export NAN_FFMPEG ?= $(LCGDIR)/gcc/ffmpeg export NAN_FFMPEGLIBS ?= $(NAN_FFMPEG)/lib/libavformat.a $(NAN_FFMPEG)/lib/libavutil.a $(NAN_FFMPEG)/lib/libavcodec.a $(NAN_FFMPEG)/lib/libavdevice.a else - export NAN_FTGL ?= $(LCGDIR)/ftgl export NAN_FFMPEG ?= $(LCGDIR)/ffmpeg export NAN_FFMPEGLIBS ?= $(NAN_FFMPEG)/lib/libavformat.a $(NAN_FFMPEG)/lib/libavcodec.a $(NAN_FFMPEG)/lib/libswscale.a $(NAN_FFMPEG)/lib/libavutil.a $(NAN_FFMPEG)/lib/libavdevice.a endif @@ -172,9 +169,6 @@ endif # l10n #export INTERNATIONAL ?= true - # enable freetype2 support for text objects - #export WITH_FREETYPE2 ?= true - else ifeq ($(OS),darwin) @@ -246,9 +240,6 @@ endif # enable l10n export INTERNATIONAL ?= true - # enable freetype2 support for text objects - export WITH_FREETYPE2 ?= true - else ifeq ($(OS),freebsd) @@ -290,9 +281,6 @@ endif # enable l10n # export INTERNATIONAL ?= true - # enable freetype2 support for text objects - # export WITH_FREETYPE2 ?= true - else ifeq ($(OS),irix) @@ -347,9 +335,6 @@ endif # enable l10n export INTERNATIONAL ?= true - # enable freetype2 support for text objects - export WITH_FREETYPE2 ?= true - else ifeq ($(OS),linux) @@ -403,9 +388,6 @@ endif # l10n export INTERNATIONAL ?= true - # enable freetype2 support for text objects - export WITH_FREETYPE2 ?= true - export WITH_BINRELOC ?= true # enable ffmpeg support @@ -454,9 +436,6 @@ endif # l10n #export INTERNATIONAL ?= true - # enable freetype2 support for text objects - #export WITH_FREETYPE2 ?= true - else ifeq ($(OS),solaris) @@ -502,9 +481,6 @@ endif # l10n #export INTERNATIONAL ?= true - # enable freetype2 support for text objects - #export WITH_FREETYPE2 ?= true - else ifeq ($(OS),windows) @@ -561,9 +537,6 @@ endif # l10n export INTERNATIONAL ?= true - # enable freetype2 support for text objects - export WITH_FREETYPE2 ?= true - # enable quicktime support # export WITH_QUICKTIME ?= true @@ -605,9 +578,6 @@ endif # l10n #export INTERNATIONAL ?= true - # enable freetype2 support for text objects - #export WITH_FREETYPE2 ?= true - endif # windows + fallback endif # solaris endif # openbsd @@ -624,8 +594,3 @@ ifeq ($(NAN_NO_KETSJI), true) export NAN_JUST_BLENDERDYNAMIC=true export NAN_NO_OPENAL=true endif - -# INTERNATIONAL implies WITH_FREETYPE2 -ifeq ($(INTERNATIONAL), true) - export WITH_FREETYPE2=true -endif |