From 3337649996a61710c32ce27a5e72682801c7e039 Mon Sep 17 00:00:00 2001 From: asterakin Date: Fri, 26 May 2017 00:43:24 -0700 Subject: [PATCH] updating fast_rotate for matlab 2017 and mac: changed to mxCreateNumericArray_700 in the cpp file --- fastRotate/fast_rotate_loose.cpp | 4 ++-- fastRotate/fast_rotate_loose.mexmaci64 | Bin 8988 -> 9060 bytes fastRotate/fast_rotate_loose_double.cpp | 4 ++-- fastRotate/fast_rotate_loose_double.mexmaci64 | Bin 9192 -> 9100 bytes 4 files changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 fastRotate/fast_rotate_loose.mexmaci64 mode change 100644 => 100755 fastRotate/fast_rotate_loose_double.mexmaci64 diff --git a/fastRotate/fast_rotate_loose.cpp b/fastRotate/fast_rotate_loose.cpp index b02924e..bffbdd3 100644 --- a/fastRotate/fast_rotate_loose.cpp +++ b/fastRotate/fast_rotate_loose.cpp @@ -19,7 +19,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) const int *dims = mxGetDimensions(prhs[0]); int width = dims[0]; int height = dims[1]; - const int num_of_dims=mxGetNumberOfDimensions(prhs[0]); + const int num_of_dims=mxGetNumberOfDimensions_700(prhs[0]); int dim = 1; // Number of colors (default - gray scale) if(num_of_dims==3) dim=dims[2]; @@ -45,7 +45,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) WIDTH = 2*DW2+1, HEIGHT = 2*DH2+1, DIMS[2] = { WIDTH, HEIGHT }; - plhs[0] = mxCreateNumericArray(num_of_dims, DIMS, mxUINT8_CLASS, mxREAL); + plhs[0] = mxCreateNumericArray_700(num_of_dims, DIMS, mxUINT8_CLASS, mxREAL); source=(unsigned char *)mxGetData(prhs[0]); dest=(unsigned char *)mxGetData(plhs[0]); diff --git a/fastRotate/fast_rotate_loose.mexmaci64 b/fastRotate/fast_rotate_loose.mexmaci64 old mode 100644 new mode 100755 index 115f28b67a18f56ea3dbe7f2dd5e8fb6d9f447bc..d62e1d555934c90fabba133c1244d1f17bf2faa0 GIT binary patch delta 1756 zcma)7YfM~46rR}!EDxPs3#GNTEM$p*XrOJhlqy`=OE2wSgUY5*yKE^eg0@wGHCRiw z3M5P~OO_5MH1R?Di^K<*uFb~8xIzt&sx51*^^vAZiR-`GHL>ZR>zRA6q~Vv7+;iqT zbLPBe=G=GdZq`L|9*kKL8bbQm46N9Mkl)`ZHZ`&_ykShp$7y4&4?D`Ubd_^votKZD zt#%~t*TLgDLy56Js~@lt9lc}-ZG`Q{Pv!O*;v7TFv6)q*ZDCW`=@>Cq^NrOJ_7kqo z{m76u7*dW++MWs1KDOPwjm?;B*v2x<@R-ws8S z`=MSbQg#iTPipp)mAYg>qVh!8y#-S-8unyhDvwZcfy&=V;o!o&7=h@}=NUjM7A2*B zDw%+IJxU;6Pc1G<5o40FD|r!Q5}m78_PCNUn1h2axbKu3G8q?#LMj<;)#cWD?$%A3 zp+wDhz|cf(INPOoN654{O5f>&T?2~{#8hqAkI&ohQZLK~xLyeXaCEX7Z#!7Zo`!(4`J-tT`YD61>>Ur1&~$|4fSiNRdM; zDbjQUax1$jR;Xg--~HvV_5(FuW37olif3O=vz1M94R%7S+H` zwdiS$x;0v-QAwlwH0sglGa79G>IrYfz=Y@3qQB0N!*IH+g*>;D_otm;mVe(HZHdp} z-lA-HygAwfMmWL+2;t=>D~8wn5G%It%4{+EOeZJGHGzS{MA zpu305E6iwSBSaG43Y%v(M$&l%5I7=`$bXHMhrn^%2)-0BKcgtYww<;uf)En)u>)AZBnVz_tz2KrMp62xn1vEX4?N^>ChIOAnRV_Q zJyqd2m#Txubtaq}yHfpk3^&`Qf5s!@^mmQxKMcZ{GtGIFwA|#eh>l_P7LL zk!`iypNIhQnas1cZh$?5mzA|zY`ZHj-S|{JUYL2dV^t_$$=>4zKP`>qB);Id<(e4< z1lD2AH>0GBj9K?O3Sk4DVy@v@JiTO9Evzuv9t;rr9ijdiqF9$Kf=+1ZxN$a)9deW?rLhK3RMV)e3se6DGq`Vu9#-4==#&P~K1f9}0kCo|~c|yYhRaL`MCZcjQ>`6qlW`xS~wB`~C z`{#>h;gn;aCqjBf3rhcZ>?&mHQG7Gi)Z!+JJVBJ=*teh~^g^}rq&xNn$Pl4_ATGfn zB7}yH1Yv(Uq~a6DbemP;u_fF9Cu!JF-c49(ob}T){cNg7s&db1ROUehbEN{R*5ne^oBJCYP-D7l839 zIMy$MWeM(OO)B}Le}_o#$ceWC4jE7WE}?HEbd$9ICB3)n5ovg*sLl~}PQC0uU5yq> zxH0oV@lmX$&XOR2o8p}Xnxki{GQ;uEtMDjm<&b( zFN;lLv)Cefn=i!j;FM~1Ex4%JFKV=2qm3GE(rAlDTQ%CI(GH-V@B>?ci7%+x|G*}Z zE?&CZHz8)1lS?cIdsqNJSH*kWqoCpQywSzD44*PQYXpxIwt=x!Z`Fjmt<3!9^8yOk zkv%2B7D4dRT}c+B|Dpy&fZ{^zo)(L;Nc#@ZWhkm$3yE>?>HEexZ9R_IDl5}!w2u9_u`^W zSlWc2(J?=%HX4AUpdLq4^m4^L_?=CdZNgKV@RvINFG2Y02njHGH{-7tTAr3Y#L(I) d^ebVn@z1H`Y5ng4_PQ&bee607wJUqj^)IAp(3JoH diff --git a/fastRotate/fast_rotate_loose_double.cpp b/fastRotate/fast_rotate_loose_double.cpp index 1f59b3d..679bd46 100644 --- a/fastRotate/fast_rotate_loose_double.cpp +++ b/fastRotate/fast_rotate_loose_double.cpp @@ -18,7 +18,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) { if (nrhs != 2) mexErrMsgTxt("Usage : fast_rotate(image,ang)"); float angle = (float)mxGetScalar(prhs[1]); - const int *dims = mxGetDimensions(prhs[0]); + const int *dims = mxGetDimensions_700(prhs[0]); int width = dims[0]; int height = dims[1]; const int num_of_dims=mxGetNumberOfDimensions(prhs[0]); @@ -47,7 +47,7 @@ void mexFunction(int nlhs, mxArray *plhs[], int nrhs, const mxArray *prhs[]) WIDTH = 2*DW2+1, HEIGHT = 2*DH2+1, DIMS[2] = { WIDTH, HEIGHT }; - plhs[0] = mxCreateNumericArray(num_of_dims, DIMS, mxDOUBLE_CLASS, mxREAL); + plhs[0] = mxCreateNumericArray_700(num_of_dims, DIMS, mxDOUBLE_CLASS, mxREAL); source=(unsigned char *)mxGetData(prhs[0]); dest=(double *)mxGetData(plhs[0]); diff --git a/fastRotate/fast_rotate_loose_double.mexmaci64 b/fastRotate/fast_rotate_loose_double.mexmaci64 old mode 100644 new mode 100755 index 21487e037aba9cea9ac3f19f9aba59e50c89926e..d8cb9ce17553b4e3958b4ec37ca8a765a07876cc GIT binary patch literal 9100 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 TQ@Kh8o1Hv&SA3!nBP#y|A7WhL literal 9192 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 M#k