--- gforth/fi2c.fs	1999/08/29 21:44:46	1.8
+++ gforth/fi2c.fs	2002/09/14 08:20:19	1.12
@@ -1,6 +1,6 @@
 \ Convert image to C include file
 
-\ Copyright (C) 1998 Free Software Foundation, Inc.
+\ Copyright (C) 1998,1999 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -16,7 +16,7 @@
 
 \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software
-\ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
 
 0 Value image
 0 Value bitmap
@@ -36,7 +36,7 @@ Variable au
 
 : search-magic ( fd -- )  >r
     BEGIN  magicbuf 8 r@ read-file throw  8 =  WHILE
-	magicbuf s" Gforth2" tuck compare 0=  UNTIL
+	magicbuf s" Gforth2" tuck str=  UNTIL
     ELSE  true abort" No magic found"  THEN
     1 magicbuf 7 + c@ 5 rshift 3 and lshift tchars !
     1 magicbuf 7 + c@ 1 rshift 3 and lshift tcell !
@@ -52,7 +52,7 @@ Variable bitmap-chars
 
 : read-header ( fd -- )
     image-header 4 cells rot read-file throw drop
-    image-header 2 cells + @ bswap tchars @ * au @ /
+    image-header 2 cells + @ bswap tchars @ * tcell @ / au @ /
     dup image-cells ! 1- 8 / tchars @ / 1+ bitmap-chars !
     image-cells @ cells allocate throw to image
     bitmap-chars @ allocate throw to bitmap ;
@@ -85,7 +85,7 @@ Variable bitmap-chars
     r@ read-dictionary r@ read-bitmap r> close-file throw ;
 
 : .imagesize ( -- )
-    image-header 3 cells + @ bswap .08x ;
+    image-header 3 cells + @ tchars @ * tcell @ / au @ / bswap .08x ;
 
 : .relocsize ( -- )
     bitmap-chars @ .08x ;