mirror of
https://github.com/storytold/harfbuzz.git
synced 2026-11-19 22:11:04 +01:00
Merge pull request #5909 from harfbuzz/clears
Add _clear() methods to new libraries.
This commit is contained in:
11 files changed
+147
-64
No files matched your search
@@ -1033,6 +1033,7 @@ hb_raster_draw_get_transform
|
||||
hb_raster_draw_set_extents
|
||||
hb_raster_draw_get_extents
|
||||
hb_raster_draw_set_glyph_extents
|
||||
hb_raster_draw_clear
|
||||
hb_raster_draw_reset
|
||||
hb_raster_draw_get_funcs
|
||||
hb_raster_draw_glyph
|
||||
@@ -1057,6 +1058,7 @@ hb_raster_paint_set_custom_palette_color
|
||||
hb_raster_paint_get_funcs
|
||||
hb_raster_paint_glyph
|
||||
hb_raster_paint_render
|
||||
hb_raster_paint_clear
|
||||
hb_raster_paint_reset
|
||||
hb_raster_paint_recycle_image
|
||||
</SECTION>
|
||||
@@ -1084,6 +1086,7 @@ hb_vector_draw_glyph
|
||||
hb_vector_draw_set_flat
|
||||
hb_vector_draw_set_precision
|
||||
hb_vector_draw_render
|
||||
hb_vector_draw_clear
|
||||
hb_vector_draw_reset
|
||||
hb_vector_draw_recycle_blob
|
||||
hb_vector_paint_t
|
||||
@@ -1108,6 +1111,7 @@ hb_vector_paint_glyph
|
||||
hb_vector_paint_set_flat
|
||||
hb_vector_paint_set_precision
|
||||
hb_vector_paint_render
|
||||
hb_vector_paint_clear
|
||||
hb_vector_paint_reset
|
||||
hb_vector_paint_recycle_blob
|
||||
</SECTION>
|
||||
@@ -1128,6 +1132,7 @@ hb_gpu_draw_set_scale
|
||||
hb_gpu_draw_glyph
|
||||
hb_gpu_draw_encode
|
||||
hb_gpu_draw_get_extents
|
||||
hb_gpu_draw_clear
|
||||
hb_gpu_draw_reset
|
||||
hb_gpu_draw_recycle_blob
|
||||
</SECTION>
|
||||
+29
-5
@@ -372,6 +372,12 @@ encode_curve_info (const hb_gpu_curve_t *c)
|
||||
hb_blob_t *
|
||||
hb_gpu_draw_encode (hb_gpu_draw_t *draw)
|
||||
{
|
||||
/* Unlike hb_vector_*_render and hb_raster_*_render, encode() does
|
||||
* NOT auto-clear — the encoded extents live on @draw (not on the
|
||||
* returned blob) and callers typically read them via
|
||||
* hb_gpu_draw_get_extents() after encode(). Call
|
||||
* hb_gpu_draw_clear() explicitly before the next glyph. */
|
||||
|
||||
if (unlikely (!draw->success))
|
||||
return nullptr;
|
||||
|
||||
@@ -1073,16 +1079,17 @@ hb_gpu_draw_get_extents (hb_gpu_draw_t *draw,
|
||||
}
|
||||
|
||||
/**
|
||||
* hb_gpu_draw_reset:
|
||||
* hb_gpu_draw_clear:
|
||||
* @draw: a GPU shape encoder
|
||||
*
|
||||
* Resets the encoder, discarding all accumulated outlines.
|
||||
* The internal encode buffer is kept for reuse.
|
||||
* Discards accumulated outlines so @draw can be reused for another
|
||||
* encode. User configuration (font scale) is preserved. Call
|
||||
* hb_gpu_draw_reset() to also reset user configuration to defaults.
|
||||
*
|
||||
* Since: 14.0.0
|
||||
* XSince: REPLACEME
|
||||
**/
|
||||
void
|
||||
hb_gpu_draw_reset (hb_gpu_draw_t *draw)
|
||||
hb_gpu_draw_clear (hb_gpu_draw_t *draw)
|
||||
{
|
||||
draw->start_x = draw->start_y = 0;
|
||||
draw->current_x = draw->current_y = 0;
|
||||
@@ -1097,6 +1104,23 @@ hb_gpu_draw_reset (hb_gpu_draw_t *draw)
|
||||
draw->ext_max_y = -HUGE_VAL;
|
||||
}
|
||||
|
||||
/**
|
||||
* hb_gpu_draw_reset:
|
||||
* @draw: a GPU shape encoder
|
||||
*
|
||||
* Resets the encoder, discarding all accumulated outlines and
|
||||
* resetting user configuration to defaults.
|
||||
*
|
||||
* Since: 14.0.0
|
||||
**/
|
||||
void
|
||||
hb_gpu_draw_reset (hb_gpu_draw_t *draw)
|
||||
{
|
||||
draw->x_scale = 0;
|
||||
draw->y_scale = 0;
|
||||
hb_gpu_draw_clear (draw);
|
||||
}
|
||||
|
||||
/**
|
||||
* hb_gpu_draw_recycle_blob:
|
||||
* @draw: a GPU shape encoder
|
||||
|
||||
@@ -116,6 +116,9 @@ HB_EXTERN void
|
||||
hb_gpu_draw_get_extents (hb_gpu_draw_t *draw,
|
||||
hb_glyph_extents_t *extents);
|
||||
|
||||
HB_EXTERN void
|
||||
hb_gpu_draw_clear (hb_gpu_draw_t *draw);
|
||||
|
||||
HB_EXTERN void
|
||||
hb_gpu_draw_reset (hb_gpu_draw_t *draw);
|
||||
|
||||
|
||||
+22
-12
@@ -404,6 +404,26 @@ hb_raster_draw_set_glyph_extents (hb_raster_draw_t *draw,
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* hb_raster_draw_clear:
|
||||
* @draw: a rasterizer
|
||||
*
|
||||
* Discards accumulated geometry and extents so @draw can be reused
|
||||
* for another render. User configuration (transform, scale factors)
|
||||
* is preserved. Call hb_raster_draw_reset() to also reset user
|
||||
* configuration to defaults.
|
||||
*
|
||||
* XSince: REPLACEME
|
||||
**/
|
||||
void
|
||||
hb_raster_draw_clear (hb_raster_draw_t *draw)
|
||||
{
|
||||
draw->fixed_extents = {};
|
||||
draw->has_extents = false;
|
||||
draw->edges.clear ();
|
||||
draw->active_edges.clear ();
|
||||
}
|
||||
|
||||
/**
|
||||
* hb_raster_draw_reset:
|
||||
* @draw: a rasterizer
|
||||
@@ -412,9 +432,6 @@ hb_raster_draw_set_glyph_extents (hb_raster_draw_t *draw,
|
||||
* geometry, the transform, and fixed extents. The object can then be
|
||||
* reused for a new glyph.
|
||||
*
|
||||
* Internal scratch buffers and recycled image cache are preserved for
|
||||
* reuse across subsequent renders.
|
||||
*
|
||||
* Since: 13.0.0
|
||||
**/
|
||||
void
|
||||
@@ -423,10 +440,7 @@ hb_raster_draw_reset (hb_raster_draw_t *draw)
|
||||
draw->transform = {1, 0, 0, 1, 0, 0};
|
||||
draw->x_scale_factor = 1.f;
|
||||
draw->y_scale_factor = 1.f;
|
||||
draw->fixed_extents = {};
|
||||
draw->has_extents = false;
|
||||
draw->edges.clear ();
|
||||
draw->active_edges.clear ();
|
||||
hb_raster_draw_clear (draw);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1283,11 +1297,7 @@ hb_raster_draw_render (hb_raster_draw_t *draw)
|
||||
|
||||
/* ── 3. Allocate or reuse image ─────────────────────────────────── */
|
||||
/* Reset one-shot state on every exit path. */
|
||||
HB_SCOPE_GUARD ({
|
||||
draw->edges.clear ();
|
||||
draw->has_extents = false;
|
||||
draw->fixed_extents = {};
|
||||
});
|
||||
HB_SCOPE_GUARD (hb_raster_draw_clear (draw));
|
||||
|
||||
hb_raster_image_t *image;
|
||||
if (draw->recycled_image)
|
||||
|
||||
+27
-17
@@ -2203,16 +2203,7 @@ hb_raster_paint_render (hb_raster_paint_t *paint)
|
||||
{
|
||||
/* Common per-exit state reset. Runs on every return path,
|
||||
* including the early-return failure cases below. */
|
||||
HB_SCOPE_GUARD ({
|
||||
paint->transform_stack.clear ();
|
||||
paint->release_all_clips ();
|
||||
for (auto *s : paint->surface_stack)
|
||||
paint->release_surface (s);
|
||||
paint->surface_stack.clear ();
|
||||
hb_raster_draw_reset (paint->clip_rdr);
|
||||
paint->has_extents = false;
|
||||
paint->fixed_extents = {};
|
||||
});
|
||||
HB_SCOPE_GUARD (hb_raster_paint_clear (paint));
|
||||
|
||||
if (unlikely (!paint->has_extents))
|
||||
return nullptr;
|
||||
@@ -2237,6 +2228,31 @@ hb_raster_paint_render (hb_raster_paint_t *paint)
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* hb_raster_paint_clear:
|
||||
* @paint: a paint context
|
||||
*
|
||||
* Discards accumulated paint output so @paint can be reused for
|
||||
* another render. User configuration (base transform, scale
|
||||
* factors, foreground, custom palette colors) is preserved. Call
|
||||
* hb_raster_paint_reset() to also reset user configuration to
|
||||
* defaults.
|
||||
*
|
||||
* XSince: REPLACEME
|
||||
**/
|
||||
void
|
||||
hb_raster_paint_clear (hb_raster_paint_t *paint)
|
||||
{
|
||||
paint->fixed_extents = {};
|
||||
paint->has_extents = false;
|
||||
paint->transform_stack.clear ();
|
||||
paint->release_all_clips ();
|
||||
for (auto *s : paint->surface_stack)
|
||||
paint->release_surface (s);
|
||||
paint->surface_stack.clear ();
|
||||
hb_raster_draw_reset (paint->clip_rdr);
|
||||
}
|
||||
|
||||
/**
|
||||
* hb_raster_paint_reset:
|
||||
* @paint: a paint context
|
||||
@@ -2252,15 +2268,9 @@ hb_raster_paint_reset (hb_raster_paint_t *paint)
|
||||
paint->base_transform = {1, 0, 0, 1, 0, 0};
|
||||
paint->x_scale_factor = 1.f;
|
||||
paint->y_scale_factor = 1.f;
|
||||
paint->fixed_extents = {};
|
||||
paint->has_extents = false;
|
||||
paint->foreground = HB_COLOR (0, 0, 0, 255);
|
||||
hb_raster_paint_clear_custom_palette_colors (paint);
|
||||
paint->transform_stack.clear ();
|
||||
paint->release_all_clips ();
|
||||
for (auto *s : paint->surface_stack)
|
||||
paint->release_surface (s);
|
||||
paint->surface_stack.clear ();
|
||||
hb_raster_paint_clear (paint);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -205,6 +205,9 @@ hb_raster_draw_glyph (hb_raster_draw_t *draw,
|
||||
HB_EXTERN hb_raster_image_t *
|
||||
hb_raster_draw_render (hb_raster_draw_t *draw);
|
||||
|
||||
HB_EXTERN void
|
||||
hb_raster_draw_clear (hb_raster_draw_t *draw);
|
||||
|
||||
HB_EXTERN void
|
||||
hb_raster_draw_reset (hb_raster_draw_t *draw);
|
||||
|
||||
@@ -308,6 +311,9 @@ hb_raster_paint_glyph (hb_raster_paint_t *paint,
|
||||
HB_EXTERN hb_raster_image_t *
|
||||
hb_raster_paint_render (hb_raster_paint_t *paint);
|
||||
|
||||
HB_EXTERN void
|
||||
hb_raster_paint_clear (hb_raster_paint_t *paint);
|
||||
|
||||
HB_EXTERN void
|
||||
hb_raster_paint_reset (hb_raster_paint_t *paint);
|
||||
|
||||
|
||||
+25
-18
@@ -777,12 +777,7 @@ hb_vector_draw_render_pdf (hb_vector_draw_t *draw)
|
||||
|
||||
hb_blob_t *blob = hb_buf_blob_from (&draw->recycled_blob, &out);
|
||||
|
||||
draw->path.clear ();
|
||||
draw->defs.clear ();
|
||||
draw->body.clear ();
|
||||
hb_set_clear (draw->defined_glyphs);
|
||||
draw->has_extents = false;
|
||||
draw->extents = {0, 0, 0, 0};
|
||||
hb_vector_draw_clear (draw);
|
||||
|
||||
return blob;
|
||||
}
|
||||
@@ -835,12 +830,7 @@ hb_vector_draw_render_svg (hb_vector_draw_t *draw)
|
||||
|
||||
hb_blob_t *blob = hb_buf_blob_from (&draw->recycled_blob, &out);
|
||||
|
||||
draw->path.clear ();
|
||||
draw->defs.clear ();
|
||||
draw->body.clear ();
|
||||
hb_set_clear (draw->defined_glyphs);
|
||||
draw->has_extents = false;
|
||||
draw->extents = {0, 0, 0, 0};
|
||||
hb_vector_draw_clear (draw);
|
||||
|
||||
return blob;
|
||||
}
|
||||
@@ -871,6 +861,28 @@ hb_vector_draw_render (hb_vector_draw_t *draw)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* hb_vector_draw_clear:
|
||||
* @draw: a draw context.
|
||||
*
|
||||
* Discards accumulated draw output so @draw can be reused for
|
||||
* another render. User configuration (transform, scale factors,
|
||||
* precision, flat) is preserved. Call hb_vector_draw_reset() to
|
||||
* also reset user configuration to defaults.
|
||||
*
|
||||
* XSince: REPLACEME
|
||||
*/
|
||||
void
|
||||
hb_vector_draw_clear (hb_vector_draw_t *draw)
|
||||
{
|
||||
draw->extents = {0, 0, 0, 0};
|
||||
draw->has_extents = false;
|
||||
draw->defs.clear ();
|
||||
draw->body.clear ();
|
||||
draw->path.clear ();
|
||||
hb_set_clear (draw->defined_glyphs);
|
||||
}
|
||||
|
||||
/**
|
||||
* hb_vector_draw_reset:
|
||||
* @draw: a draw context.
|
||||
@@ -885,14 +897,9 @@ hb_vector_draw_reset (hb_vector_draw_t *draw)
|
||||
draw->transform = {1, 0, 0, 1, 0, 0};
|
||||
draw->x_scale_factor = 1.f;
|
||||
draw->y_scale_factor = 1.f;
|
||||
draw->extents = {0, 0, 0, 0};
|
||||
draw->has_extents = false;
|
||||
draw->precision = 2;
|
||||
draw->flat = false;
|
||||
draw->defs.clear ();
|
||||
draw->body.clear ();
|
||||
draw->path.clear ();
|
||||
hb_set_clear (draw->defined_glyphs);
|
||||
hb_vector_draw_clear (draw);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -254,8 +254,8 @@ hb_pdf_get_resources (hb_vector_paint_t *paint)
|
||||
return res;
|
||||
}
|
||||
|
||||
static void
|
||||
hb_pdf_free_resources (hb_vector_paint_t *paint)
|
||||
void
|
||||
hb_vector_paint_pdf_free_resources (hb_vector_paint_t *paint)
|
||||
{
|
||||
if (paint->defs.length >= sizeof (void *))
|
||||
{
|
||||
@@ -1342,12 +1342,7 @@ hb_vector_paint_render_pdf (hb_vector_paint_t *paint)
|
||||
|
||||
hb_blob_t *blob = hb_buf_blob_from (&paint->recycled_blob, &out);
|
||||
|
||||
/* Reset state. */
|
||||
hb_pdf_free_resources (paint);
|
||||
paint->group_stack.clear ();
|
||||
paint->path.clear ();
|
||||
paint->has_extents = false;
|
||||
paint->extents = {0, 0, 0, 0};
|
||||
hb_vector_paint_clear (paint);
|
||||
|
||||
return blob;
|
||||
}
|
||||
+20
-4
@@ -882,6 +882,8 @@ hb_vector_paint_destroy (hb_vector_paint_t *paint)
|
||||
if (!hb_object_should_destroy (paint))
|
||||
return;
|
||||
|
||||
if (paint->format == HB_VECTOR_FORMAT_PDF)
|
||||
hb_vector_paint_pdf_free_resources (paint);
|
||||
hb_blob_destroy (paint->recycled_blob);
|
||||
hb_set_destroy (paint->defined_outlines);
|
||||
hb_set_destroy (paint->defined_clips);
|
||||
@@ -1416,12 +1418,26 @@ hb_vector_paint_set_precision (hb_vector_paint_t *paint,
|
||||
paint->precision = hb_min (precision, 12u);
|
||||
}
|
||||
|
||||
static void
|
||||
hb_vector_paint_clear_render_state (hb_vector_paint_t *paint)
|
||||
/**
|
||||
* hb_vector_paint_clear:
|
||||
* @paint: a paint context.
|
||||
*
|
||||
* Discards accumulated paint output so @paint can be reused for
|
||||
* another render. User configuration (transform, scale factors,
|
||||
* precision, flat, foreground, palette, custom palette colors)
|
||||
* is preserved. Call hb_vector_paint_reset() to also reset
|
||||
* user configuration to defaults.
|
||||
*
|
||||
* XSince: REPLACEME
|
||||
*/
|
||||
void
|
||||
hb_vector_paint_clear (hb_vector_paint_t *paint)
|
||||
{
|
||||
paint->extents = {0, 0, 0, 0};
|
||||
paint->has_extents = false;
|
||||
|
||||
if (paint->format == HB_VECTOR_FORMAT_PDF)
|
||||
hb_vector_paint_pdf_free_resources (paint);
|
||||
paint->defs.clear ();
|
||||
paint->path.clear ();
|
||||
paint->group_stack.clear ();
|
||||
@@ -1484,7 +1500,7 @@ hb_vector_paint_render_svg (hb_vector_paint_t *paint)
|
||||
|
||||
hb_blob_t *blob = hb_buf_blob_from (&paint->recycled_blob, &out);
|
||||
|
||||
hb_vector_paint_clear_render_state (paint);
|
||||
hb_vector_paint_clear (paint);
|
||||
|
||||
return blob;
|
||||
}
|
||||
@@ -1533,7 +1549,7 @@ hb_vector_paint_reset (hb_vector_paint_t *paint)
|
||||
paint->palette = 0;
|
||||
paint->precision = 2;
|
||||
paint->flat = false;
|
||||
hb_vector_paint_clear_render_state (paint);
|
||||
hb_vector_paint_clear (paint);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -78,5 +78,6 @@ struct hb_vector_paint_t
|
||||
/* Implemented in hb-vector-paint-pdf.cc */
|
||||
HB_INTERNAL hb_paint_funcs_t * hb_vector_paint_pdf_funcs_get ();
|
||||
HB_INTERNAL hb_blob_t * hb_vector_paint_render_pdf (hb_vector_paint_t *paint);
|
||||
HB_INTERNAL void hb_vector_paint_pdf_free_resources (hb_vector_paint_t *paint);
|
||||
|
||||
#endif /* HB_VECTOR_PAINT_HH */
|
||||
@@ -173,6 +173,9 @@ hb_vector_draw_set_precision (hb_vector_draw_t *draw,
|
||||
HB_EXTERN hb_blob_t *
|
||||
hb_vector_draw_render (hb_vector_draw_t *draw);
|
||||
|
||||
HB_EXTERN void
|
||||
hb_vector_draw_clear (hb_vector_draw_t *draw);
|
||||
|
||||
HB_EXTERN void
|
||||
hb_vector_draw_reset (hb_vector_draw_t *draw);
|
||||
|
||||
@@ -275,6 +278,9 @@ hb_vector_paint_set_precision (hb_vector_paint_t *paint,
|
||||
HB_EXTERN hb_blob_t *
|
||||
hb_vector_paint_render (hb_vector_paint_t *paint);
|
||||
|
||||
HB_EXTERN void
|
||||
hb_vector_paint_clear (hb_vector_paint_t *paint);
|
||||
|
||||
HB_EXTERN void
|
||||
hb_vector_paint_reset (hb_vector_paint_t *paint);
|
||||
|
||||
|
||||
Reference in new issue
Block a user