diff options
author | Daniel Stenberg <daniel@haxx.se> | 2002-09-09 13:13:17 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2002-09-09 13:13:17 +0000 |
commit | 89db47fde8f09924ba72db9311267d6d5c5014e8 (patch) | |
tree | 1f58c28067553f99c0ebeb15b9e9c7384399ae04 /tools | |
parent | 7c57db5560d622fc1af803ea9b95816d6b2f2b2b (diff) | |
download | rockbox-89db47fde8f09924ba72db9311267d6d5c5014e8.tar.gz rockbox-89db47fde8f09924ba72db9311267d6d5c5014e8.zip |
no thank you, no very nasty union tricks here
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2237 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
-rw-r--r-- | tools/bdf2ajf.c | 12 | ||||
-rw-r--r-- | tools/bdf2ajf.h | 6 |
2 files changed, 4 insertions, 14 deletions
diff --git a/tools/bdf2ajf.c b/tools/bdf2ajf.c index 1e534f0006..6733f00d92 100644 --- a/tools/bdf2ajf.c +++ b/tools/bdf2ajf.c | |||
@@ -799,9 +799,7 @@ void test_print(unsigned char c, BDF* font, short* enc_map) | |||
799 | { | 799 | { |
800 | unsigned short bmp = 0; | 800 | unsigned short bmp = 0; |
801 | unsigned short sh; | 801 | unsigned short sh; |
802 | DOUBLE_BYTE db; | 802 | int db= (g->bitmap[i*2] | (g->bitmap[i*2+1] <<8)); |
803 | db.db[0] = g->bitmap[i*2]; | ||
804 | db.db[1] = g->bitmap[i*2+1]; | ||
805 | 803 | ||
806 | sh = 1 << 7; /*g->dwidth_x;*/ | 804 | sh = 1 << 7; /*g->dwidth_x;*/ |
807 | 805 | ||
@@ -814,7 +812,7 @@ void test_print(unsigned char c, BDF* font, short* enc_map) | |||
814 | sh = 1 << (sizeof(unsigned short)*8-1); | 812 | sh = 1 << (sizeof(unsigned short)*8-1); |
815 | bit = sh>>(j - 8); | 813 | bit = sh>>(j - 8); |
816 | } | 814 | } |
817 | b = bit & db.sval; | 815 | b = bit & db; |
818 | printf( b ? "*" : " " ); | 816 | printf( b ? "*" : " " ); |
819 | } | 817 | } |
820 | 818 | ||
@@ -884,9 +882,7 @@ void getBitmap(BDF_GLYPH* g, unsigned char* src) | |||
884 | { | 882 | { |
885 | unsigned short bmp = 0; | 883 | unsigned short bmp = 0; |
886 | unsigned short sh, srcmap; | 884 | unsigned short sh, srcmap; |
887 | DOUBLE_BYTE db; | 885 | int db= (g->bitmap[i*2] | (g->bitmap[i*2+1] <<8)); |
888 | db.db[0] = g->bitmap[i*2]; | ||
889 | db.db[1] = g->bitmap[i*2+1]; | ||
890 | 886 | ||
891 | sh = 1 << 7; /*g->dwidth_x;*/ | 887 | sh = 1 << 7; /*g->dwidth_x;*/ |
892 | 888 | ||
@@ -906,7 +902,7 @@ void getBitmap(BDF_GLYPH* g, unsigned char* src) | |||
906 | sh = 1 << (sizeof(unsigned short)*8-1); | 902 | sh = 1 << (sizeof(unsigned short)*8-1); |
907 | bit = sh>>(j - 8); | 903 | bit = sh>>(j - 8); |
908 | } | 904 | } |
909 | b = bit&db.sval; | 905 | b = bit&db; |
910 | 906 | ||
911 | if (b) | 907 | if (b) |
912 | src[j*rows+d] |= srcmap; | 908 | src[j*rows+d] |= srcmap; |
diff --git a/tools/bdf2ajf.h b/tools/bdf2ajf.h index 6367fae00b..9f1e70f1fb 100644 --- a/tools/bdf2ajf.h +++ b/tools/bdf2ajf.h | |||
@@ -60,12 +60,6 @@ typedef struct | |||
60 | BDF_GLYPH* enc_table[256]; | 60 | BDF_GLYPH* enc_table[256]; |
61 | } BDF; | 61 | } BDF; |
62 | 62 | ||
63 | typedef union | ||
64 | { | ||
65 | unsigned char db[2]; | ||
66 | unsigned short sval; | ||
67 | } DOUBLE_BYTE; | ||
68 | |||
69 | BDF* readFont(const char *name); | 63 | BDF* readFont(const char *name); |
70 | BDF_GLYPH* getGlyph(unsigned char c, BDF* bdf, short* enc_map); | 64 | BDF_GLYPH* getGlyph(unsigned char c, BDF* bdf, short* enc_map); |
71 | void getBitmap(BDF_GLYPH* g, unsigned char* src); | 65 | void getBitmap(BDF_GLYPH* g, unsigned char* src); |