use 2-byte offset instead of 4-byte for local subrs

more than enough since local subrs immediately follow its corresponding private dict, as the result 2-byte redunction for each font dict with local subrs
updated api test expected subset fonts accordingly

diff --git a/src/hb-subset-cff-common.hh b/src/hb-subset-cff-common.hh
index 55b33b1..d5f7ec1 100644 (file)
--- a/src/hb-subset-cff-common.hh
+++ b/src/hb-subset-cff-common.hh
@@ -258,7 +258,7 @@ struct CFFPrivateDict_OpSerializer : OpSerializer
       if (desubroutinize || (subrsOffset == 0))
         return_trace (true);
       else
-        return_trace (FontDict::serialize_offset4_op (c, opstr.op, subrsOffset));
+        return_trace (FontDict::serialize_offset2_op (c, opstr.op, subrsOffset));
     }
     else
       return_trace (copy_opstr (c, opstr));
@@ -274,7 +274,7 @@ struct CFFPrivateDict_OpSerializer : OpSerializer
       if (desubroutinize || !has_localsubr)
         return 0;
       else
-        return OpCode_Size (OpCode_longintdict) + 4 + OpCode_Size (opstr.op);
+        return OpCode_Size (OpCode_shortint) + 2 + OpCode_Size (opstr.op);
     }
     else
       return opstr.str.len;

diff --git a/test/api/fonts/AdobeVFPrototype.abc.otf b/test/api/fonts/AdobeVFPrototype.abc.otf
index e21d87f..cc47708 100644 (file)
Binary files a/test/api/fonts/AdobeVFPrototype.abc.otf and b/test/api/fonts/AdobeVFPrototype.abc.otf differ

diff --git a/test/api/fonts/AdobeVFPrototype.ac.nohints.otf b/test/api/fonts/AdobeVFPrototype.ac.nohints.otf
index c0d034a..935bdbf 100644 (file)
Binary files a/test/api/fonts/AdobeVFPrototype.ac.nohints.otf and b/test/api/fonts/AdobeVFPrototype.ac.nohints.otf differ

diff --git a/test/api/fonts/AdobeVFPrototype.ac.otf b/test/api/fonts/AdobeVFPrototype.ac.otf
index c5080fc..beab7d5 100644 (file)
Binary files a/test/api/fonts/AdobeVFPrototype.ac.otf and b/test/api/fonts/AdobeVFPrototype.ac.otf differ

diff --git a/test/api/fonts/SourceHanSans-Regular.41,4C2E.nohints.otf b/test/api/fonts/SourceHanSans-Regular.41,4C2E.nohints.otf
index e054826..ec39590 100644 (file)
Binary files a/test/api/fonts/SourceHanSans-Regular.41,4C2E.nohints.otf and b/test/api/fonts/SourceHanSans-Regular.41,4C2E.nohints.otf differ

diff --git a/test/api/fonts/SourceHanSans-Regular.41,4C2E.otf b/test/api/fonts/SourceHanSans-Regular.41,4C2E.otf
index 7b88702..2c6cd9a 100644 (file)
Binary files a/test/api/fonts/SourceHanSans-Regular.41,4C2E.otf and b/test/api/fonts/SourceHanSans-Regular.41,4C2E.otf differ

diff --git a/test/api/fonts/SourceSansPro-Regular.abc.otf b/test/api/fonts/SourceSansPro-Regular.abc.otf
index 4db5c79..7f51bd3 100644 (file)
Binary files a/test/api/fonts/SourceSansPro-Regular.abc.otf and b/test/api/fonts/SourceSansPro-Regular.abc.otf differ

diff --git a/test/api/fonts/SourceSansPro-Regular.ac.nohints.otf b/test/api/fonts/SourceSansPro-Regular.ac.nohints.otf
index 3ad2bb4..14a3a5f 100644 (file)
Binary files a/test/api/fonts/SourceSansPro-Regular.ac.nohints.otf and b/test/api/fonts/SourceSansPro-Regular.ac.nohints.otf differ

diff --git a/test/api/fonts/SourceSansPro-Regular.ac.otf b/test/api/fonts/SourceSansPro-Regular.ac.otf
index a22b157..12d6d0f 100644 (file)
Binary files a/test/api/fonts/SourceSansPro-Regular.ac.otf and b/test/api/fonts/SourceSansPro-Regular.ac.otf differ

diff --git a/test/api/fonts/cff1_seac.C0.otf b/test/api/fonts/cff1_seac.C0.otf
index 0b69513..aed2fdd 100644 (file)
Binary files a/test/api/fonts/cff1_seac.C0.otf and b/test/api/fonts/cff1_seac.C0.otf differ