From 5dc4fca7593af7c4192325038b960b0f7ffb3136 Mon Sep 17 00:00:00 2001 From: Stephan Reichhelm Date: Wed, 9 Nov 2022 16:39:12 +0100 Subject: [PATCH 1/2] index check excluded last glyph --- .../org/deegree/style/se/parser/GraphicSymbologyParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deegree-core/deegree-core-style/src/main/java/org/deegree/style/se/parser/GraphicSymbologyParser.java b/deegree-core/deegree-core-style/src/main/java/org/deegree/style/se/parser/GraphicSymbologyParser.java index ab28997e2f..2496e428ac 100644 --- a/deegree-core/deegree-core-style/src/main/java/org/deegree/style/se/parser/GraphicSymbologyParser.java +++ b/deegree-core/deegree-core-style/src/main/java/org/deegree/style/se/parser/GraphicSymbologyParser.java @@ -302,7 +302,7 @@ private Pair> parseMark( XMLStreamReader in ) break sym; } - if ( font != null && base.markIndex >= font.getNumGlyphs() - 1 ) { + if ( font != null && base.markIndex >= font.getNumGlyphs() ) { LOG.warn( "The font only contains {} glyphs, but the index given was {}.", font.getNumGlyphs(), base.markIndex ); break sym; From 17a9817b30e19e8f9952df680f885ad96c78dd24 Mon Sep 17 00:00:00 2001 From: Stephan Reichhelm Date: Wed, 9 Nov 2022 16:39:40 +0100 Subject: [PATCH 2/2] re-enable test-cases which use the last glyph for rendering --- .../similaritytests/render_scene_point.png | Bin 4349 -> 4953 bytes .../similaritytests/render_scene_point.xml | 3 --- .../similaritytests/render_scene_strokes.png | Bin 3043 -> 3454 bytes .../similaritytests/render_scene_strokes.xml | 3 --- 4 files changed, 6 deletions(-) diff --git a/deegree-core/deegree-core-rendering-2d/src/test/resources/org/deegree/rendering/r2d/similaritytests/render_scene_point.png b/deegree-core/deegree-core-rendering-2d/src/test/resources/org/deegree/rendering/r2d/similaritytests/render_scene_point.png index e476bc8affa4e3500dbbf6b72fb96a624be4064b..99d2bfa41fb9582f5c50e585b8c312e539277d45 100644 GIT binary patch literal 4953 zcmc&&doE~(+StZyzsb)z&$BpB=lnY7_s`D0=e$4f&-?Ovy*}^HC;p_hxzxI? z>%_#wq%18CpB58a#uEN_TeDpFD|mEvmzbE0lI3BuGeOQ{Iab9^X8|#=BlUV6@~7e@ zv*mM)ddn(i`Mw7&pBe9s3*X6$i@5o_`A%N* zrseU=^rJW5-ju(g*SXz(#uLuX^_vQ2o4|8wy6NmsmL?$#vgcT74l~G4A5#ffX|^FT zSzi#Xv?lUCQkibHVWrAWDsZLQ-h=ZWjm@(RxXxD!UyD9QA?pa9$J&utPk<&fuk^wG zu`(;o6uY~p`>c98xK^ZWvjB_mM!Of#>(YLjnV{n`;BC(5svsGcqR> z_L6Q$qLmv;T70zhNH^#{_2&sD-)-XG>s5F~7&utSjW>OJkqN*pTQK@=|3zB-*4!G<5kM+(MimDPmj7mD@`&Hp)KSTtl^^{pg5a>RN^V@~MTk>tOGT4+pEm4ey`` zixevSb#aTI2Hm|Ci0B8N#`j^ zXZvkTO_}-sFMDM=2oFR+^q*Y1>R9s+C;<3En0DfsKULPanR__nmcv&73dB;vmd;hR z&qKYSO|bg!@LND)b;GjV&?C7czA0E#vS?Wc$^>Jh6hmA{ajc{HgljC8)G&;kWB}(E zC7aU6E~Q{l(u(Lk!k*Pj$$HH7tm%x92cL}Ru|AJofUnSO-A|d>Ss&ZkWj_zs6LVZD zeYn6Eu>|{6m6VxR!d?}rtKOpRhGfmL>hau8#8V5*n*&rFys_@uY30nf^K5c`Ds*ve z`#eJz_+d_36`E0dIo(OL@oF&#R@~R`yyeB8U0yq;wfaDWR<#TL!a+^sxv#{@$WRbnDumzOWX% zb~9U`TWV%^#$-(Tjv>o;P?OGS5_(BqdfSlH-PV0k!b_K}DS0uP)rHnaTxj`wI~GxY zQYFUbEtDRz@|+=SE~yIeOq~&X1y9 zm^?o0>;Vy8FS3qGC3mP4gT3uNi2CMtCs+4Bq7SK*q|EN>fI@kz7gY4GN|5iH*P&UQ zv!{EkV$=igY^0fb!hOkedbc56<{rd%@53{-#YNOIg5PwZ&a(bA)!lbkK|!Q-6-x{Q z_WmS=^jEuxtdsVY9mR&6+}#(R7c@5v+Rp3KB6+M6=09uBxdYRN;i;eb^~jj?_0UIY z1_`QQpkmFE0PNn#jtS1mVNaT6ql0MnFbl4Wt?}jZbDe_|&+){iN?_%iw-@vRgfmJ9 z$)O$!VavP+1eA4JX1%@zOi6KCav0G{n7K|v9jsg#2n~(>)633Eh^1J4u#VeL1S-dl z0ljp(MDlD6In*j%{`bu|4a15wN;&QTxuFlqN&@nIh&pf#d!+ws{=9sb2%E;+P*;W_ z+D#E?0IQU>_Ot@RMaz`t<~>USQMMWJs+H<|Nf@R0KCsG9L}{zYR>SW8cG8yTIy1xy zf9!s}*uN7hY~7%1#**WaZev|MV<5i28rt{~5 zt51;_9CyeR0w1e#ZRS&Or^H4XZ5nK!A?1zigA?rzSrYG1+0nS9MN}qxBU{BhH-tlh z^!s-eqOc)eMQ}EfN3X#NzTwjxthw;YsLZwAyMALhNO)BlQk^yU!JcX3TXzlWToRc? z!<(;6^>pLjjG%Bn;{!ys?frG|SgjdbSnWio93<3bB&o>VITBrY7jiX_qCGhYjuyM{ z z6qR^&{~y@s4?2&Y%L=?iH2W>b=#Q_T>e&3dT<0(3IypsfNRJMBQ~H)XO+8!>EwaRJ zdRQZyMRDJ1d>PczN@EUj(Lqy+!-KeHkpT;!xc;~C@*9c2PRool;m*gmM9rp3z0`qi* zb`qv-9slw%HNkU$qQv-EVD;14F!_fwoyR2vlbH=2HTa}i zq)Y!5D}+s6aOM3pgQ#uUCQu;U&TF|qRkWNQMo1n`LE%6q&6(bV6OzE}8ob zFF}wS1t(rpC7xY3lkWULEuQg^;ppg!DF4w0P&*Gv+ykw~p=z(SFj6DPP64NYS8^Uq ztUC8fNt|}ow;NHhmX{%#`9n(b0W9b}!%eLel_wa8GG)Uht#HbD+=!f_N#_of>`Ji3 z5$Kbd%Uxpw{5H|vNfDjcrwl^Y29iRV?mXb3u7|HB4rRL%lx|w=hd!QP#6vU4-3^Rc z>IYyhXDkX_>oJ%LL{eJvg@ZCcT;001YbLDEq#X=@%j}c1B5p{KeOqxgjMp5nKT6LM zCJrmY8GKZuw~HJm*}gubJzB-gZ_{2eM^Qf0NylS{FP9D*Ge;|e-2Zv;_}3yE5CK1e z25bgn>+m&^+B-W7)APusy^^gv>$YQGkbC{JFs2}pGB=qenO13i_CkuW0|WByBeeWf z!iK{OY&1>loL&Gn9}h7L^_{Jt1^9$PML3)oC8JIzj2~b#XAPpto>i?_9e5i~P(mEz z(#D<=?w{+FpeBqITA`z6K%&6jH`*7tcE!g&PtRT^mu&v(Su?%8{g%li9xLEa z=*iu*RTHl#JJiM@7e%*?fz!D!o0_8A{7u!5gIOJCktq}p%dzvX`uDCRw32kGK*>XM zQG*u+$AvdxiaWvAK4}VR+m>*(=~XUNq0(CM3^Kgt3P>Z9mCT_V2Tv(R2sZr?bS;}a zq2P`2N6apVRu>7OUCvL~f!={)xRX=HtAI*~lUx8@n7Lc$0cy=i0l}Vw`aUQ8~wzIcYUPNnxnrrg4aa4Tt7^T5`I|x^`k|wEEsGQ Vs!C7C37^cwERR?pE8@F$M4B5}?u%VXI#v!&< zZF{@GDOtf6s~gaH&-S^LhNMRFdmCiAvOn{ubo6oj-Biu&7m~n3XWpjBTlw#w!`RvE zeeRuE60}eCS9Bp2MnP91@>sNB1dWr&ufuV{hbM^^(Ub`^U^)bgd^!)1jM<~KJAn6< zoVZmxSe~;-GG@besI1_}J&M#&944>@l~)k)4y2_uD5K{`5 zvV!gYlR@msDyuL)TEaL1U3SqYhX_=K2IdIyWt$6(T+_5#)@x1h%RToeT30#k#FEoE zrhj<;6PYNi$trs|F8P!~T`r7I8T&L?3{XskEE$Fh(uhQ@X3{#X+I^M|BMI%%_*Rg~ zpvAH@g6a{Jh8_w_wu>WAEt=v7L1u#@0a=c~W(rWK_ZqFhO_gIfG}_bB zTKj|1n^#vBg*mTkWPda}@+~Y%duO|65o2ikE?>acLOR!IMS98ngeicw5}r64aT?|3 zp^Qs9aCF@#o~H1#)qtlM-|@m_uIv-)utrlm?f@*w=k}1mWeH&Ng{mWJ*D7Nnfl5RnU-c{u5hg`~p2OL?i zp}Gf>?Ng$E#izKke3LJDf);XkBe9*=g??Rwolz_bDm_;7D3wHYfzZu>*G=;2{UN`k}d5&R+IfyaknG+W2Q>(Ck@J^2WjuW6Md|ggNWM-|#y1~W@ z0-rCMY0m`#l{lMXUFPxGqrw)yYKQtXY%E3oNVb2n6n16(uqblVly5rUsII(w zef#ZgfbZ_3?7(q}39#Drp_wwDn5mEG7AMuYtzTSb&}eFEbPaE`tSN2Y15+S28}6M6 zGM&1S0DE{2csf{rK}YLu;Mp~bK?-UaH26ARjo0a90_VLC=r*o~ahfJ7X)r+T!7D8X z;BDU<7~-kYF0czlK#B^qc;|4bo)pCT68oVjSxb|d@uHI_jKL)ZE{+yZL17m&N&{yb zRRFMlq=YdJI^%e3a#(?d?;*mEu`RS^%n`#bQAhhgQgC^ZF;4l*co`2|Ff9@k7IpOy zhQ2Tl0V6*4U1@ootug>j&duT$3x>1L&^y`Z>n8Hi^bV0^{3CMAL#JO}Q#b4j?ycqD zxNk2z7OI0kKZVv{;gO!txIgjCV(ut9XWdf8^!Hdg+hat@si$6(KwM$GC_~5s>r+!@ zRV{cql#@!9P5$=?5;X9kH*{FLWxh&lRNKtBdj1_3k@+U)8gy>b!?Ao~mJtBsc=EbV z7mw8LcYpqhs@+mOmvFYhf{yvtKaO+|bD~{KWU?e)SF+_+jp_T9Du$346_7%=tOwSa zO?i=2BNKYQRE+PD^MYGOn2dJ&PqWDKFd?{fCtf#=n7q}qSg+Kl2+83Ww~faWJ=92y zEquTG6IOvaOdzbbfGf_E6Qz4=6Kc`_ELFp=DuXo3;Exxc&9dCi$!yJ&T zN>3uVh8tkMQuh{dQEdN6esl#K1nlk2f`A_YrQ0i8whz@YrDB*5G|Jwp613XmMFDzY zS;Roj3<#Y*Hb%3Y`_L9**B7EQjRuU@JY^xTxXFd=`5gU_=?C_W`A85M2{+fzbVp~V zdj4|Br0=70?i&-;Q-@6&_A|F`OwK&(S9P14DK*W4;DS#};P@}h}7{bfWCA3N_RvAnBrJo|$g&SjxY!H4TAnQN8E6H-F z4RspAscxq8jlS2~fC!5T^zheN5_oaf9HlnPs6Ds$#h5047VhlNZW;}!<|X3IJ}rWe z+6Ye&T_X-QF~88*h$MuV*t@A7jz}faQObo*IQuuzaj-K{KrO*r0OE+PUm+;l<&Lc3 zpEvUy{Ifxv>CDWQ>=E1E zch~|tPARB`WzNv~*bM&4;G}D2&lr+G+s8gGGQt4&sYOREPA|R~O;aUxb+-X{(XShx zr3L(4tV3u(-33U;*g6Qx#))P289YW5W@3g`U+vIMKv6M(f16{k*3seQzS<(x=^B61)j&RvURR=+OIA)LJ zsl5Z>V@ogkRyya%u}jATa;uLA{&ZF_9j(@>d)jy(^s3-kL(IX}*{0}gubAHeA+m_* diff --git a/deegree-core/deegree-core-rendering-2d/src/test/resources/org/deegree/rendering/r2d/similaritytests/render_scene_point.xml b/deegree-core/deegree-core-rendering-2d/src/test/resources/org/deegree/rendering/r2d/similaritytests/render_scene_point.xml index 59604d040e..3028c3b180 100644 --- a/deegree-core/deegree-core-rendering-2d/src/test/resources/org/deegree/rendering/r2d/similaritytests/render_scene_point.xml +++ b/deegree-core/deegree-core-rendering-2d/src/test/resources/org/deegree/rendering/r2d/similaritytests/render_scene_point.xml @@ -67,8 +67,6 @@ - - diff --git a/deegree-core/deegree-core-rendering-2d/src/test/resources/org/deegree/rendering/r2d/similaritytests/render_scene_strokes.png b/deegree-core/deegree-core-rendering-2d/src/test/resources/org/deegree/rendering/r2d/similaritytests/render_scene_strokes.png index 5e6495276dc3700f8facb79c66fb412d96742314..b985f75286b22d41a1a1193a0dd75cac300bbf81 100644 GIT binary patch literal 3454 zcmeHKc~p~E7RPo*#G{~6LCO*jgJDkHmjY#rwk)D7BaWgIwumzUlaECutSKYt0mdl^ zj8L0GdR$8>Bp`V#fueDA&A zefNIf???LYyxq5Mes{Buj?Pw(lPy+s`PRgYL0Q^dGHu}w>B8trCbTwE?I z7btdKrkJ8H%+7 zUXh7%^rJs{MwIsZnhGdP?Wym=P%g1?-j;{~E0GK&|9z19&wY7jZ}xF^@hvNWGzmOy zn7p0noCHc(%?DG=Vx*35L%>H6uP(4p>!T17VhH9m4=nu@s(WUt0}Q^w(Q>atYqMrS z>M84-`b%0KWMb&RO7?x(#Ueg>VkE(!nfcqP;J)sJNmIo&u zbQP%kBv1R)i;@(aQZ5-`P!l>KX#RW)>$MF2%ck`CDD{l8HN$y&n$@nLFYzQ!xCH9# zX?2bL6%rf?V!>#YY-lJP+UyJvSF*HFi3$XQk_Sk^gtM~@z%da@6Ic5z!Pm2C<8+kq z_MY9&GD}O-A5|l{ky=r7s?uXec=k=2)d1FG9p>wfgS_@$9S8~INTvvoCRZ4bL?Y_y{?*T?5?PJxC5wvupBkCiJ|k7dL2`77`esPmDm4GKhFXCh8qXHjH!2%GQ3NJP zQ!{ZYx$?O+eYq2jP(S+NGgLdavcZ&7b9Ll~Utrv{C`R3`iZa$JDX6eQ9QMV*Di7EF zsN(V!4w$h}h{AhSj%#hw00<2R(w0yTU)xD5YUy%=fv6^aOrAuipxOon(fsc0amFO0 zfYSXc;_a)vE1%Y@Kwb(p;wMt8M|8WSXc<&#VEYt5-_RsL$uQN31Fl;KP^H z=}i1cJ1-vvos`V|EK$hmvk8Cu^jyhfO@|7w2$GY7-1>B+oj2)Q0>7P_@u0wVeI%4ZJh@ciEwk_be?*+}D+mFIDKH za#wOGs{%R1p*f4b>!2JrVx~0JXhDteg6R%BeHM=TqE0L6c}dS)I$s3?n!Et;06QPk z7SHtpDM^cwRpE+FuJTjJBGB{YFpVxCi%0DZC-$TwdtWA2i{z)zW%IyJWI_{R_X2OW zvvfRAlaD485Qf%tn+wM3c*_?$Vcsi=PF?y1g4oATM7=?*;!rKtIS`HILyh?cpks4F zRLl^}YbpX$5ulcbzw8@5hdwMuI`}rt;6p~C(Ay6wlv?1gup4t9&;QoFOoYTn_?Ujq zTWg@NMqX^kK;u5Bv%20-YGbIcaRJPfe3Z*_kEJqZyJSw0ff-$BN?k!jfDo90;he&CADxDUpP+Oo%3zW9I<>4H0CUeP>C7wU-J@?-4_dCDu zJKsI$9N*~cWnuoAIR=BV@cxeAhrvvEh4z_KC!$vyib0OSO#jWB@a+##0m_R@pD!fN z^|C#ZSYYLpxGf}vGCP0P78XI7P;ff1YHjkFdiyz3naQ(UnN^>duldw^)<&iiDRYKn z;fci5z*`?V%{jX8t38_1N)N3>S{Bw;5-Ja$dHte3J(4qcVy9(Va`FuR75#iWI~`xP z#BSMqT%^_M3B4sL$upAq{)8Q?SE=mmCOzGUwVL}egPVNsP?W@zFuCeKgo>_y z;l-8n!FZ`wAxer`D}wNG#{L#vkg+F$6J$bz?yc~WV&^Iqf;QbQW(4mi{$n&d z%@#!Dp6@MzVzF3t71Z}FQ|>eB8OEi$`mo$O!;p1eLwS#SK~cB68g3z>4Z60D8&|fE z!)CJ|dyUJ#o-T>+6A^>++>9Bb;0k?*Xi9v)UQ|mS9K3FrE#CGP7(^h!j@j0_M&0b>v zK3&P=823}}89NphZu5L#_4}7FoTdg`em3b}F+tOC4*zWVUMh?+K}mcNWSpBm2r^!f zYC&AHv=TW9=D}}}0~$f@%r^c|*W55DC}3?T@sawO@PI^I= zao*)Bn#@(2M@c+l6*BK`z}4m}ccbsXA{fZ=zkNlY-${YFNE&FQ6nfYuVp#Uxj#%UF;SEcLdH9QW)b>w1gb5 z$70F6&gBgUv*wwF0&4`B24m>$b+S19;MwaLhW5Kj8Sw@`S977*!SuOLbMFFQU!58m z5Z%FLco?3@ayGaR6s(XAeg9WX?9Dz6HBbNQ{@E!3F`c(LQUgiHPZ{+DQjdcnwdl5f z+Vab{Zux~ObhTG#up<^b3DVsV3&*(Uds8%2i$7hqZu3y%10vqd(D1Si88+iEGIP+8 zPi&wIUwc+a%QoB}>UqPnIJo3mMoE8{I0-<{YQ%p>=*UeYbXe=rw5qHNkl;~ND5TB7 zS9_3c$R868yYg|Q?UHgZrm&fBRcFinN>ny90Py_fgtDHV8V(p$l3V9jI@F~`zk>)H z5=2T<0ne?*FIxR1kpr@oR;1nZs&iQy`=vQ$7fl|eGK<+hG-$rm(OnV?okND73t5d} zU3qE>Gy|pH;_$TM4hNUjq)h3Jn38Bn+X8PQ2Y^DwTl{dEpgg9R0@K6-Hj7G%Yz67Q zd#fwY@2LQ!CL|a5!<#ywC|0}-;O$pX;4h{yvEXrt>1-hG>jhR;1DJL5A@qX_5GVGc<6Amf zULhviqI7nUu1Ft|J0Ma!T4Xmk?VGP@xyt7N$I(|6AiX}Owi20bDv!!=vYHmKiug#a@yQ|rp*`W)xMT4t - -