From 57c875df3d02f83586c3d21ae5e0081794c065f7 Mon Sep 17 00:00:00 2001
From: Yves Rizoud <yrizoud@gmail.com>
Date: Sun, 28 Dec 2008 19:44:17 +0000
Subject: [PATCH] Fix issue 60 : Wrong spacing in Text when using bitmap fonts.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@435 416bcca6-2ee7-4201-b75f-2eb2f807beb1
---
 SFont.c                  |  10 ++++------
 fonts/GrafX2_Classic.gif | Bin 1716 -> 1719 bytes
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/SFont.c b/SFont.c
index 40516bde..e2e2ada8 100644
--- a/SFont.c
+++ b/SFont.c
@@ -129,12 +129,10 @@ void SFont_Write(SDL_Surface *Surface, const SFont_Font *Font,
             continue;
         }
 
-        srcrect.w = dstrect.w = 
-            (Font->CharPos[charoffset+2] + Font->CharPos[charoffset+1])/2 -
-            (Font->CharPos[charoffset] + Font->CharPos[charoffset-1])/2;
-        srcrect.x = (Font->CharPos[charoffset]+Font->CharPos[charoffset-1])/2;
-        dstrect.x = x - (float)(Font->CharPos[charoffset]
-                              - Font->CharPos[charoffset-1])/2;
+        srcrect.w = Font->CharPos[charoffset+2] - Font->CharPos[charoffset];
+        dstrect.w = srcrect.w;
+        srcrect.x = Font->CharPos[charoffset];
+        dstrect.x = x;
 
         SDL_BlitSurface(Font->Surface, &srcrect, Surface, &dstrect); 
 
diff --git a/fonts/GrafX2_Classic.gif b/fonts/GrafX2_Classic.gif
index 8ecfa8d770700657d178307a61a40c909a2ae3ec..af4d73c3923fc96b1a23405156862ef6f42a4a3e 100644
GIT binary patch
delta 466
zcmV;@0WJQt4Yv)j@C1L>V}cx3x*?%Q?l;?<WlC3Fbarxjqm-Bus#%h6hPWqdg1YwU
zZl>=438|@8b_!Ui1;!VqaC~a|-=d`!N?fOa3hL>vxWVb>nv9kx=cc+A$7-3iN}1z}
z%kHY}pUQ$bCZgmSD{8jgUP>vRBbFN{h<5TQpLi3Zc<Q3+0SA9=jKpGT?UJolX{?UJ
zx(6YmM&dgvw_=i4D0*vFi|o7Uve}@Q1RqLbkd^kDEW@duIq|rWit6r(neJ;NZ<fl(
zE4>6W`)zUUItcQl57*2rt^bng>X~%%46(dQ&i5n73947~t=1_VAGHSic&EQ3lRD$J
zC_)JJ&q3Qdq{@F(lUwkVRDZ1Q*XNdfG|g788ZlvPV_bF5SbwRfc3#(wZ@8fi?CaU#
zqMY4zsd+bDvBVZ~=_<@=lf3uAND~QHfo(S}x8y2P?qQ~&!a69uJkOdrtB7M=GUHKi
z+$P|~rXH`OaO$>N!~uKVtl~3M$~oRoTHN~OeHQ*Ms+~%44!VB87T+t&Q}2Fz&wazr
zuEvcQygcGfw&(WCKsKMS<=1xaedXVWFaG#IlW+d{=%=s#`s}w)eyrmGzdns~yFV}Y
I-v<N$I|P6Gx&QzG

delta 463
zcmV;=0Wkiz4YUog@C1KWAe?TlNgR)5MmcAh(p49ootxe$C82%dm*krv?#Y^<u6eo}
zp;a#bTB?zPZU<_C@r5ZIpZg^!>#v1gis_-B?iXr#mU5`<h=CG2Vyd35nrW}{<>+3e
zx@P+)r67)pD0#KU$8C?kZb+h*;(@qki0a;n;;_#W8Ka|3wmE;>snx=pq@Dq?8Y`#f
zE=sPd@dB(OmUiZ=-)Msl>@2NQYKy6th^BjPvb^F3q;=pv{M*7ACk*eH5L?@5o7C<q
zaK-C-Tb#)EsyA-AH2>FbvFSS4>X~%%obS6z&i5mF9LhW)U`N&~?#TT9YjKG*c03?}
zQkM+0mE+9|mwbQ84t(_0%Q{_i%kg6CGMrX>2;r-9O57m2sFEyn*fx6|=BN#eJ@MTH
z%bARFz^;D1W7Yn~-0I5^0-d&~HzK+9T#51v^W4}~+!?rlhBhnDkgkj{;y<6LXVT8e
zx$(BAZ_M|}RCmrY$U)MbdAE^EygBAiKD;*K(V~hky)Z{=PU^3`dX8u7lka|L!IC1q
zI?=45ZlKO&`wA=82Aiz?_E~f9{rBHD4gUD#mv8?0=%=s#k^)!$`}t98y}tABj~@^K
F06WA!0Mh^f