mirror of
https://github.com/storytold/harfbuzz.git
synced 2026-11-21 15:01:01 +01:00
raster: rename has_fixed_extents to has_extents
This commit is contained in:
1 parent
8ccb383ce0
commit
1cdab593b8
2 files changed
+15
-15
No files matched your search
@@ -69,7 +69,7 @@ struct hb_raster_draw_t
|
||||
float x_scale_factor = 1.f;
|
||||
float y_scale_factor = 1.f;
|
||||
hb_raster_extents_t fixed_extents = {};
|
||||
bool has_fixed_extents = false;
|
||||
bool has_extents = false;
|
||||
|
||||
/* Accumulated geometry */
|
||||
hb_vector_t<hb_raster_edge_t> edges;
|
||||
@@ -306,7 +306,7 @@ hb_raster_draw_set_extents (hb_raster_draw_t *draw,
|
||||
const hb_raster_extents_t *extents)
|
||||
{
|
||||
draw->fixed_extents = *extents;
|
||||
draw->has_fixed_extents = true;
|
||||
draw->has_extents = true;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -364,7 +364,7 @@ hb_raster_draw_set_glyph_extents (hb_raster_draw_t *draw,
|
||||
if (ex1 <= ex0 || ey1 <= ey0)
|
||||
{
|
||||
draw->fixed_extents = {};
|
||||
draw->has_fixed_extents = false;
|
||||
draw->has_extents = false;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -374,7 +374,7 @@ hb_raster_draw_set_glyph_extents (hb_raster_draw_t *draw,
|
||||
(unsigned) (ey1 - ey0),
|
||||
0
|
||||
};
|
||||
draw->has_fixed_extents = true;
|
||||
draw->has_extents = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -398,7 +398,7 @@ hb_raster_draw_reset (hb_raster_draw_t *draw)
|
||||
draw->x_scale_factor = 1.f;
|
||||
draw->y_scale_factor = 1.f;
|
||||
draw->fixed_extents = {};
|
||||
draw->has_fixed_extents = false;
|
||||
draw->has_extents = false;
|
||||
draw->edges.clear ();
|
||||
draw->active_edges.clear ();
|
||||
}
|
||||
@@ -1168,7 +1168,7 @@ hb_raster_draw_render (hb_raster_draw_t *draw)
|
||||
/* ── 1. Compute result extents ─────────────────────────────────── */
|
||||
hb_raster_extents_t ext;
|
||||
|
||||
if (draw->has_fixed_extents)
|
||||
if (draw->has_extents)
|
||||
{
|
||||
ext = draw->fixed_extents;
|
||||
}
|
||||
@@ -1312,7 +1312,7 @@ hb_raster_draw_render (hb_raster_draw_t *draw)
|
||||
done:
|
||||
/* ── 6. Reset one-shot state ────────────────────────────────────── */
|
||||
draw->edges.clear ();
|
||||
draw->has_fixed_extents = false;
|
||||
draw->has_extents = false;
|
||||
draw->fixed_extents = {};
|
||||
|
||||
return image;
|
||||
|
||||
@@ -94,7 +94,7 @@ struct hb_raster_paint_t
|
||||
float x_scale_factor = 1.f;
|
||||
float y_scale_factor = 1.f;
|
||||
hb_raster_extents_t fixed_extents = {};
|
||||
bool has_fixed_extents = false;
|
||||
bool has_extents = false;
|
||||
hb_color_t foreground = HB_COLOR (0, 0, 0, 255);
|
||||
|
||||
/* Stacks */
|
||||
@@ -1819,7 +1819,7 @@ hb_raster_paint_set_extents (hb_raster_paint_t *paint,
|
||||
const hb_raster_extents_t *extents)
|
||||
{
|
||||
paint->fixed_extents = *extents;
|
||||
paint->has_fixed_extents = true;
|
||||
paint->has_extents = true;
|
||||
if (paint->fixed_extents.stride == 0)
|
||||
paint->fixed_extents.stride = paint->fixed_extents.width * 4;
|
||||
}
|
||||
@@ -1883,7 +1883,7 @@ hb_raster_paint_set_glyph_extents (hb_raster_paint_t *paint,
|
||||
if (ex1 <= ex0 || ey1 <= ey0)
|
||||
{
|
||||
paint->fixed_extents = {};
|
||||
paint->has_fixed_extents = false;
|
||||
paint->has_extents = false;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1893,7 +1893,7 @@ hb_raster_paint_set_glyph_extents (hb_raster_paint_t *paint,
|
||||
(unsigned) (ey1 - ey0),
|
||||
0
|
||||
};
|
||||
paint->has_fixed_extents = true;
|
||||
paint->has_extents = true;
|
||||
if (paint->fixed_extents.stride == 0)
|
||||
paint->fixed_extents.stride = paint->fixed_extents.width * 4;
|
||||
return true;
|
||||
@@ -1961,7 +1961,7 @@ hb_raster_paint_render (hb_raster_paint_t *paint)
|
||||
{
|
||||
hb_raster_image_t *result = nullptr;
|
||||
|
||||
if (unlikely (!paint->has_fixed_extents))
|
||||
if (unlikely (!paint->has_extents))
|
||||
goto fail;
|
||||
|
||||
if (paint->surface_stack.length)
|
||||
@@ -1984,7 +1984,7 @@ hb_raster_paint_render (hb_raster_paint_t *paint)
|
||||
paint->transform_stack.clear ();
|
||||
paint->release_all_clips ();
|
||||
hb_raster_draw_reset (paint->clip_rdr);
|
||||
paint->has_fixed_extents = false;
|
||||
paint->has_extents = false;
|
||||
paint->fixed_extents = {};
|
||||
|
||||
return result;
|
||||
@@ -1993,7 +1993,7 @@ fail:
|
||||
paint->transform_stack.clear ();
|
||||
paint->release_all_clips ();
|
||||
hb_raster_draw_reset (paint->clip_rdr);
|
||||
paint->has_fixed_extents = false;
|
||||
paint->has_extents = false;
|
||||
paint->fixed_extents = {};
|
||||
return nullptr;
|
||||
}
|
||||
@@ -2014,7 +2014,7 @@ hb_raster_paint_reset (hb_raster_paint_t *paint)
|
||||
paint->x_scale_factor = 1.f;
|
||||
paint->y_scale_factor = 1.f;
|
||||
paint->fixed_extents = {};
|
||||
paint->has_fixed_extents = false;
|
||||
paint->has_extents = false;
|
||||
paint->foreground = HB_COLOR (0, 0, 0, 255);
|
||||
paint->transform_stack.clear ();
|
||||
paint->release_all_clips ();
|
||||
|
||||
Reference in new issue
Block a user