From 978852494a0e16884df10e7ece7fdfda99c8effe Mon Sep 17 00:00:00 2001 From: Thomas Friedel Date: Sat, 21 Mar 2020 16:47:05 +0100 Subject: [PATCH] removed dead code enabled font hinting --- freetype.go | 38 +------------------------------------- testdata/Text.png | Bin 1915 -> 1914 bytes 2 files changed, 1 insertion(+), 37 deletions(-) diff --git a/freetype.go b/freetype.go index 833192a..5cc13b5 100644 --- a/freetype.go +++ b/freetype.go @@ -8,7 +8,6 @@ package canvas import ( "errors" "image" - "image/draw" "github.com/golang/freetype/raster" "github.com/golang/freetype/truetype" @@ -42,8 +41,6 @@ type frContext struct { r *raster.Rasterizer f *truetype.Font glyphBuf truetype.GlyphBuf - // dst and src are the destination and source images for drawing. - dst draw.Image fontSize fixed.Int26_6 hinting font.Hinting @@ -236,37 +233,6 @@ func (c *frContext) recalc() { } } -// setFont sets the font used to draw text. -func (c *frContext) setFont(f *truetype.Font) { - if c.f == f { - return - } - c.f = f - c.recalc() -} - -// setFontSize sets the font size in points (as in "a 12 point font"). -func (c *frContext) setFontSize(fontSize fixed.Int26_6) { - if c.fontSize == fontSize { - return - } - c.fontSize = fontSize - c.recalc() -} - -// setHinting sets the hinting policy. -func (c *frContext) setHinting(hinting font.Hinting) { - c.hinting = hinting - for i := range c.cache { - c.cache[i] = cacheEntry{} - } -} - -// setDst sets the destination image for draw operations. -func (c *frContext) setDst(dst draw.Image) { - c.dst = dst -} - func (c *frContext) cacheSize() int { if c.f == nil { return 0 @@ -282,12 +248,10 @@ func (c *frContext) cacheSize() int { return w * h * len(c.cache) } -// TODO(nigeltao): implement Context.SetGamma. - -// NewContext creates a new Context. func newFRContext() *frContext { return &frContext{ r: raster.NewRasterizer(0, 0), fontSize: fixed.I(12), + hinting: font.HintingFull, } } diff --git a/testdata/Text.png b/testdata/Text.png index 8dac94d16a4be6812bd1ca6c60200aa79d8f54c1..4d60a2c0ce5d4d7f4e7db3ae62b3bd0c2bcfd0e2 100755 GIT binary patch delta 1899 zcmZ9Gc~lYz0>(`f%R79M9lfZkyAm&j`I|T7T>k#KbBZTUq{so@ih@M@Rdo9wUA&|qWvO{J z&_FV!?46Emxjg4Q$U_ef46R$_kAL9qNA6aCuG;(-(aloH!bd*%xS-b?HR`hBLK(J)U1K%Gsq2yV3Q3N9Sw|`S z_?RNG>n6`<270F8XjDsJJ?rPz!^_sBeA_J_SDHsLbq2m#*Pb0Io&9=08ujrU0)WLLI1{Ge|ETC9a1hiEs+o-JXeln%Nf3=$jwWkiw~ow zI{2*dz1lQjNiPbg227*Tb~q9R1rW5_Df)A4(KC@`MkT#bXx$pjRH%uI&!64ge>o;q zI-gpUha=f>2*8-H93eunI+eXj?e)k zK?X(uv-E(IT7J?_r5agtoX194%@xL-KPBKV@5#K$*o3&52~DOFRkR>$@Aa=xuPaH~ z;0TU_9<(MIIK_3qSuWp;rDXNU<eP ze#ZEnA*OGhV*yYVa~eFy)6?@GT7Mi3SDsK0;?U8;BP`(!2x6&QZ5|u<#v+;$;Vbc! ziyRKBy(=iF&?MTNLwlC$9Vvjh)4VW}nvgnO zGU4V8KGr{)iANJF=brg&TpCDU{X4T-;zsSGYR{Htg$Sta?(A*6cQ)MObG^8_UMbFR zr7(KI#xH@0&PK|5{J2!N9N1z1kk^6G9jBZ$3R-#of+V4_{$EK(jYq#vEHs8Wb#|i0yU?%2Ok-LjVI@ug z?1K@hR9%fp1$6*o-Zzg|PY5QH&Q3*(MdWE|;!@-@KZqsARAEVKUIBBwwY;%9mIfs~ z8@F<7WvVx=;ta;n02h-kTYKmolY{NO!8R|l7!Xpp-$g|rPSuwX5uGK|Vh1;WtPUkb z4QTYYoAb1r*4mD_l*c`aC^k32Th^pK%)B#|I^6b;nm+D5-^)Lq#93<-h_l&o?cHxC?ROx|u~7O8MsT~iSPeM*x2fqxhU(2jevq=) zEAH1G0*~5G*0}RD)_(D@VGX`L8&J`~-v8QmNS+oU`u1FWS?LhLxf|`fSkSSe5|3Us zKNYb%tAmF~AD4%M${)IHH?KS64@ z_eq5rbHC?kHV}=m;-G0ze>(NpaYDvcAj&|{BjKsDy^E%Kw}dqbTE{_;)im8o6&GfV zeJniHwbv^ZKiFA+l|BtMm>;?iI^p}A)1l*OXQw#ATr>GCfd`VmK*fN`uy4-d+1S4j zs9bddF0qO~dER0;Hxc|tMdD1=j5}EPa-ueti7ziMAM4r_Cc3hSeY(5O?lKn`!v7)W zOS7Pu(q*q?)O*V=8S7qOA}*)Nawt%Lj|H)ZD4(FM!51QApRt2)ztFWZ<@ zsEu;33S*pQ;3FMFFD?+6hV6bF{JMGAMwAos8cV+Squ;>SY)3EdIQ;ssVxuMhFV+9m eK9Cj?Iy`h!cfDl*&V>m5D=16!HTG3p%s&A)E0RV4 delta 1900 zcmV-y2b1{v4*L#}B!5ClL_t(|oa|a#j1@%_{tmmqa{K>P5D-uSkziN}Q4$OqFh&Uq z58RAKz<`=)3>v&V5RvEuyr>UIh$0ZPL81s=P$EjAghT=w31UD%1EMJ4MlLHXBFklr zHK}pt%=DSAo}S&~+5R#)=`&MZUHwgUb#?c&gM&64Spqn+1b=X33E;>Qz>y_@BTE2B zmH>_{0UTKZII;w&)|BfATuFtKz#sXTas|*u{q!Pm1~?6zx76I_z-V9?&gTn&{Lxpt7Eg9fB_Pd7PCpZ{oO#) z$LURiW+D$b#(yosfGhxSaIJA_nR=FaN@!9KN>)62CF%X`O9_rgVarG0Xj6p^r^1Y^ zhq%^kg?~VI;4BFo(a$PFSjGCsr)KaoSfZZqtf#ybG;5Rt8o1C)Aux$YXgy7WQmo~| zm{hW6(eG|xJKs46tf9g*&k{Rc1e$3m+Qk|C$TKN|SXfFqjH&M(?kr-zs3b zQS){&kP8PD0;A}+*)-!h0?Y>%0vk)qt)Q`bk$)mr5f0F!-A2u;U>38sa*`Q0(to4= z^#6@DGn3E-I7Q8Tn)LJq?$`)>EgFzDiL1P=5a_`IpII|A2{XBw#Qb$2KYi6+i&C=2 zQ+nl3bA1#tgIMRg_Uuf+W@_W4I@#NjCLo0-Sv@H|4s!Pcz)-bt9gD59VPSISaV<|G zYkz^i6g5`@w*a-kMCzwSY*b8bU1>2~%YPey<-m)SH?|Ct$(jWesIXF9a}Dqcxz$YD zWDV96`-SqD&aF#UJKzB-?5DA&LL()p_W*a&Omx_uP0ML+QK2hEsGDhS83D`#o(Eo{ zvDOM0%j5jHG|34pIoC$Jq5xk2?gqZ)Du2s(C=|hN%u2v&POq*?ldPt|;Q{;XwJS;; zI`P6@wM#cNSF&n(*||wiei2(UDs$6jNoiNkkk9gwN*MiF=lhw>OE?O3g z_CgUVjOna)iIG(kx%$FzfFDn5^nYL@RRllL53<=7MmJta|CaQ09jCa{jiPF>d;UrI zZji7Hl54EtQ4lLL#o=y}4%LiRY5UW1(mG?xPZ2VT@)C^`;sO$f}|U;Mdw#Qu1LIJAbOZP@l$C z_R%Z(7kfAfuGKcQ2nFCrQqn|OwE?7LjiJQK<88GY(&XO>@in=mWHoICU*P<4cr+Qzt@a)o|$=YKRA6FKQv%9KyY(8KT^?q;Lv(oc^3p|D)?)lmU>nis#p z)l9zD6jQ#9HbEn(As_ZXM>06DErP$-d@0_H26V_eNBO}n3RRD3d_0qgzQD^wP+}8j zXwQ0VQbps5{y&cb1)n`kL zw*}_Nv+?!}3}`W(%3&CjNNGDvnO(lhZGdN*4Skxt(BIbi>Zj$9Idv%FsG|9@k!Ka! zN|?8ll!p1LT<3Bbyng`p$Z7-5*b zJLV}HIL{Km5?O7)tt^ohW~!o*nXDpLs$93qu-pkBM5C>o8)d4=(%Eo^lF|ta$nHHnQu6I=Kp>J8kW$*$xvIKBs3E;>Qz>y_@ mBTE2BmH>_{0samE0RR8z0&-<5_$rG40000