summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Almesberger <werner@almesberger.net>2016-08-25 11:51:30 -0300
committerWerner Almesberger <werner@almesberger.net>2016-08-25 11:51:30 -0300
commit44d558a20c93153f0d210926328f8084e52ef6d6 (patch)
tree7489c05dfa8b7205bed285c22144f3306c91f599
parent673aade18a3e47118754bd2abc2b3479a5f4f39b (diff)
downloadeeshow-44d558a20c93153f0d210926328f8084e52ef6d6.tar.gz
eeshow-44d558a20c93153f0d210926328f8084e52ef6d6.tar.bz2
eeshow-44d558a20c93153f0d210926328f8084e52ef6d6.zip
gfx/cro.c (cro_img, cro_img_surface): call cro_ctx variable "cc", not "ctx"
All the rest of cro.c uses "cc".
-rw-r--r--gfx/cro.c28
-rw-r--r--gfx/cro.h4
2 files changed, 16 insertions, 16 deletions
diff --git a/gfx/cro.c b/gfx/cro.c
index 4ec1809..689d126 100644
--- a/gfx/cro.c
+++ b/gfx/cro.c
@@ -760,7 +760,7 @@ void cro_canvas_draw(struct cro_ctx *cc, cairo_t *cr, int xo, int yo,
/* ----- Image for external use (simplified API) --------------------------- */
-uint32_t *cro_img(struct cro_ctx *ctx, struct cro_ctx *ctx_extra,
+uint32_t *cro_img(struct cro_ctx *cc, struct cro_ctx *cc_extra,
int xo, int yo, int w, int h,
float scale, cairo_t **res_cr, int *res_stride)
{
@@ -782,20 +782,20 @@ uint32_t *cro_img(struct cro_ctx *ctx, struct cro_ctx *ctx_extra,
cairo_set_line_width(cr, 2);
cairo_set_line_cap(cr, CAIRO_LINE_CAP_ROUND);
- ctx->cr = cr;
- ctx->s = s;
- ctx->xo = xo;
- ctx->yo = yo;
- ctx->scale = scale;
- ctx->color_override = COLOR_NONE;
+ cc->cr = cr;
+ cc->s = s;
+ cc->xo = xo;
+ cc->yo = yo;
+ cc->scale = scale;
+ cc->color_override = COLOR_NONE;
- setup_pango(ctx);
+ setup_pango(cc);
- if (ctx_extra) {
- ctx_extra->record.user = ctx->record.user; /* @@@ eww ! */
- record_replay(&ctx_extra->record);
+ if (cc_extra) {
+ cc_extra->record.user = cc->record.user; /* @@@ eww ! */
+ record_replay(&cc_extra->record);
}
- record_replay(&ctx->record);
+ record_replay(&cc->record);
if (res_cr)
*res_cr = cr;
@@ -808,9 +808,9 @@ uint32_t *cro_img(struct cro_ctx *ctx, struct cro_ctx *ctx_extra,
/* @@@ redesign this when we get a bit more serious about cleaning up */
-cairo_surface_t *cro_img_surface(struct cro_ctx *ctx)
+cairo_surface_t *cro_img_surface(struct cro_ctx *cc)
{
- return ctx->s;
+ return cc->s;
}
diff --git a/gfx/cro.h b/gfx/cro.h
index 50a5ee3..f52bd3d 100644
--- a/gfx/cro.h
+++ b/gfx/cro.h
@@ -47,9 +47,9 @@ void cro_canvas_prepare(cairo_t *cr);
void cro_canvas_draw(struct cro_ctx *cc, cairo_t *cr,
int x, int y, float scale);
-uint32_t *cro_img(struct cro_ctx *ctx, struct cro_ctx *ctx_extra,
+uint32_t *cro_img(struct cro_ctx *cc, struct cro_ctx *cc_extra,
int x0, int yo, int w, int h,
float scale, cairo_t **res_cr, int *res_stride);
-cairo_surface_t *cro_img_surface(struct cro_ctx *ctx);
+cairo_surface_t *cro_img_surface(struct cro_ctx *cc);
#endif /* !GFX_CRO_H */