Index: concrete_line.h =================================================================== --- concrete_line.h (.../concrete_line.h) (revision 340) +++ concrete_line.h (.../concrete_bitmap.h) (revision 341) @@ -1,13 +1,18 @@ -#ifndef CSCH_CONCRETE_LINE_H -#define CSCH_CONCRETE_LINE_H +#ifndef CSCH_CONCRETE_BITMAP_H +#define CSCH_CONCRETE_BITMAP_H #include "libcschem/concrete.h" -/* type=CSCH_CTYPE_LINE */ +/* type=CSCH_CTYPE_BITMAP */ -typedef struct csch_cline_s { +#include "TODO.h" +typedef csch_uint32_t csch_pixel_t; + +typedef struct csch_cbitmap_s { csch_chdr_t hdr; - csch_oid_t pen; - csch_coord_t x1, y1, x2, y2; + csch_coord_t x1, y1; + csch_pixel_t transp; + int sx, sy; /* size in pixels */ + csch_pixel_t *bitmap; } csch_cline_t; #endif