Redefine CPU_xx constants in cv::namespace

This makes them visible from the python bindings
This commit is contained in:
John Stowers 2013-09-18 22:52:37 +02:00
parent 99a43257d5
commit 14d225134d
2 changed files with 16 additions and 10 deletions

View File

@ -111,6 +111,7 @@
#define CV_CPU_POPCNT 8 #define CV_CPU_POPCNT 8
#define CV_CPU_AVX 10 #define CV_CPU_AVX 10
#define CV_CPU_NEON 11 #define CV_CPU_NEON 11
// when adding to this list remember to update the enum in core/utility.cpp
#define CV_HARDWARE_MAX_FEATURE 255 #define CV_HARDWARE_MAX_FEATURE 255
// do not include SSE/AVX/NEON headers for NVCC compiler // do not include SSE/AVX/NEON headers for NVCC compiler

View File

@ -190,20 +190,25 @@ CV_EXPORTS_W double getTickFrequency();
*/ */
CV_EXPORTS_W int64 getCPUTickCount(); CV_EXPORTS_W int64 getCPUTickCount();
//! Available CPU features. Currently, the following features are recognized:
enum {
CPU_MMX = 1,
CPU_SSE = 2,
CPU_SSE2 = 3,
CPU_SSE3 = 4,
CPU_SSSE3 = 5,
CPU_SSE4_1 = 6,
CPU_SSE4_2 = 7,
CPU_POPCNT = 8,
CPU_AVX = 10,
CPU_NEON = 11
};
// remember to keep this list identical to the one in cvdef.h
/*! /*!
Returns SSE etc. support status Returns SSE etc. support status
The function returns true if certain hardware features are available. The function returns true if certain hardware features are available.
Currently, the following features are recognized:
- CV_CPU_MMX - MMX
- CV_CPU_SSE - SSE
- CV_CPU_SSE2 - SSE 2
- CV_CPU_SSE3 - SSE 3
- CV_CPU_SSSE3 - SSSE 3
- CV_CPU_SSE4_1 - SSE 4.1
- CV_CPU_SSE4_2 - SSE 4.2
- CV_CPU_POPCNT - POPCOUNT
- CV_CPU_AVX - AVX
\note {Note that the function output is not static. Once you called cv::useOptimized(false), \note {Note that the function output is not static. Once you called cv::useOptimized(false),
most of the hardware acceleration is disabled and thus the function will returns false, most of the hardware acceleration is disabled and thus the function will returns false,