--- imgObj.c	2002-01-15 16:00:08.000000000 -0500
+++ imgObj.c	2011-09-19 18:18:06.000000000 -0400
@@ -23,5 +23,5 @@
 
 static int initialized = 0;
-static Tcl_ObjType* byteArrayType = 0;
+static const Tcl_ObjType* byteArrayType = 0;
 
 int
@@ -33,5 +33,5 @@
     return (initialized = IMG_PERL|IMG_OBJS);
 #else
-    char *version;
+    const char *version;
     initialized = IMG_TCL;
     if (!Tcl_GetCommandInfo(interp,"image", &cmdInfo)) {
@@ -186,5 +186,5 @@
 	    *lengthPtr = baPtr->used;
 	}
-	return (unsigned char *) baPtr->bytes;
+	return (char *)baPtr->bytes;
     } else {
 	char *string =  (char *) objPtr;
--- imgInit.c	Tue Jan 15 15:59:58 2002
+++ imgInit.c	Thu Jun  9 05:27:40 2005
@@ -94,5 +94,5 @@
 {
     Tk_PhotoImageFormat **formatPtr = Formats;
-    char *version;
+    const char *version;
 
     if ((version = Tcl_InitStubs(interp, "8.0", 0)) == NULL) {
--- imgBMP.c	2002-01-15 16:00:07.000000000 -0500
+++ imgBMP.c	2011-09-14 01:52:28.000000000 -0400
@@ -222,5 +222,6 @@
     unsigned char *colorMap = NULL;
     char buf[10];
-    unsigned char *line = NULL, *expline = NULL;
+    char *line = NULL;
+    unsigned char *expline = NULL;
 
     CommonMatchBMP(handle, &fileWidth, &fileHeight, &colorMap, &numBits,
@@ -237,5 +238,5 @@
 
     bytesPerLine = ((numBits * fileWidth + 31)/32)*4;
-    line = (unsigned char *) ckalloc(bytesPerLine);
+    line = ckalloc(bytesPerLine);
 
     for(y=srcY+height; y<fileHeight; y++) {
@@ -253,5 +254,5 @@
     switch (numBits) {
 	case 24:
-	    block.pixelPtr = line + srcX*3;
+	    block.pixelPtr = (unsigned char *)line + srcX*3;
 	    for( y = height-1; y>=0; y--) {
 		ImgRead(handle, line, bytesPerLine);
--- imgGIF.c	2002-01-15 16:00:07.000000000 -0500
+++ imgGIF.c	2011-09-14 02:10:28.000000000 -0400
@@ -115,5 +115,5 @@
 			    int flag));
 static int		GetDataBlock _ANSI_ARGS_((MFile *handle,
-			    unsigned char *buf));
+			    char *buf));
 static int		ReadColorMap _ANSI_ARGS_((MFile *handle, int number,
 			    unsigned char buffer[MAXCOLORMAPSIZE][4]));
@@ -256,6 +256,6 @@
     Tcl_Obj **objv = NULL;
     myblock bl;
-    unsigned char buf[100];
-    unsigned char *trashBuffer = NULL;
+    char buf[100];
+    char *trashBuffer = NULL;
     int bitPixel;
     unsigned int colorResolution;
@@ -402,6 +402,5 @@
 	    if (trashBuffer == NULL) {
 		nBytes = fileWidth * fileHeight * 3;
-		trashBuffer =
-		    (unsigned char *) ckalloc((unsigned int) nBytes);
+		trashBuffer = ckalloc((unsigned int) nBytes);
 	    }
 
@@ -602,9 +601,9 @@
 				 * returned here. */
 {
-    unsigned char buf[7];
+    char buf[7];
 
     if ((ImgRead(handle, buf, 6) != 6)
-	    || ((strncmp(GIF87a, (char *) buf, 6) != 0)
-	    && (strncmp(GIF89a, (char *) buf, 6) != 0))) {
+	    || ((strncmp(GIF87a, buf, 6) != 0)
+	    && (strncmp(GIF89a, buf, 6) != 0))) {
 	return 0;
     }
@@ -633,5 +632,5 @@
 {
 	int i;
-	unsigned char rgb[3];
+	char rgb[3];
 
 	for (i = 0; i < number; ++i) {
@@ -658,5 +657,5 @@
      int *transparent;
 {
-    static unsigned char buf[256];
+    static char buf[256];
     int count;
 
@@ -670,10 +669,10 @@
 	case 0xfe:      /* Comment Extension */
 	    do {
-		count = GetDataBlock(handle, (unsigned char*) buf);
+		count = GetDataBlock(handle, buf);
 	    } while (count > 0);
 	    return count;
 
 	case 0xf9:      /* Graphic Control Extension */
-	    count = GetDataBlock(handle, (unsigned char*) buf);
+	    count = GetDataBlock(handle, buf);
 	    if (count < 0) {
 		return 1;
@@ -684,5 +683,5 @@
 
 	    do {
-		count = GetDataBlock(handle, (unsigned char*) buf);
+		count = GetDataBlock(handle, buf);
 	    } while (count > 0);
 	    return count;
@@ -690,5 +689,5 @@
 
     do {
-	count = GetDataBlock(handle, (unsigned char*) buf);
+	count = GetDataBlock(handle, buf);
     } while (count > 0);
     return count;
@@ -700,7 +699,7 @@
 GetDataBlock(handle, buf)
      MFile *handle;
-     unsigned char *buf;
+     char *buf;
 {
-    unsigned char count;
+    char count;
 
     if (! ReadOK(handle,&count,1)) {
@@ -759,5 +758,5 @@
      int transparent;
 {
-    unsigned char initialCodeSize;
+    char initialCodeSize;
     int v;
     int xpos = 0, ypos = 0, pass = 0, i;
@@ -982,7 +981,7 @@
      int flag;
 {
-    static unsigned char buf[280];
+    static char buf[280];
     static int bytes = 0, done;
-    static unsigned char *c;
+    static char *c;
 
     static unsigned int window;
@@ -1473,5 +1472,5 @@
 static int obits;
 static MFile *ofile;
-static unsigned char oblock[MAXCOLORMAPSIZE];
+static char oblock[MAXCOLORMAPSIZE];
 static int oblen;
 
--- imgJPEG.c	2002-01-15 15:59:56.000000000 -0500
+++ imgJPEG.c	2011-09-14 02:22:30.000000000 -0400
@@ -1386,5 +1080,5 @@
   int nbytes;
 
-  nbytes = ImgRead(&src->handle, src->buffer, STRING_BUF_SIZE);
+  nbytes = ImgRead(&src->handle, (char *)src->buffer, STRING_BUF_SIZE);
 
   if (nbytes <= 0) {
--- imgPS.c	Sun Aug 13 06:06:53 2000
+++ imgPS.c	2011-09-14 03:05:21.000000000 -0400
@@ -178,5 +178,5 @@
     int *widthPtr, *heightPtr;
 {
-    unsigned char buf[41];
+    char buf[41];
 
     if ((ImgRead(handle, (char *) buf, 11) != 11)
@@ -184,11 +184,11 @@
 	return 0;
     }
-    while (ImgRead(handle,(char *) buf, 1) == 1) {
+    while (ImgRead(handle, buf, 1) == 1) {
 	if (buf[0] == '%' &&
-		(ImgRead(handle, (char *) buf, 2) == 2) &&
+		(ImgRead(handle, buf, 2) == 2) &&
 		(!memcmp(buf, "%B", 2) &&
-		(ImgRead(handle, (char *) buf, 11) == 11) &&
+		(ImgRead(handle, buf, 11) == 11) &&
 		(!memcmp(buf, "oundingBox:", 11)) &&
-		(ImgRead(handle, (char *) buf, 40) == 40))) {
+		(ImgRead(handle, buf, 40) == 40))) {
 	    int w, h, zoomx, zoomy;
 	    char *p = buf;
@@ -272,5 +272,6 @@
     int len, i, j, fileWidth, fileHeight, maxintensity, index;
     char *p, type;
-    unsigned char buffer[1025], *line = NULL, *line3 = NULL;
+    char buffer[1025];
+    unsigned char *line = NULL, *line3 = NULL;
 	char zoom[64], papersize[64];
     Tcl_Channel chan;
--- imgUtil.c	2002-01-15 15:59:59.000000000 -0500
+++ imgUtil.c	2011-09-14 03:40:28.000000000 -0400
@@ -249,3 +249,3 @@
     }
     *handlePtr = IMG_FAILED;
-}
\ No newline at end of file
+}
