walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[paint] Spell out rectangle in the API 

No need to abbreviate this.
This commit is contained in:
Matthias Clasen 2022-12-17 12:25:04 -05:00 committed by Behdad Esfahbod
parent 37f3f0fcc2
commit 485ba9beb3
4 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hb-paint.cc
View File

@ -54,9 +54,9 @@ hb_paint_push_clip_glyph_nil (hb_paint_funcs_t *funcs, void *paint_data,
void *user_data) {} void *user_data) {}
static void static void
hb_paint_push_clip_rect_nil (hb_paint_funcs_t *funcs, void *paint_data, hb_paint_push_clip_rectangle_nil (hb_paint_funcs_t *funcs, void *paint_data,
float xmin, float ymin, float xmax, float ymax, float xmin, float ymin, float xmax, float ymax,
void *user_data) {} void *user_data) {}
static void static void
hb_paint_pop_clip_nil (hb_paint_funcs_t *funcs, void *paint_data, hb_paint_pop_clip_nil (hb_paint_funcs_t *funcs, void *paint_data,
@ -324,10 +324,10 @@ hb_paint_push_clip_glyph (hb_paint_funcs_t *funcs, void *paint_data,
} }
void void
hb_paint_push_clip_rect (hb_paint_funcs_t *funcs, void *paint_data, hb_paint_push_clip_rectangle (hb_paint_funcs_t *funcs, void *paint_data,
float xmin, float ymin, float xmax, float ymax) float xmin, float ymin, float xmax, float ymax)
{ {
funcs->push_clip_rect (paint_data, xmin, ymin, xmax, ymax); funcs->push_clip_rectangle (paint_data, xmin, ymin, xmax, ymax);
} }
void void

32
src/hb-paint.h
View File

@ -153,7 +153,7 @@ typedef void (*hb_paint_push_clip_glyph_func_t) (hb_paint_funcs_t *funcs,
void *user_data); void *user_data);
/** /**
* hb_paint_push_clip_rect_func_t: * hb_paint_push_clip_rectangle_func_t:
* @funcs: paint functions object * @funcs: paint functions object
* @paint_data: The data accompanying the paint functions * @paint_data: The data accompanying the paint functions
* @xmin: min X for the rectangle * @xmin: min X for the rectangle
@ -174,11 +174,11 @@ typedef void (*hb_paint_push_clip_glyph_func_t) (hb_paint_funcs_t *funcs,
* *
* Since: REPLACEME * Since: REPLACEME
*/ */
typedef void (*hb_paint_push_clip_rect_func_t) (hb_paint_funcs_t *funcs, typedef void (*hb_paint_push_clip_rectangle_func_t) (hb_paint_funcs_t *funcs,
void *paint_data, void *paint_data,
float xmin, float ymin, float xmin, float ymin,
float xmax, float ymax, float xmax, float ymax,
void *user_data); void *user_data);
/** /**
* hb_paint_pop_clip_func_t: * hb_paint_pop_clip_func_t:
@ -188,7 +188,7 @@ typedef void (*hb_paint_push_clip_rect_func_t) (hb_paint_funcs_t *funcs,
* *
* A virtual method for the #hb_paint_funcs_t to undo * A virtual method for the #hb_paint_funcs_t to undo
* the effect of a prior call to the #hb_paint_funcs_push_clip_glyph_func_t * the effect of a prior call to the #hb_paint_funcs_push_clip_glyph_func_t
* or #hb_paint_funcs_push_clip_rect_func_t vfuncs. * or #hb_paint_funcs_push_clip_rectangle_func_t vfuncs.
* *
* Since: REPLACEME * Since: REPLACEME
*/ */
@ -512,9 +512,9 @@ hb_paint_funcs_set_push_clip_glyph_func (hb_paint_funcs_t *funcs,
hb_destroy_func_t destroy); hb_destroy_func_t destroy);
/** /**
* hb_paint_funcs_set_push_clip_rect_func: * hb_paint_funcs_set_push_clip_rectangle_func:
* @funcs: A paint functions struct * @funcs: A paint functions struct
* @func: (closure user_data) (destroy destroy) (scope notified): The push-clip-rect callback * @func: (closure user_data) (destroy destroy) (scope notified): The push-clip-rectangle callback
* @user_data: Data to pass to @func * @user_data: Data to pass to @func
* @destroy: (nullable): Function to call when @user_data is no longer needed * @destroy: (nullable): Function to call when @user_data is no longer needed
* *
@ -523,10 +523,10 @@ hb_paint_funcs_set_push_clip_glyph_func (hb_paint_funcs_t *funcs,
* Since: REPLACEME * Since: REPLACEME
*/ */
HB_EXTERN void HB_EXTERN void
hb_paint_funcs_set_push_clip_rect_func (hb_paint_funcs_t *funcs, hb_paint_funcs_set_push_clip_rectangle_func (hb_paint_funcs_t *funcs,
hb_paint_push_clip_rect_func_t func, hb_paint_push_clip_rectangle_func_t func,
void *user_data, void *user_data,
hb_destroy_func_t destroy); hb_destroy_func_t destroy);
/** /**
* hb_paint_funcs_set_pop_clip_func: * hb_paint_funcs_set_pop_clip_func:
@ -678,9 +678,9 @@ hb_paint_push_clip_glyph (hb_paint_funcs_t *funcs, void *paint_data,
hb_codepoint_t glyph); hb_codepoint_t glyph);
HB_EXTERN void HB_EXTERN void
hb_paint_push_clip_rect (hb_paint_funcs_t *funcs, void *paint_data, hb_paint_push_clip_rectangle (hb_paint_funcs_t *funcs, void *paint_data,
float xmin, float ymin, float xmin, float ymin,
float xmax, float ymax); float xmax, float ymax);
HB_EXTERN void HB_EXTERN void
hb_paint_pop_clip (hb_paint_funcs_t *funcs, void *paint_data); hb_paint_pop_clip (hb_paint_funcs_t *funcs, void *paint_data);

12
src/hb-paint.hh
View File

@ -31,7 +31,7 @@
HB_PAINT_FUNC_IMPLEMENT (push_transform) \ HB_PAINT_FUNC_IMPLEMENT (push_transform) \
HB_PAINT_FUNC_IMPLEMENT (pop_transform) \ HB_PAINT_FUNC_IMPLEMENT (pop_transform) \
HB_PAINT_FUNC_IMPLEMENT (push_clip_glyph) \ HB_PAINT_FUNC_IMPLEMENT (push_clip_glyph) \
HB_PAINT_FUNC_IMPLEMENT (push_clip_rect) \ HB_PAINT_FUNC_IMPLEMENT (push_clip_rectangle) \
HB_PAINT_FUNC_IMPLEMENT (pop_clip) \ HB_PAINT_FUNC_IMPLEMENT (pop_clip) \
HB_PAINT_FUNC_IMPLEMENT (color) \ HB_PAINT_FUNC_IMPLEMENT (color) \
HB_PAINT_FUNC_IMPLEMENT (image) \ HB_PAINT_FUNC_IMPLEMENT (image) \
@ -79,11 +79,11 @@ struct hb_paint_funcs_t
{ func.push_clip_glyph (this, paint_data, { func.push_clip_glyph (this, paint_data,
glyph, glyph,
!user_data ? nullptr : user_data->push_clip_glyph); } !user_data ? nullptr : user_data->push_clip_glyph); }
void push_clip_rect (void *paint_data, void push_clip_rectangle (void *paint_data,
float xmin, float ymin, float xmax, float ymax) float xmin, float ymin, float xmax, float ymax)
{ func.push_clip_rect (this, paint_data, { func.push_clip_rectangle (this, paint_data,
xmin, ymin, xmax, ymax, xmin, ymin, xmax, ymax,
!user_data ? nullptr : user_data->push_clip_rect); } !user_data ? nullptr : user_data->push_clip_rectangle); }
void pop_clip (void *paint_data) void pop_clip (void *paint_data)
{ func.pop_clip (this, paint_data, { func.pop_clip (this, paint_data,
!user_data ? nullptr : user_data->pop_clip); } !user_data ? nullptr : user_data->pop_clip); }

12
util/hb-test.c
View File

@ -245,14 +245,14 @@ push_clip_glyph (hb_paint_funcs_t *funcs,
} }
static void static void
push_clip_rect (hb_paint_funcs_t *funcs, push_clip_rectangle (hb_paint_funcs_t *funcs,
void *paint_data, void *paint_data,
float xmin, float ymin, float xmax, float ymax, float xmin, float ymin, float xmax, float ymax,
void *user_data) void *user_data)
{ {
paint_data_t *data = user_data; paint_data_t *data = user_data;
print (data, "start clip rect %f %f %f %f", xmin, ymin, xmax, ymax); print (data, "start clip rectangle %f %f %f %f", xmin, ymin, xmax, ymax);
data->level++; data->level++;
cairo_save (data->cr); cairo_save (data->cr);
@ -1065,7 +1065,7 @@ int main (int argc, char *argv[])
hb_paint_funcs_set_push_transform_func (funcs, push_transform, &data, NULL); hb_paint_funcs_set_push_transform_func (funcs, push_transform, &data, NULL);
hb_paint_funcs_set_pop_transform_func (funcs, pop_transform, &data, NULL); hb_paint_funcs_set_pop_transform_func (funcs, pop_transform, &data, NULL);
hb_paint_funcs_set_push_clip_glyph_func (funcs, push_clip_glyph, &data, NULL); hb_paint_funcs_set_push_clip_glyph_func (funcs, push_clip_glyph, &data, NULL);
hb_paint_funcs_set_push_clip_rect_func (funcs, push_clip_rect, &data, NULL); hb_paint_funcs_set_push_clip_rectangle_func (funcs, push_clip_rectangle, &data, NULL);
hb_paint_funcs_set_pop_clip_func (funcs, pop_clip, &data, NULL); hb_paint_funcs_set_pop_clip_func (funcs, pop_clip, &data, NULL);
hb_paint_funcs_set_push_group_func (funcs, push_group, &data, NULL); hb_paint_funcs_set_push_group_func (funcs, push_group, &data, NULL);
hb_paint_funcs_set_pop_group_func (funcs, pop_group, &data, NULL); hb_paint_funcs_set_pop_group_func (funcs, pop_group, &data, NULL);