[FOray-commit] SF.net SVN: foray:[13617] trunk/foray
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray:[13617] trunk/foray
|
From: <vic...@us...> - 2025-05-06 17:46:44
|
Revision: 13617
http://sourceforge.net/p/foray/code/13617
Author: victormote
Date: 2025-05-06 17:46:25 +0000 (Tue, 06 May 2025)
Log Message:
-----------
Fix computation of offset in the TrueTypeFontParser, which was causing errors in TrueType Collections.
Modified Paths:
--------------
trunk/foray/foray-font/src/test/java/org/foray/font/ttf/TrueTypeCollectionParserTests.java
trunk/foray/foray-font-parse/src/main/java/org/foray/fontParse/ttf/TrueTypeFontParser.java
Modified: trunk/foray/foray-font/src/test/java/org/foray/font/ttf/TrueTypeCollectionParserTests.java
===================================================================
--- trunk/foray/foray-font/src/test/java/org/foray/font/ttf/TrueTypeCollectionParserTests.java 2025-05-06 17:39:40 UTC (rev 13616)
+++ trunk/foray/foray-font/src/test/java/org/foray/font/ttf/TrueTypeCollectionParserTests.java 2025-05-06 17:46:25 UTC (rev 13617)
@@ -38,7 +38,6 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import java.io.IOException;
@@ -56,7 +55,6 @@
* @throws FontException Not expected here.
*/
@Test
- @Disabled
public void test01() throws IOException, FontException {
final String path = "/source-windows-classic-samples/Selwk.ttc";
final InputStream inputStream = getClass().getResourceAsStream(path);
Modified: trunk/foray/foray-font-parse/src/main/java/org/foray/fontParse/ttf/TrueTypeFontParser.java
===================================================================
--- trunk/foray/foray-font-parse/src/main/java/org/foray/fontParse/ttf/TrueTypeFontParser.java 2025-05-06 17:39:40 UTC (rev 13616)
+++ trunk/foray/foray-font-parse/src/main/java/org/foray/fontParse/ttf/TrueTypeFontParser.java 2025-05-06 17:46:25 UTC (rev 13617)
@@ -68,7 +68,9 @@
throws IOException {
input.seek(offset);
/* Note that, unlike most of the other parsers in this package, the parameter "offset" here is ignored.
- * All of the parsing of the tables is done using offsets provided by the "handler". */
+ * All of the parsing of the tables is done using offsets provided by the "handler". The offsets stored in the
+ * font for the various tables are always relative to the **file**, not to the **font**, so there is no need
+ * to add an adjustment for the offset to the beginning of the font. */
@@ -84,7 +86,7 @@
final HeadTableHandler tableHandler = handler.startHeadTable();
if (tableHandler != null) {
final HeadTableParser tableParser = new HeadTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -97,7 +99,7 @@
final MaxpTableHandler tableHandler = handler.startMaxpTable();
if (tableHandler != null) {
final MaxpTableParser tableParser = new MaxpTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -110,7 +112,7 @@
final NameTableHandler tableHandler = handler.startNameTable();
if (tableHandler != null) {
final NameTableParser tableParser = new NameTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -123,7 +125,7 @@
final CmapTableHandler tableHandler = handler.startCmapTable();
if (tableHandler != null) {
final CmapTableParser tableParser = new CmapTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -136,7 +138,7 @@
final HheaTableHandler tableHandler = handler.startHheaTable();
if (tableHandler != null) {
final HheaTableParser tableParser = new HheaTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -155,7 +157,7 @@
final HmtxTableHandler tableHandler = handler.startHmtxTable();
if (tableHandler != null) {
final HmtxTableParser tableParser = new HmtxTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -167,7 +169,7 @@
final PostTableHandler tableHandler = handler.startPostTable();
if (tableHandler != null) {
final PostTableParser tableParser = new PostTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -179,7 +181,7 @@
final Os2TableHandler tableHandler = handler.startOs2Table();
if (tableHandler != null) {
final Os2TableParser tableParser = new Os2TableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -198,7 +200,7 @@
final CvtTableHandler tableHandler = handler.startCvtTable();
if (tableHandler != null) {
final CvtTableParser tableParser = new CvtTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -210,7 +212,7 @@
final FpgmTableHandler tableHandler = handler.startFpgmTable();
if (tableHandler != null) {
final FpgmTableParser tableParser = new FpgmTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -222,7 +224,7 @@
final LocaTableHandler tableHandler = handler.startLocaTable();
if (tableHandler != null) {
final LocaTableParser tableParser = new LocaTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -235,7 +237,7 @@
final GlyfTableHandler tableHandler = handler.startGlyfTable();
if (tableHandler != null) {
final GlyfTableParser tableParser = new GlyfTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -247,7 +249,7 @@
final PrepTableHandler tableHandler = handler.startPrepTable();
if (tableHandler != null) {
final PrepTableParser tableParser = new PrepTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -259,7 +261,7 @@
final GaspTableHandler tableHandler = handler.startGaspTable();
if (tableHandler != null) {
final GaspTableParser tableParser = new GaspTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -278,7 +280,7 @@
final CffTableHandler tableHandler = handler.startCffTable();
if (tableHandler != null) {
final CffTableParser tableParser = new CffTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -290,7 +292,7 @@
final Cff2TableHandler tableHandler = handler.startCff2Table();
if (tableHandler != null) {
final Cff2TableParser tableParser = new Cff2TableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -302,7 +304,7 @@
final VorgTableHandler tableHandler = handler.startVorgTable();
if (tableHandler != null) {
final VorgTableParser tableParser = new VorgTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -320,7 +322,7 @@
final BaseTableHandler tableHandler = handler.startBaseTable();
if (tableHandler != null) {
final BaseTableParser tableParser = new BaseTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -332,7 +334,7 @@
final GdefTableHandler tableHandler = handler.startGdefTable();
if (tableHandler != null) {
final GdefTableParser tableParser = new GdefTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -344,7 +346,7 @@
final GposTableHandler tableHandler = handler.startGposTable();
if (tableHandler != null) {
final GposTableParser tableParser = new GposTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -356,7 +358,7 @@
final GsubTableHandler tableHandler = handler.startGsubTable();
if (tableHandler != null) {
final GsubTableParser tableParser = new GsubTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -368,7 +370,7 @@
final JstfTableHandler tableHandler = handler.startJstfTable();
if (tableHandler != null) {
final JstfTableParser tableParser = new JstfTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -380,7 +382,7 @@
final MathTableHandler tableHandler = handler.startMathTable();
if (tableHandler != null) {
final MathTableParser tableParser = new MathTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -398,7 +400,7 @@
final PcltTableHandler tableHandler = handler.startPcltTable();
if (tableHandler != null) {
final PcltTableParser tableParser = new PcltTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
@@ -410,7 +412,7 @@
final KernTableHandler tableHandler = handler.startKernTable();
if (tableHandler != null) {
final KernTableParser tableParser = new KernTableParser();
- tableParser.parse(input, offset + tableOffset, tableHandler);
+ tableParser.parse(input, tableOffset, tableHandler);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
