svn commit: r1166824 - /pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OS2WindowsMetricsTable.java

[lehmi]

Author: lehmi
Date: Thu Sep  8 17:40:48 2011
New Revision: 1166824

URL: http://svn.apache.org/viewvc?rev=1166824&view=rev
Log:
PDFBOX-954: determine the correct family class

Modified:
    
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OS2WindowsMetricsTable.java

Modified: 
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OS2WindowsMetricsTable.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OS2WindowsMetricsTable.java?rev=1166824&r1=1166823&r2=1166824&view=diff
==============================================================================
--- 
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OS2WindowsMetricsTable.java
 (original)
+++ 
pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/OS2WindowsMetricsTable.java
 Thu Sep  8 17:40:48 2011
@@ -205,18 +205,32 @@ public class OS2WindowsMetricsTable exte
     /**
      * @return Returns the familyClass.
      */
-    public short getFamilyClass()
+    public int getFamilyClass()
     {
         return familyClass;
     }
     /**
      * @param familyClassValue The familyClass to set.
      */
-    public void setFamilyClass(short familyClassValue)
+    public void setFamilyClass(int familyClassValue)
     {
         this.familyClass = familyClassValue;
     }
     /**
+     * @return Returns the familySubClass.
+     */
+    public int getFamilySubClass()
+    {
+        return familySubClass;
+    }
+    /**
+     * @param familySubClassValue The familySubClass to set.
+     */
+    public void setFamilySubClass(int familySubClassValue)
+    {
+        this.familySubClass = familySubClassValue;
+    }
+    /**
      * @return Returns the firstCharIndex.
      */
     public int getFirstCharIndex()
@@ -609,7 +623,8 @@ public class OS2WindowsMetricsTable exte
     private short superscriptYOffset;
     private short strikeoutSize;
     private short strikeoutPosition;
-    private short familyClass;
+    private int familyClass;
+    private int familySubClass;
     private byte[] panose = new byte[10];
     private long unicodeRange1;
     private long unicodeRange2;
@@ -656,7 +671,8 @@ public class OS2WindowsMetricsTable exte
         superscriptYOffset = data.readSignedShort();
         strikeoutSize = data.readSignedShort();
         strikeoutPosition = data.readSignedShort();
-        familyClass = data.readSignedShort();
+        familyClass = data.read();
+        familySubClass = data.read();
         panose = data.read( 10 );
         unicodeRange1 = data.readUnsignedInt();
         unicodeRange2 = data.readUnsignedInt();