Commit 00a7b51fab76e8331f4ae86507e468b79856b47e
2013-12-27T19:18:49
Minor.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84
diff --git a/ChangeLog b/ChangeLog
index 6cbca83..e466396 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,21 +3,21 @@
[ftrfork] Fix the face order difference between POSIX and Carbon.
The fragmented resources in Suitcase and .dfont should be reordered
- when post resource for Type1 is being restored, but reordering of
+ when `POST' resource for Type1 is being restored, but reordering of
sfnt resources induces the different face order. Now the ordering
- is restricted to post resource only, to prevent the different order
- issue (e.g. the face index in the fontconfig cache generated with
- Carbon framework is incompatible with that by FreeType2 without
- Carbon framework.) Found by Khaled Hosny and Hin-Tak Leung.
-
+ is restricted to `POST' resource only, to prevent the different
+ order issue (e.g. the face index in the fontconfig cache generated
+ with Carbon framework is incompatible with that by FreeType 2
+ without Carbon framework.) Found by Khaled Hosny and Hin-Tak Leung.
+
http://lists.gnu.org/archive/html/freetype-devel/2013-02/msg00035.html
http://lists.gnu.org/archive/html/freetype-devel/2013-12/msg00027.html
* src/base/ftrfork.c (FT_Raccess_Get_DataOffsets): Add a switch
`sort_by_res_id' to control the fragmented resource ordering.
- * include/internal/ftrfork.h: Daclare new switch.
- * src/base/ftobjs.c (IsMacResource): Enable the soring for post
- resource, and disable the sorting for sfnt resource.
+ * include/internal/ftrfork.h: Declare new switch.
+ * src/base/ftobjs.c (IsMacResource): Enable the sorting for `POST'
+ resource, and disable the sorting for `sfnt' resource.
2013-12-25 Werner Lemberg <wl@gnu.org>
diff --git a/include/internal/ftrfork.h b/include/internal/ftrfork.h
index a0e583b..d750cbe 100644
--- a/include/internal/ftrfork.h
+++ b/include/internal/ftrfork.h
@@ -225,11 +225,11 @@ FT_BEGIN_HEADER
/* The resource tag. */
/* */
/* sort_by_res_id :: */
- /* A Boolean to order the fragmented resource by their ids. */
- /* The fragmented resources for POST resource should be sorted */
- /* to restore Type1 font properly. For snft resource, sorting */
- /* may induce the different order of the faces in comparison with */
- /* that by QuickDraw API. */
+ /* A Boolean to sort the fragmented resource by their ids. */
+ /* The fragmented resources for `POST' resource should be sorted */
+ /* to restore Type1 font properly. For `snft' resources, sorting */
+ /* may induce a different order of the faces in comparison to that */
+ /* by QuickDraw API. */
/* */
/* <Output> */
/* offsets :: */
diff --git a/src/base/ftrfork.c b/src/base/ftrfork.c
index 87ac6fb..007351e 100644
--- a/src/base/ftrfork.c
+++ b/src/base/ftrfork.c
@@ -212,8 +212,9 @@
goto Exit;
ref[j].offset = temp & 0xFFFFFFL;
- FT_TRACE3(( " [%d]: resouce_id=0x%04x, offset=0x%08x\n",
- j, ref[j].res_id, ref[j].offset ));
+ FT_TRACE3(( " [%d]:"
+ " resource_id=0x%04x, offset=0x%08x\n",
+ j, ref[j].res_id, ref[j].offset ));
}
if (sort_by_res_id)
@@ -224,8 +225,9 @@
FT_TRACE3(( " -- sort resources by their ids --\n" ));
for ( j = 0; j < *count; ++ j ) {
- FT_TRACE3(( " [%d]: resouce_id=0x%04x, offset=0x%08x\n",
- j, ref[j].res_id, ref[j].offset ));
+ FT_TRACE3(( " [%d]:"
+ " resource_id=0x%04x, offset=0x%08x\n",
+ j, ref[j].res_id, ref[j].offset ));
}
}