From 82a621b4c830d8bdf7c58440486b2352fbc7ec40 Mon Sep 17 00:00:00 2001 From: Eoin Landy Date: Fri, 19 Apr 2019 21:14:09 +0100 Subject: [PATCH] 1.1.0 --- CHANGELOG.md | 4 + example-desktop/get_dependencies.sh | 4 +- example-mobile/get_ios_dependencies.sh | 4 +- example-tvos/get_tvos_dependencies.sh | 4 +- native_extension/ane/extension.xml | 2 +- native_extension/bin/MLANE.swc | Bin 19981 -> 18254 bytes native_extension/src/com/tuarua/utils/GUID.as | 100 ------------------ native_library/apple/MLANE/Cartfile | 2 +- .../apple/MLANE/MLANE/CoreMlController.swift | 2 +- .../apple/MLANE/MLANE/SwiftController.swift | 2 +- 10 files changed, 14 insertions(+), 110 deletions(-) delete mode 100644 native_extension/src/com/tuarua/utils/GUID.as diff --git a/CHANGELOG.md b/CHANGELOG.md index 972a458..a219a83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +### 1.1.0 +- Upgraded to AIR 32.0.0.116 +- iOS/OSX/tvOS: Updated to FreSwift 3.1.0 + ### 1.0.0 - Updated to FreSwift 3.0.0 - Updated to AIR 32 diff --git a/example-desktop/get_dependencies.sh b/example-desktop/get_dependencies.sh index c9e5501..116101f 100755 --- a/example-desktop/get_dependencies.sh +++ b/example-desktop/get_dependencies.sh @@ -1,7 +1,7 @@ #!/bin/sh -AneVersion="1.0.0" -FreSwiftVersion="3.0.0" +AneVersion="1.1.0" +FreSwiftVersion="3.1.0" wget -O ../native_extension/ane/FreSwift.ane https://github.com/tuarua/Swift-IOS-ANE/releases/download/$FreSwiftVersion/FreSwift.ane?raw=true wget -O ../native_extension/ane/MLANE.ane https://github.com/tuarua/ML-ANE/releases/download/$AneVersion/MLANE.ane?raw=true diff --git a/example-mobile/get_ios_dependencies.sh b/example-mobile/get_ios_dependencies.sh index fac1cef..87cbecd 100755 --- a/example-mobile/get_ios_dependencies.sh +++ b/example-mobile/get_ios_dependencies.sh @@ -1,7 +1,7 @@ #!/bin/sh -AneVersion="1.0.0" -FreSwiftVersion="3.0.0" +AneVersion="1.1.0" +FreSwiftVersion="3.1.0" rm -r ios_dependencies/device rm -r ios_dependencies/simulator diff --git a/example-tvos/get_tvos_dependencies.sh b/example-tvos/get_tvos_dependencies.sh index cbbd699..33a6046 100755 --- a/example-tvos/get_tvos_dependencies.sh +++ b/example-tvos/get_tvos_dependencies.sh @@ -1,7 +1,7 @@ #!/bin/sh -AneVersion="1.0.0" -FreSwiftVersion="3.0.0" +AneVersion="1.1.0" +FreSwiftVersion="3.1.0" rm -r tvos_dependencies/device rm -r tvos_dependencies/simulator diff --git a/native_extension/ane/extension.xml b/native_extension/ane/extension.xml index f3047eb..c444a33 100644 --- a/native_extension/ane/extension.xml +++ b/native_extension/ane/extension.xml @@ -3,7 +3,7 @@ com.tuarua.MLANE Machine Learning ANE This work is licensed under Apache License, Copyright (c) 2018 Tua Rua Ltd. - 1.0.0 + 1.1.0 diff --git a/native_extension/bin/MLANE.swc b/native_extension/bin/MLANE.swc index cebd48a8a736d8009e3b85d4be6331ad7d3e4d9a..7729afdcead935f266538e3daec1d26a505155a9 100644 GIT binary patch delta 7850 zcmY+JMN}LNu%&Si?%uddXxyy{1b1l~5AH6Zad$#+cZc8>T!I95cM0y!{BJSm&D5#8 zxu&|c|R! z`6Q!n3$&FLn^=5QxaAD8ku-WV26HjM!fC58+~uU!Bmq_ho{pBU^_7*C0}$Shc6=?4H| z;%{zZEnMAoP9*wZht6`o>c!N`*c-f-7`E3)DCB2Wm?5Vle?GLkC29TK&bJhTW0-R4 zUAki@IRDM;eRM4awYz-&sIi*wph~^^XneV;+Pf^xXv9$OQVzE;<&?~!`nLtIqu%Oj z$}juvw3}K^em>j#Xq|%N{933?Vh;|mRnXX{JeP@D2Sz~LOp5l zgub>%Vm1&SxQx{7D7UFU`|X?zQ?c*WsEog819 zah7}*b5;d-2RBYBvf%VY#+*JKS0T_1>4QlOk46pYNrrW?U1ec;1FdlKs7m$%cRIuv zX$70mexF=D!O}$>P?(AP<6Z69@p$<0^0IfQa9_B|X4ZQ>=S}))dZ*u_kVnrQTCK;a zlZz+YsGTDM>1?R7U)nG*RBW4GH}HFMpDo`JdPY=>$4hWM(W*4ny*rE@92#9Yq0O~b zBO?Wl)^O@f3ya2I6^`R`62`i5tfKrr!ZUZ3Y5FS|v{zb5-qh&NB_#DQmqusfrz zL5c$HO9i;x+^`ayu0f_$*)|(tP@F`4EZGM8ChT6U*J5`#n;R*%*dRHalA-mS=U-l^ znU$&>`XV~Qr>F*6U|H4f+OBi4ro+O0*6Mo2{qntWp+SB3{r=+gZLp~lTKC|(c;I}< zJEpY{_@%hfoRNuiEoC>C1W*{1iMzl+jwbu8KH8E6f*%ljUbFT%TWs~}s-)ID*=y3j z3rrI=rxcFOR!Cl~2zrVN?p80>Rb$bfF8|^&kEmDOzMrJgls&a*0p^rUu~|I%t4)8O zqOr-szcOeUkJGX4Fcpyp{h_Pms{y3I_RBD+M$-?DEcHoNn=B<456SK?ld3g}|9GbMF)SNI?5?NC zEpM_6_w3?Wbp#ByPFXCeobT)XV^0?I_Zgo{FMWf<#dpEmrws9aHMyZloL;vamJfoy zJ%jb-MJQeO&OV;dP%s%a-4DRVCN;UgvvQ;YesDzyvu2P{N?&?~1Ylc+R)!I&Q>xGD zC+HHpSSE@)XxNE-#hFDuWZiKe&4uqx5P&#HK6-$6nl57dM;A%7igAL6Ri1^w{KgLO zE5q~(2&i7WNJwwtXwe`aQGB zdqMkQEhani<0lTqX2y~$GSRY|2z&1hw#Z)iF^~I#Iyy+wU2cu1!_v}@UQp?aT40cx zZB<$8;jeN4Tfn#v;dB2_-L|9@?O{E?snUrB_#HI(bA%+K51mud{*gcNc{*+TVH03A zkI6$uz3o2e!-DLHiZ`uk$w!3S5GDoLRl_^&Z{aj~IM-6FwXe%YZ*PvtQ|RAT;msQm z-RUdckc@de_Lg8iLhmWI&VKXv{1#?M3Sc&F=7D(~uQK2Ni!u{KATlx!?FXf`Q_$O>(be~<{f+r_M#neDBy{zHdQ>F5wHoyg5Wjk4>Je5r%wyF#Dc1@6TrUqMjrqHmPc9C!oMQz)Ul60jVk{3acW(RJ9o9Z&9MQ zgJ>fz&18(;*wLWrTED4t;Gq8;R`P~i2ucRD4K^(gd?!H?9EM}o@k;76#-Dc>fx!EI z({+6_kv4LGxZ{8QZ8gy|Pt2pJ)C^`c+%SJQ4?iPL!XQeE*&z0m8_~On6&0om1k^;u z*9;mjm#B+ztw6^{FQp4up<+rYt3qM2ol+&vppGE$((a>jzC|;yiQ9d3ARF_P{GLU2jJ`}8p#K{erAp6(w4QeT zmIu{ugC+W|{cfoLCF@cmoCOT04fElqSH_?PJCol2Rdk7y^>RRj573_=`HRgQ%cV1g z=Xeo+AU>boxUtQh=*d6pYt%5kp3^Z@=wClQmdvm+ zQW9n4(7a?-VnPPE066XN;oWJfJ+4=h%hbJ$xbUteOhAH%>=3>7<#0dMZpg`Q$RCWW z$kSasT^D$Mw804;l;LPKloqgRm%^A9dZLuupsE@%uj(RqxJ%2{7kPj{Bp5(vZs|6Q-FMS1Pqlq)I3wZY zhLwlxGK)AfFDGmuTk4;|^jH~G8r$u?Qu?X?jW&*yE7oF3a065jg$6e6MWyu(kKRe2 zs1qy@mHV1&CVR&hLv!%TS~!`7Sn{B3soQ%vili@>UZ~Lu$UsDD{Jjk=$n9BiDT;NG z-?SnVe9Eq+V!YFlG>!3|lqFEvKUwo>PYrh)p6vZH3*L|Q<%(-lsl2;lXKh>el~9>s6-6AovNY)deL|Jx zs?EO-mBcDk;$Ei#Kkb0-@#7VVS$3e9rxL{Y%oFmd@IQFp?BV zx_9SstblAseZG^0N)M8ZL>883<`LgO(74tlXMF71>=Sl1g7-Ja<^GN&vcXZ{1J$y-e|b{iMKIp(@{5UX z)~%IReDJYIc||%EamA9W*(j67Hs@{gmlU zBvQ-)pQA(ir4sKkgUz|`UDSU6H!Lf#MGV?xsZ>3AVQ}-W4W6~dA29%xI6-z$zlR_1 zNUzO?qXt|&1RKM{UW$g?O4Q1_QD3o>g_!`Sv`Tm zZpPnF>oKo=d)`S5K<|}DroD&)0sFgAG>S`amd{ni(FehZ-WSy304jUTm_@pTA^CXf z8)wPCDs`KuPqyvh_6Yy>jMjph+o1?$){QBvVzteC7ah^bx4Eq? zCSLHCtuPc2r;AgFmuDR^9L(|a%qZ@%Asia!cy0|xLqVsw{8rO^r{)ixi-JGoedm*s z4+lbS!t!gYo05|U4X>g?@=#R!n+FmMY|J8}>Kqh(QK3$}HD8%veN-E>UT81|*436| zaJbB6UcdCObyOD&A$i26h@Z1(`ak^3C{Sz&$|f3Z%^I{ZY>*T45n_vFORvW+fc?ajfZ$tII{tqwx;HGc9$vt@KCd?Wi^wv&a*Yw}rV9$J2VvB9cq$e`Vm zBeT+ylci3%wWDmPs~DIN+sGOyEsHLo0b(#omUQM^pEujRCu6&CMHbRrwa!_BtX|8W z;{Or-Mt4uJf0ZoT_D>7Um4li%y`ndX&~62-0&8(G+^r^Rx<1T1=>*EF)afQ$2R@3dGsqOQ~Ds3 zfMddz$@!(uR(k3;x zxQGJ?GHSrOgBsLEO^~DP zYHbJteP7)FQj~1b^Ub>}^s3KTRLJGCl=Q15_f%SEK=(2(R_?eXM?HB;eTXfvH`Q5F zzjtudj>z=z=gWf6Z3x$0-4~ZWb!F2vw>z?4;pf@94drZVZ4wm0^ZRXqs*ZvR7~XF$ zxx~o9;}si*dR6AvQfo?VzmBInfQd%(Ln@w-xCaeILs+bvY-)JUMhO(+BW0vno`QJo zTst;)sJNd0>*YJGz|FuQ9=VzdYCIyT7h<^^n@5B?03`2(hN&8$+r+gp2G4?lijip~EnxOtkINsP z589Lg&r}xyNFHO#@|}Rrv8El)x!O=q*2a3+Ogl5P^J23xV)xYJ^+H&j(u;|sl6l?l zT6b!zWcf@-G3Gj?*Z0b1Jg2?;1;MV#{@0g*_cIl#YVMEzEzPDoHT!~^XQLO-$f+1m zl<6ze6xF`hmq3X>j{#WO8&!JfmT3j%w~BPh#A=`zNke(-V}R^TTKBX&;k9dOM>V>p zV$y+d&mLE5AviKVjA=1hlPbWz*0M}Yrj2`iA4hre$g*5ap-@#2RH*76cVd|?Hd-KG z63;FAr+}oSA1bXVK70%75#}uP_ZR_MdMKE^cMDfaB$$nc`X|)c)9l?b?MsK=MXEIs zuQ$ISLSIdJM{3EjY+t_eD^25ZL>J~1XiI0HJ|kcC0>5v}7LltPt$2+HnucqagrCt> z90Xw@F7A?z`cSRCt4;C>nu4;M;727k%~w?uNFn}4(tfgUC-WD!7;|z7eK>`xz8-qH zghp-GU)a4dFYog-tIbu9K-7>k`MjeO3hHZmlF7zc=c0&W3$}+QdVyunY|m#4<@_Rq zyIbB0-A%YJvSz&UoGaH-Oj(b^;o-7^s1?p15J0HRd5NXnAjM_XANAd=F47__tHcgYXCfNv$(XGd@hcJM)Y=NQP$Ke;KRv$|I2c zQG-%Mas?;Lb%^OFoE+0k1(yVtR9|ClG`rHGW6_R*SGy3&XbcXZ8+pRFmOV3%YJ@}q ziI1Be{ge-VgI~gZU#Y24UBqO`f8NVPd2z~;Go#5R_&PgY*NY01elTO=vJXiV@j7C6 zmFXScN9p?~F^I#@xI^)+C%OV?L?LsM?JDHT7Zl3F+XeLloLz(J#EiG3JqpdamUSW* z*cjw6#Kd;NuyL#e%l$clh>^Z1DDRJ#T+!PMYt*;CVPC7G1nS>bB`T_=7@u>h2S1QK z3JC7%FO1jiybW1KU%VsFY%VbEC^rLEwy*|_HiFO1wAtQS{h;VMi=}891#HmB8b!6T zCtv>wNxn}o26F%#y$8sr_Q|nR11m61kyHIh_{a9Pi3#b7TM-mb9dBkc z7^vCW3IZ4rJy|D0Ij(tVK3o%X37)8={n2J}`-0{%v50`8+z8?D5O3E%t^?k~OQM?% z%Z7OmN6=j$)NA1MBF&a-v{)hl5=cjr1`_4VYnP}G|yPLDN~HNY6aYmfvsU& zs;96P{c96NBV}jdNV2|}Epi;AGd4+fA@kh))k{!B+%x6sD^^fPTv}#30M-~ZJ>2SO zVu$-*1No*Ai@&rAu#hIipf_lE<%;*foHH*2Gz9H9-Y@MH9pf?wh!YoPK7RU=4^RWf}QPvHp1?!YJ4GS(M0E*`Mn(r z4mQS`i8=tj;FGQy&aI(Ytl{rNa%H*b5IGW*&HCom8b|1hH@8sL0t&A!mQ8KeGezZg zR?T>kPTtfgWGW0!amjlkGcztNyS66=lj!qPJFTv8%j=4VNbb|xNpyK~6xIBK2lP}4 z*t!~;s$zp|@gRD2Z(eU`ac>=qep|P;gu9uKz^n5Nyca9DSvw8-es=QofY+c4{T;js z-^|K+XZ^8MuTVKZn(1+Dmm9V@XFGqW!uN0LeNJ$rRx|5R8xiXt<_qDo`r4B7`Y%Hy z7pfrQdErJ3sV2s?E>=EYQ}6eyYba_Z-(v0ApD~X%qZ_=%GxhF;Xxpx_6yY|LkGqWX z#hZFWo|h&O>p_l(;@u+pj+NY#-?l?GoG~`OBsBXD9O0RUii)~&p~Bkd7Gc^ChonC9 z=?blDvev)+Vz7-E%VSgd zCw1_!0#gVXfHfeGNgRS0gZbGRG_~D|iXqR2d@H-G5-Xnokl7EXGb_4DgnXnjrx+|u z9vV4fHBHocL8NppjL$e+Y%J#;ja%0)hN;|Df$qc1Ux=@s8&fjr9MMtv(^YV8?8KB9 z<%KYsN!Nq@cI{tj_TEQpcD%TM{(cR{K#= z5!5WBG!Z*J(RRxQSOkrJ5gV3ykD8r}zB8lgcn99DGo8i|VCneRgGNEKzy9_xMQcSR z))2nKac>?=2shDq<$>J6uqyq8gTevtP5V>iQ@MBl>v*TNzr)7oZfF3DxAxko2kehP zFyH|GN11BNWKnW=@Tc2TbFacR-PPrdn)ys+X8&9GMVKX=-`n4fkG>PFQlydk*_=QF znCe7UK%Nq7|Fpjh;Q2fiQB5xO7R9PAZc$MZksGTF_Q5tYYx{KdivP#T6M!9}HRstP7B=PIzFDT4NKiG;*DVX^_ly(EZU zI5Cr`JZK{p(YLii5n4IJxaCo;7TT3cWZiH#w5N`>9UM2K&M0)9{U(6-Ycgto8H-5_ zn2S1f*+(LD*-1WCUzKcd&RG&(+vyt+{_+;N{nvYI9ZeW=DV-ef}Hf-Ay~IJJp)Rti^S) z3iq(6S+~8sY;ksF zzL>L*1OK{#_=Nb6CyQHQCJ`*9f78I{W(~acHv9T0me-Kq1?k`ibdGL!FX`uK_v?bj zW%5~3x-LOz_EAUnk;JrCt>wLgKl_bl*eqmen&K$+ieLfSG2Wh(EnXeNGk+d_43*@ z8gj;?XDEUF#Y;S{4Fp5XRg>CUAB+Jqclw`TWya)veh+)`s^ua*Z+5SZ%|G>FCV84p z6{0l@r?)nf8_1d)h!eXuRjPD?h=0e>nwr+f+}lr27kru+Tuv%aalS7^72s~n6|4@4 z;F)U)xL|Gkj^6aAe$`(p(`N?ygXxmj$I33{niI~rWR|d&D!g_%V>9o@)@fU~s+o3B z#xK(AcQn;&6gg1xpPh@YpwrwvHRN;tD3>iypRglXm2jpPp-#>osg`xo^A@G=*e$1= z9b~pEgN=GJN-{?`2VeH(;gjaFd3Ha#H=hU?u&HyD&~vn-#q}tg!<=J#dq{f zG{X}=)W5{U#{8N6IXgN#U+{C5y}&X;-kjk96-lM~M2ZYQsSl%A-bIcV%%jGm!F!Nt zlX;p+m5GzPL{oeFQ^n^>XKQgk|?vfRrYR1#r7YGIpBY3Ai0 zpB&cDd7It%@L zG@^75ibD+}#5YH|LV5ZSzFMJF#C2n|&`M36!yS1OO7Mwh5AXQucwUnT!E*(n4Q zrTj!xj!agZjhwvPNvyj$ODCF1T88pQgWW!>OxU3r(yE}pta{bH6%V@cP z*Urq=AoSkP$!9u`XZ^bvZq#x!RwBT)0~*yRajBc}&A1zvV8by@FtgBRyUomw2EE z8Vja577#=#K$b!nODpGXQ|AfRA&W0ze8j18y<7o)&J zpIi+uE6`mv4AqMobtGxb>nWZgkN+Vu9F5;D_=Qr;iAevX>q#L(0Eeh?tg0B(|LQKi z;=XUUzYrfhGd>*h`0%iJw_yig(H&g8Z}+2vUR-C?hN4PDXOfVjD(VuFVzS<+&rikk zt`gOi^=S+EuyI_X{5meIVkCu)0R8%Yq0Y{V&H=x&^8P#}JUJ%(IXG#ttCwIp#9V*F zymMm1a*ktqQeC>6ijkjBHsKvx8alz|nu%@)BBh!ih^W{V}S@p=$j77Z_GCUVTp>E2;F@#X>-%<2duRJkczaV;< zR!+ju@i@CL_NwfSmIdaRhe~a7R%H^Y^(9RMkSHV?bT@ES&1`gvdecV|#CAS`wbTo= zH%HvqJCU(O^fBn(STa{N3;Dv#QD)={-e+ylB#d-T#8Xkpj0nF&8pw|@cgafxWDCj0 zGXVF|20f?G7)&h5`)qZ4|p*2Q{)2nbiDvtO{K z>M(Rc%8B4huC+3nvK85?Ikd&!)5&YHb_9aBn%Z$1RF@k_TV0SJU1Cf1eH#X->!2_t zt&cY?=z2G$=^etZB6iv1zL=LQv6#hjrV{u^t}UTZl%L;*hru|S^~RvcUhR|xM51{* zFt6*2QSS+@k-if@U-o5D7YP0^Y{ioNt9iMl+tO87#lNXbEZ;h}lHPh(dH4(c^%)>A zHbfHhC^ExCX}>9LQ`R@oZ#{GUdM*-XL;lZn_UgV``j+hWxoz0rw2mydMBkg_stq0V z^YzX;evC6Oo_9*L^|XA`w)dL}KOx>TE7~wIQOFP zp-#twQ=Q$>W~u%ugQN(a#W1fJnz$9P`(SCHVstf3QGbW z`KHH1TSt; zeZ1=AoMa?k$-)TT;Je&V3TWUvo}`U~LpABLO2DqisDT+g7o}u0L7fZ}p=rUYmGbYo zsX+@<(g6oHg*kMNKRx^(2Gm>(-_G<9opAS6BN;)I3e|}C^bj#b5>%rRJYPhqMu*U) z=6EczGP4eudRGYEnPAk*GM7s7My;nTyk>TTc&CygSyqU&zBzGCuSfz@o4e=s@0bhB z;**|to;yBaa9ewNJLe2&oi#b3nP}cmu$Ij{?URE|WuWA?y9W`|-+F}5?-;j}E#%8@ z@}L9;736Y?;^gge)nzrD5vt5U>oTmF`#@o1W|SQo#1{5Gc!z$Pzk7i)2#9+U0IQ%ZZX6a% z_Wr8`l038p0^Lb`0#4y{;aMJpZB8Flr*udH(+3`_N3~gFzbPOms%9{cw=&Xv+}YYZ z__w%_b=+qDSN60ViPH(v`lUMxX=bsC8xJ9?qCYMlZhXCLmR*iHVRy;L=$ADo35xtd z;>1(;msbmyZtCRwZw?>pB`Q{smlunB*D-BGTB}v{*0gS=_x7vx_o@5_XZ+8%ITY7U z|E!3=&5t{`Zgc<~7ZRwPpJ#WR>$~$R2{pIcar+@OQ&zJO9b&NrYnYGPzEjX6oyDdk zLd<99d0eKpPpW=jTa{vIj%7WNwX!{4P-kyT_BroLg#^omjpQ3%ulSDBzM8L|2>%t` zQ-&*h3v2YQiH#n=wLAEF+Fhf_9}=wKcu^cBc*0rF;v4F7tfhAH}6YJLl-Q^GtvXw_z0shCY~)J z&3CD{G7-QY>e>$vUjrYf)c0#G5gFQlOCQ4;u0t6XgA5JNV8k5Bsh~CVV9=H6yy=kb zATZgQ5T`+tM{CE}qEh1l{DuS#z7jDkzF{^lvcu@+sufd3!(+;zyzjT zQ9S5Cm@i10!3Apno+&jt_LwhT<8Nx{WPA$1PQNE8M+_f|7rn3OHt^ioT88^ayi77I z{(+z+z&C%sf_!rSy=%tqgllrZmMDIpf{14Q(MjnpJO3y(-NI!5Cuf`{0x@jH?pZ@j%P7 z6}#Cg!Z;LV^ljr=6yL71*MPG(omM@!3qaMj%_tud4Ap@D{nw1~*Ccyi^17lsP>?k>DXYM6Y?Z3lWDP zc8}0!79J?^0D&Oi8iW+KyGsy!F*pLWu8Kuelth1FX+6 zZJaj4&SAun&=SOa8l$JstX?-${m^EsWHRSxTx$u~SL{v97jt@1{T*m2;D|5g^$~oB zo_$Ggj}UiBe)DVHE!SmBFd&oesXn+pw%hB$^Go=dv>m4r(s->)N0%pcI19QgQTVs1Qb0T_68gW3DVC7iJkYw{q;}K`G zPj?KB0lG(xe+6etwr^~wd*pi-><j;uy{ha&#Eth*9f}Ub$8j#B%@GAnmuCO}dri;^9J_dd40rUbxjgg*c)Y zv>#hCH`f-;akmWEawVpe#{g-^Pbus?|BiPjk^PC41&PxreTLL*$6sd}X_(3u@kaO> zfJc*(_g~t)5R!(BJK{u@!z2`C(@gRcT!2Q-Bz1!O8rh|Ep5$b$iA)u^dw=otTzCxJZ zs37BkU8$p7)DVAg+gcTZ*x+iR7Qi$Q{vlkQ()>WX*s~IdbGn)l^+TA=>NRQBK&~{Y z{M&oN6pWEb?vv|feTv^}$9E|MI;C@y4Nif7Xe1QYLWY^Hjw2$&R$6yco-d~0Ite>I zF8;s5V^Uj${<^J&`T&VVou{ewN^ToQLIW967z&|7(f#}S0oU@CqTi3mg!Wfut3@eEotxkvx>^S&zv#7(t^jQ5r>pub7reT>y=Vi|3F=basAO3kR z*QsyY{op+g)<+>@W!#rc*bqwEq5+NjcXH?w(s=(Ys&G-`S|`&`>NFhd7=uvSdSfgu zF{|KMjz6KX!9X?-1l;NA2o2mi@RLVCjOqe22r4GqvjkS%tX{^UO~Ax2crh4KDGSAeJ;*PC4}dQ} z=e5n(^thyBZ1Ty7v6!lJfqizaVVy;Fsi~Q}!aEyo*B7)If$-Nyl^_N-^puIr(Hwmw zi{d%abRp^6BVpfG+*Rwtl3uUIu5L_|{8+}{D{og*V^m!<-!p3gg=V!a&?|c**FrlwJ?hMk+#;pf@xDy%{U^OxEm4Qz^;l169r;x7CXT!U6 zdbzDsC^<2s{Y3WJ$la)&CWwqiAh^<(fLCy|%jSiBb$~C}`NmT?u&oU`(AtiFAqFjQ z79HqbY0#V}og0#7_VlCKC|E6}5cugE%0B*l(%(Ebqa^Ue5f=ynL-2nEPL z$r@Mq_TZc4sOe%GNX)!gbkPU}?ixwlynx6{?qH%2sTbWM_++?;?IW^AEyYlqmIv0ewyKn3QQ6G znTfMOgXk2)CY@mi-IW82gJ#pP;gAZ#ewzy}m_!`D@q(vvb4z(o{0@^+=yN8rrC85R z6L^;q-^x5Xn^dZu0)GaUZzyXaIZl;bi)WtN9REN=T8)MyV!SaX?rrO2)W0k@6=c|R z^ih1_b}sGM`F*;j0gRD$Y1Z;p0u{KvFR*_7qmxAt^oxvrKWq?IjswV@=-NpG!!*JN z2;8Kj7i_0lyNA7xoLUX||8zB-L@%=@`Hl#k(~n_EN4pGH@E8l=k_Gj137DvkZe#Lk z`t_pv)Z-RoV9hXHcEJgRGZ=`xaVoXlbEi1;XYlGztUHqIA=u_vG!QeGZq0#KhJ}Ym)*JdB41C3jW9u_Ox|8x_y6?Ys z&wUqbj9Wi+IMABzS8JnCr!QIQhCdNP`_cDGDbTSu&M>PTW&7^G78qy^$~WNmxBV4m zj-e!uBc0Y-r?Trob82nSTyKEQl`Iv&v?)UGR}T?N!{8O)2pD3l(xgJ4H#*}CUDc`B z548N#m=PWIP5}tf7}DW5@p_H5yV9eHJujW*2HnDN({7^29k@KSpVIc#;ruX+kZkG_ zdK_>!iy4b|ubIWg7_OPT3fI^7*11txbIqeWZrI1JxY6uv!?@daSsbjB-Rf}F^)=B# zEame{UF$O0^^_6-LN(i{~tk>biH;uxaH_iL8Rmx_A zd?MG)#ZoClc#GFI1sPz|G~XsNNM+si?>njs?*xu3lSnH`(F+-qub|Yu@mMUzw|EyH zF=5$zR>JT;XTtD&HFe?9J67B{Hvh~M72G&h;ty2zckFq%6@;M^=n`;d_8~{_34!9Y z3m*=85)$yvMe)HYQz*6G&UR5r!=2wxcAmb<QEiP$QGxbNKD{R zF(h#Ym1>bFtU5$f$vk6QYhPGJH8@0Z6w;YIyw634rL@W(D^Uw8M-CHr+ODpygKug5 zE=3vq|A2iVCR~u?eWkbp*VP2&L`4sV=YYKdp|Cav(&2q*s+6|@l?Jf~p(-%HHjFhV zWUwzlFBYiyx*nqbArbAnnysN1KZ0h6$mtFcOAgG44PQcKs#is=6NV>7Z?D?#ouyX-8ZDvUUYzZwwyR)m!SgR?Hg{u>d0y&d3tvS*={=@T0S^ zBe8R(*7$wY9s_VDHZh3Qj61unzfogjB$B8_h8uF)Imfs-G>;bHKLl5rW7`?WHuJh> zs#y(dbFg+$vWYi5%*cL1PuCEPSCa?AI-T~i@5d>)#Yvkz6l2nNhOs^RmCajy#Ga$; zE#R*HuyJFvu_6-UEA0AE>XYC(j^(I?`xsqG(&!v~i4Bxz>}G&9N5e=`I^)j;x!aAl z0-SH|2bk1J7Op>$mYD^X3O)pvrmB*orXO7`ebnEiiu8QkfC9+-c;dY(lUaW=Jm-3c zddDu>!37^7LnlO$OJei_xr|@rbPu8JzC#vq6G~gUd?t&BJ_~|As}{Z*!Y-Rr_vM|n ztAhGv1pwnicFk?4ju3~jW=*>EtpZ*V` zJ8{@;zwR_{*A~2cUlnK8QQ4B00lth{N4^VQiI?XOra;@yOBH`4jtY775pTfw=ZAtQ$)(CSBZ}=!g zbJrDg5hH8wuXzgC(bWp9N-c@5GkS=GV)~qvl8!A86)uQKA32g>u0@651XV>)*lUwN zt~&i-20fyCt;Wj+#Bv6ig1IkFO_e5LU&NR4%j_Smv9D$~8 zXwEulZzjwyaj`=~BQi_YLRd3tjf-SRdGok>cR6*B?P@RLDr2=P)OG<+tL{MzhXupHx(VfB&FrCiF&@|4cya zze4BgxF=Av-Lu}TTM!YeyLQ8P&1OmX0(&_C@ zKWnt5*tb$s=2fg$RoLDQDsibKDu2aZHJh>4(=80Z%2JBdRepxHP%xWUeX z^k6bF*m_q|3`jUOHWqF!Ue^DIM6K^5uR{gvF!O+OIAQ8*S@?0lES&g=?rzq0uFTRJ zvJzkwX8!+E^8N3!mz)?JE5HcGp<{qnFm|&7CsNXYh3Qbi1QaA-CvH+OIyDv;T?8Ih z&B?{u%^d7ZM+2T_g9T^PFo9VZ@xW)2QX5%x1x2%*MiNW@606&cefLYz%gmlBF?m`fy!m0D+eN ugYtI>NNmvmXVG!~fA0g{mSQCPAJ@+R-HrtMzr%?F%qUF^8>a9-> 5] |= 0x80 << (24-len%32); - x[((len+64 >> 9) << 4)+15] = len; - var w:Array = new Array(80), a:Number = 1732584193; - var b:Number = -271733879, c:Number = -1732584194; - var d:Number = 271733878, e:Number = -1009589776; - for (var i:Number = 0; i> 16)+(y >> 16)+(lsw >> 16); - return (msw << 16) | (lsw & 0xFFFF); - } - - private static function rol(num:Number, cnt:Number):Number { - return (num << cnt) | (num >>> (32-cnt)); - } - - private static function str2binb(str:String):Array { - var bin:Array = []; - var mask:Number = (1 << 8)-1; - for (var i:Number = 0; i> 5] |= (str.charCodeAt(i/8) & mask) << (24-i%32); - } - return bin; - } - - private static function binb2hex(binarray:Array):String { - var str:String = ""; - var tab:String = "0123456789abcdef"; - for (var i:Number = 0; i> 2] >> ((3-i%4)*8+4)) & 0xF) - + tab.charAt((binarray[i >> 2] >> ((3-i%4)*8)) & 0xF); - } - return str; - } -} -} \ No newline at end of file diff --git a/native_library/apple/MLANE/Cartfile b/native_library/apple/MLANE/Cartfile index 782d90e..ff5cd47 100644 --- a/native_library/apple/MLANE/Cartfile +++ b/native_library/apple/MLANE/Cartfile @@ -1 +1 @@ -binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/3.0.0/FreSwift.json" ~> 3.0.0 \ No newline at end of file +binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/3.1.0/FreSwift.json" ~> 3.1.0 \ No newline at end of file diff --git a/native_library/apple/MLANE/MLANE/CoreMlController.swift b/native_library/apple/MLANE/MLANE/CoreMlController.swift index 2a3415b..7c42282 100644 --- a/native_library/apple/MLANE/MLANE/CoreMlController.swift +++ b/native_library/apple/MLANE/MLANE/CoreMlController.swift @@ -23,7 +23,7 @@ import AVFoundation class CoreMlController: NSObject, FreSwiftController { static var TAG: String = "CoreMlController" var context: FreContextSwift! - internal var models: [String: MLModel] = [:] + internal var models = [String: MLModel]() internal let userInitiatedQueue = DispatchQueue(label: "com.tuarua.mlane.userInitiatedQueue", qos: .userInitiated) #if os(iOS) internal lazy var captureSession = AVCaptureSession() diff --git a/native_library/apple/MLANE/MLANE/SwiftController.swift b/native_library/apple/MLANE/MLANE/SwiftController.swift index 35c3ab5..c7cf5ea 100644 --- a/native_library/apple/MLANE/MLANE/SwiftController.swift +++ b/native_library/apple/MLANE/MLANE/SwiftController.swift @@ -185,7 +185,7 @@ public class SwiftController: NSObject { else { return FreArgError(message: "inputFromCamera").getError(#file, #line, #column) } - var mask: CGImage? = nil + var mask: CGImage? if let freMask = argv[1] { let asBitmapData = FreBitmapDataSwift(freObject: freMask) defer {