From e53c44e3260d6136e27635b5bbcb2da43bc4f1b1 Mon Sep 17 00:00:00 2001 From: Qunxin Liu Date: Fri, 24 Apr 2020 14:06:13 -0700 Subject: [PATCH] [subset] temporarily revert previous cmap commit Required in https://github.com/harfbuzz/harfbuzz/issues/2356 --- src/hb-ot-cmap-table.hh | 3 ++- test/api/test-subset-cmap.c | 4 +++- test/subset/data/Makefile.sources | 2 +- .../japanese/Mplus1p-Regular.default.25771.ttf | Bin 1824 -> 0 bytes .../Mplus1p-Regular.drop-hints.25771.ttf | Bin 1096 -> 0 bytes .../japanese/Mplus1p-Regular.keep-gdef.25771.ttf | Bin 1860 -> 0 bytes test/subset/data/tests/japanese.tests | 1 - test/subset/meson.build | 1 - 8 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 test/subset/data/expected/japanese/Mplus1p-Regular.default.25771.ttf delete mode 100644 test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.25771.ttf delete mode 100644 test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.25771.ttf diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh index 30c6644d6..861a5eaed 100644 --- a/src/hb-ot-cmap-table.hh +++ b/src/hb-ot-cmap-table.hh @@ -238,7 +238,8 @@ struct CmapSubtableFormat4 { return _.first <= 0xFFFF; }) ; - if (format4_iter.len () == 0) return; + //comment off temporarily while we're working on supporting --gids option + //if (format4_iter.len () == 0) return; unsigned table_initpos = c->length (); if (unlikely (!c->extend_min (*this))) return; diff --git a/test/api/test-subset-cmap.c b/test/api/test-subset-cmap.c index e16400ea5..38f01539e 100644 --- a/test/api/test-subset-cmap.c +++ b/test/api/test-subset-cmap.c @@ -113,6 +113,7 @@ test_subset_cmap4_no_exceeding_maximum_codepoint (void) hb_face_destroy (face_origin); } +/* TEMPORARILY COMMENTED OFF static void test_subset_cmap_empty_tables (void) { @@ -132,6 +133,7 @@ test_subset_cmap_empty_tables (void) hb_face_destroy (face_abc); hb_face_destroy (face_empty); } +*/ static void test_subset_cmap_noto_color_emoji_noop (void) @@ -186,7 +188,7 @@ main (int argc, char **argv) hb_test_add (test_subset_cmap_noop); hb_test_add (test_subset_cmap_non_consecutive_glyphs); hb_test_add (test_subset_cmap4_no_exceeding_maximum_codepoint); - hb_test_add (test_subset_cmap_empty_tables); + //hb_test_add (test_subset_cmap_empty_tables); hb_test_add (test_subset_cmap_noto_color_emoji_noop); hb_test_add (test_subset_cmap_noto_color_emoji_non_consecutive_glyphs); diff --git a/test/subset/data/Makefile.sources b/test/subset/data/Makefile.sources index f50e6ae6b..ef3a3d92c 100644 --- a/test/subset/data/Makefile.sources +++ b/test/subset/data/Makefile.sources @@ -4,7 +4,6 @@ TESTS = \ tests/cff-full-font.tests \ tests/japanese.tests \ tests/cff-japanese.tests \ - tests/cmap.tests \ tests/cmap14.tests \ tests/sbix.tests \ tests/colr.tests \ @@ -21,6 +20,7 @@ DISABLED_TESTS = \ tests/layout.gsub3.tests \ tests/layout.gsub6.tests \ tests/layout.gdef.tests \ + tests/cmap.tests \ $(NULL) XFAIL_TESTS = \ diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.25771.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.default.25771.ttf deleted file mode 100644 index 1dcfeeccd6444f7ea2282c1ccecf0596b5c08013..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1824 zcmaJ?TWl0n82-=9-hh^FZ`}<<+>4iXLdvQry2%AF7Os%ooc4;9kUEA7l z5kumIW&}h-jG7pHP?QJdl$ywc2^dW@1|Pfx4T;eQA9(N*jn@RaerI-7B*wGZ|NP(o zfB)^w$qX?f3PN~@cI>RHZyH+ogGd>HwQqPLm7&t}6~J!;uNj`5;l9(#k3`;wftT;e zj7}82S@$aZ-{7AfO-*OASyG97-@+dl9Y46|k^4^`B4P!=SH{w*k>K2^72pC=;}{G} zo}){^ap0=4iJ1f5U9=gv88|RLIh>+B(1`sG;hRVu$gmdn81NUse1B>p9Xc8P0sS0@ zEuNX2p2)T5BYp~(!M_c-b{6&g?*!k1{|0c?Eb4i5$IJZD=uf z>}qS9Of6fdc1#YgO$;u++qcHs;VlZYmX2PM&sCw1DMUx902;$Tgj2#fKu9mSXDc;U z^y0H0I%gj!+Wd zwb-uhh|NC}thBZ=BACgqiGpxMC}ww$b+2LT5uuuUE4hd#EnURzi13&)R5$cP)|c8x zwg#ScQ~S==3|)A`mPpLnuEVyG&ubPA^hboxoL|M}P@T^W3}}Lo#&6D7xu*Evrhr*e z%s19W#1fMqkwxA^elFDNPJ;{2>MlV^%Sk&aE|q3Y*KN&lQBMxZf=hGV1+}1#BFjwv zi91e#$?JqaJYaFY)kviFaf^=(ZPqTsQ)Vtu zoW@zNdiM&9nDyXXUI zr%B4tL7JkyG)iMMgSqNyJw>Sz+Adhq*tb&{G6~is@}_Y}lGjQPVIPBSil*`Q*p5u& zuua1kh28_^DDXI?z=(pe9$BNXZKAD+nuInEP6FC~WSWNkpByqnX)9R7@8+EI`@Zx2zH{z9_dozB#35+t zS<_n|Y}z{h4Ummw`v*tNBxc?B5T7JoIBcepmPIA>5@N@2eBbtin@{g&{+{hsY{=Z^ zJa%?AAYKzkVk8PKVuJNf;)>Wvdau!kWyB6*M?5iTVmmX47wl{!=H4W#L@)7e;_^{* zWXOFw@QM0|SNE>+(I?_And>s02BaX=3ds&mMOh{H=|nX1=AnJ0)E7pzm?W5$6gYpGob?SwcB zgXwYknB^yPqxgt`kPe%iZb&ILDecO7TGl_;t@f9fqt#+)o2)dVdPuYm6pM)uU-Kft zze^R&;G-hDXO04L{jO}wy`ddZDurIaxo);xF5o1}pT`!I$b7)A_fl=FXUKmZYDePo6>u7;m|4^;{J4q-5>Yr}4iF>+%_p^mB~ z;^b1)2AHp0&lYrxf|$9?D_y6pwzY)ml5U6>61V tp8v1o4OU?tR(I*2A$ZTFHp#oRl=H#~?dXq7h-#BojTP3%757)2_z8Icz$pL# diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.25771.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.25771.ttf deleted file mode 100644 index cce2d366060de9044fd82a1956a5592949583807..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1860 zcmaJ?TWl0n82-=9-hh_f?PXh>s%My%0z2E%E^Q%DS=zF-Erd;>Wu~sN+p@Hfmac7W zxCBGug=V;jh6gnoeDKDDa!O6)!32yZ`hX8!f(g;+BQI(+USa}WzcXFH5aXH5Isf;c z@4wE;8Dc~f#^j+;XUDcA1xX?Dd!Q}bxvRdhWoZ6yB4rx5e|S8Tqtc5Nz}J9R56?_< z-#O)1BJU~S<@<6Y_aEC`~~$h)u1ZsAS#VF`TVubEfqe0dA!_+RQOlbhK;bRGiq8Q70oSrlV0xg zM{{Q!;&q;jjj2tW)}Md4ed~55vA(AG7Sl$R>T|xpmSD8CB=pACcZX`GQwt63 z%@bpfy!H0v`c`x2?zXmx%(As=$Hd^8@9uWxUovE--gxm`O^y*yhlB8K=~cq!Ny1j zQw5~EHn8|O5qG(JgW>2rR&9L>DP|f|7TqIJKE)sT3 zcuZ-k8~PFJd+iHb1JAmx{bXx~F1%4oBxh`Q!?xkiYZj*mV!~(6tz@%^&S%qUO%UAp z&ADn3rbl|*2!=wY|wPw)*Ki0E+QFl z>0)*vEu)P@-vj+GlXRUQYg8v03>Q8jm&|;e^(++OHCBvoRDqn-fK91 z!Bf^|?J9Q4%y~+%L|Yr{xg4Tla%V~IL+0G+wTvNTZ?tJxn9+vLCwi?*#HoF_?Gob* zi{QgzMYhV#6dub>0WJE1DTYILndP4o>@@X=K+2k9?2J8^lxIbRaL~$nAsn|K#D`5= zwkV4d<*W05Dgot&@-ykmVR?MXPXjp7%(DdYcD#!+qY%)dtk7~w7i1N;)PaJG`}{7) zOApZd1-*|RqR*+FCMZXTX_EHS2#wM->T0BQ)IiOUc0-fJx`U#aQ(#TNZx&6Gysh*U z)=}stX$rT;4tN@aZVG!1kbA)#0Uo0a7!6>ogVzS=Hc=<6CLoQ0lZ12-o~EF`=R