qi-hardware/eda-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/eda-tools.git synced 2024-12-23 12:32:24 +02:00
Code

eeshow/cro.c (cro_get_size): split from end_common

Browse Source
This commit is contained in:
Werner Almesberger 2016-08-08 17:13:30 -03:00
parent e874d66ebb
commit cd0ee8932d
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
eeshow/cro.c
View File

@ -58,31 +58,31 @@ struct cro_ctx {
};
static inline int cd(struct cro_ctx *cc, int x)
static inline int cd(const struct cro_ctx *cc, int x)
{
return x * cc->scale;
}
static inline int cx(struct cro_ctx *cc, int x)
static inline int cx(const struct cro_ctx *cc, int x)
{
return cc->xo + x * cc->scale;
}
static inline int xc(struct cro_ctx *cc, int x)
static inline int xc(const struct cro_ctx *cc, int x)
{
return (x - cc->xo) / cc->scale;
}
static inline int cy(struct cro_ctx *cc, int y)
static inline int cy(const struct cro_ctx *cc, int y)
{
return cc->yo + y * cc->scale;
}
static inline float pt(struct cro_ctx *cc, int x)
static inline float pt(const struct cro_ctx *cc, int x)
{
return cd(cc, x) * 72 * 1.5 / 1200.0;
}
@ -301,6 +301,21 @@ static struct cro_ctx *init_common(int argc, char *const *argv)
}
void cro_get_size(const struct cro_ctx *cc, int *w, int *h, int *x, int *y)
{
int xmin, ymin;
record_bbox(&cc->record, &xmin, &ymin, w, h);
// fprintf(stderr, "%dx%d%+d%+d\n", *w, *h, xmin, ymin);
*x = xmin;
*y = ymin;
*w = cd(cc, *w);
*h = cd(cc, *h);
// fprintf(stderr, "%dx%d%+d%+d\n", *w, *h, xmin, ymin);
}
static void end_common(struct cro_ctx *cc, int *w, int *h, int *x, int *y)
{
int xmin, ymin;
@ -308,18 +323,14 @@ static void end_common(struct cro_ctx *cc, int *w, int *h, int *x, int *y)
cairo_surface_destroy(cc->s);
cairo_destroy(cc->cr);
record_bbox(&cc->record, &xmin, &ymin, w, h);
// fprintf(stderr, "%dx%d%+d%+d\n", *w, *h, xmin, ymin);
cro_get_size(cc, w, h, &xmin, &ymin);
cc->xo = -cd(cc, xmin);
cc->yo = -cd(cc, ymin);
if (x)
*x = xmin;
if (y)
*y = ymin;
*w = cd(cc, *w);
*h = cd(cc, *h);
// fprintf(stderr, "%dx%d%+d%+d\n", *w, *h, xmin, ymin);
}

2
eeshow/cro.h
View File

@ -33,6 +33,8 @@ extern const struct gfx_ops cro_pdf_ops;
void cro_color_override(struct cro_ctx *cc, int color);
void cro_get_size(const struct cro_ctx *cc, int *w, int *h, int *x, int *y);
uint32_t *cro_img_end(struct cro_ctx *cc, int *w, int *h, int *stride);
void cro_img_write(struct cro_ctx *cc, const char *name);