diff options
| author | Dylan Noblesmith <nobled@dreamwidth.org> | 2012-04-01 19:48:21 +0000 |
|---|---|---|
| committer | Dylan Noblesmith <nobled@dreamwidth.org> | 2012-04-13 14:25:08 +0000 |
| commit | 6a491b5728fcfb928612182fa87212eeb2253917 (patch) | |
| tree | f4cd06fd6cb01cc3ec2fb29cff7210815b90d07a /src/gallium/state_trackers/vega | |
| parent | 071501a68129768c6223beb24f7363d87c6684ea (diff) | |
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 <brianp@vmware.com>
Diffstat (limited to 'src/gallium/state_trackers/vega')
| -rw-r--r-- | 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 a183933c364..27d461ce660 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); } |