Merge pull request #48 from myfonts/bugfix/ulCodePageRange/joe

Don't do a blind read to ulCodePageRange

1 files changed, 8 insertions, 2 deletions

diff --git a/java/src/com/google/typography/font/tools/conversion/eot/EOTWriter.java b/java/src/com/google/typography/font/tools/conversion/eot/EOTWriter.java
index 839cf41..bff070c 100644
--- a/java/src/com/google/typography/font/tools/conversion/eot/EOTWriter.java
+++ b/java/src/com/google/typography/font/tools/conversion/eot/EOTWriter.java
@@ -166,8 +166,14 @@ public class EOTWriter {
 
   private int writeCodePages(int start, OS2Table os2Table, WritableFontData writableFontData) {
     int index = start;
-    index += writableFontData.writeULongLE(index, os2Table.ulCodePageRange1());
-    index += writableFontData.writeULongLE(index, os2Table.ulCodePageRange2());
+    if (os2Table.tableVersion() >= 1) {
+    	index += writableFontData.writeULongLE(index, os2Table.ulCodePageRange1());
+    	index += writableFontData.writeULongLE(index, os2Table.ulCodePageRange2());
+    }
+    else {
+    	index += writableFontData.writeULongLE(index, 0x00000001);
+    	index += writableFontData.writeULongLE(index, 0x00000000);
+    }
     return index - start;
   }