[cairo] [PATCH 45/71] drm/intel: renamed intel_glyph_cache_add_glyph()::glyph to glyph_private
Enrico Weigelt, metux IT consult
enrico.weigelt at gr13.net
Mon Apr 17 16:57:24 UTC 2017
harmonize naming with other backends a little bit
Signed-off-by: Enrico Weigelt, metux IT consult <enrico.weigelt at gr13.net>
---
src/drm/cairo-drm-intel.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/drm/cairo-drm-intel.c b/src/drm/cairo-drm-intel.c
index 27e214c6e..f69252ba1 100644
--- a/src/drm/cairo-drm-intel.c
+++ b/src/drm/cairo-drm-intel.c
@@ -780,7 +780,7 @@ intel_glyph_cache_add_glyph (intel_device_t *device,
cairo_scaled_glyph_t *scaled_glyph)
{
cairo_image_surface_t *glyph_surface = scaled_glyph->surface;
- intel_glyph_t *glyph;
+ intel_glyph_t *glyph_private;
cairo_rtree_node_t *node = NULL;
double sf_x, sf_y;
cairo_int_status_t status;
@@ -875,25 +875,25 @@ intel_glyph_cache_add_glyph (intel_device_t *device,
scaled_glyph->surface_private = node;
- glyph= (intel_glyph_t *) node;
- glyph->node.owner = &scaled_glyph->surface_private;
- glyph->cache = cache;
+ glyph_private= (intel_glyph_t *) node;
+ glyph_private->node.owner = &scaled_glyph->surface_private;
+ glyph_private->cache = cache;
/* compute tex coords: bottom-right, bottom-left, top-left */
sf_x = 1. / cache->buffer.width;
sf_y = 1. / cache->buffer.height;
- glyph->texcoord[0] =
+ glyph_private->texcoord[0] =
texcoord_2d_16 (sf_x * (node->x + glyph_surface->width),
sf_y * (node->y + glyph_surface->height));
- glyph->texcoord[1] =
+ glyph_private->texcoord[1] =
texcoord_2d_16 (sf_x * node->x,
sf_y * (node->y + glyph_surface->height));
- glyph->texcoord[2] =
+ glyph_private->texcoord[2] =
texcoord_2d_16 (sf_x * node->x,
sf_y * node->y);
- glyph->width = glyph_surface->width;
- glyph->height = glyph_surface->height;
+ glyph_private->width = glyph_surface->width;
+ glyph_private->height = glyph_surface->height;
return CAIRO_INT_STATUS_SUCCESS;
}
--
2.11.0.rc0.7.gbe5a750
More information about the cairo
mailing list