From eb2802e366994bee1c94ad311b63650160e0ae92 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Wed, 7 Aug 2024 14:09:20 +0200 Subject: [PATCH] [ue] Fix shadowed variables on Clang/GCC. --- spine-cpp/spine-cpp/src/spine/Skeleton.cpp | 3 +-- .../lib/assets/libspine_flutter.wasm | Bin 417869 -> 417918 bytes .../SpinePlugin/Private/SpineAtlasAsset.cpp | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/spine-cpp/spine-cpp/src/spine/Skeleton.cpp b/spine-cpp/spine-cpp/src/spine/Skeleton.cpp index d307f7f87..baaa7b53d 100644 --- a/spine-cpp/spine-cpp/src/spine/Skeleton.cpp +++ b/spine-cpp/spine-cpp/src/spine/Skeleton.cpp @@ -462,10 +462,9 @@ void Skeleton::getBounds(float &outX, float &outY, float &outWidth, getBounds(outX, outY, outWidth, outHeight, outVertexBuffer, NULL); } -static unsigned short quadIndices[] = {0, 1, 2, 2, 3, 0}; - void Skeleton::getBounds(float &outX, float &outY, float &outWidth, float &outHeight, Vector &outVertexBuffer, SkeletonClipping *clipper) { + static unsigned short quadIndices[] = {0, 1, 2, 2, 3, 0}; float minX = FLT_MAX; float minY = FLT_MAX; float maxX = -FLT_MAX; diff --git a/spine-flutter/lib/assets/libspine_flutter.wasm b/spine-flutter/lib/assets/libspine_flutter.wasm index 7ba4114037ed4a46f6d65d57a4eb5f2f7f847c61..cffc6246ba57442b30e518fb9d07e8fb31129ee1 100755 GIT binary patch delta 2587 zcmbVOU1%g#7OuK=tExLy)v0v4lXN=CoO?$hHV#G|*G41T?I!-s1V;%PG1El!q2~wj zC$F=;tTT>38C<$bi+vD<-6!!u@Szu0+z1QHg5rZZILr_k9eosi(kJmdx6(6=4+;j- zx9Z$`&-u>xefM^Mv|amYyY^0Z)BfSPBb%p>Y}$h(o8qU7_8VFEA!m<6)}w=09&%p4 z&VGNe?=Q|jr0r)PpLC|K;K;csI(vS@?~r++-@WIvvir{aH)3a3{+AzEZL#5H;> zJ9A3jJm-^W2vPwL*Q*J#=0!n^c_ABOMpd$%Q*!Tkfvh{NTg4JtZTmKBo-8V4mFML` zFE2&;(5dT@ep4LBG?H{1;vKswp5na6mCM71Dsu6C*1W_(Zc{8^C^p6QNNgc-Xa|ff zRO37xR~{z&Y=B-KSKQu%NlpQTP6T`mPk)?=bOd4>g5ywVdg z9HfY%Er1)x9v2y0a%lt^T#8JFg8_L|*vNNR42MtMnZ~cVfKp=&ggsm2w%`7zz0b1h zs+xyqQZ-57qamhxsVeisAvMLrLC}oh9yQ9t5(8?8SjEFum2_Gp4fi8730QHOP&uX1 zz7A78+7$PogOCa-75f^pm>w^;2qLBcK2E9H$F2l>Zq!pvacH>7?Q2Myx0Pt_EwX}O zSR7>qjb)ve<#cIR23CP%FTEh=dK0_SwC%e&+z?Oj$6B1ac{@#Gq(ph51#QsSeq*Ub z`-hRbqMD4Eu-RiT%E{h%Y9+-y(l#C0*LWF{x1PRh+ckN~toNX5cL>kNG$>#8s{=53w5?O>*gwqO_lTZ$r6x zedS*^Ss8}$X#^$#0X8J7@5D`^7eOpS)_b7<_u%EK+joNP_HqhQM2%@(D19L^xS^ zN08Y=qBZW-0Qp_}ThQV%W@I%*yC`KaG6+-Ol@%RCZ=Z2HEym`N!JUTWlU}2rJRETWT)bb51txsch|>oI5bfqR`at0_`QKstImRB5V!A(+Sg!Z;xSM zCZRc4x4!EH+(T3wd~i;#*_ArkG@a-giIirc)J&r5*}n5~x>zG8rRl!1Gy9^P%bq+h z|L)Z}HZzDWNGbN#I?J+!9?FmuAbvYjEzk7-_i{cTuxr^DJMy}*T2oj7_H*vOazrbO zFUZNu9G9|{3jnaaBgY1(zK|b_k;!{;v}gp34LV=S$L;FGUAW`Iw)F=gDa7qEhTE^2 zo&8GA-2!9<8oL`vEwEk4*F^IIY#q}`ArKGnZ$UQ>leH2>*^QUv&ZJoqa86hjKUEI! zd1@E3`!317$@$Mq*$bCs=;Aw@f~@F+&v@V)1)Kk_pMOUsJ@ delta 2561 zcmbVOU1%It6rQY2X0u5)$>y(~d;K8|Rf85?wZ*I^tv_ig5~R{JMl72CfIkF$ zsvESmYNHQ3Q!fgFpx{d%6onNO?33by_@JW2(jWgG6vU@K7Qb_6H&zh^^RRdBxo5s} z&Ue0hCYMePe|~ECo#hqxlV|s@9NWL*w)d}yOBdX?%<}!-72!vX)z#HY!S?ox_j|8z zbU$oQta@)s^Z5~PxJQQ+JUE*;RHA^w^w`BCp1F8L9<99JBfMtyu$U%iQe34g=J-*0 zvPlh)Ga*7PCWM?6W2)brIV!L0_sO}#xmnDR({OKfCdeV*^gSo1n*N;* z{wQA-N44Loi$gdD$nvCk$E}OU8TXJ1cv(^<4t}jOA+b+Mu>f_~*DiEx7Wj&TT!>0JaRaIanHjl+wIgN+ak5!SvjwJzP=ahqTjm7n# zyq}?nqBY%1eN?1Un&~3e-o2yvjTT2y&rH+>%K@e=fK9%MN+-o!j!?1)K?k998NyuD z&B~|3gE>molJ@u=S>+WUfK>*fOb2TeG)}(dUh6ocYA`pCWva%sOp02jdU@TYhHT&_ zc*XWERpw7=TF21igeYTImOl6E7K8J z2q-X5ydZ~~eVILMF$wb^Dzd}|mEQt%AgDYOs<>O@Y$B+iMCFW!7UyLrZY&}y=iX)O zZ4aRNzj@BGh8?IY360RmmHx8#s*0GC>{YTNTqIh6 zx>!OLC01M5(xJ_pg@bEtdjh#3+HM*|fhe{oYf&{LtM_>wVwW)aSsgA8z=QojvN-cd zyReveFy<`?b5cV~DznVzU?ze%(Pkb|e;G<_MS68kuP!#Ta{e3{|Ds{ltZ>TnnaT&C zf^v9vd8{Z@1$}95hU2g%kwoYDFh6J7=2sw_Z4vjPz*#MzL@Ji|qF!)W;6ee(Wdj80e2>6c4!KVk83?xvdl-u#4nVu}X^TYu=ldj@-JF4H zgDxYK&5@I^@onhksH-6GAZ&KHQlM@DSBM9>*p#toZ*OVeHn>y6K5X_yW&0=o%$Qz0bSgY1Qa8OhB&APaZk zs%s=N8UwYXsU9&~&&rWvjl7J8TgtWW=Be-GtHlwvjk4|31v%87IwOB^udMMmu;Hpc zG#5$zH)1VEyycv{#_YTx?{sVC!gq3GT&oKw!uuStsgejq_3&IxlFY%%`_Q2Eru z2Le4Y*S#$VP4g!iT#Y>O;n;yG$zBAgl>-fcQ*;oImEVJri2BSE_j#@M?w{qySI`Mx zgiZf2x%?Tx&$Nzt*`mv-PAaKy<_i98Zfu?}_}BO6Q)5r!;%2~U7bPdmySK~Xiq~-F g5|LZyJJyatlas; }