From d7d0754f388eadcbf6219bdca61a3930855a31be Mon Sep 17 00:00:00 2001 From: Anatoly Baksheev Date: Mon, 15 Nov 2010 13:51:48 +0000 Subject: [PATCH] fixed compilation error under nvcc --- modules/core/include/opencv2/core/operations.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/core/include/opencv2/core/operations.hpp b/modules/core/include/opencv2/core/operations.hpp index 990e2e0448..1029a3ff02 100644 --- a/modules/core/include/opencv2/core/operations.hpp +++ b/modules/core/include/opencv2/core/operations.hpp @@ -2077,10 +2077,11 @@ public: Vector(const Vector& d) { *this = d; } - Vector(const Vector& d, const Range& r) + Vector(const Vector& d, const Range& r_) { - if( r == Range::all() ) - r = Range(0, d.size()); + Range r = r_ == Range::all() ? Range(0, d.size()) : r_; + /*if( r == Range::all() ) + r = Range(0, d.size());*/ if( r.size() > 0 && r.start >= 0 && r.end <= d.size() ) { if( d.hdr.refcount )