Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
6e44e0a4
O
Opencv
项目概览
Greenplum
/
Opencv
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
6e44e0a4
编写于
5月 13, 2013
作者:
V
Vadim Pisarevsky
提交者:
OpenCV Buildbot
5月 13, 2013
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #881 from apavlenko:hidden_visibility
上级
88556629
b8ed00bd
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
42 addition
and
85 deletion
+42
-85
3rdparty/libjasper/CMakeLists.txt
3rdparty/libjasper/CMakeLists.txt
+3
-1
CMakeLists.txt
CMakeLists.txt
+0
-1
apps/haartraining/cvboost.cpp
apps/haartraining/cvboost.cpp
+1
-3
cmake/OpenCVCompilerOptions.cmake
cmake/OpenCVCompilerOptions.cmake
+6
-0
modules/contrib/include/opencv2/contrib/detection_based_tracker.hpp
...ntrib/include/opencv2/contrib/detection_based_tracker.hpp
+2
-2
modules/core/include/opencv2/core/cvdef.h
modules/core/include/opencv2/core/cvdef.h
+3
-1
modules/core/include/opencv2/core/cvstd.hpp
modules/core/include/opencv2/core/cvstd.hpp
+1
-1
modules/core/include/opencv2/core/types_c.h
modules/core/include/opencv2/core/types_c.h
+15
-3
modules/gpu/perf4au/main.cpp
modules/gpu/perf4au/main.cpp
+0
-2
modules/highgui/include/opencv2/highgui.hpp
modules/highgui/include/opencv2/highgui.hpp
+2
-2
modules/python/src2/cv2.cpp
modules/python/src2/cv2.cpp
+1
-5
modules/ts/include/opencv2/ts.hpp
modules/ts/include/opencv2/ts.hpp
+1
-10
modules/ts/include/opencv2/ts/ts_gtest.h
modules/ts/include/opencv2/ts/ts_gtest.h
+1
-13
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/include/opencv2/ts/ts_perf.hpp
+0
-10
samples/c/latentsvmdetect.cpp
samples/c/latentsvmdetect.cpp
+6
-23
samples/cpp/latentsvm_multidetect.cpp
samples/cpp/latentsvm_multidetect.cpp
+0
-8
未找到文件。
3rdparty/libjasper/CMakeLists.txt
浏览文件 @
6e44e0a4
...
...
@@ -23,7 +23,9 @@ if(WIN32 AND NOT MINGW)
add_definitions
(
-DJAS_WIN_MSVC_BUILD
)
endif
(
WIN32 AND NOT MINGW
)
ocv_warnings_disable
(
CMAKE_C_FLAGS -Wno-implicit-function-declaration -Wno-uninitialized -Wmissing-prototypes -Wmissing-declarations -Wunused -Wshadow -Wsign-compare
)
ocv_warnings_disable
(
CMAKE_C_FLAGS -Wno-implicit-function-declaration -Wno-uninitialized
-Wmissing-prototypes -Wmissing-declarations -Wunused -Wshadow
-Wsign-compare -Wstrict-overflow
)
ocv_warnings_disable
(
CMAKE_C_FLAGS -Wunused-parameter
)
# clang
ocv_warnings_disable
(
CMAKE_C_FLAGS /wd4013 /wd4018 /wd4101 /wd4244 /wd4267 /wd4715
)
# vs2005
...
...
CMakeLists.txt
浏览文件 @
6e44e0a4
...
...
@@ -285,7 +285,6 @@ endif()
# Path for build/platform -specific headers
# ----------------------------------------------------------------------------
set
(
OPENCV_CONFIG_FILE_INCLUDE_DIR
"
${
CMAKE_BINARY_DIR
}
/"
CACHE PATH
"Where to create the platform-dependant cvconfig.h"
)
add_definitions
(
-DHAVE_CVCONFIG_H
)
ocv_include_directories
(
${
OPENCV_CONFIG_FILE_INCLUDE_DIR
}
)
...
...
apps/haartraining/cvboost.cpp
浏览文件 @
6e44e0a4
...
...
@@ -39,9 +39,7 @@
//
//M*/
#ifdef HAVE_CVCONFIG_H
#include "cvconfig.h"
#endif
#include "cvconfig.h"
#ifdef HAVE_MALLOC_H
#include <malloc.h>
...
...
cmake/OpenCVCompilerOptions.cmake
浏览文件 @
6e44e0a4
...
...
@@ -250,6 +250,12 @@ set(OPENCV_EXTRA_EXE_LINKER_FLAGS "${OPENCV_EXTRA_EXE_LINKER_FLAGS}"
set
(
OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE
"
${
OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE
}
"
CACHE INTERNAL
"Extra linker flags for Release build"
)
set
(
OPENCV_EXTRA_EXE_LINKER_FLAGS_DEBUG
"
${
OPENCV_EXTRA_EXE_LINKER_FLAGS_DEBUG
}
"
CACHE INTERNAL
"Extra linker flags for Debug build"
)
# set default visibility to hidden
if
(
CMAKE_COMPILER_IS_GNUCXX AND CMAKE_OPENCV_GCC_VERSION_NUM GREATER 399
)
add_extra_compiler_option
(
-fvisibility=hidden
)
add_extra_compiler_option
(
-fvisibility-inlines-hidden
)
endif
()
#combine all "extra" options
set
(
CMAKE_C_FLAGS
"
${
CMAKE_C_FLAGS
}
${
OPENCV_EXTRA_FLAGS
}
${
OPENCV_EXTRA_C_FLAGS
}
"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
${
OPENCV_EXTRA_FLAGS
}
${
OPENCV_EXTRA_CXX_FLAGS
}
"
)
...
...
modules/contrib/include/opencv2/contrib/detection_based_tracker.hpp
浏览文件 @
6e44e0a4
#pragma once
#if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(
ANDROID
)
#if defined(__linux__) || defined(LINUX) || defined(__APPLE__) || defined(
__ANDROID__
)
#include <opencv2/core.hpp>
#include <opencv2/objdetect.hpp>
...
...
@@ -9,7 +9,7 @@
namespace
cv
{
class
DetectionBasedTracker
class
CV_EXPORTS
DetectionBasedTracker
{
public:
struct
Parameters
...
...
modules/core/include/opencv2/core/cvdef.h
浏览文件 @
6e44e0a4
...
...
@@ -73,8 +73,10 @@
# define CV_ENABLE_UNROLLED 1
#endif
#if (defined WIN32 || defined _WIN32 || defined WINCE) && defined CVAPI_EXPORTS
#if (defined WIN32 || defined _WIN32 || defined WINCE
|| defined __CYGWIN__
) && defined CVAPI_EXPORTS
# define CV_EXPORTS __declspec(dllexport)
#elif defined __GNUC__ && __GNUC__ >= 4
# define CV_EXPORTS __attribute__ ((visibility ("default")))
#else
# define CV_EXPORTS
#endif
...
...
modules/core/include/opencv2/core/cvstd.hpp
浏览文件 @
6e44e0a4
...
...
@@ -174,7 +174,7 @@ public:
To make it all work, you need to specialize Ptr<>::delete_obj(), like:
\code
template<> void Ptr<MyObjectType>::delete_obj() { call_destructor_func(obj); }
template<>
CV_EXPORTS
void Ptr<MyObjectType>::delete_obj() { call_destructor_func(obj); }
\endcode
\note{if MyObjectType is a C++ class with a destructor, you do not need to specialize delete_obj(),
...
...
modules/core/include/opencv2/core/types_c.h
浏览文件 @
6e44e0a4
...
...
@@ -272,7 +272,11 @@ CV_INLINE double cvRandReal( CvRNG* rng )
#define IPL_BORDER_REFLECT 2
#define IPL_BORDER_WRAP 3
typedef
struct
CV_EXPORTS
_IplImage
typedef
struct
#ifdef __cplusplus
CV_EXPORTS
#endif
_IplImage
{
int
nSize
;
/* sizeof(IplImage) */
int
ID
;
/* version (=0)*/
...
...
@@ -563,7 +567,11 @@ CV_INLINE int cvIplDepth( int type )
#define CV_MAX_DIM 32
#define CV_MAX_DIM_HEAP 1024
typedef
struct
CV_EXPORTS
CvMatND
typedef
struct
#ifdef __cplusplus
CV_EXPORTS
#endif
CvMatND
{
int
type
;
int
dims
;
...
...
@@ -610,7 +618,11 @@ CvMatND;
struct
CvSet
;
typedef
struct
CV_EXPORTS
CvSparseMat
typedef
struct
#ifdef __cplusplus
CV_EXPORTS
#endif
CvSparseMat
{
int
type
;
int
dims
;
...
...
modules/gpu/perf4au/main.cpp
浏览文件 @
6e44e0a4
...
...
@@ -42,9 +42,7 @@
#include <cstdio>
#ifdef HAVE_CVCONFIG_H
#include "cvconfig.h"
#endif
#include "opencv2/core.hpp"
#include "opencv2/gpu.hpp"
#include "opencv2/highgui.hpp"
...
...
modules/highgui/include/opencv2/highgui.hpp
浏览文件 @
6e44e0a4
...
...
@@ -542,8 +542,8 @@ protected:
Ptr
<
CvVideoWriter
>
writer
;
};
template
<
>
void
Ptr
<
CvCapture
>::
delete_obj
();
template
<
>
void
Ptr
<
CvVideoWriter
>::
delete_obj
();
template
<
>
CV_EXPORTS
void
Ptr
<
CvCapture
>::
delete_obj
();
template
<
>
CV_EXPORTS
void
Ptr
<
CvVideoWriter
>::
delete_obj
();
}
// cv
...
...
modules/python/src2/cv2.cpp
浏览文件 @
6e44e0a4
...
...
@@ -1205,11 +1205,7 @@ static int to_ok(PyTypeObject *to)
return
(
PyType_Ready
(
to
)
==
0
);
}
extern
"C"
#if defined WIN32 || defined _WIN32
__declspec
(
dllexport
)
#endif
void
initcv2
();
extern
"C"
CV_EXPORTS
void
initcv2
();
void
initcv2
()
{
...
...
modules/ts/include/opencv2/ts.hpp
浏览文件 @
6e44e0a4
#ifndef __OPENCV_GTESTCV_HPP__
#define __OPENCV_GTESTCV_HPP__
#ifdef HAVE_CVCONFIG_H
# include "cvconfig.h"
#endif
#ifndef GTEST_CREATE_SHARED_LIBRARY
#ifdef BUILD_SHARED_LIBS
#define GTEST_LINKED_AS_SHARED_LIBRARY 1
#endif
#endif
#include "opencv2/core/cvdef.h"
#include <stdarg.h> // for va_list
#ifdef _MSC_VER
...
...
modules/ts/include/opencv2/ts/ts_gtest.h
浏览文件 @
6e44e0a4
...
...
@@ -1912,19 +1912,7 @@ using ::std::tuple_size;
#endif // GTEST_HAS_SEH
#ifdef _MSC_VER
# if GTEST_LINKED_AS_SHARED_LIBRARY
# define GTEST_API_ __declspec(dllimport)
# elif GTEST_CREATE_SHARED_LIBRARY
# define GTEST_API_ __declspec(dllexport)
# endif
#endif // _MSC_VER
#ifndef GTEST_API_
# define GTEST_API_
#endif
#define GTEST_API_ CV_EXPORTS
#ifdef __GNUC__
// Ask the compiler to never inline a given function.
...
...
modules/ts/include/opencv2/ts/ts_perf.hpp
浏览文件 @
6e44e0a4
#ifndef __OPENCV_TS_PERF_HPP__
#define __OPENCV_TS_PERF_HPP__
#ifdef HAVE_CVCONFIG_H
# include "cvconfig.h"
#endif
#ifndef GTEST_CREATE_SHARED_LIBRARY
# ifdef BUILD_SHARED_LIBS
# define GTEST_LINKED_AS_SHARED_LIBRARY 1
# endif
#endif
#include "opencv2/core.hpp"
#include "ts_gtest.h"
...
...
samples/c/latentsvmdetect.cpp
浏览文件 @
6e44e0a4
#include "opencv2/objdetect/objdetect_c.h"
#include "opencv2/highgui/highgui_c.h"
#include "opencv2/core/utility.hpp"
#include <stdio.h>
#ifdef HAVE_CVCONFIG_H
#include <cvconfig.h>
#endif
#ifdef HAVE_TBB
#include "tbb/task_scheduler_init.h"
#endif
using
namespace
cv
;
static
void
help
()
...
...
@@ -31,28 +25,17 @@ static void detect_and_draw_objects( IplImage* image, CvLatentSvmDetector* detec
CvSeq
*
detections
=
0
;
int
i
=
0
;
int64
start
=
0
,
finish
=
0
;
#ifdef HAVE_TBB
tbb
::
task_scheduler_init
init
(
tbb
::
task_scheduler_init
::
deferred
);
if
(
numThreads
>
0
)
{
init
.
initialize
(
numThreads
);
printf
(
"Number of threads %i
\n
"
,
numThreads
);
}
else
{
printf
(
"Number of threads is not correct for TBB version"
);
return
;
}
#endif
setNumThreads
(
numThreads
);
numThreads
=
getNumThreads
();
printf
(
"Number of threads %i
\n
"
,
numThreads
);
start
=
cvGetTickCount
();
detections
=
cvLatentSvmDetectObjects
(
image
,
detector
,
storage
,
0.5
f
,
numThreads
);
finish
=
cvGetTickCount
();
printf
(
"detection time = %.3f
\n
"
,
(
float
)(
finish
-
start
)
/
(
float
)(
cvGetTickFrequency
()
*
1000000.0
));
setNumThreads
(
-
1
);
#ifdef HAVE_TBB
init
.
terminate
();
#endif
for
(
i
=
0
;
i
<
detections
->
total
;
i
++
)
{
CvObjectDetection
detection
=
*
(
CvObjectDetection
*
)
cvGetSeqElem
(
detections
,
i
);
...
...
samples/cpp/latentsvm_multidetect.cpp
浏览文件 @
6e44e0a4
...
...
@@ -9,14 +9,6 @@
#include <dirent.h>
#endif
#ifdef HAVE_CVCONFIG_H
#include <cvconfig.h>
#endif
#ifdef HAVE_TBB
#include "tbb/task_scheduler_init.h"
#endif
using
namespace
std
;
using
namespace
cv
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录