From 89db47fde8f09924ba72db9311267d6d5c5014e8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 9 Sep 2002 13:13:17 +0000 Subject: no thank you, no very nasty union tricks here git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2237 a1c6a512-1295-4272-9138-f99709370657 --- tools/bdf2ajf.c | 12 ++++-------- tools/bdf2ajf.h | 6 ------ 2 files changed, 4 insertions(+), 14 deletions(-) (limited to 'tools') 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) { unsigned short bmp = 0; unsigned short sh; - DOUBLE_BYTE db; - db.db[0] = g->bitmap[i*2]; - db.db[1] = g->bitmap[i*2+1]; + int db= (g->bitmap[i*2] | (g->bitmap[i*2+1] <<8)); sh = 1 << 7; /*g->dwidth_x;*/ @@ -814,7 +812,7 @@ void test_print(unsigned char c, BDF* font, short* enc_map) sh = 1 << (sizeof(unsigned short)*8-1); bit = sh>>(j - 8); } - b = bit & db.sval; + b = bit & db; printf( b ? "*" : " " ); } @@ -884,9 +882,7 @@ void getBitmap(BDF_GLYPH* g, unsigned char* src) { unsigned short bmp = 0; unsigned short sh, srcmap; - DOUBLE_BYTE db; - db.db[0] = g->bitmap[i*2]; - db.db[1] = g->bitmap[i*2+1]; + int db= (g->bitmap[i*2] | (g->bitmap[i*2+1] <<8)); sh = 1 << 7; /*g->dwidth_x;*/ @@ -906,7 +902,7 @@ void getBitmap(BDF_GLYPH* g, unsigned char* src) sh = 1 << (sizeof(unsigned short)*8-1); bit = sh>>(j - 8); } - b = bit&db.sval; + b = bit&db; if (b) 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 BDF_GLYPH* enc_table[256]; } BDF; -typedef union -{ - unsigned char db[2]; - unsigned short sval; -} DOUBLE_BYTE; - BDF* readFont(const char *name); BDF_GLYPH* getGlyph(unsigned char c, BDF* bdf, short* enc_map); void getBitmap(BDF_GLYPH* g, unsigned char* src); -- cgit v1.2.3