From 34b06d994a79124963d2a7432d0ec945e72bfdbd Mon Sep 17 00:00:00 2001 From: Michiharu Ariza Date: Fri, 2 Nov 2018 16:40:20 -0700 Subject: [PATCH] fixed FDSelect size calcluation --- src/hb-ot-cff-common.hh | 2 +- src/hb-subset-cff-common.cc | 6 +++--- .../SourceHanSans-Regular.41,3041,4C2E.otf | Bin 2576 -> 3892 bytes 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/hb-ot-cff-common.hh b/src/hb-ot-cff-common.hh index 2f5e2f86d..7a1175c97 100644 --- a/src/hb-ot-cff-common.hh +++ b/src/hb-ot-cff-common.hh @@ -632,7 +632,7 @@ struct FDSelect3_4 { FDSelect3_4_Range ranges[VAR]; /* GID_TYPE sentinel */ - DEFINE_SIZE_ARRAY (GID_TYPE::static_size * 2, ranges); + DEFINE_SIZE_ARRAY (GID_TYPE::static_size, ranges); }; typedef FDSelect3_4 FDSelect3; diff --git a/src/hb-subset-cff-common.cc b/src/hb-subset-cff-common.cc index f5fcebdb6..b319a9a02 100644 --- a/src/hb-subset-cff-common.cc +++ b/src/hb-subset-cff-common.cc @@ -112,14 +112,14 @@ hb_plan_subset_cff_fdselect (const hb_vector_t &glyphs, { assert (src.format == 4); subset_fdselect_format = 4; - subset_fdselect_size = FDSelect4::min_size + FDSelect4_Range::static_size * num_ranges + HBUINT32::static_size; + subset_fdselect_size = FDSelect::min_size + FDSelect4::min_size + FDSelect4_Range::static_size * num_ranges + HBUINT32::static_size; } else { #if CFF_SERIALIZE_FDSELECT_0 - unsigned int format0_size = FDSelect0::min_size + HBUINT8::static_size * subset_num_glyphs; + unsigned int format0_size = FDSelect::min_size + FDSelect0::min_size + HBUINT8::static_size * subset_num_glyphs; #endif - unsigned int format3_size = FDSelect3::min_size + FDSelect3_Range::static_size * num_ranges + HBUINT16::static_size; + unsigned int format3_size = FDSelect::min_size + FDSelect3::min_size + FDSelect3_Range::static_size * num_ranges + HBUINT16::static_size; #if CFF_SERIALIZE_FDSELECT_0 if (format0_size <= format3_size) diff --git a/test/api/fonts/SourceHanSans-Regular.41,3041,4C2E.otf b/test/api/fonts/SourceHanSans-Regular.41,3041,4C2E.otf index b4d1165c7321308d35bf724581476491a86fb749..08bc0e03aecfaf4842e3dc6ee539320808d26904 100644 GIT binary patch delta 1995 zcmb_deN0nV6hH6vlTs>B(WccFurkaoaixF<=cS*2oSqXwd9DEP^ldQ-ST^&#$Oj1_4HeTvs_hNtMd zgLq+Dn!%zM`gvW&07^6{(=v1O1@WW-@l?dVnfiPaa8{xU4{>mf`b@)uIdKW-$AZX2 zQ&vu{y9^>QK?V8)^Du)~@$^7|DZYr6c^Hq~Oq3#KBgQH)76(fQHVFhlOw-nmNW?2# zGS>{7Q0|&Zxa6cu!E#9`9x>-_*M%vr%fi_+G4U;-(lz1-0^9{$Y}ZW~1vfE+SW4)K ze1eKj$=Ym)OEDO8x8@d5n}|o$MpDaOt~ctbMl#r<&Dw5GHpJ?UTD>tRY?UE(dxqW| zrepj}6+CY9!Xrz(0fIRvl;6CtvzQXGNEVPJu&`D(8aPa95`=_=mBX$Q1qp%$w3hA) z6x0sTojo_c(_HhX)&2C00c{UGG${VlwU)jgP=D&ezAl-ij=L>t!}7#Le#uv5U00;B zB>{0%%zlkLJK0c}DKq9bwhs1<40kB#a(ZzRv@2dK^vZ%74GOr?sU$wKq zwo{g2d8gKyrKnMHD!v>jZ<94P+NuvI%2O*+DmU}Th_!QPjd7*RIx~9CTs-*2dAXy| zS>z}lI3(HARC>7d$Y5XJuNP=8e|SgxYPED$*t=sPh4M2iIP|*KVVa;x>4W&2K`nAe zJ=N^k%NJ?8PxorO>C~>G-aQ@8V+Sv#b+@%IWT{BYy#c!UYJYEhuRndOpZ2}B=JLiq z`s5Gdht?;Bt`kVREW5%(yJWYmL?*svP2N;moTR8ZZf~(4ec&9eyHj7)FA?9gMi#tf zonOuuKd{;l**~>6*6ep2u-Cm;BSGp_#qv@uXFYdIoYQGi)WmVbzgsI>`zlY!EcFex z>PCk4mdY*spu{L;s8rRFe(7vy!{_JZ4y5d`e1Aw%+O+4hvcuPVzP;1&7ytT>Q)_h6 zH)N`FrHDfB2(u5EJG@t^sOJr6Jy*0(B<%9ZYs8|UO|N?n&A z$JE(|G^6JMXo?$$T2+a zJgL7c=%u>I-xVwjX=1E8f7dKwNE@SW^LHsuKbG`{~#9n7Q70I3J%eoIK(>{7%Gydq>{Mv z36gSh7qn;c5=jdH^A59cFn0x`Cm>=XDRCBfFdM>g=Ho-+93395p67N?XzokbyW597 zd(enK&%FeZR;8g*u1+;E(k!NgL}!>ZNu5U@PUP;r+)1a-q}s>Kse0QK+`cpt>5 z6JTy~fjI*frY(nP)KPg6?(F z@*jseHv*SVLVCK!^kSSj(?RC@!d&%CYq1+F6OQ}1j)L0|3de!)1>*4wJh$HGpG|wd L-rEEe?dA73_5Dre delta 686 zcmX|<&uddb5XZl}@Ac)q*JnaQTLoW25~6LeG`31FMrcr43#BP0gep=SO-KUyWep`F znu0|et5VpDXFaF~4<#a=Y6})}5JV9C161h6gI)p(#@Sk2nElRYW_D*-_LX7@ht%wi{g*^cK?V_E-IwHko1*MGlK<8le3SaOOZFJ~lgw2Zv z`*9$eE?>z^r8A{!zIucD^ow_S(1IT z$&>X`P13Va<>Nvll@mm#hdUkOJ?(5YKkZdhfPRo%vQ{om7Tq_xZ+iHjQJhF!{j&vh nzY)icL%qr_()=8X93h0yp1P1>C