From e5d5c295c75828fce604ad27332c1f2872e8788b Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Sat, 10 May 2008 23:41:51 +0000
Subject: [PATCH] fix accidental change

---
 panda/src/tinydisplay/zbuffer.cxx | 10 +++++-----
 panda/src/tinydisplay/zgl.h       |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/panda/src/tinydisplay/zbuffer.cxx b/panda/src/tinydisplay/zbuffer.cxx
index 8a919004a3..eaa885a3b2 100644
--- a/panda/src/tinydisplay/zbuffer.cxx
+++ b/panda/src/tinydisplay/zbuffer.cxx
@@ -142,11 +142,11 @@ static void ZB_copyFrameBuffer5R6G5B(ZBuffer * zb,
                                      void *buf, int linesize) 
 {
     PIXEL *q;
-    unsigned char *p, *p1;
+    unsigned short *p, *p1;
     int y, n;
 
     q = zb->pbuf;
-    p1 = (unsigned char *) buf;
+    p1 = (unsigned short *) buf;
 
     for (y = 0; y < zb->ysize; y++) {
 	p = p1;
@@ -159,7 +159,7 @@ static void ZB_copyFrameBuffer5R6G5B(ZBuffer * zb,
 	    q += 4;
 	    p += 4;
 	} while (--n > 0);
-	p1 = (unsigned char *)((char *)p1 + linesize);
+	p1 = (unsigned short *)((char *)p1 + linesize);
     }
 }
 
@@ -222,7 +222,7 @@ void memset_s(void *adr, int val, int count)
 {
     int i, n, v;
     unsigned int *p;
-    unsigned char *q;
+    unsigned short *q;
 
     p = (unsigned int *)adr;
     v = val | (val << 16);
@@ -236,7 +236,7 @@ void memset_s(void *adr, int val, int count)
 	p += 4;
     }
 
-    q = (unsigned char *) p;
+    q = (unsigned short *) p;
     n = count & 7;
     for (i = 0; i < n; i++)
 	*q++ = val;
diff --git a/panda/src/tinydisplay/zgl.h b/panda/src/tinydisplay/zgl.h
index ee4bb699d1..47ca07bab6 100644
--- a/panda/src/tinydisplay/zgl.h
+++ b/panda/src/tinydisplay/zgl.h
@@ -208,7 +208,7 @@ void gl_eval_viewport(GLContext *c);
 void gl_vertex_transform(GLContext * c, GLVertex * v);
 
 /* image_util.c */
-void gl_convertRGB_to_5R6G5B(unsigned char *pixmap,unsigned char *rgb,
+void gl_convertRGB_to_5R6G5B(unsigned short *pixmap,unsigned char *rgb,
                              int xsize,int ysize);
 void gl_convertRGB_to_8A8R8G8B(unsigned int *pixmap, unsigned char *rgb,
                                int xsize, int ysize);