From c4af85043ab62082a0e744536d7229a5b5190199 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Sun, 15 Apr 2012 23:19:57 +0000 Subject: [PATCH] merged few missed changes from 2.4 to trunk --- cmake/OpenCVDetectCXXCompiler.cmake | 8 ++++++++ modules/core/src/convert.cpp | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/cmake/OpenCVDetectCXXCompiler.cmake b/cmake/OpenCVDetectCXXCompiler.cmake index 1d003b9..f429455 100644 --- a/cmake/OpenCVDetectCXXCompiler.cmake +++ b/cmake/OpenCVDetectCXXCompiler.cmake @@ -5,6 +5,14 @@ if(CMAKE_CL_64) set(MSVC64 1) endif() +if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + set(CMAKE_COMPILER_IS_GNUCXX 1) +endif() + +if(CMAKE_C_COMPILER_ID STREQUAL "Clang") + set(CMAKE_COMPILER_IS_GNUC 1) +endif() + # ---------------------------------------------------------------------------- # Detect Intel ICC compiler -- for -fPIC in 3rdparty ( UNIX ONLY ): # see include/opencv/cxtypes.h file for related ICC & CV_ICC defines. diff --git a/modules/core/src/convert.cpp b/modules/core/src/convert.cpp index 3ec88ec..043b5aa 100644 --- a/modules/core/src/convert.cpp +++ b/modules/core/src/convert.cpp @@ -1190,9 +1190,10 @@ cvSplit( const void* srcarr, void* dstarr0, void* dstarr1, void* dstarr2, void* if( dptrs[i] != 0 ) { dvec[j] = cv::cvarrToMat(dptrs[i]); - CV_Assert( dvec[j].size() == src.size() && - dvec[j].depth() == src.depth() && - dvec[j].channels() == 1 && i < src.channels() ); + CV_Assert( dvec[j].size() == src.size() ); + CV_Assert( dvec[j].depth() == src.depth() ); + CV_Assert( dvec[j].channels() == 1 ); + CV_Assert( i < src.channels() ); pairs[j*2] = i; pairs[j*2+1] = j; j++; -- 2.7.4