Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
ab2749d6
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,发现更多精彩内容 >>
提交
ab2749d6
编写于
5月 23, 2014
作者:
A
Alexander Alekhin
提交者:
OpenCV Buildbot
5月 23, 2014
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2709 from alalek:icv_update_binary_pack
上级
c43e3285
df9aa889
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
49 addition
and
5 deletion
+49
-5
cmake/OpenCVFindIPP.cmake
cmake/OpenCVFindIPP.cmake
+12
-1
cmake/OpenCVGenConfig.cmake
cmake/OpenCVGenConfig.cmake
+24
-3
cmake/templates/OpenCVConfig.cmake.in
cmake/templates/OpenCVConfig.cmake.in
+12
-0
modules/imgproc/src/corner.cpp
modules/imgproc/src/corner.cpp
+1
-1
未找到文件。
cmake/OpenCVFindIPP.cmake
浏览文件 @
ab2749d6
...
...
@@ -126,7 +126,18 @@ macro(ipp_detect_version)
macro
(
_ipp_add_library name
)
if
(
EXISTS
${
IPP_LIBRARY_DIR
}
/
${
IPP_LIB_PREFIX
}${
IPP_PREFIX
}${
name
}${
IPP_SUFFIX
}${
IPP_LIB_SUFFIX
}
)
list
(
APPEND IPP_LIBRARIES
${
IPP_LIBRARY_DIR
}
/
${
IPP_LIB_PREFIX
}${
IPP_PREFIX
}${
name
}${
IPP_SUFFIX
}${
IPP_LIB_SUFFIX
}
)
add_library
(
ipp
${
name
}
STATIC IMPORTED
)
set_target_properties
(
ipp
${
name
}
PROPERTIES
IMPORTED_LINK_INTERFACE_LIBRARIES
""
IMPORTED_LOCATION
${
IPP_LIBRARY_DIR
}
/
${
IPP_LIB_PREFIX
}${
IPP_PREFIX
}${
name
}${
IPP_SUFFIX
}${
IPP_LIB_SUFFIX
}
)
list
(
APPEND IPP_LIBRARIES ipp
${
name
}
)
# CMake doesn't support "install(TARGETS ipp${name} " command with imported targets
install
(
FILES
${
IPP_LIBRARY_DIR
}
/
${
IPP_LIB_PREFIX
}${
IPP_PREFIX
}${
name
}${
IPP_SUFFIX
}${
IPP_LIB_SUFFIX
}
DESTINATION
${
OPENCV_3P_LIB_INSTALL_PATH
}
COMPONENT main
)
string
(
TOUPPER
${
name
}
uname
)
set
(
IPP
${
uname
}
_INSTALL_PATH
"
${
CMAKE_INSTALL_PREFIX
}
/
${
OPENCV_3P_LIB_INSTALL_PATH
}
/
${
IPP_LIB_PREFIX
}${
IPP_PREFIX
}${
name
}${
IPP_SUFFIX
}${
IPP_LIB_SUFFIX
}
"
CACHE INTERNAL
""
FORCE
)
set
(
IPP
${
uname
}
_LOCATION_PATH
"
${
IPP_LIBRARY_DIR
}
/
${
IPP_LIB_PREFIX
}${
IPP_PREFIX
}${
name
}${
IPP_SUFFIX
}${
IPP_LIB_SUFFIX
}
"
CACHE INTERNAL
""
FORCE
)
else
()
message
(
STATUS
"Can't find IPP library:
${
name
}
at
${
IPP_LIBRARY_DIR
}
/
${
IPP_LIB_PREFIX
}${
IPP_PREFIX
}${
name
}${
IPP_SUFFIX
}${
IPP_LIB_SUFFIX
}
"
)
endif
()
...
...
cmake/OpenCVGenConfig.cmake
浏览文件 @
ab2749d6
...
...
@@ -83,6 +83,14 @@ endif()
export
(
TARGETS
${
OpenCVModules_TARGETS
}
FILE
"
${
CMAKE_BINARY_DIR
}
/OpenCVModules
${
modules_file_suffix
}
.cmake"
)
if
(
TARGET ippicv
)
set
(
USE_IPPICV TRUE
)
file
(
RELATIVE_PATH INSTALL_PATH_RELATIVE_IPPICV
${
CMAKE_BINARY_DIR
}
${
IPPICV_LOCATION_PATH
}
)
else
()
set
(
USE_IPPICV FALSE
)
set
(
INSTALL_PATH_RELATIVE_IPPICV
"non-existed-path"
)
endif
()
configure_file
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/templates/OpenCVConfig.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/OpenCVConfig.cmake"
@ONLY
)
#support for version checking when finding opencv. find_package(OpenCV 2.3.1 EXACT) should now work.
configure_file
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/templates/OpenCVConfig-version.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/OpenCVConfig-version.cmake"
@ONLY
)
...
...
@@ -98,9 +106,6 @@ if(INSTALL_TO_MANGLED_PATHS)
set
(
OpenCV_3RDPARTY_LIB_DIRS_CONFIGCMAKE
"
\"\$
{OpenCV_INSTALL_PATH}/
${
OpenCV_3RDPARTY_LIB_DIRS_CONFIGCMAKE
}
\"
"
)
endif
()
configure_file
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/templates/OpenCVConfig.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/unix-install/OpenCVConfig.cmake"
@ONLY
)
configure_file
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/templates/OpenCVConfig-version.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/unix-install/OpenCVConfig-version.cmake"
@ONLY
)
if
(
UNIX
)
# ANDROID configuration is created here also
#http://www.vtk.org/Wiki/CMake/Tutorials/Packaging reference
# For a command "find_package(<name> [major[.minor]] [EXACT] [REQUIRED|QUIET])"
...
...
@@ -108,6 +113,15 @@ if(UNIX) # ANDROID configuration is created here also
# <prefix>/(share|lib)/cmake/<name>*/ (U)
# <prefix>/(share|lib)/<name>*/ (U)
# <prefix>/(share|lib)/<name>*/(cmake|CMake)/ (U)
if
(
USE_IPPICV
)
if
(
INSTALL_TO_MANGLED_PATHS
)
file
(
RELATIVE_PATH INSTALL_PATH_RELATIVE_IPPICV
"
${
CMAKE_INSTALL_PREFIX
}
/
${
OPENCV_CONFIG_INSTALL_PATH
}
-
${
OPENCV_VERSION
}
/"
${
IPPICV_INSTALL_PATH
}
)
else
()
file
(
RELATIVE_PATH INSTALL_PATH_RELATIVE_IPPICV
"
${
CMAKE_INSTALL_PREFIX
}
/
${
OPENCV_CONFIG_INSTALL_PATH
}
/"
${
IPPICV_INSTALL_PATH
}
)
endif
()
endif
()
configure_file
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/templates/OpenCVConfig.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/unix-install/OpenCVConfig.cmake"
@ONLY
)
configure_file
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/templates/OpenCVConfig-version.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/unix-install/OpenCVConfig-version.cmake"
@ONLY
)
if
(
INSTALL_TO_MANGLED_PATHS
)
install
(
FILES
${
CMAKE_BINARY_DIR
}
/unix-install/OpenCVConfig.cmake DESTINATION
${
OPENCV_CONFIG_INSTALL_PATH
}
-
${
OPENCV_VERSION
}
/ COMPONENT dev
)
install
(
FILES
${
CMAKE_BINARY_DIR
}
/unix-install/OpenCVConfig-version.cmake DESTINATION
${
OPENCV_CONFIG_INSTALL_PATH
}
-
${
OPENCV_VERSION
}
/ COMPONENT dev
)
...
...
@@ -131,6 +145,13 @@ if(WIN32)
set
(
OpenCV2_INCLUDE_DIRS_CONFIGCMAKE
"
\"\"
"
)
exec_program
(
mkdir ARGS
"-p
\"
${
CMAKE_BINARY_DIR
}
/win-install/
\"
"
OUTPUT_VARIABLE RET_VAL
)
if
(
USE_IPPICV
)
if
(
BUILD_SHARED_LIBS
)
file
(
RELATIVE_PATH INSTALL_PATH_RELATIVE_IPPICV
"
${
CMAKE_INSTALL_PREFIX
}
/
${
OpenCV_INSTALL_BINARIES_PREFIX
}
lib"
${
IPPICV_INSTALL_PATH
}
)
else
()
file
(
RELATIVE_PATH INSTALL_PATH_RELATIVE_IPPICV
"
${
CMAKE_INSTALL_PREFIX
}
/
${
OpenCV_INSTALL_BINARIES_PREFIX
}
staticlib"
${
IPPICV_INSTALL_PATH
}
)
endif
()
endif
()
configure_file
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/templates/OpenCVConfig.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/win-install/OpenCVConfig.cmake"
@ONLY
)
configure_file
(
"
${
OpenCV_SOURCE_DIR
}
/cmake/templates/OpenCVConfig-version.cmake.in"
"
${
CMAKE_BINARY_DIR
}
/win-install/OpenCVConfig-version.cmake"
@ONLY
)
if
(
BUILD_SHARED_LIBS
)
...
...
cmake/templates/OpenCVConfig.cmake.in
浏览文件 @
ab2749d6
...
...
@@ -49,6 +49,18 @@ if(NOT DEFINED OpenCV_MODULES_SUFFIX)
endif()
endif()
if(@USE_IPPICV@) # value is defined by package builder
if(NOT TARGET ippicv)
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/@INSTALL_PATH_RELATIVE_IPPICV@")
add_library(ippicv STATIC IMPORTED)
set_target_properties(ippicv PROPERTIES
IMPORTED_LINK_INTERFACE_LIBRARIES ""
IMPORTED_LOCATION "${CMAKE_CURRENT_LIST_DIR}/@INSTALL_PATH_RELATIVE_IPPICV@"
)
endif()
endif()
endif()
if(NOT TARGET opencv_core)
include(${CMAKE_CURRENT_LIST_DIR}/OpenCVModules${OpenCV_MODULES_SUFFIX}.cmake)
endif()
...
...
modules/imgproc/src/corner.cpp
浏览文件 @
ab2749d6
...
...
@@ -544,7 +544,7 @@ void cv::cornerHarris( InputArray _src, OutputArray _dst, int blockSize, int ksi
scale
*=
2.0
;
if
(
depth
==
CV_8U
)
scale
*=
255.0
;
scale
=
std
::
pow
(
scale
,
-
4.0
f
);
scale
=
std
::
pow
(
scale
,
-
4.0
);
if
(
ippiHarrisCornerGetBufferSize
(
roisize
,
masksize
,
blockSize
,
datatype
,
cn
,
&
bufsize
)
>=
0
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录