generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merged few missed changes from 2.4 to trunk

Browse Source
This commit is contained in:
Andrey Kamaev
2012-04-15 23:19:57 +00:00
parent 2fd1e2ea57
commit c4af85043a
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/OpenCVDetectCXXCompiler.cmake
View File

@@ -5,6 +5,14 @@ if(CMAKE_CL_64)
set(MSVC64 1) set(MSVC64 1)
endif() 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 ): # Detect Intel ICC compiler -- for -fPIC in 3rdparty ( UNIX ONLY ):
# see include/opencv/cxtypes.h file for related ICC & CV_ICC defines. # see include/opencv/cxtypes.h file for related ICC & CV_ICC defines.

7
modules/core/src/convert.cpp
View File

@@ -1190,9 +1190,10 @@ cvSplit( const void* srcarr, void* dstarr0, void* dstarr1, void* dstarr2, void*
if( dptrs[i] != 0 ) if( dptrs[i] != 0 )
{ {
dvec[j] = cv::cvarrToMat(dptrs[i]); dvec[j] = cv::cvarrToMat(dptrs[i]);
CV_Assert( dvec[j].size() == src.size() && CV_Assert( dvec[j].size() == src.size() );
dvec[j].depth() == src.depth() && CV_Assert( dvec[j].depth() == src.depth() );
dvec[j].channels() == 1 && i < src.channels() ); CV_Assert( dvec[j].channels() == 1 );
CV_Assert( i < src.channels() );
pairs[j*2] = i; pairs[j*2] = i;
pairs[j*2+1] = j; pairs[j*2+1] = j;
j++; j++;