Module: Mesa Branch: master Commit: 6a491b5728fcfb928612182fa87212eeb2253917 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6a491b5728fcfb928612182fa87212eeb2253917
Author: Dylan Noblesmith <nob...@dreamwidth.org> Date: Sun Apr 1 19:48:21 2012 +0000 st/vega: fix uninitialized values C still treats array arguments exactly like pointer arguments. By sheer coincidence, this still worked fine on 64-bit machines where 2 * sizeof(float) == sizeof(void*), but not on 32-bit. Noticed by clang: text.c:76:51: warning: sizeof on array function parameter will return size of 'const VGfloat *' (aka 'const float *') instead of 'const VGfloat [2]' [-Wsizeof-array-argument] memcpy(glyph->glyph_origin, glyphOrigin, sizeof(glyphOrigin)); NOTE: This is a candidate for the 8.0 branch. Reviewed-by: Brian Paul <bri...@vmware.com> --- src/gallium/state_trackers/vega/text.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/state_trackers/vega/text.c b/src/gallium/state_trackers/vega/text.c index a183933..27d461c 100644 --- a/src/gallium/state_trackers/vega/text.c +++ b/src/gallium/state_trackers/vega/text.c @@ -73,8 +73,8 @@ static void add_glyph(struct vg_font *font, glyph = CALLOC_STRUCT(vg_glyph); glyph->object = obj; glyph->is_hinted = isHinted; - memcpy(glyph->glyph_origin, glyphOrigin, sizeof(glyphOrigin)); - memcpy(glyph->escapement, escapement, sizeof(escapement)); + memcpy(glyph->glyph_origin, glyphOrigin, sizeof(glyph->glyph_origin)); + memcpy(glyph->escapement, escapement, sizeof(glyph->glyph_origin)); cso_hash_insert(font->glyphs, (unsigned) glyphIndex, glyph); } _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit