summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-10-05 13:36:05 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-10-05 13:36:05 +0000
commit26f69d87a4e6f4d39ce10864e9e70689646155ed (patch)
tree9132840c93da4c99c6d4f61dbc6e620a60f46e4b
parentea20c324ae1dd6360ec88f83f95087ebbb79bd0d (diff)
fix byteswapping bug in _mesa_texstore_ycbcr() (Benjamin Herrenschmidt)
-rw-r--r--src/mesa/main/texstore.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index f4da9053f7..5f6fb29b5f 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -1,6 +1,6 @@
/*
* Mesa 3-D graphics library
- * Version: 6.3
+ * Version: 6.5
*
* Copyright (C) 1999-2005 Brian Paul All Rights Reserved.
*
@@ -1917,15 +1917,15 @@ _mesa_texstore_ycbcr(STORE_PARAMS)
(srcType == GL_UNSIGNED_SHORT_8_8_REV_MESA) ^
(dstFormat == &_mesa_texformat_ycbcr_rev) ^
!littleEndian) {
- GLushort *pImage = (GLushort *) ((GLubyte *) dstAddr
- + dstZoffset * dstImageStride
- + dstYoffset * dstRowStride
- + dstXoffset * dstFormat->TexelBytes);
+ GLubyte *pImage = (GLubyte *) dstAddr
+ + dstZoffset * dstImageStride
+ + dstYoffset * dstRowStride
+ + dstXoffset * dstFormat->TexelBytes;
GLint img, row;
for (img = 0; img < srcDepth; img++) {
- GLushort *pRow = pImage;
+ GLubyte *pRow = pImage;
for (row = 0; row < srcHeight; row++) {
- _mesa_swap2(pRow, srcWidth);
+ _mesa_swap2((GLushort *) pRow, srcWidth);
pRow += dstRowStride;
}
pImage += dstImageStride;