From 2a1f50aee4f30dbd0c55d8f0b7185b690c841051 Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Tue, 27 Jun 2000 15:47:59 +0000
Subject: fixed GL_INTENSITY error checking bug

---
 src/mesa/main/colortab.c | 8 +++++---
 src/mesa/main/image.c    | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index 143d9e99d4..9ee3f0f2bb 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -1,4 +1,4 @@
-/* $Id: colortab.c,v 1.18 2000/05/24 14:03:04 brianp Exp $ */
+/* $Id: colortab.c,v 1.19 2000/06/27 15:47:59 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -301,7 +301,8 @@ _mesa_ColorTable( GLenum target, GLenum internalFormat,
 
    assert(table);
 
-   if (!_mesa_is_legal_format_and_type(format, type)) {
+   if (!_mesa_is_legal_format_and_type(format, type) ||
+       format == GL_INTENSITY) {
       gl_error(ctx, GL_INVALID_ENUM, "glColorTable(format or type)");
       return;
    }
@@ -477,7 +478,8 @@ _mesa_ColorSubTable( GLenum target, GLsizei start,
 
    assert(table);
 
-   if (!_mesa_is_legal_format_and_type(format, type)) {
+   if (!_mesa_is_legal_format_and_type(format, type) ||
+       format == GL_INTENSITY) {
       gl_error(ctx, GL_INVALID_ENUM, "glColorSubTable(format or type)");
       return;
    }
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index c695bd85be..9bf1ad33f8 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -1,4 +1,4 @@
-/* $Id: image.c,v 1.33 2000/06/22 21:26:51 brianp Exp $ */
+/* $Id: image.c,v 1.34 2000/06/27 15:47:59 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -330,6 +330,7 @@ _mesa_is_legal_format_and_type( GLenum format, GLenum type )
       case GL_GREEN:
       case GL_BLUE:
       case GL_ALPHA:
+      case GL_INTENSITY:
       case GL_LUMINANCE:
       case GL_LUMINANCE_ALPHA:
       case GL_DEPTH_COMPONENT:
-- 
cgit v1.2.3