From: Karryanna Date: Tue, 12 May 2015 18:54:20 +0000 (+0200) Subject: Labelling: bitmaps for labels are still somewhat dummy (no rotation) X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=21017820e79722500c429cabda7f7c3a74259cd1;p=leo.git Labelling: bitmaps for labels are still somewhat dummy (no rotation) --- diff --git a/labeller.c b/labeller.c index 1a88bbc..0942f07 100644 --- a/labeller.c +++ b/labeller.c @@ -247,28 +247,13 @@ void make_bitmap_point(struct point_variant *v, struct sym_point *sp) void make_bitmap_label(struct point_variant *v, struct sym_text *text) { - int x_ld = 0; - int y_ld = 0; - int x_lu = 0; - int y_lu = 0; - int x_rd = 0; - int y_rd = 0; - int x_ru = 0; - int y_ru = 0; - - v->width = max4(x_ld, x_lu, x_rd, x_ru) - min4(x_ld, x_lu, x_rd, x_ru); - v->height = max4(y_ld, y_lu, y_rd, y_ru) - min4(y_ld, y_lu, y_rd, y_ru); - //v->bitmap = malloc((int) (ceil(v->width) * ceil(v->height) * sizeof(bool))); - v->width = ceil(text->tw); v->height = ceil(text->th); v->bitmap = malloc(v->width * v->height * sizeof(bool)); -// printf("Allocated bitmap of %d bools for %d x %d label\n", v->width * v->height, v->width, v->height); for (int i=0; iheight; i++) for (int j=0; jwidth; j++) { v->bitmap[i*v->width + j] = 1; -// printf("Writing at %d\n", i*v->width + j); } }