Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
c2f85956
O
Opencv
项目概览
Greenplum
/
Opencv
大约 1 年 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c2f85956
编写于
4月 07, 2014
作者:
A
Andrey Pavlenko
提交者:
OpenCV Buildbot
4月 07, 2014
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2563 from alalek:ipp_builds
上级
def4f5e2
bfc546d2
变更
8
展开全部
隐藏空白更改
内联
并排
Showing
8 changed file
with
199 addition
and
332 deletion
+199
-332
CMakeLists.txt
CMakeLists.txt
+5
-4
cmake/OpenCVFindIPP.cmake
cmake/OpenCVFindIPP.cmake
+174
-306
cmake/OpenCVFindLibsPerf.cmake
cmake/OpenCVFindLibsPerf.cmake
+4
-7
cmake/templates/cvconfig.h.in
cmake/templates/cvconfig.h.in
+1
-0
modules/core/include/opencv2/core/private.hpp
modules/core/include/opencv2/core/private.hpp
+6
-1
modules/core/src/arithm.cpp
modules/core/src/arithm.cpp
+0
-12
modules/core/src/system.cpp
modules/core/src/system.cpp
+8
-1
modules/imgproc/src/imgwarp.cpp
modules/imgproc/src/imgwarp.cpp
+1
-1
未找到文件。
CMakeLists.txt
浏览文件 @
c2f85956
...
...
@@ -127,7 +127,8 @@ OCV_OPTION(WITH_FFMPEG "Include FFMPEG support" ON
OCV_OPTION
(
WITH_GSTREAMER
"Include Gstreamer support"
ON
IF
(
UNIX AND NOT APPLE AND NOT ANDROID
)
)
OCV_OPTION
(
WITH_GSTREAMER_0_10
"Enable Gstreamer 0.10 support (instead of 1.x)"
OFF
)
OCV_OPTION
(
WITH_GTK
"Include GTK support"
ON
IF
(
UNIX AND NOT APPLE AND NOT ANDROID
)
)
OCV_OPTION
(
WITH_IPP
"Include Intel IPP support"
OFF
IF
(
MSVC OR X86 OR X86_64
)
)
OCV_OPTION
(
WITH_ICV
"Include Intel IPP ICV support"
ON
IF
(
NOT IOS
)
)
OCV_OPTION
(
WITH_IPP
"Include Intel IPP support"
OFF
IF
(
NOT IOS
)
)
OCV_OPTION
(
WITH_JASPER
"Include JPEG2K support"
ON
IF
(
NOT IOS
)
)
OCV_OPTION
(
WITH_JPEG
"Include JPEG support"
ON
)
OCV_OPTION
(
WITH_WEBP
"Include WebP support"
ON
IF
(
NOT IOS
)
)
...
...
@@ -916,11 +917,11 @@ endif(DEFINED WITH_INTELPERC)
status
(
""
)
status
(
" Other third-party libraries:"
)
if
(
WITH_IPP AND IPP_FOUND
)
status
(
" Use IPP:"
"
${
IPP_
LATEST_VERSION_STR
}
[
${
IPP_LATEST_VERSION_MAJOR
}
.
${
IPP_LATEST_VERSION_MINOR
}
.
${
IPP_LATEST
_VERSION_BUILD
}
]"
)
if
(
(
WITH_IPP OR WITH_ICV
)
AND HAVE_IPP
)
status
(
" Use IPP:"
"
${
IPP_
VERSION_STR
}
[
${
IPP_VERSION_MAJOR
}
.
${
IPP_VERSION_MINOR
}
.
${
IPP
_VERSION_BUILD
}
]"
)
status
(
" at:"
"
${
IPP_ROOT_DIR
}
"
)
else
()
status
(
" Use IPP:"
WITH_IPP AND NOT IPP_FOUND
THEN
"IPP not found"
ELSE NO
)
status
(
" Use IPP:"
(
WITH_IPP OR WITH_ICV
)
AND NOT HAVE_IPP
THEN
"IPP not found"
ELSE NO
)
endif
()
status
(
" Use Eigen:"
HAVE_EIGEN THEN
"YES (ver
${
EIGEN_WORLD_VERSION
}
.
${
EIGEN_MAJOR_VERSION
}
.
${
EIGEN_MINOR_VERSION
}
)"
ELSE NO
)
...
...
cmake/OpenCVFindIPP.cmake
浏览文件 @
c2f85956
此差异已折叠。
点击以展开。
cmake/OpenCVFindLibsPerf.cmake
浏览文件 @
c2f85956
...
...
@@ -8,16 +8,13 @@ if(WITH_TBB)
endif
(
WITH_TBB
)
# --- IPP ---
ocv_clear_vars
(
IPP_FOUND
)
if
(
WITH_IPP
)
if
(
WITH_IPP OR WITH_ICV
)
include
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/OpenCVFindIPP.cmake"
)
if
(
IPP_FOUND
)
add_definitions
(
-DHAVE_IPP
)
if
(
HAVE_IPP
)
ocv_include_directories
(
${
IPP_INCLUDE_DIRS
}
)
link_directories
(
${
IPP_LIBRARY_DIRS
}
)
set
(
OPENCV_LINKER_LIBS
${
OPENCV_LINKER_LIBS
}
${
IPP_LIBRARIES
}
)
list
(
APPEND OPENCV_LINKER_LIBS
${
IPP_LIBRARIES
}
)
endif
()
endif
(
WITH_IPP
)
endif
()
# --- CUDA ---
if
(
WITH_CUDA
)
...
...
cmake/templates/cvconfig.h.in
浏览文件 @
c2f85956
...
...
@@ -93,6 +93,7 @@
/* Intel Integrated Performance Primitives */
#cmakedefine HAVE_IPP
#cmakedefine HAVE_IPP_ICV_ONLY
/* JPEG-2000 codec */
#cmakedefine HAVE_JASPER
...
...
modules/core/include/opencv2/core/private.hpp
浏览文件 @
c2f85956
...
...
@@ -210,7 +210,12 @@ CV_EXPORTS void scalarToRawData(const cv::Scalar& s, void* buf, int type, int un
\****************************************************************************************/
#ifdef HAVE_IPP
# include "ipp.h"
# ifdef HAVE_IPP_ICV_ONLY
# include "ippicv.h"
# include "ippicv_fn_map.h"
# else
# include "ipp.h"
# endif
static
inline
IppiSize
ippiSize
(
int
width
,
int
height
)
{
...
...
modules/core/src/arithm.cpp
浏览文件 @
c2f85956
...
...
@@ -52,18 +52,6 @@
namespace
cv
{
#if ARITHM_USE_IPP
struct
IPPArithmInitializer
{
IPPArithmInitializer
(
void
)
{
ippStaticInit
();
}
};
IPPArithmInitializer
ippArithmInitializer
;
#endif
struct
NOP
{};
#if CV_SSE2
...
...
modules/core/src/system.cpp
浏览文件 @
c2f85956
...
...
@@ -274,7 +274,14 @@ volatile bool useOptimizedFlag = true;
#ifdef HAVE_IPP
struct
IPPInitializer
{
IPPInitializer
(
void
)
{
ippStaticInit
();
}
IPPInitializer
(
void
)
{
#if IPP_VERSION_MAJOR >= 8
ippInit
();
#else
ippStaticInit
();
#endif
}
};
IPPInitializer
ippInitializer
;
...
...
modules/imgproc/src/imgwarp.cpp
浏览文件 @
c2f85956
...
...
@@ -1982,7 +1982,7 @@ public:
}
private:
Mat
&
src
;
const
Mat
&
src
;
Mat
&
dst
;
double
inv_scale_x
;
double
inv_scale_y
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录