diff -ruN magicpoint-1.10a.orig/image/gif.c magicpoint-1.10a/image/gif.c
--- magicpoint-1.10a.orig/image/gif.c	2000-03-07 15:59:56.000000000 +0900
+++ magicpoint-1.10a/image/gif.c	2003-11-28 18:35:44.000000000 +0900
@@ -103,7 +103,7 @@
 			if (GifFile->Image.Left + GifFile->Image.Width > GifFile->SWidth ||
 			   GifFile->Image.Top + GifFile->Image.Height > GifFile->SHeight) {
 				fprintf(stderr,
-"Image %d is not confined to screen dimension, aborted.\n");
+"Image %d is not confined to screen dimension, aborted.\n", GifFile->ImageCount);
 				exit(-2);
 			}
 			if (GifFile->Image.Interlace) {
diff -ruN magicpoint-1.10a.orig/image/imagetypes.h magicpoint-1.10a/image/imagetypes.h
--- magicpoint-1.10a.orig/image/imagetypes.h	2003-11-28 18:37:31.000000000 +0900
+++ magicpoint-1.10a/image/imagetypes.h	2003-11-28 18:30:25.000000000 +0900
@@ -44,5 +44,5 @@
 int imIdent();
 #ifdef USE_PNG
 int pngIdent();
-int pngLoad();
+Image *pngLoad();
 #endif
diff -ruN magicpoint-1.10a.orig/image/pbm.c magicpoint-1.10a/image/pbm.c
--- magicpoint-1.10a.orig/image/pbm.c	1998-12-28 17:23:14.000000000 +0900
+++ magicpoint-1.10a/image/pbm.c	2003-11-28 18:36:56.000000000 +0900
@@ -359,8 +359,10 @@
        */
 
       destptr = image->data;
-      for (y = 0; y < size; y++)
-	*(destptr++) = PM_SCALE(*destptr, maxval, 0xff);
+      for (y = 0; y < size; y++) {
+	*destptr = PM_SCALE(*destptr, maxval, 0xff);
+	destptr++;
+      }
       break;
 
     case ITRUE:
diff -ruN magicpoint-1.10a.orig/mng.c magicpoint-1.10a/mng.c
--- magicpoint-1.10a.orig/mng.c	2003-11-28 18:37:31.000000000 +0900
+++ magicpoint-1.10a/mng.c	2003-11-28 18:30:25.000000000 +0900
@@ -43,6 +43,8 @@
 	mng_uint32	delay;     /* ticks to wait before resuming decode */
 } mngstuff;
 
+void mng_window_setup(mngstuff *mymng, int x, int y, int width, int height);
+
 /* callbacks for the mng decoder */
 
 /* memory allocation; data must be zeroed */
@@ -228,7 +230,7 @@
 	return (0);
 }
 
-int mymngquit()
+void mymngquit(int sig)
 {
 	mngstuff	*mymng;