From 9a991a2e101beefb0f1416b0b621a792022ef56b Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Mon, 18 Apr 2011 15:14:32 +0000 Subject: [PATCH] fixed build problems on Windows --- modules/core/include/opencv2/core/core.hpp | 6 ++- modules/core/include/opencv2/core/operations.hpp | 4 +- modules/core/src/arithm.cpp | 2 +- modules/core/src/mathfuncs.cpp | 2 +- modules/core/src/matmul.cpp | 4 +- modules/imgproc/src/sumpixels.cpp | 12 ++--- modules/imgproc/test/test_histograms.cpp | 2 +- modules/imgproc/test/test_imgwarp.cpp | 12 ++--- modules/python/hdr_parser.pyc | Bin 17332 -> 0 bytes .../include/opencv2/video/background_segm.hpp | 2 +- samples/cpp/brief_match_test.cpp | 2 +- samples/cpp/kmeans.cpp | 2 +- samples/cpp/stereo_calib.cpp | 2 +- samples/cpp/stereo_match.cpp | 2 +- samples/cpp/video_homography.cpp | 2 +- samples/gpu/morfology.cpp | 4 +- samples/gpu/performance/tests.cpp | 58 ++++++++++----------- 17 files changed, 60 insertions(+), 58 deletions(-) delete mode 100755 modules/python/hdr_parser.pyc diff --git a/modules/core/include/opencv2/core/core.hpp b/modules/core/include/opencv2/core/core.hpp index 9751a5a..ca1dd3e 100644 --- a/modules/core/include/opencv2/core/core.hpp +++ b/modules/core/include/opencv2/core/core.hpp @@ -4117,7 +4117,8 @@ public: int index; }; - + +#if 0 class CV_EXPORTS AlgorithmImpl; /*! @@ -4163,7 +4164,8 @@ protected: Ptr impl; }; - +#endif + } #endif // __cplusplus diff --git a/modules/core/include/opencv2/core/operations.hpp b/modules/core/include/opencv2/core/operations.hpp index 45a6c6e..f06bf6e 100644 --- a/modules/core/include/opencv2/core/operations.hpp +++ b/modules/core/include/opencv2/core/operations.hpp @@ -3558,7 +3558,7 @@ template static inline std::ostream& operator << (std::ostream& ou return out; } -template struct AlgorithmParamType {}; +/*template struct AlgorithmParamType {}; template<> struct AlgorithmParamType { enum { type = CV_PARAM_TYPE_INT }; }; template<> struct AlgorithmParamType { enum { type = CV_PARAM_TYPE_REAL }; }; template<> struct AlgorithmParamType { enum { type = CV_PARAM_TYPE_STRING }; }; @@ -3600,7 +3600,7 @@ template void Algorithm::addParam(int propId, _Tp& value, bool rea template void Algorithm::setParamRange(int propId, const _Tp& minVal, const _Tp& maxVal) { setParamRange_(propId, AlgorithmParamType<_Tp>::type, &minVal, &maxVal); -} +}*/ } diff --git a/modules/core/src/arithm.cpp b/modules/core/src/arithm.cpp index 0101896..d0fc0f4 100644 --- a/modules/core/src/arithm.cpp +++ b/modules/core/src/arithm.cpp @@ -2271,7 +2271,7 @@ void cv::inRange(const InputArray& _src, const InputArray& _lowerb, BinaryFunc sccvtfunc = getConvertFunc(scdepth, CV_32S); sccvtfunc(lb.data, 0, 0, 0, (uchar*)ilbuf, 0, Size(cn, 1), 0); sccvtfunc(ub.data, 0, 0, 0, (uchar*)iubuf, 0, Size(cn, 1), 0); - int minval = getMinVal(depth), maxval = getMaxVal(depth); + int minval = cvRound(getMinVal(depth)), maxval = cvRound(getMaxVal(depth)); for( int k = 0; k < cn; k++ ) { diff --git a/modules/core/src/mathfuncs.cpp b/modules/core/src/mathfuncs.cpp index f28bb0c..fd57f37 100644 --- a/modules/core/src/mathfuncs.cpp +++ b/modules/core/src/mathfuncs.cpp @@ -115,7 +115,7 @@ static void FastAtan2_32f(const float *Y, const float *X, float *angle, int len, a = (y >= 0 ? CV_PI*0.5 : CV_PI*1.5) - x*y*(y2 + 0.43157974*x2)/(y2*y2 + x2*(0.76443945*y2 + 0.05831938*x2) + (float)DBL_EPSILON); } - angle[i] = a*scale; + angle[i] = (float)(a*scale); } } diff --git a/modules/core/src/matmul.cpp b/modules/core/src/matmul.cpp index 20bb513..9d0d957 100644 --- a/modules/core/src/matmul.cpp +++ b/modules/core/src/matmul.cpp @@ -1665,7 +1665,7 @@ diagtransform_( const T* src, T* dst, const WT* m, int len, int cn, int ) { const WT* _m = m; for( int j = 0; j < cn; j++, _m += cn + 1 ) - dst[j] = src[j]*_m[j] + _m[cn]; + dst[j] = saturate_cast(src[j]*_m[j] + _m[cn]); } } } @@ -2600,7 +2600,7 @@ static double dotProd_8u(const uchar* src1, const uchar* src2, int len) __m128i z = _mm_setzero_si128(); while( i < len0 ) { - blockSize = std::min(len0 - j, blockSize0); + blockSize = std::min(len0 - i, blockSize0); __m128i s = _mm_setzero_si128(); for( j = 0; j <= blockSize - 16; j += 16 ) { diff --git a/modules/imgproc/src/sumpixels.cpp b/modules/imgproc/src/sumpixels.cpp index 0562f6a..4aae88c 100644 --- a/modules/imgproc/src/sumpixels.cpp +++ b/modules/imgproc/src/sumpixels.cpp @@ -46,16 +46,16 @@ namespace cv { template -void integral_( const T* src, size_t srcstep, ST* sum, size_t sumstep, - QT* sqsum, size_t sqsumstep, ST* tilted, size_t tiltedstep, +void integral_( const T* src, size_t _srcstep, ST* sum, size_t _sumstep, + QT* sqsum, size_t _sqsumstep, ST* tilted, size_t _tiltedstep, Size size, int cn ) { int x, y, k; - srcstep /= sizeof(T); - sumstep /= sizeof(ST); - tiltedstep /= sizeof(ST); - sqsumstep /= sizeof(QT); + int srcstep = (int)(_srcstep/sizeof(T)); + int sumstep = (int)(_sumstep/sizeof(ST)); + int tiltedstep = (int)(_tiltedstep/sizeof(ST)); + int sqsumstep = (int)(_sqsumstep/sizeof(QT)); size.width *= cn; diff --git a/modules/imgproc/test/test_histograms.cpp b/modules/imgproc/test/test_histograms.cpp index 07633be..da1643b 100644 --- a/modules/imgproc/test/test_histograms.cpp +++ b/modules/imgproc/test/test_histograms.cpp @@ -1509,7 +1509,7 @@ cvTsCalcBackProject( IplImage** images, IplImage* dst, CvHistogram* hist, int* c } -int CV_CalcBackProjectTest::validate_test_results( int test_case_idx ) +int CV_CalcBackProjectTest::validate_test_results( int /*test_case_idx*/ ) { int code = cvtest::TS::OK; diff --git a/modules/imgproc/test/test_imgwarp.cpp b/modules/imgproc/test/test_imgwarp.cpp index 09e96aa..f9aa53e 100644 --- a/modules/imgproc/test/test_imgwarp.cpp +++ b/modules/imgproc/test/test_imgwarp.cpp @@ -629,12 +629,12 @@ int CV_WarpPerspectiveTest::prepare_test_case( int test_case_idx ) s[0] = Point2f(0,0); d[0] = Point2f(0,0); - s[1] = Point2f(src.cols-1,0); - d[1] = Point2f(dst.cols-1,0); - s[2] = Point2f(src.cols-1,src.rows-1); - d[2] = Point2f(dst.cols-1,dst.rows-1); - s[3] = Point2f(0,src.rows-1); - d[3] = Point2f(0,dst.rows-1); + s[1] = Point2f(src.cols-1.f,0); + d[1] = Point2f(dst.cols-1.f,0); + s[2] = Point2f(src.cols-1.f,src.rows-1.f); + d[2] = Point2f(dst.cols-1.f,dst.rows-1.f); + s[3] = Point2f(0,src.rows-1.f); + d[3] = Point2f(0,dst.rows-1.f); float buf[16]; Mat tmp( 1, 16, CV_32FC1, buf ); diff --git a/modules/python/hdr_parser.pyc b/modules/python/hdr_parser.pyc deleted file mode 100755 index b3e9a5d6510907e68fb89a091b778a5540be51a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17332 zcmcIs>u(%cR=?Hl_WKb#b{r>}q~c7*?Tp9X$qZ!HBs&SV0K<1Hr>HW_cz?kd}r zw7c6~WyfLSkyf+PK3E}O7m3#*Scy*{!2&|d7lg!PK>{ScfW$Yx@CP6v@d0W1{eHK) zs-4VgST;=Dx2x_w_kHd;zjN;C`KSLF=$#$;=w`(v{|(^#bNEDmj>N~GV;&lFFMW2* zJ*SnQGxu`F$6wy~9mX#hzti|##_u+MkMVnr-)A;^%{`R%o1nvNpyGh}vN0bU^M!i_ z6M%ZqJjj{)E#m|QX5Z^Fn@GFO{#g^`&C=S0xz}TYZWDBwu-61V=3~cPLix^@%w6X7 zu@HGqfG+fO?Y$aaG3?di5T+3R0RJsV=kYi@J6EYUgSoI)sqXs0T)h$0Dti}gCQD|w z8ja|TrQEJQLx-&Gs%T~{O}M?;Xx1yw5T^OIyuC`LTn*P>^Pj2G%1^#k<&y1XBPhqa z%^``@JwsrSHKd3*`naz!x<;ugbwki6HpH9CH^37&_x8|3kU~^m5Ubofi z>ks@O4l408U1cTdlPV@FxD{@0ZSIE8RBPoY->Nc-zU-Ejf_)6WRBnVUh`G&+jmCRH z*$>YffM@Ry&mY5ejNX~W0jAYN89>BtRJ%Eur^Z*7e=mAXKsRyuj zmma|2-Fg6IG)x{e{_7t=ID5!1} z@okhuKZ&QgJ6P{%Zm%)-sNQ@ySFh|P2WxJ-?(bHEXs+=%-m2H;w)|$Pq1~B9PB*HS zN?|RGOQlnIjyP!J^d$c(oDwI)UbS4W;9>tI^CSnUaN2y3GY5HdfHiUqR^tg)t;2kb zOvmhWnY+kc)u@;4*t<}<88oWpN}wh3xQsEU6~*kOQ4X6?%*^#*1Cl_Q<&8LKKA+i= z1J=uNWvi5o;vBo?8W^X`^gG8KO_;;va5Ui#4A0JvT$1DLI+8hyWgp-;xR7*W7%&6G z>#=L^#W}JAn1@19lCWS73TFS?WFqhgT10c;=1p*%g!cHyc`awBmJ?Yy(`vd)m40Z` zPjEgQ3GhMVJi)0cm`mu3y|SoNMHr$jdILp#Lh}&$1>>yj{JU{>Zs>zyVGq&3I0kh# zlrq56Mh^SPWm?u|6~*|`6f&+hoAu_rTdTX}=H~8pP>UlMJLkq*fxBI>=Y5HP zofI`N9Z~RPb+@@Ekb&;h^pqRc+G;}(S8WqIa^n7tu;zf zL?kNJAfZZe{UL_M{fy#f*eG&$E#vVC!!99Tm1~W<XcCD5D-JkA&al(z?hm znEG{4bch114raq>&|0p=-QZ?Bq;3QD98bCdiAzd|_#QKUW*ibk42%JzlivSxCw>3R zPB0Cu9oDAH9CT|Pp-%dBX8&2|rALQ~rxz0d-2hROKVaJRQe&?cAlvI)H{mI-m(-I+!qKgq$O0|9k9mY3&c40}LCvT!0}> zU`P{q8)L%UkLl$sUOG&FeFES825JTQ7-*mCkE7#$v*YDhfZ<=VZ?#*F!^JqF>L*pr zKd#azgIbm@JJTskH$u9`0O(L@Se3qumqF8@@STu^>}d(#ULsOVCS5ALsew8rB<6g= z4&%S`ZOwgA&0+s1@S$vE!zVwbVXPS|^q2=7rq%cxr zT9r|)#q-1F364izE82@8oaNZWl^v$ReNTnKuxUF0qELG-rb>A-VrvbU205?aggAjm zIe4B9bbzcJcnj1!#e(Bc8Xzj_YX=O7h5+Tr!8x@;1cMg9)u+_Lm|7&;>b=h;lfGPV z?mihww{A@}r%-RWCw?m>d=>&q%3_?WwXtChQW#q+Lw!Qvwo zU2!e!Ibv%q-dVkU>t@N4MMTweiy)zOEM(y-eM#vBr3*?gE1eNuhxOGg$Mt5!k+fc1 z!IetA7RACcm9279)D^BRu$3ApMb}VAz{{el`D_JIH!g=@yQ!He7Z7gh@)UL_*6I_J z1=|4bakk_ZDwVLBrRb%nTTQ9SL+$8L!z=};qyc@T^uE%yXyWN+P_t64M}&rJqIp|r z4?7uIK>1@xg-sL>4eN{>X52n=$at?nmX zlDzS%YBerC9{|m1%9bT~UcgKAk4Q{UXMO-6`B=`TodD7U0Mf^E!_J9Z`*S~X@vo2v zsD8yc3aXP%0qL+lU3doA&RH6!U8Ym;d(4^0^*UXk>ILlyJQ1o}cs{J>VLwr*w7b?wlxS#F z!`P$m&YNeVb3{LxtV3E|em#b~m+CEYeXUK%6X*w(s`!^DqAHH9R>jQX^SyFa&YIRs z$q%Y=S!bIy^*~RCW%WHBZq#``EYFczmJe#X+kb<%=tU$3+&N^qSzI~KCoZixX&Do=oP-TX3`h6{62q~@T(lj*4%l-*HLwe|H!(rz9DABxo{K~D z)|3?Mph@5`YcirPXsyY(2;KvK2st4a)jvRwaGAiSvYpC~vc{r3CN4Urcf%Ts7S*u{ zjR;^L(9j2V9TQ)nTMPnI%u%4jfP>kA`W&S^-5oTIx^Pa8i)DLEoyZz_J!WL5-*NEy zs5?1A=yBqpSBC1aIYZkBFG%xdBM-Kvl#c!ZNeV#{$XBVBqi7CNakmn?-12U(uDJ^;69)rF&by7>^=epg7uL&B zP*T~e$QN>3dlp@0m0z847g|s;s~bd@(}BbZd`Y@4-7Vd`vZ8ZoG0e?!Bc_7OMhBAB z>o-?!T#dSrKerkJJp{3w73mC0S5|d^y_+Dhr<&~9-iUR9rZv=9GEFITA+z~;>8{y` z8tQ}S!u^@~wYTvtudGD{Uqnf!=smc4+g_h()uI6kUSNTr#h0940stOmh;+YI`J9o2 zi%xqp@NSWu(~vyzKF=qQ$y-dQoxQi2P$_$>NF*;x_g`JJf+mn^*5*j-QkZd5qUR$& zxRF+V*!?Fb{wwkX;Y=sB+yFEewHZ@t%j48>xfk(1Lp^2X$P1`LTq8O1ElA+h>C|`; z`T&Ph9;n8+wax4c?Z1|vPKS54F z1wzfidr1L>MnK~73v#0SDW?*ew~Fxpp?NEY&_mJq)5gDG{FjYCWBgZ)KWqFsvkA4E ziX?|3iP~9$ae|TvvxkTpp_r}DOAuL~k=!59v7;^b1Sp}FEajOHw{mh};mn{t$y>XQ zV{D1K*fuQBO#SDyLR{u?$~i6&$yG1vxQ6w0mtq<$H`Sd>AM2ds5&xCNSoX`^8OJ_3H8VP5D`C?ev zOn&rUG*Zmodc81Xs3m|J`4|oc=_;dN%yK4uJJ`W)aIstiaE;MnMaLcd1aKoAG2=v8 z^i^PuGhf9Q^A4O2$s+gtutkO=$hvVFN6;c%HDHjFntl5*LeB%*Yj`2-mcZ9S_e(c? zenMgN2!Y*>>Y$A(9b+-(vfs$T+rjAo^{vBQrwW(o>BSnL9ql2w1ui51jPYHw2|R~G zWIdk8Mt?0ChPM|NUHG8zYIy{1Jkar-M)FkHd2b4>Kx+a9GO!M&}!ZTfZG0_#Qquz)0b~)#7KU+5Q43H$^fD8l&%MW4Bfj z0)w*y=IvJ9KZMJYd#J;R?0)eu0>d4p+<4RO6L<0bD=XKFNzQZzxaj)3|Iyk)t3M0a z(h;$^m^uW3*z`=@|LW!YZ!P%2MtQdymtaBcB4>?&E~UQMMt$)a>WiR;*KRFy+i55= zmDb!3-^7@+L9N&Q$CnS%QKb(pXXK$3Ysar}n>8P2nDu_vB-D`L8@RWIo%D#}=Myz5^vwp*@Rz)Hjh%pHdnfNowP%7bAa1q^i|ob=#Ylu6W-)Iq`Zybv~N%2o=3K_Q249Lp`)_<6Oe^+$Z`@x5J38ws|#@AZu%ZpJ#(Fu|ax@ zvWwf6bB_16y6A1~$kNq!uiUwD+XjW$%|Z-=&7%`+`Ob|S0_~qsKX2KuxmAnSxrZ5A zkDl4Ftjq&WX(xT!e#j^l*^rqQZ3Q&>4{f)F|DUwySuGFYSV_ln_|f!OuhuIMt#ho+ zLXg3bnhD-du-<2x&^aLvse(nqhR3~n%3NoPTmGLBAL74q74zKBX z+#nk1iy=Spn%<)=;w>S0KBf|ns5OkuAA}jiPB&Poa{C)*^7(3-rl#P^GON9~V zG`udo&IS1TdO-nyUSd(5m7fu|RqhCUeXZQl+-bDc>zqbD%U2~QGC3|ef+p@2=#L?@Mh(Ox=}rkXAb>q7)ReAE zrdiQVG1vA=%I6|VB)q?Z@kw=?fnMA!Ksw+y;UrEZ?-9mun!6wk6xKs05yh^~;x6{X zo<$tNi9=_OCLN3coHbaU*$umnpUw`-I|T9>$^bGPH{49y05!N(Q7jjWJ!p8#>>s?? zAc$`mXa8&R9JG!leX?@A(nSFAU_(q`BXz=7uyHQBYoOtV(@&QTj8%vNYyCoJB(kF0 zEYx7}fxEH{+FEFQfc8-S4_r)0>HTJGnz+A`Ye-;tn0j0K!1^6}dBf<>V<`T(~oFq3=eA)%8B5hXDHty>G$ zBOS_mVe}Iv)iB&3SZj>@G?!Oi3ELAFU0a{_)Z$^e&05@DKL$QX$Iv6DsORuy8EXVb42~sO zuy!~9MNUcvMZu!AS#;^h0EJH`)lwLX!nk0;`{$B~kd%Q@5qy&_*)1He~R$Ksm!`d_1W!qvz)P?k!ulH=B#G3PoXla zk843Ch;Rx1c-FlhyFjIkp-Ed_$Rs>XQu{^$&$pz#YI&1yZN_bO1EM$^VS^3ED7&w@ zGRPyhUaLNaZT2ug=t(UCYQXr^I)ZD$*c4@zPU_9tW zDo2Y(r0el>3jT~B@F65n&u;p5yqs&p3WtL;tjRV;5?NxzL7BBC=&)R`*$W> z!h{&w-Vw>TOL+qO`WZhT21@^ek z&d3g-(!J*bk~G4MZNG!|qmR&s=|&g_OdyyqFp&^wkvoByXkJVeU{*22V;K3zo$mY@ zJ-Ns|4tRCKIR{9^JR4Tg?@Yk(8AENh@j`BxW>H}%Kb)IIeFlgy@Z&T}C!LEqhI*WL zhVwcf74iZXh2M+#L=7Y~i8>6RC*(VI5W@REPbjvuc3l_OkorP1P%RMgHUI;nn6QZ^ zQQ~oha!33H^61#NVHEla0Ln>o7uppBiohq^N8d-1O0{Z$S0Tdv zTeW8>nTwN%6hz=tF`AxE#4;=@4GRvY4gPG&O-HXYss*+Ol@1Y|LVMlH6XTKlB=Kc^0hcHCn8D>Q|NU16Dc9oPy8?1=E1FAbIcy z(1hz2paP(W63DUf_XGc|VjlmvSfr>-4`$L3C1=^rm^kd{tzD_2~f*&sK05c0s91J6U>>h zd_oWS3pmsPj87!2=34DwaEN#2#iQndX<*2QE*`T0_2xX#p|t?kFKI zX%U9~IS|2`u$SMHFiU5cEm#c5i`yg2Tvyx9PAz|T=hqS2Z!>j~?(F=YX_r540=nPhgWy?2j72?4ZMSUk&maXOI_v7$zc!&=vj!#d$9WxZZXjj>haS zB)06dI>mXsW^daVGCTx@Z4c`*o$PrGh_BtEO29d=%gd#o0FRSDlAkc(bc4rs;tsKo zl?NGdvQIdnbds$W>GzGkiX;`jgxcG1g(X*Cv+fFi6lj%+)fDu_e6l*AT49`b8&U?^ zjTzQmLG<=|-~uzk+q0|4T|MKH2Tt7#+uCrMSkhm}Qo%YNhnOMWa}hzt2LhHC<|0D6 zL!dXT?a|jHTf}{<^*b}~*FdM5lin|~y`NuPh6oFW$O&^Xl?#p~}?U5{kY@XmBXspL+o%1HhLE{uLG_6c`jPrPDs|Twu_yt_4Ptln(w* zAk{(D=ml~;iyRv+j8Nm;F_j#L1CSVZFn?O$g6MNBHR`qh!TXqX z+jFb9tBd$Vw7K>_CLCQ_`!Iyocm2fA|ZuU?X@VM!2OiXN6M1 zikMFlAv3hv;WZBT05aDf3&U!Ein#sM1%295CO352B|Kyn%20$KT?hS5*Z%O><0&a} zt?X^tpYiFhnLt53r`sZ40JcfGuac#BR!s*tbJFQUddlfTTz64d!QCh-$*3xo#P%iH zV)&(YspNH`OyU1F#*jv&H8Ev&eub~HJ$2eg`TBh(e~TnL8G8CLejDzgHN&gAhytWD z*VENg=o#(#IzA_Rei@%q|B)X1djSj`nxs_HPwaKZfygDO%BZSK;N*W9z+azB#t_`& z|3!e~tbV+|BOx=j;Z09l^gX<1Q?t?xS#6X2G3F mpts_1, mpts_2; matches2points(matches_popcount, kpts_1, kpts_2, mpts_1, mpts_2); //Extract a list of the (x,y) location of the matches vector outlier_mask; - Mat H = findHomography(Mat(mpts_2), Mat(mpts_1), outlier_mask, RANSAC, 1); + Mat H = findHomography(mpts_2, mpts_1, RANSAC, 1, outlier_mask); Mat outimg; drawMatches(im2, kpts_2, im1, kpts_1, matches_popcount, outimg, Scalar::all(-1), Scalar::all(-1), diff --git a/samples/cpp/kmeans.cpp b/samples/cpp/kmeans.cpp index 4a48155..7e52ca4 100644 --- a/samples/cpp/kmeans.cpp +++ b/samples/cpp/kmeans.cpp @@ -54,7 +54,7 @@ int main( int /*argc*/, char** /*argv*/ ) kmeans(points, clusterCount, labels, TermCriteria( CV_TERMCRIT_EPS+CV_TERMCRIT_ITER, 10, 1.0), - 3, KMEANS_PP_CENTERS, ¢ers); + 3, KMEANS_PP_CENTERS, centers); img = Scalar::all(0); diff --git a/samples/cpp/stereo_calib.cpp b/samples/cpp/stereo_calib.cpp index 0dc429f..2c1c91f 100644 --- a/samples/cpp/stereo_calib.cpp +++ b/samples/cpp/stereo_calib.cpp @@ -230,7 +230,7 @@ StereoCalib(const vector& imagelist, Size boardSize, bool useCalibrated= stereoRectify(cameraMatrix[0], distCoeffs[0], cameraMatrix[1], distCoeffs[1], imageSize, R, T, R1, R2, P1, P2, Q, - 1, imageSize, &validRoi[0], &validRoi[1]); + CALIB_ZERO_DISPARITY, 1, imageSize, &validRoi[0], &validRoi[1]); fs.open("extrinsics.yml", CV_STORAGE_WRITE); if( fs.isOpened() ) diff --git a/samples/cpp/stereo_match.cpp b/samples/cpp/stereo_match.cpp index f3616f6..cb02ae8 100644 --- a/samples/cpp/stereo_match.cpp +++ b/samples/cpp/stereo_match.cpp @@ -178,7 +178,7 @@ int main(int argc, char** argv) fs["R"] >> R; fs["T"] >> T; - stereoRectify( M1, D1, M2, D2, img_size, R, T, R1, R2, P1, P2, Q, -1, img_size, &roi1, &roi2 ); + stereoRectify( M1, D1, M2, D2, img_size, R, T, R1, R2, P1, P2, Q, CALIB_ZERO_DISPARITY, -1, img_size, &roi1, &roi2 ); Mat map11, map12, map21, map22; initUndistortRectifyMap(M1, D1, R1, P1, img_size, CV_16SC2, map11, map12); diff --git a/samples/cpp/video_homography.cpp b/samples/cpp/video_homography.cpp index a91ea1a..9ff374b 100644 --- a/samples/cpp/video_homography.cpp +++ b/samples/cpp/video_homography.cpp @@ -182,7 +182,7 @@ int main(int ac, char ** av) if (matches.size() > 5) { - Mat H = findHomography(Mat(train_pts), Mat(query_pts), match_mask, RANSAC, 4); + Mat H = findHomography(train_pts, query_pts, RANSAC, 4, match_mask); if (countNonZero(Mat(match_mask)) > 15) { H_prev = H; diff --git a/samples/gpu/morfology.cpp b/samples/gpu/morfology.cpp index 702125b..2090592 100644 --- a/samples/gpu/morfology.cpp +++ b/samples/gpu/morfology.cpp @@ -41,7 +41,7 @@ void OpenClose(int, void*) cv::gpu::morphologyEx(src, dst, CV_MOP_OPEN, element); else cv::gpu::morphologyEx(src, dst, CV_MOP_CLOSE, element); - imshow("Open/Close",dst); + imshow("Open/Close",(Mat)dst); } // callback function for erode/dilate trackbar @@ -54,7 +54,7 @@ void ErodeDilate(int, void*) cv::gpu::erode(src, dst, element); else cv::gpu::dilate(src, dst, element); - imshow("Erode/Dilate",dst); + imshow("Erode/Dilate",(Mat)dst); } diff --git a/samples/gpu/performance/tests.cpp b/samples/gpu/performance/tests.cpp index 18b45f2..a4a5384 100644 --- a/samples/gpu/performance/tests.cpp +++ b/samples/gpu/performance/tests.cpp @@ -784,10 +784,10 @@ TEST(projectPoints) void InitSolvePnpRansac() -{ - Mat object; gen(object, 1, 4, CV_32FC3, Scalar::all(0), Scalar::all(100)); - Mat image; gen(image, 1, 4, CV_32FC2, Scalar::all(0), Scalar::all(100)); - Mat rvec, tvec; +{ + Mat object; gen(object, 1, 4, CV_32FC3, Scalar::all(0), Scalar::all(100)); + Mat image; gen(image, 1, 4, CV_32FC2, Scalar::all(0), Scalar::all(100)); + Mat rvec, tvec; gpu::solvePnPRansac(object, image, Mat::eye(3, 3, CV_32F), Mat(), rvec, tvec); } @@ -796,31 +796,31 @@ TEST(solvePnPRansac) { InitSolvePnpRansac(); - for (int num_points = 5000; num_points <= 300000; num_points = int(num_points * 3.76)) - { - SUBTEST << "num_points " << num_points; - - Mat object; gen(object, 1, num_points, CV_32FC3, Scalar::all(10), Scalar::all(100)); - Mat image; gen(image, 1, num_points, CV_32FC2, Scalar::all(10), Scalar::all(100)); - Mat camera_mat; gen(camera_mat, 3, 3, CV_32F, 0.5, 1); - camera_mat.at(0, 1) = 0.f; - camera_mat.at(1, 0) = 0.f; - camera_mat.at(2, 0) = 0.f; - camera_mat.at(2, 1) = 0.f; - - Mat rvec, tvec; - const int num_iters = 200; - const float max_dist = 2.0f; - vector inliers_cpu, inliers_gpu; - - CPU_ON; - solvePnPRansac(object, image, camera_mat, Mat(), rvec, tvec, false, num_iters, - max_dist, int(num_points * 0.05), &inliers_cpu); - CPU_OFF; - - GPU_ON; - gpu::solvePnPRansac(object, image, camera_mat, Mat(), rvec, tvec, false, num_iters, - max_dist, int(num_points * 0.05), &inliers_gpu); + for (int num_points = 5000; num_points <= 300000; num_points = int(num_points * 3.76)) + { + SUBTEST << "num_points " << num_points; + + Mat object; gen(object, 1, num_points, CV_32FC3, Scalar::all(10), Scalar::all(100)); + Mat image; gen(image, 1, num_points, CV_32FC2, Scalar::all(10), Scalar::all(100)); + Mat camera_mat; gen(camera_mat, 3, 3, CV_32F, 0.5, 1); + camera_mat.at(0, 1) = 0.f; + camera_mat.at(1, 0) = 0.f; + camera_mat.at(2, 0) = 0.f; + camera_mat.at(2, 1) = 0.f; + + Mat rvec, tvec; + const int num_iters = 200; + const float max_dist = 2.0f; + vector inliers_cpu, inliers_gpu; + + CPU_ON; + solvePnPRansac(object, image, camera_mat, Mat(), rvec, tvec, false, num_iters, + max_dist, int(num_points * 0.05), inliers_cpu); + CPU_OFF; + + GPU_ON; + gpu::solvePnPRansac(object, image, camera_mat, Mat(), rvec, tvec, false, num_iters, + max_dist, int(num_points * 0.05), &inliers_gpu); GPU_OFF; } } \ No newline at end of file -- 2.7.4