diff options
author | José Fonseca <jfonseca@vmware.com> | 2009-06-11 16:34:56 +0100 |
---|---|---|
committer | José Fonseca <jfonseca@vmware.com> | 2009-06-11 16:34:56 +0100 |
commit | bf89ecb6c92aaaeccd7b6f093cb8bae9fd56aaf6 (patch) | |
tree | b7b38a1e1bd5e975f77ec23ea872a97dc6963b64 /src/mesa/main/image.c | |
parent | 0d2ac7a10b2904eda70794534a9a73b3f4b654cf (diff) | |
parent | cc09724a50a4cabb68b7c5f5b8d3812d38f65391 (diff) |
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/state_tracker/st_cb_fbo.c
src/mesa/state_tracker/st_framebuffer.c
Diffstat (limited to 'src/mesa/main/image.c')
-rw-r--r-- | src/mesa/main/image.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c index c06031e6cb..090e5eb330 100644 --- a/src/mesa/main/image.c +++ b/src/mesa/main/image.c @@ -2874,7 +2874,7 @@ extract_uint_indexes(GLuint n, GLuint indexes[], } else { for (i = 0; i < n; i++) - indexes[i] = s[i] & 0xfff; /* lower 8 bits */ + indexes[i] = s[i] & 0xff; /* lower 8 bits */ } } break; |