From 7975c9cabda33f6f02fb7dd3d54dd8e46dc84950 Mon Sep 17 00:00:00 2001 From: Qunxin Liu Date: Wed, 8 May 2024 10:11:03 -0700 Subject: [PATCH] [instancer] bug fix for COLRv1, add missing mapping to VarIdx::NO_VARIATION --- src/hb-subset-plan.cc | 17 +++++++++++++---- .../Foldit.default.41.wght=300-600.ttf | Bin 0 -> 2396 bytes .../Foldit.default.41.wght=900.ttf | Bin 0 -> 1704 bytes .../KalniaGlaze.default.41.wght=300-600.ttf | Bin 0 -> 3096 bytes .../KalniaGlaze.default.41.wght=900.ttf | Bin 0 -> 2544 bytes .../KalniaGlaze.default.all.wght=300-600.ttf | Bin 0 -> 5612 bytes .../KalniaGlaze.default.all.wght=900.ttf | Bin 0 -> 4088 bytes test/subset/data/fonts/KalniaGlaze.ttf | Bin 0 -> 5944 bytes .../subset/data/tests/instantiate_colrv1.tests | 2 ++ 9 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 test/subset/data/expected/instantiate_colrv1/Foldit.default.41.wght=300-600.ttf create mode 100644 test/subset/data/expected/instantiate_colrv1/Foldit.default.41.wght=900.ttf create mode 100644 test/subset/data/expected/instantiate_colrv1/KalniaGlaze.default.41.wght=300-600.ttf create mode 100644 test/subset/data/expected/instantiate_colrv1/KalniaGlaze.default.41.wght=900.ttf create mode 100644 test/subset/data/expected/instantiate_colrv1/KalniaGlaze.default.all.wght=300-600.ttf create mode 100644 test/subset/data/expected/instantiate_colrv1/KalniaGlaze.default.all.wght=900.ttf create mode 100644 test/subset/data/fonts/KalniaGlaze.ttf diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc index 15b9b6bc1..616a010f4 100644 --- a/src/hb-subset-plan.cc +++ b/src/hb-subset-plan.cc @@ -527,11 +527,20 @@ _remap_colrv1_delta_set_index_indices (const OT::DeltaSetIndexMap &index_map, for (unsigned delta_set_idx : delta_set_idxes) { unsigned var_idx = index_map.map (delta_set_idx); - hb_pair_t *new_varidx_delta; - if (!variation_idx_delta_map.has (var_idx, &new_varidx_delta)) continue; + unsigned new_varidx = HB_OT_LAYOUT_NO_VARIATIONS_INDEX; + int delta = 0; + + if (var_idx != HB_OT_LAYOUT_NO_VARIATIONS_INDEX) + { + hb_pair_t *new_varidx_delta; + if (!variation_idx_delta_map.has (var_idx, &new_varidx_delta)) continue; + + new_varidx = hb_first (*new_varidx_delta); + delta = hb_second (*new_varidx_delta); + } - new_deltaset_idx_varidx_map.set (new_delta_set_idx, hb_first (*new_varidx_delta)); - delta_set_idx_delta_map.set (delta_set_idx, hb_pair_t (new_delta_set_idx, hb_second (*new_varidx_delta))); + new_deltaset_idx_varidx_map.set (new_delta_set_idx, new_varidx); + delta_set_idx_delta_map.set (delta_set_idx, hb_pair_t (new_delta_set_idx, delta)); new_delta_set_idx++; } variation_idx_delta_map = std::move (delta_set_idx_delta_map); diff --git a/test/subset/data/expected/instantiate_colrv1/Foldit.default.41.wght=300-600.ttf b/test/subset/data/expected/instantiate_colrv1/Foldit.default.41.wght=300-600.ttf new file mode 100644 index 0000000000000000000000000000000000000000..27d183fd70e662798b2db07f1288a02ac85c1278 GIT binary patch literal 2396 zcmZuyZERCj7=F&_Z8u6C?bu-9!*p{RCa{f;!5B!|ZLkt2kZpV=g6p=@&hDex%9kNw zItXzpA!@`A449bs1AZ72%}fxQpu`_jB=Lto%#0C@F)={{2`oT;-gEE9h@6{y&ilOI z=e+Md7Ye{UP8K>Ex3skGI<|Wp@B{%>(YQ6zLP>!1SRFa;u7NWWMAfB z-fi^({k=|H*gMb_!)G`^e3-bPFLp4E*_ccG6LGLV))!yuZ@mHJF&|x!9vI5x&LBkj zZIP!3PQih+;c;wFkA-4C$Tpky08dqoJv< zNfiL$a5#7A(xn`c)JdMDxoRhQv-@f083w6Ud~Cl<@}OP(AiE_Z1U$zLKCahA-AC=YVA_y~>| zP0qQj6GylT-@Mkbc>N1=*4={3^bCHUc=dZq@XPumf0&c5*I7c3IUx}!Mko}*84Jjn zdVpfmU{BfJamR>wU}2*zTwo#JB174e$yh`sjkE0{5^ZD9m1T2C!e#E>QL3*~Ov@kwRBFZg3%n55{iC=wz z*p|5@9xVMlS4PvL#_m~rReM-lkOLbQ4=Ff{5J@R;9`NEs?96CQi_)su$&~ ziQNkYPA^RLf%sIZ_+UTtw=+|$y*9ha=PDfmltJnx-6A?OAK_Wk6}M>Tlbfj~u(~D? zsI4gu1Zo1V+M4;rp*nS{?&_IpeX{yqSVdQ_zCWf%@9o#4t7^rcbbE?D!)V5q>PA!I zrBqaDbwti_E?uThi8&O%M5uZ_D*RH0QMyh%8Vfy2iSb5@`Nb*5HG$~O-hu3iwdE)` zb19ag4ozqci##7|g6!VO$*7DCc*l9J&4}Qg3HMAllOYF z*%8}A0X_(>fjV1~`j|{79*4CeE>pLMwtOpVB(6~ml z-r~+3f3{WXnWF=~GWEo)C*gOOyCgAF)lRPRhp6ORmN^VwD!DKZ!=}iRHUPYeEntvrNOYw@ekNz+xdcw&b9{+wm^2p(ZN@HK`R?j( z*Z;YrN`e*j;Z57pwr-eF?BV0d^1iTU5nkcH!=@GH;j}|*-j637+QnYzbZBdaj+^<7RP(8sL9J!9cHR}6_)mMZmsWa7 zFm^9u^fpr`I31~x5z;tB`BX+hoi997{H6v=`uLN zxEb0En0*AX#Oyr7SVO4if4GYOdU-0Dq3k_L{Z67TTJ%vm#5GNB4|DIPS2>FWV^yJ< LIV^uDj|$*FwG?Bi literal 0 HcmV?d00001 diff --git a/test/subset/data/expected/instantiate_colrv1/Foldit.default.41.wght=900.ttf b/test/subset/data/expected/instantiate_colrv1/Foldit.default.41.wght=900.ttf new file mode 100644 index 0000000000000000000000000000000000000000..aae2665bcd81e961e39d465ae0fbc77c0f158034 GIT binary patch literal 1704 zcmZ`(U1(fI6#i!JO`2@BX*X`7)GE8(7-~(EG=G9kCELU-)nGz4Rx7mjx>Jy@rS%@Df;=TPxcRO)FUnM>npN-BgzBf;Q`X1taiHwtnA8!+n z6Az}GVxB8~sX?wysrkhhmi^rYlItY?B%O5T?*IPDVcIVc52q>E)}`oQeM{V#&bSLL z@9MvZCyCqUa|s8lI7>W2+?sI~@@Tq{n`z|DPzkkA%Ub;ZsO}uSYRW4k$UnhjBR9FdVd(ekNcpS%Ag%cREt{|eHK}3c1k_uBV_4SJ( z8_$`}1h}$}Xaz<`M=NV6G0TV z{)|x@81f?P3_Rhj>IC}DEs0I78J0D`*LMWh5Jl9hk=>)-WDakMUTx^lxrD0heduI` zz529P>r<GHT%v@*v!!{e}sX+!vle#p>TV9U?8A|!gsev zHkCSF-uy^izOGxo+w5A|*jQ1e@-9`{_=5>6@xia+rqsur<^f|!u?k~_-^+*ch900( z6;{W2o*KO*Z$Onq6J{vAR2HY^j4GMeL4Sq-4_&@qjV8RCQIPwzo4Nl6?^O2+9eAa> z*L?Ri8w=f-sLJg+n+D!wcU9gabw2$Hl4*rjq8G1?KB@?%>#U^wo(ikJ; zvB+pOMj^iKK8^$AM)MT)iPMT{KwZ{hJE@DGg}`||(* literal 0 HcmV?d00001 diff --git a/test/subset/data/expected/instantiate_colrv1/KalniaGlaze.default.41.wght=300-600.ttf b/test/subset/data/expected/instantiate_colrv1/KalniaGlaze.default.41.wght=300-600.ttf new file mode 100644 index 0000000000000000000000000000000000000000..7862e82d870910c0c7baef1bbdb27f82eac26712 GIT binary patch literal 3096 zcmai0ZA@F&8Gg?3^#{f^4q%cdY2p+@Ng5~toNP};->%g#M=f^@ict+0r3QJ(_zZRslS-i_Ye;! z;^QiAfblZ?dJ@Se4(F=Yj{wdj@l1mHmj`ZM0bJXtb7pubK3M(O+$s7yOZkprGF<-> zvy}agxN10+nQ(R@PJEKsn;ad8qXqrM-zN5?;uC3ju!Z!&@gl9yNbkecH~H6Pj9*3pB~WIQthzxJl%GCMV_=n~Eu z%xFficg+vCp1tQ#1QBMr#MOxXp}txd`g!p+(|qr5S@ZO1(=>m4+`RazY5w7lpO|mV z-Y~Dt{mJq!sjI3f=d2=?v*r-L1|Nl^It$L`jGc+%igkm(K0SHrV9D;!;Bd^7gO7G! z9JRi07PE_xm*p(63o3#df)PqBQqOD2S$cpC+PhC{t9%6H2lM~FcJ(?r#1U1iJuG?! z$B@s9ZE!O3wEQ|%_gY`^4K$Fye5e}oBi7j&V{4;`T5Dzmwf^^&f>_X1gzWAB+-L03 z?V;9Dc?;=T<*({g9LdNKQ_)T2eXat_ys!?t8f6!tzSQgBJC+#Es9e;mYog<0gPCCr zQcu0#QJ#blhNYu;f*sH&L(wk23zn`>CtCGI*{L{Q)M2;1_tx5bkA48IxRNi?)P8Je zY((!W#TS%Fd!Jc(0(Y}7Trp+MZ{c&B=h5e@)EdW5n#fOdS9=c$^${MrXZ zv93@_A-qVRu)IrAl&=E9t*cU*v0h!R+CS`}>VkY-v9-*wcY%@Lok84*jkpJB4DS?; zVs)@Gywg$XaJhoz6%~y^M|g9vtWi|D8%1Mvb+~EA&Q;CAStpF><=8*HKlS;7+iUI@ zTT>0Wn^l3b++zQ_buPEpFVALs{N5tJ9Lt683YXnkRq7R+yq?nB-{sG@W*;x!yy1=w zWz4S+9{CjWbK(wQ^RhT{|8k#&hPoQPqp)7>D~=jHpH$aFM4uBipKx#|9ia9BN?RCj z%i`icavgo`?Qgv``~IJM+rr`S1CJa$`01xJGnd-ijE}G0*n58+$2LSKCz0jfla6fm z%$a6f$2&M72ios?GLX%>vL4Uk;`#GMMP;#}&( zx;xt1+V+1dijz1g5{VdY;g;AT`tTe466f#>&(@(HYCP0|h?tt3c1tN84w=h+&oHIK za87MmSorJp`sUi&n>XjKepFfE_xnTj_4V`fSFX%O>OPylGPkjeJii~CXzg;ji@l!Q zt!d$QPdc4BSCP*@rTb9DK2)*~8`+1F71jDyRJ7-RC;7CUTFHt8rV7K_yH2l+p49on zb2h%4;v^oxI^L^aIH>1Pf`YI79L~$BqjtEp7r5n@^a}YlPm=d2U!Pas%)Bbf)omuv z%USb9eWrN7Ips?*BGf{l2X^2k zn>Gq`oV>rDwfQcDkhW+h=VOPpf8KXqo=b~1NO#$^^R|E9-9EO{(sA=FH`#O%`877} z#TrU1onlhJ9!xM|93zZ1#J8Js3P)D(zlKqaQ4&WouhUFkk~R-(%Of~Sc?WG17)FNo z)e*`vr28me;_lTRMu_8x(K?Rfl-8n$dPkT=FVPsrNskhRu${j;+fk351=KEDcJhf~ z7yh5Wee{=LW-8LyGVM@7{7^oA3*)Bo1a+4(4)Hgpo^J!QQCSZ0TNrh@pDtRC;+xbO zVC^CPmvB_~Ky`1NxJLIT!x-cE3hv{RU?kP0qd3G`2WXul_pr`jkXfhbYmi8-(I_Q_ Mv1+h&BPET7<@3I7@@~+=A13tK=i?xoSFao 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 literal 0 HcmV?d00001 diff --git a/test/subset/data/expected/instantiate_colrv1/KalniaGlaze.default.all.wght=900.ttf b/test/subset/data/expected/instantiate_colrv1/KalniaGlaze.default.all.wght=900.ttf new file mode 100644 index 0000000000000000000000000000000000000000..580816e8e0ee76d289caef2bafa60c84a0e405c3 GIT binary patch literal 4088 zcmb_fdr(x@8UMa>_W{e(WtW$T3#$u`h_Va2Di#+IRuKvc3O=H)fDo03fK@X|1e7tp zrk$j5GOaUBQ=4(7O|+S|V<%?fSla&4n6$CYIAdnoCQjNh(@xE3qlxV8@0@$JI2!yT zy@z|w_dDl%f8V`#Ats`9OcvTw-B`c+D!-)z+$IvP>ZZ#2QoSh?^j>fkN0!yphO3jm zAktjG6_KXK=2Pc?+7JFV;FlxKYpTxOJ$D`avw#biudQ7D-MZBM;BNu0X>6YF-+E|G zJ23RqmgbhqmRqZ$5#W=+8>8Qf4v>}L3?BndZ|{lrQzD&!zSF>^+i?C=;qF7g^}t14 z(LvazRPYaBjqBREZ`;X*Z@|Aq@M}$7;4j~_<#$B!8-eS)JEI-G@oQs{{}BAaZfw|B z3O6ty&FbzM+Uu(0t>HdsJM}ehBbqBl98D|m=c%gAvt zX&2~%BEuBMDsrevDEx zZer#*6Qf>|2MBsz{iUv7`TK-^^r)`uFF&PU{DrPx{_}PH?eRPMzpi~?XqQEj(YP>6 zOD^=R2df1`;%enZB{W=6*zkv^cO-pm`(ks-l3S!{{{SC-wB%x+vHm)NtojXYzPJo* zGui+YDnL%jVP3h|k$cjLq|lpcPE-=W?_M$Xje4mwqM6{6&xvs{A&;8CpE}Ml6-d{i zfH(0O;S>!9GSw&$r)B7KQ{6>El!(*U1<5 z7D84gSoR7Jt3%8(ADZ&XIFtB+n830J%tw>}Q9kfZT1r{yrLTQSosUv-Zy&1-x9q@! zxVPhO!X3n&72~FiN684B{N|A- z7M!?b$BLibm&qowCSD>-7~W87*7p=5a{9KBP3^e?0a7n1N(Z)smnc&iVyN5rusXAZ z#i{^>s!;hT4T5D^G>e*rnn~%AJ?fGU^E>z50;6=xFl>Wc9L5&K!7UL6K@PZO>?Hzg zYA;!ty!YgqJ#ayFN8+Whp(}}Ak$qx`hmP~~nMpG`;twV*@V>fe(i*CC%%m-oc&wC7 z1LnSsJha-N(Q=7YYtoG9mY8%LdcD-7VpS8;M|EXOdsYBY6V{h4N*6!PS9PThG?bY=>?8b1bk6?3a9h%Md`*~ zFRcX{ph3`mKprZ=GhKpbGBk-Qhh!s0gvuYQZ#DFF(QajF-~n#WB>SHG_N!sHpZ39r zdmel6C0l^o4{xNGomeMF@t~e2NcQ2W>ZEo=>%n_#x5|Oc&meH2%EAzA4ANqnkI@B7 zGE2K@D`IVjbPsm7DGxf3pC0Jy0FqVc!^vdZ^CrbGNA;WWrkRDezr1{E4$^5(WFKDo zFN9_P#ZiZcXoR?qUgLN^qecp2&~X~01KRd=>(*7%Fug(JG|rL83VNU3=V|;J+vq3s z9lW?K^le*jTU*=4%@pP{BS-8GN1`(|>C4+k*x?wl+U_Q#xHAqYTUTMLh0}OYkZ4e2 zk+ATOc^$?Hz9EXu-7J2a8#!%kEqHS<(l9(~mef~{;YxWn`~*9>g?}q@Ol|r6N8Zd? z>^3D+IFpYHmw8G&I7y>>I4l}QMy#o%j^{ORd#SF-TB{kcLB@Ml^LpOzl*2ZLp$ zK5s!;s6v3?z%(!WC0Q)IQqZOu96kf_d#eV&5n8)-Zm4H{u&`mEF1Eq%=MnEb$FzzW z3uo0<)z*3!<%eP~UAn~2F4 z#r$+fig-T7kt)PQht0dDu64Oc5S+Ji>C%-GTg1tUc6U+b+`L6anHkFh%UgMqx7J@& zKGR)Y9Bjb1Cl|jv-oo!=AAWDu63s@S`NeR*LIeIgUaV>>n%~qJs@M}< zl$I`vT^kQ?XdY>smse=9R&?(Vhr8-u+-d)Js>kBTkBtWW2X$SXMJ1CE%L82^5+-+q zYjWK+T2E=>1ITHVMtMY`$5e6sS5^mlr%X6}EG4@*CElbA`5(lT>16*@sS-b*A{YM! DDsBgm literal 0 HcmV?d00001 diff --git a/test/subset/data/fonts/KalniaGlaze.ttf b/test/subset/data/fonts/KalniaGlaze.ttf new file mode 100644 index 0000000000000000000000000000000000000000..52036fac2d892ec5719b9d03f8c17ea6dbdc57f3 GIT binary patch literal 5944 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 literal 0 HcmV?d00001 diff --git a/test/subset/data/tests/instantiate_colrv1.tests b/test/subset/data/tests/instantiate_colrv1.tests index eeb5716d7..183bae8c9 100644 --- a/test/subset/data/tests/instantiate_colrv1.tests +++ b/test/subset/data/tests/instantiate_colrv1.tests @@ -1,10 +1,12 @@ FONTS: Foldit.ttf +KalniaGlaze.ttf PROFILES: default.txt SUBSETS: +A * INSTANCES: