qi-hardware/antorcha
1
0
Fork 0
mirror of git://projects.qi-hardware.com/antorcha.git synced 2024-11-01 07:24:58 +02:00
Code

tools/libtxt/: create library instead of executable

Browse Source
This commit is contained in:
Werner Almesberger 2012-06-30 12:52:01 -03:00
parent 758d9e7fc4
commit 350283375c
2 changed files with 5 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/libtxt/Makefile
View File

@ -11,7 +11,7 @@
# #
MAIN = libtxt.a LIB = libtxt.a
CFLAGS = -g -Wall CFLAGS = -g -Wall
@ -19,13 +19,13 @@ OBJS = edit.o font.o
.PHONY: all clean spotless .PHONY: all clean spotless
all: $(MAIN) all: $(LIB)
$(MAIN): $(OBJS) $(LIB): $(OBJS)
$(CC) $(CFLAGS) -o $@ $(OBJS) $(AR) cr $@ $^
clean: clean:
rm -f $(OBJS) rm -f $(OBJS)
spotless: clean spotless: clean
rm -f $(MAIN) rm -f $(LIB)

45
tools/libtxt/font.c
View File

@ -305,48 +305,3 @@ int char_height(const struct font *font, char c)
sym = font->sym+(cp-charset); sym = font->sym+(cp-charset);
return sym->h; return sym->h;
} }
/* ----- Testing ----------------------------------------------------------- */
#define W 64
#define H 20
int main(int argc, char **argv)
{
struct font *font;
struct image *img;
const char *error;
uint8_t canvas[W*H/8] = { 0 };
char *s;
int x, xo, y;
img = load_image(argv[1], &error);
if (!img) {
fprintf(stderr, "%s\n", error);
return 1;
}
font = make_font(img, &error);
if (!font) {
fprintf(stderr, "%s\n", error);
return 1;
}
x = 0;
for (s = argv[2]; *s; s++) {
xo = draw_char(canvas, W, H, font, *s, x, 0);
if (xo)
x += xo+1;
}
for (y = 0; y != H; y++) {
for (x = 0; x != W; x++)
if (canvas[(y*W+x) >> 3] & (1 << (x & 7)))
putchar('#');
else
putchar('.');
putchar('\n');
}
return 0;
}