Tue Feb 26 23:38:09 2013 UTC ()
Honor sequence point rules.
(joerg)
diff -r1.16 -r1.17 pkgsrc/graphics/opencv/distinfo
diff -r0 -r1.1 pkgsrc/graphics/opencv/patches/patch-modules_legacy_src_dpstereo.cpp
diff -r0 -r1.1 pkgsrc/graphics/opencv/patches/patch-modules_ts_include_opencv2_ts_ts__perf.hpp
--- pkgsrc/graphics/opencv/distinfo 2012/12/07 21:37:10 1.16
+++ pkgsrc/graphics/opencv/distinfo 2013/02/26 23:38:08 1.17
| @@ -1,6 +1,8 @@ | | | @@ -1,6 +1,8 @@ |
| 1 | $NetBSD: distinfo,v 1.16 2012/12/07 21:37:10 adam Exp $ | | 1 | $NetBSD: distinfo,v 1.17 2013/02/26 23:38:08 joerg Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (OpenCV-2.4.3.tar.bz2) = 982be2c3e52dfc3e9d14692c60bc856b2b766be2 | | 3 | SHA1 (OpenCV-2.4.3.tar.bz2) = 982be2c3e52dfc3e9d14692c60bc856b2b766be2 |
| 4 | RMD160 (OpenCV-2.4.3.tar.bz2) = b862ddd9e7fefd885d78835660a9f5c9320889c2 | | 4 | RMD160 (OpenCV-2.4.3.tar.bz2) = b862ddd9e7fefd885d78835660a9f5c9320889c2 |
| 5 | Size (OpenCV-2.4.3.tar.bz2) = 67240491 bytes | | 5 | Size (OpenCV-2.4.3.tar.bz2) = 67240491 bytes |
| 6 | SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = c056068c01c417dc262f21c00324da7f86c0cd8e | | 6 | SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = c056068c01c417dc262f21c00324da7f86c0cd8e |
| | | 7 | SHA1 (patch-modules_legacy_src_dpstereo.cpp) = da9955fb6cc81054427b69efb97a58160b64f262 |
| | | 8 | SHA1 (patch-modules_ts_include_opencv2_ts_ts__perf.hpp) = 8a7f08b176cedec85fd613e715d7b12d666a3e45 |
$NetBSD: patch-modules_legacy_src_dpstereo.cpp,v 1.1 2013/02/26 23:38:08 joerg Exp $
--- modules/legacy/src/dpstereo.cpp.orig 2012-10-22 22:55:11.000000000 +0000
+++ modules/legacy/src/dpstereo.cpp
@@ -65,6 +65,8 @@
#define ICV_MAX_DP_SUM_VAL (INT_MAX/4)
+#include <algorithm>
+
typedef struct _CvDPCell
{
uchar step; //local-optimal step
@@ -76,8 +78,8 @@ typedef struct _CvRightImData
uchar min_val, max_val;
} _CvRightImData;
-#define CV_IMAX3(a,b,c) ((temp3 = (a) >= (b) ? (a) : (b)),(temp3 >= (c) ? temp3 : (c)))
-#define CV_IMIN3(a,b,c) ((temp3 = (a) <= (b) ? (a) : (b)),(temp3 <= (c) ? temp3 : (c)))
+#define CV_IMAX3(a,b,c) std::max((a), std::max((b), (c)))
+#define CV_IMIN3(a,b,c) std::min((a), std::min((b), (c)))
static void icvFindStereoCorrespondenceByBirchfieldDP( uchar* src1, uchar* src2,
uchar* disparities,
$NetBSD: patch-modules_ts_include_opencv2_ts_ts__perf.hpp,v 1.1 2013/02/26 23:38:08 joerg Exp $
--- modules/ts/include/opencv2/ts/ts_perf.hpp.orig 2013-02-26 16:47:16.000000000 +0000
+++ modules/ts/include/opencv2/ts/ts_perf.hpp
@@ -478,7 +478,6 @@ CV_EXPORTS void PrintTo(const Size& sz,
#define CV_PERF_TEST_MAIN(testsuitname, ...) \
int main(int argc, char **argv)\
{\
- while (++argc >= (--argc,-1)) {__VA_ARGS__; break;} /*this ugly construction is needed for VS 2005*/\
::perf::Regression::Init(#testsuitname);\
::perf::TestBase::Init(argc, argv);\
::testing::InitGoogleTest(&argc, argv);\