diff --git a/src/hb-vector-buf.hh b/src/hb-vector-buf.hh index 3efd78bc1..d09f907de 100644 --- a/src/hb-vector-buf.hh +++ b/src/hb-vector-buf.hh @@ -36,7 +36,7 @@ HB_INTERNAL const char * hb_vector_decimal_point_get (void); -struct hb_buf_t : hb_vector_t +struct hb_vector_buf_t : hb_vector_t { unsigned precision = 2; diff --git a/src/hb-vector-draw.cc b/src/hb-vector-draw.cc index f73cc8675..cd3afc670 100644 --- a/src/hb-vector-draw.cc +++ b/src/hb-vector-draw.cc @@ -33,7 +33,7 @@ #include HB_UNUSED static inline bool -hb_vector_svg_buffer_contains (const hb_buf_t &buf, const char *needle) +hb_vector_svg_buffer_contains (const hb_vector_buf_t &buf, const char *needle) { unsigned nlen = (unsigned) strlen (needle); if (!nlen || buf.length < nlen) @@ -688,7 +688,7 @@ const char * hb_vector_draw_get_svg_prefix (const hb_vector_draw_t *draw) { if (!draw->id_prefix.length) return ""; - const_cast (draw->id_prefix).alloc (draw->id_prefix.length + 1, false); + const_cast (draw->id_prefix).alloc (draw->id_prefix.length + 1, false); draw->id_prefix.arrayZ[draw->id_prefix.length] = '\0'; return draw->id_prefix.arrayZ; } @@ -807,7 +807,7 @@ hb_vector_draw_render_pdf (hb_vector_draw_t *draw) float ew = draw->extents.width; float eh = draw->extents.height; - hb_buf_t stream; + hb_vector_buf_t stream; stream.alloc (draw->body.length + draw->path.length + 256); /* Background rect. */ @@ -840,7 +840,7 @@ hb_vector_draw_render_pdf (hb_vector_draw_t *draw) stream.append_len (draw->body.arrayZ, draw->body.length); /* Build PDF objects, tracking byte offsets for xref. */ - hb_buf_t out; + hb_vector_buf_t out; hb_buf_recover_recycled (draw->recycled_blob, &out); out.alloc (stream.length + 512); @@ -906,7 +906,7 @@ hb_vector_draw_render_svg (hb_vector_draw_t *draw) if (!draw->has_extents) return nullptr; - hb_buf_t out; + hb_vector_buf_t out; hb_buf_recover_recycled (draw->recycled_blob, &out); unsigned estimated = draw->defs.length + (draw->body.length ? draw->body.length : draw->path.length) + diff --git a/src/hb-vector-draw.hh b/src/hb-vector-draw.hh index db44e3b24..3647c78ec 100644 --- a/src/hb-vector-draw.hh +++ b/src/hb-vector-draw.hh @@ -21,11 +21,11 @@ struct hb_vector_draw_t bool has_extents = false; hb_color_t foreground = HB_COLOR (0, 0, 0, 255); hb_color_t background = HB_COLOR (0, 0, 0, 0); - hb_buf_t id_prefix; + hb_vector_buf_t id_prefix; - hb_buf_t defs; - hb_buf_t body; - hb_buf_t path; + hb_vector_buf_t defs; + hb_vector_buf_t body; + hb_vector_buf_t path; void set_precision (unsigned p) { diff --git a/src/hb-vector-paint-pdf.cc b/src/hb-vector-paint-pdf.cc index aa455db16..2b07d36b2 100644 --- a/src/hb-vector-paint-pdf.cc +++ b/src/hb-vector-paint-pdf.cc @@ -54,14 +54,14 @@ struct hb_pdf_obj_t { - hb_buf_t data; + hb_vector_buf_t data; }; /* Collects extra PDF objects (shadings, functions, ExtGState) * during painting. Referenced from the content stream by name * (e.g. /SH0, /GS0) and emitted at render time. */ static bool -hb_pdf_build_indexed_smask (hb_buf_t *out, +hb_pdf_build_indexed_smask (hb_vector_buf_t *out, const char *idat_data, unsigned idat_len, unsigned width, unsigned height, const uint8_t *trns, unsigned trns_len); @@ -69,14 +69,14 @@ hb_pdf_build_indexed_smask (hb_buf_t *out, struct hb_pdf_resources_t { hb_vector_t objects; /* extra objects, starting at id 5 */ - hb_buf_t extgstate_dict; /* /GS0 5 0 R /GS1 6 0 R ... */ - hb_buf_t shading_dict; /* /SH0 7 0 R ... */ - hb_buf_t xobject_dict; /* /Im0 8 0 R ... */ + hb_vector_buf_t extgstate_dict; /* /GS0 5 0 R /GS1 6 0 R ... */ + hb_vector_buf_t shading_dict; /* /SH0 7 0 R ... */ + hb_vector_buf_t xobject_dict; /* /Im0 8 0 R ... */ unsigned extgstate_count = 0; unsigned shading_count = 0; unsigned xobject_count = 0; - unsigned add_object (hb_buf_t &&obj_data) + unsigned add_object (hb_vector_buf_t &&obj_data) { unsigned id = 5 + objects.length; /* objects 1-4 are fixed */ hb_pdf_obj_t obj; @@ -89,7 +89,7 @@ struct hb_pdf_resources_t unsigned add_extgstate_alpha (float alpha) { unsigned idx = extgstate_count++; - hb_buf_t obj; + hb_vector_buf_t obj; obj.append_str ("<< /Type /ExtGState /ca "); obj.append_num (alpha, 4); obj.append_str (" >>"); @@ -107,7 +107,7 @@ struct hb_pdf_resources_t unsigned add_extgstate_blend (const char *bm) { unsigned idx = extgstate_count++; - hb_buf_t obj; + hb_vector_buf_t obj; obj.append_str ("<< /Type /ExtGState /BM /"); obj.append_str (bm); obj.append_str (" >>"); @@ -129,10 +129,10 @@ struct hb_pdf_resources_t unsigned precision) { /* Form XObject: transparency group painting the alpha shading. */ - hb_buf_t form_stream; + hb_vector_buf_t form_stream; form_stream.append_str ("/SHa sh\n"); - hb_buf_t form; + hb_vector_buf_t form; form.append_str ("<< /Type /XObject /Subtype /Form\n"); form.append_str ("/BBox ["); form.append_num (bbox_x, precision); @@ -155,7 +155,7 @@ struct hb_pdf_resources_t /* ExtGState with luminosity soft mask. */ unsigned idx = extgstate_count++; - hb_buf_t gs; + hb_vector_buf_t gs; gs.append_str ("<< /Type /ExtGState\n"); gs.append_str ("/SMask << /Type /Mask /S /Luminosity /G "); gs.append_unsigned (form_id); @@ -171,7 +171,7 @@ struct hb_pdf_resources_t } /* Add a shading, return resource name index. */ - unsigned add_shading (hb_buf_t &&shading_data) + unsigned add_shading (hb_vector_buf_t &&shading_data) { unsigned obj_id = add_object (std::move (shading_data)); return add_shading_by_id (obj_id); @@ -202,7 +202,7 @@ struct hb_pdf_resources_t unsigned trns_len = 0) { unsigned idx = xobject_count++; - hb_buf_t obj; + hb_vector_buf_t obj; obj.append_str ("<< /Type /XObject /Subtype /Image\n"); obj.append_str ("/Width "); obj.append_unsigned (width); @@ -236,11 +236,11 @@ struct hb_pdf_resources_t unsigned smask_id = 0; if (plte && trns && trns_len) { - hb_buf_t smask_stream; + hb_vector_buf_t smask_stream; if (hb_pdf_build_indexed_smask (&smask_stream, idat_data, idat_len, width, height, trns, trns_len)) { - hb_buf_t smask_obj; + hb_vector_buf_t smask_obj; smask_obj.append_str ("<< /Type /XObject /Subtype /Image\n"); smask_obj.append_str ("/Width "); smask_obj.append_unsigned (width); @@ -353,7 +353,7 @@ static void hb_pdf_emit_glyph_path (hb_vector_paint_t *paint, hb_font_t *font, hb_codepoint_t glyph, - hb_buf_t *buf) + hb_vector_buf_t *buf) { hb_vector_path_sink_t sink = {&paint->path, paint->get_precision (), 1.f, 1.f}; paint->path.clear (); @@ -558,7 +558,7 @@ hb_pdf_paint_color (hb_paint_funcs_t *, /* Build an uncompressed alpha mask from indexed PNG IDAT data + tRNS. * Decompresses IDAT, un-filters PNG rows, maps palette indices to alpha. */ static bool -hb_pdf_build_indexed_smask (hb_buf_t *out, +hb_pdf_build_indexed_smask (hb_vector_buf_t *out, const char *idat_data, unsigned idat_len, unsigned width, unsigned height, const uint8_t *trns, unsigned trns_len) @@ -699,7 +699,7 @@ hb_pdf_paint_image (hb_paint_funcs_t *, unsigned plte_len = 0; const uint8_t *trns_data = nullptr; unsigned trns_len = 0; - hb_buf_t idat; + hb_vector_buf_t idat; unsigned pos = 8; while (pos + 12 <= len) @@ -800,7 +800,7 @@ hb_pdf_gradient_needs_alpha (const hb_color_stop_t *stops, unsigned count) /* Build a PDF Type 2 (exponential interpolation) function for * a single alpha stop pair (DeviceGray, scalar output). */ static void -hb_pdf_build_alpha_interpolation_function (hb_buf_t *obj, +hb_pdf_build_alpha_interpolation_function (hb_vector_buf_t *obj, float a0, float a1) { obj->append_str ("<< /FunctionType 2 /Domain [0 1] /N 1\n"); @@ -822,14 +822,14 @@ hb_pdf_build_alpha_gradient_function_from_stops (hb_pdf_resources_t *res, if (count < 2) { float a = count ? hb_color_get_alpha (paint->color_stops_scratch.arrayZ[0].color) / 255.f : 1.f; - hb_buf_t obj; + hb_vector_buf_t obj; hb_pdf_build_alpha_interpolation_function (&obj, a, a); return res->add_object (std::move (obj)); } if (count == 2) { - hb_buf_t obj; + hb_vector_buf_t obj; hb_pdf_build_alpha_interpolation_function (&obj, hb_color_get_alpha (paint->color_stops_scratch.arrayZ[0].color) / 255.f, hb_color_get_alpha (paint->color_stops_scratch.arrayZ[1].color) / 255.f); @@ -839,14 +839,14 @@ hb_pdf_build_alpha_gradient_function_from_stops (hb_pdf_resources_t *res, hb_vector_t sub_func_ids; for (unsigned i = 0; i + 1 < count; i++) { - hb_buf_t sub; + hb_vector_buf_t sub; hb_pdf_build_alpha_interpolation_function (&sub, hb_color_get_alpha (paint->color_stops_scratch.arrayZ[i].color) / 255.f, hb_color_get_alpha (paint->color_stops_scratch.arrayZ[i + 1].color) / 255.f); sub_func_ids.push (res->add_object (std::move (sub))); } - hb_buf_t obj; + hb_vector_buf_t obj; obj.append_str ("<< /FunctionType 3 /Domain [0 1]\n"); obj.append_str ("/Functions ["); for (unsigned i = 0; i < sub_func_ids.length; i++) @@ -874,7 +874,7 @@ hb_pdf_build_alpha_gradient_function_from_stops (hb_pdf_resources_t *res, /* Build a PDF Type 2 (exponential interpolation) function for * a single color stop pair. */ static void -hb_pdf_build_interpolation_function (hb_buf_t *obj, +hb_pdf_build_interpolation_function (hb_vector_buf_t *obj, hb_color_t c0, hb_color_t c1) { obj->append_str ("<< /FunctionType 2 /Domain [0 1] /N 1\n"); @@ -906,7 +906,7 @@ hb_pdf_build_gradient_function_from_stops (hb_pdf_resources_t *res, /* Single stop: constant function. */ hb_color_t c = count ? paint->color_stops_scratch.arrayZ[0].color : HB_COLOR (0, 0, 0, 255); - hb_buf_t obj; + hb_vector_buf_t obj; hb_pdf_build_interpolation_function (&obj, c, c); return res->add_object (std::move (obj)); } @@ -919,7 +919,7 @@ hb_pdf_build_gradient_function_from_stops (hb_pdf_resources_t *res, if (count == 2) { /* Two stops: single interpolation function. */ - hb_buf_t obj; + hb_vector_buf_t obj; hb_pdf_build_interpolation_function (&obj, paint->color_stops_scratch.arrayZ[0].color, paint->color_stops_scratch.arrayZ[1].color); @@ -930,7 +930,7 @@ hb_pdf_build_gradient_function_from_stops (hb_pdf_resources_t *res, hb_vector_t sub_func_ids; for (unsigned i = 0; i + 1 < count; i++) { - hb_buf_t sub; + hb_vector_buf_t sub; hb_pdf_build_interpolation_function (&sub, paint->color_stops_scratch.arrayZ[i].color, paint->color_stops_scratch.arrayZ[i + 1].color); @@ -938,7 +938,7 @@ hb_pdf_build_gradient_function_from_stops (hb_pdf_resources_t *res, } /* Stitching function (Type 3). */ - hb_buf_t obj; + hb_vector_buf_t obj; obj.append_str ("<< /FunctionType 3 /Domain [0 1]\n"); /* Functions array. */ @@ -1010,7 +1010,7 @@ hb_pdf_paint_linear_gradient (hb_paint_funcs_t *, ? "/Extend [true true]\n" : ""; /* Build Type 2 (axial) shading — color only. */ - hb_buf_t sh; + hb_vector_buf_t sh; sh.append_str ("<< /ShadingType 2 /ColorSpace /DeviceRGB\n"); sh.append_str ("/Coords ["); sh.append_num (gx0); @@ -1035,7 +1035,7 @@ hb_pdf_paint_linear_gradient (hb_paint_funcs_t *, { unsigned alpha_func_id = hb_pdf_build_alpha_gradient_function_from_stops (res, paint); - hb_buf_t ash; + hb_vector_buf_t ash; ash.append_str ("<< /ShadingType 2 /ColorSpace /DeviceGray\n"); ash.append_str ("/Coords ["); ash.append_num (gx0); @@ -1105,7 +1105,7 @@ hb_pdf_paint_radial_gradient (hb_paint_funcs_t *, ? "/Extend [true true]\n" : ""; /* Build Type 3 (radial) shading — color only. */ - hb_buf_t sh; + hb_vector_buf_t sh; sh.append_str ("<< /ShadingType 3 /ColorSpace /DeviceRGB\n"); sh.append_str ("/Coords ["); sh.append_num (gx0); @@ -1134,7 +1134,7 @@ hb_pdf_paint_radial_gradient (hb_paint_funcs_t *, { unsigned alpha_func_id = hb_pdf_build_alpha_gradient_function_from_stops (res, paint); - hb_buf_t ash; + hb_vector_buf_t ash; ash.append_str ("<< /ShadingType 3 /ColorSpace /DeviceGray\n"); ash.append_str ("/Coords ["); ash.append_num (gx0); @@ -1176,7 +1176,7 @@ hb_pdf_paint_radial_gradient (hb_paint_funcs_t *, /* Encode a 16-bit big-endian unsigned value into buf. */ static void -hb_pdf_encode_u16 (hb_buf_t *buf, uint16_t v) +hb_pdf_encode_u16 (hb_vector_buf_t *buf, uint16_t v) { char bytes[2] = {(char) (v >> 8), (char) (v & 0xFF)}; buf->append_len (bytes, 2); @@ -1184,7 +1184,7 @@ hb_pdf_encode_u16 (hb_buf_t *buf, uint16_t v) /* Encode a coordinate as 16-bit value relative to Decode range. */ static void -hb_pdf_encode_coord (hb_buf_t *buf, +hb_pdf_encode_coord (hb_vector_buf_t *buf, float val, float lo, float hi) { float t = (val - lo) / (hi - lo); @@ -1194,7 +1194,7 @@ hb_pdf_encode_coord (hb_buf_t *buf, /* Encode RGB from hb_color_t as 3 bytes. */ static void -hb_pdf_encode_color_rgb (hb_buf_t *buf, hb_color_t c) +hb_pdf_encode_color_rgb (hb_vector_buf_t *buf, hb_color_t c) { char rgb[3] = {(char) hb_color_get_red (c), (char) hb_color_get_green (c), @@ -1204,7 +1204,7 @@ hb_pdf_encode_color_rgb (hb_buf_t *buf, hb_color_t c) /* Encode alpha from hb_color_t as 1 byte (gray). */ static void -hb_pdf_encode_color_alpha (hb_buf_t *buf, hb_color_t c) +hb_pdf_encode_color_alpha (hb_vector_buf_t *buf, hb_color_t c) { char a = (char) hb_color_get_alpha (c); buf->append_len (&a, 1); @@ -1212,7 +1212,7 @@ hb_pdf_encode_color_alpha (hb_buf_t *buf, hb_color_t c) /* Encode one Coons patch control point. */ static void -hb_pdf_encode_point (hb_buf_t *buf, +hb_pdf_encode_point (hb_vector_buf_t *buf, float x, float y, float xlo, float xhi, float ylo, float yhi) @@ -1226,8 +1226,8 @@ hb_pdf_encode_point (hb_buf_t *buf, * If alpha_mesh is non-null, emits a parallel DeviceGray * patch with the alpha channel. */ static void -hb_pdf_add_sweep_patch (hb_buf_t *mesh, - hb_buf_t *alpha_mesh, +hb_pdf_add_sweep_patch (hb_vector_buf_t *mesh, + hb_vector_buf_t *alpha_mesh, float cx, float cy, float xlo, float xhi, float ylo, float yhi, float a0, hb_color_t c0_in, @@ -1331,8 +1331,8 @@ hb_pdf_add_sweep_patch (hb_buf_t *mesh, /* Callback context + trampoline for hb_paint_sweep_gradient_tiles. */ struct hb_pdf_sweep_ctx_t { - hb_buf_t *mesh; - hb_buf_t *alpha_mesh; + hb_vector_buf_t *mesh; + hb_vector_buf_t *alpha_mesh; float cx, cy, xlo, xhi, ylo, yhi; }; @@ -1385,8 +1385,8 @@ hb_pdf_paint_sweep_gradient (hb_paint_funcs_t *, bool needs_alpha = hb_pdf_gradient_needs_alpha (stops, n_stops); - hb_buf_t mesh; - hb_buf_t alpha_mesh; + hb_vector_buf_t mesh; + hb_vector_buf_t alpha_mesh; mesh.alloc (256); if (needs_alpha) alpha_mesh.alloc (256); @@ -1400,11 +1400,11 @@ hb_pdf_paint_sweep_gradient (hb_paint_funcs_t *, if (!mesh.length) return; - auto hb_pdf_build_mesh_shading = [&] (hb_buf_t &m, + auto hb_pdf_build_mesh_shading = [&] (hb_vector_buf_t &m, const char *cs, const char *decode_suffix) -> unsigned { - hb_buf_t sh; + hb_vector_buf_t sh; sh.append_str ("<< /ShadingType 6 /ColorSpace /"); sh.append_str (cs); sh.append_str ("\n/BitsPerCoordinate 16 /BitsPerComponent 8 /BitsPerFlag 8\n"); @@ -1592,7 +1592,7 @@ hb_vector_paint_render_pdf (hb_vector_paint_t *paint) !paint->group_stack.arrayZ[0].length) return nullptr; - hb_buf_t &content = paint->group_stack.arrayZ[0]; + hb_vector_buf_t &content = paint->group_stack.arrayZ[0]; hb_pdf_resources_t *res = hb_pdf_get_resources (paint); float ex = paint->extents.x; @@ -1604,7 +1604,7 @@ hb_vector_paint_render_pdf (hb_vector_paint_t *paint) unsigned total_objects = 4 + num_extra; /* 1-based: 1..total_objects */ /* Build PDF. */ - hb_buf_t out; + hb_vector_buf_t out; hb_buf_recover_recycled (paint->recycled_blob, &out); out.alloc (content.length + num_extra * 128 + 1024); @@ -1664,7 +1664,7 @@ hb_vector_paint_render_pdf (hb_vector_paint_t *paint) out.append_str (" >>\nendobj\n"); /* Build content stream: optional background rect + glyph content. */ - hb_buf_t bg_prefix; + hb_vector_buf_t bg_prefix; if (hb_color_get_alpha (paint->background)) { float r = hb_color_get_red (paint->background) / 255.f; diff --git a/src/hb-vector-paint-svg.cc b/src/hb-vector-paint-svg.cc index 73ed70596..1dacebc64 100644 --- a/src/hb-vector-paint-svg.cc +++ b/src/hb-vector-paint-svg.cc @@ -33,7 +33,7 @@ #include static void -hb_vector_svg_paint_append_global_transform_prefix (hb_vector_paint_t *paint, hb_buf_t *buf) +hb_vector_svg_paint_append_global_transform_prefix (hb_vector_paint_t *paint, hb_vector_buf_t *buf) { /* Skip when the paint's own transform is identity -- each * instance's transform already divides by scale_factor, @@ -62,7 +62,7 @@ hb_vector_svg_paint_append_global_transform_prefix (hb_vector_paint_t *paint, hb } static void -hb_vector_svg_paint_append_global_transform_suffix (hb_vector_paint_t *paint, hb_buf_t *buf) +hb_vector_svg_paint_append_global_transform_suffix (hb_vector_paint_t *paint, hb_vector_buf_t *buf) { if (paint->transform.xx == 1.f && paint->transform.yx == 0.f && paint->transform.xy == 0.f && paint->transform.yy == 1.f && @@ -114,7 +114,7 @@ hb_vector_svg_extend_mode_str (hb_paint_extend_t ext) static void hb_vector_svg_emit_color_stops (hb_vector_paint_t *paint, - hb_buf_t *buf, + hb_vector_buf_t *buf, hb_vector_t *stops) { for (unsigned i = 0; i < stops->length; i++) @@ -236,7 +236,7 @@ hb_vector_svg_normalize (const hb_vector_svg_point_t &p) } static void -hb_vector_svg_add_sweep_patch (hb_buf_t *body, +hb_vector_svg_add_sweep_patch (hb_vector_buf_t *body, unsigned precision, float cx, float cy, float radius, float a0, const hb_vector_svg_rgba_t &c0_in, @@ -310,7 +310,7 @@ hb_vector_svg_add_sweep_patch (hb_buf_t *body, /* Callback context + trampoline for hb_paint_sweep_gradient_tiles. */ struct hb_vector_svg_sweep_ctx_t { - hb_buf_t *body; + hb_vector_buf_t *body; unsigned precision; float cx, cy, radius; }; @@ -873,7 +873,7 @@ hb_vector_paint_push_group (hb_paint_funcs_t *, auto *paint = (hb_vector_paint_t *) paint_data; if (unlikely (!paint->ensure_initialized ())) return; - if (unlikely (!paint->group_stack.push_or_fail (hb_buf_t {}))) + if (unlikely (!paint->group_stack.push_or_fail (hb_vector_buf_t {}))) return; } @@ -889,7 +889,7 @@ hb_vector_paint_pop_group (hb_paint_funcs_t *, if (paint->group_stack.length < 2) return; - hb_buf_t group = paint->group_stack.pop (); + hb_vector_buf_t group = paint->group_stack.pop (); auto &body = paint->current_body (); const char *blend = hb_vector_svg_composite_mode_str (mode); @@ -945,7 +945,7 @@ hb_vector_paint_render_svg (hb_vector_paint_t *paint) if (unlikely (!paint->ensure_initialized ())) return nullptr; - hb_buf_t out; + hb_vector_buf_t out; hb_buf_recover_recycled (paint->recycled_blob, &out); unsigned estimated = paint->defs.length + paint->group_stack.arrayZ[0].length + diff --git a/src/hb-vector-paint.cc b/src/hb-vector-paint.cc index 308dcf039..08e1595b9 100644 --- a/src/hb-vector-paint.cc +++ b/src/hb-vector-paint.cc @@ -640,7 +640,7 @@ hb_vector_paint_glyph_impl (hb_vector_paint_t *paint, } { - if (unlikely (!paint->group_stack.push_or_fail (hb_buf_t {}))) + if (unlikely (!paint->group_stack.push_or_fail (hb_vector_buf_t {}))) return false; hb_bool_t ret = true; @@ -799,7 +799,7 @@ hb_vector_paint_get_svg_prefix (const hb_vector_paint_t *paint) if (!paint->id_prefix.length) return ""; /* id_prefix is appended via append_str which does NOT * NUL-terminate; ensure a trailing NUL. */ - const_cast (paint->id_prefix).alloc (paint->id_prefix.length + 1, false); + const_cast (paint->id_prefix).alloc (paint->id_prefix.length + 1, false); paint->id_prefix.arrayZ[paint->id_prefix.length] = '\0'; return paint->id_prefix.arrayZ; } diff --git a/src/hb-vector-paint.hh b/src/hb-vector-paint.hh index 35ddf2e4f..0b392fc89 100644 --- a/src/hb-vector-paint.hh +++ b/src/hb-vector-paint.hh @@ -27,11 +27,11 @@ struct hb_vector_paint_t hb_color_t background = HB_COLOR (0, 0, 0, 0); int palette = 0; hb_hashmap_t custom_palette_colors; - hb_buf_t id_prefix; + hb_vector_buf_t id_prefix; - hb_buf_t defs; - hb_buf_t path; - hb_vector_t group_stack; + hb_vector_buf_t defs; + hb_vector_buf_t path; + hb_vector_t group_stack; uint64_t transform_group_open_mask = 0; unsigned transform_group_depth = 0; unsigned transform_group_overflow_depth = 0; @@ -47,7 +47,7 @@ struct hb_vector_paint_t hb_set_t *active_color_glyphs = nullptr; hb_hashmap_t defined_color_glyphs; hb_vector_t color_stops_scratch; - hb_buf_t captured_scratch; + hb_vector_buf_t captured_scratch; hb_blob_t *recycled_blob = nullptr; hb_font_t *cached_font = nullptr; @@ -84,7 +84,7 @@ struct hb_vector_paint_t } } - hb_buf_t ¤t_body () { return group_stack.tail (); } + hb_vector_buf_t ¤t_body () { return group_stack.tail (); } void set_precision (unsigned p) { diff --git a/src/hb-vector-path.hh b/src/hb-vector-path.hh index 18fdcad64..9936428d3 100644 --- a/src/hb-vector-path.hh +++ b/src/hb-vector-path.hh @@ -40,7 +40,7 @@ * SVG backend to emit glyph outlines into defs). */ struct hb_vector_path_sink_t { - hb_buf_t *path; + hb_vector_buf_t *path; unsigned precision; float x_scale; float y_scale; diff --git a/src/hb-vector-svg.hh b/src/hb-vector-svg.hh index f377dae3b..31be2a98c 100644 --- a/src/hb-vector-svg.hh +++ b/src/hb-vector-svg.hh @@ -50,7 +50,7 @@ hb_vector_blob_meta_destroy (void *data) static inline hb_blob_t * hb_buf_blob_from (hb_blob_t **recycled_blob, - hb_buf_t *buf) + hb_vector_buf_t *buf) { unsigned len = 0; int allocated = 0; @@ -123,7 +123,7 @@ hb_buf_blob_from (hb_blob_t **recycled_blob, static inline void hb_buf_recover_recycled (hb_blob_t *blob, - hb_buf_t *buf) + hb_vector_buf_t *buf) { if (!blob) return; @@ -202,7 +202,7 @@ hb_vector_set_glyph_extents_common (const hb_transform_t<> &transform, } static inline void -hb_vector_svg_append_instance_transform (hb_buf_t *out, +hb_vector_svg_append_instance_transform (hb_vector_buf_t *out, unsigned precision, float x_scale_factor, float y_scale_factor,