kc3-lang/freetype

diff --git a/ChangeLog b/ChangeLog
index e9f86a8..ecad073 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,15 @@
 2007-05-28  David Turner  <david@freetype.org>
 
-	* src/cff/cffgload.c: do not apply the font transform to loaded glyph
-	if it is the identity. this cuts a significant percent of CFF glyph
-	loading time
+	* src/cff/cffgload.c (cff_slot_load): Do not apply the identity
+	transformation.  This significantly reduces the loading time of CFF
+	glyphs.
 
-	* docs/CHANGES: updating
+	* docs/CHANGES: Updated.
 
-	* src/autofit/afglobal.c: change default hinting script to
-	CJK, since it works well with a larger array of scripts. thanks to
-	"Rahul Bhalerao" <b.rahul.pm@gmail.com> for pointing this out !
+	* src/autofit/afglobal.c (AF_SCRIPT_LIST_DEFAULT): Change default
+	hinting script to CJK, since it works well with more scripts than
+	latin.  Thanks to Rahul Bhalerao <b.rahul.pm@gmail.com> for pointing
+	this out!
 
 2007-05-25  Werner Lemberg  <wl@gnu.org>
 
@@ -24,7 +25,6 @@
 	* src/truetype/ttobjs.c (tt_size_ready_bytecode)
 	[!TT_USE_BYTECODE_INTERPRETER]: Removed.  Unused.
 
->>>>>>> 1.1589
 2007-05-22  David Turner  <david@freetype.org>
 
 	* src/truetype/ttgload.c (load_truetype_glyph): Fix last change to
diff --git a/docs/CHANGES b/docs/CHANGES
index 01c7133..59b9319 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -16,16 +16,18 @@ CHANGES BETWEEN 2.3.5 and 2.3.4
     - The  two new  cache functions  `FTC_ImageCache_LookupScaler' and
       `FTC_SBit_Cache_LookupScaler' have been added to allow lookup of
       glyphs using an  `FTC_Scaler' object;  this makes it possible to
-      use fractional pixel sizes in the cache.
+      use fractional pixel sizes in the cache.  The demo programs have
+      been updated accordingly to use this feature.
 
-    - A new API  `FT_Get_CMap_Format)' has been added to  get the cmap
+    - A new API  `FT_Get_CMap_Format' has been added to  get the  cmap
       format  of a  TrueType font.   This  is useful  in handling  PDF
       files.  The code has been contributed by Derek Clegg.
 
-    - The auto-hinter now produces better output by default for
-      non-Latin scripts like Indic. this was done by using the CJK
-      hinting module as default, instead of the Latin one. thanks to
-      Rahul Bhalerao for suggesting this.
+    - The  auto-hinter  now  produces  better  output  by  default for
+      non-Latin scripts  like Indic.   This was done by  using the CJK
+      hinting module  as the default instead of the Latin one.  Thanks
+      to Rahul Bhalerao for this suggestion.
+
 
   III. MISCELLANEOUS
 
@@ -62,13 +64,14 @@ CHANGES BETWEEN 2.3.3 and 2.3.2
       and are placed outside of the glyph's real outline).
 
     - The `rsb_delta' and `lsb_delta' glyph slot fields are now set to
-      0 for  mono-spaced fonts.  Otherwise  code that uses  them would
+      zero for mono-spaced fonts.  Otherwise code that uses them would
       essentially ruin the fixed-advance property.
 
     - Fix  CVE-2007-1351 which  can  cause an  integer overflow  while
       parsing  BDF fonts,  leading to  a potentially  exploitable heap
       overflow condition.
 
+
   II. MISCELLANEOUS
 
     - Fixed compilation issues on some 64-bit platforms (see ChangeLog
diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c
index a4b55db..33ca63a 100644
--- a/src/cff/cffgload.c
+++ b/src/cff/cffgload.c
@@ -2547,16 +2547,16 @@
         glyph->root.outline.flags |= FT_OUTLINE_REVERSE_FILL;
 
         /* apply the font matrix */
-        if ( font_matrix.xx != 0x10000 && font_matrix.yy != 0x10000 &&
-             font_matrix.xy != 0       && font_matrix.yx != 0 )
-        {
+        if ( font_matrix.xx != 0x10000L &&
+             font_matrix.yy != 0x10000L &&
+             font_matrix.xy != 0        &&
+             font_matrix.yx != 0        )
           FT_Outline_Transform( &glyph->root.outline, &font_matrix );
-        }
 
-        if ( font_offset.x != 0 || font_offset.y != 0 )
+        if ( font_offset.x != 0 ||
+             font_offset.y != 0 )
           FT_Outline_Translate( &glyph->root.outline,
-                                font_offset.x,
-                                font_offset.y );
+                                font_offset.x, font_offset.y );
 
         advance.x = metrics->horiAdvance;
         advance.y = 0;