fix glDrawPixels(GL_COLOR_INDEX, GL_BITMAP) bug 9044

diff --git a/docs/relnotes-6.5.2.html b/docs/relnotes-6.5.2.html
index 1ba936413a8d524a8eb5108cac2176f2914fb0dd..f582c3c593bb16144a935c6effe80108fb2e0203 100644 (file)
--- a/docs/relnotes-6.5.2.html
+++ b/docs/relnotes-6.5.2.html
@@ -66,6 +66,7 @@ copy texturing).
 <li>Fixed some fragment program bugs in Intel i915 DRI driver
 <li>Fixed glGetVertexAttribfvARB bug 8883
 <li>Implemented glGetUniform[fi]vARB() functions
+<li>Fixed glDrawPixels(GL_COLOR_INDEX, GL_BITMAP) segfault (bug 9044)
 </ul>
 
 

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 695aab5227f494bbb8526d0661b724f78001b53d..6ff4089f0eacade58e802f1a6c5fe4131600326a 100644 (file)
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -1168,7 +1168,7 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
    const GLint comps = _mesa_components_in_format(dstFormat);
    GLuint i;
 
-   if (dstType != GL_FLOAT) {
+   if (dstType != GL_FLOAT || ctx->Color.ClampReadColor == GL_TRUE) {
       /* need to clamp to [0, 1] */
       transferOps |= IMAGE_CLAMP_BIT;
    }
@@ -1182,7 +1182,7 @@ _mesa_pack_rgba_span_float(GLcontext *ctx, GLuint n, GLfloat rgba[][4],
 
    if (dstFormat == GL_LUMINANCE || dstFormat == GL_LUMINANCE_ALPHA) {
       /* compute luminance values */
-      if (ctx->Color.ClampReadColor == GL_TRUE || dstType != GL_FLOAT) {
+      if (dstType != GL_FLOAT || ctx->Color.ClampReadColor == GL_TRUE) {
          for (i = 0; i < n; i++) {
             GLfloat sum = rgba[i][RCOMP] + rgba[i][GCOMP] + rgba[i][BCOMP];
             luminance[i] = CLAMP(sum, 0.0F, 1.0F);
@@ -4173,7 +4173,7 @@ _mesa_unpack_image( GLuint dimensions,
    if (width <= 0 || height <= 0 || depth <= 0)
       return NULL;  /* generate error later */
 
-   if (format == GL_BITMAP) {
+   if (type == GL_BITMAP) {
       bytesPerRow = (width + 7) >> 3;
       flipBytes = !unpack->LsbFirst;
       swap2 = swap4 = GL_FALSE;