From 6ef9f6ca2c8ac809d15450d946b1e3bdfe8a22b7 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Thu, 5 Sep 2002 08:20:03 +0000
Subject: [PATCH] better just do it the old way

---
 2d/rle.c      | 11 +++++++++--
 2d/scalec.c   |  4 ++--
 include/rle.h |  4 ++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/2d/rle.c b/2d/rle.c
index 9d0d6301..0a0dfe07 100644
--- a/2d/rle.c
+++ b/2d/rle.c
@@ -1,4 +1,4 @@
-/* $Id: rle.c,v 1.10 2002-09-05 07:57:11 btb Exp $ */
+/* $Id: rle.c,v 1.11 2002-09-05 08:20:03 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -125,7 +125,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: rle.c,v 1.10 2002-09-05 07:57:11 btb Exp $";
+static char rcsid[] = "$Id: rle.c,v 1.11 2002-09-05 08:20:03 btb Exp $";
 #endif
 
 #include <stdlib.h>
@@ -269,6 +269,7 @@ done:
 
 #ifdef RLE_DECODE_ASM
 
+#if 0
 void gr_rle_decode( ubyte * src, ubyte * dest, int dest_len )
 {
 	ubyte *dest_end;
@@ -277,6 +278,12 @@ void gr_rle_decode( ubyte * src, ubyte * dest, int dest_len )
 
 	Assert(dest_end-src < dest_len);
 }
+#else
+void gr_rle_decode( ubyte * src, ubyte * dest )
+{
+    gr_rle_decode_asm( src, dest );
+}
+#endif
 
 #else // NO_ASM or unknown compiler
 
diff --git a/2d/scalec.c b/2d/scalec.c
index 4bc78387..e9f5fce2 100644
--- a/2d/scalec.c
+++ b/2d/scalec.c
@@ -1,4 +1,4 @@
-/* $Id: scalec.c,v 1.4 2002-09-05 08:02:27 btb Exp $ */
+/* $Id: scalec.c,v 1.5 2002-09-05 08:20:03 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -48,7 +48,7 @@ void decode_row( grs_bitmap * bmp, int y )
 
 	for (i=0; i<y; i++ )
 		offset += bmp->bm_data[4+i];
-	gr_rle_decode( &bmp->bm_data[offset], scale_rle_data, sizeof(scale_rle_data));
+	gr_rle_decode( &bmp->bm_data[offset], scale_rle_data );
 }
 
 void scale_up_bitmap(grs_bitmap *source_bmp, grs_bitmap *dest_bmp, int x0, int y0, int x1, int y1, fix u0, fix v0,  fix u1, fix v1, int orientation  )
diff --git a/include/rle.h b/include/rle.h
index a5b35bae..fe03aa66 100644
--- a/include/rle.h
+++ b/include/rle.h
@@ -39,7 +39,11 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "pstypes.h"
 #include "gr.h"
 
+#if 0
 void gr_rle_decode( ubyte * src, ubyte * dest, int dest_len );
+#else
+void gr_rle_decode( ubyte * src, ubyte * dest );
+#endif
 int gr_rle_encode( int org_size, ubyte *src, ubyte *dest );
 int gr_rle_getsize( int org_size, ubyte *src );
 ubyte * gr_rle_find_xth_pixel( ubyte *src, int x,int * count, ubyte color );
-- 
2.39.2