Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
d62bc8cf
O
Opencv
项目概览
Greenplum
/
Opencv
10 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
d62bc8cf
编写于
4月 01, 2013
作者:
A
Andrey Kamaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove more old definitions from internal.hpp
上级
e972d6b8
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
85 addition
and
88 deletion
+85
-88
apps/traincascade/boost.cpp
apps/traincascade/boost.cpp
+2
-2
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/internal.hpp
+40
-79
modules/core/include/opencv2/core/types_c.h
modules/core/include/opencv2/core/types_c.h
+4
-0
modules/core/src/array.cpp
modules/core/src/array.cpp
+6
-0
modules/core/src/datastructs.cpp
modules/core/src/datastructs.cpp
+6
-0
modules/core/src/precomp.hpp
modules/core/src/precomp.hpp
+12
-6
modules/imgproc/src/color.cpp
modules/imgproc/src/color.cpp
+2
-0
modules/imgproc/src/demosaicing.cpp
modules/imgproc/src/demosaicing.cpp
+2
-0
modules/imgproc/src/distransform.cpp
modules/imgproc/src/distransform.cpp
+1
-0
modules/imgproc/src/filter.cpp
modules/imgproc/src/filter.cpp
+1
-1
modules/legacy/src/precomp.hpp
modules/legacy/src/precomp.hpp
+4
-0
modules/ml/src/precomp.hpp
modules/ml/src/precomp.hpp
+3
-0
modules/video/src/lkpyramid.cpp
modules/video/src/lkpyramid.cpp
+2
-0
未找到文件。
apps/traincascade/boost.cpp
浏览文件 @
d62bc8cf
...
...
@@ -44,7 +44,7 @@ static CvMat* cvPreprocessIndexArray( const CvMat* idx_arr, int data_arr_size, b
CV_FUNCNAME
(
"cvPreprocessIndexArray"
);
__BEGIN__
;
__
CV_
BEGIN__
;
int
i
,
idx_total
,
idx_selected
=
0
,
step
,
type
,
prev
=
INT_MIN
,
is_sorted
=
1
;
uchar
*
srcb
=
0
;
...
...
@@ -132,7 +132,7 @@ static CvMat* cvPreprocessIndexArray( const CvMat* idx_arr, int data_arr_size, b
}
}
__END__
;
__
CV_
END__
;
if
(
cvGetErrStatus
()
<
0
)
cvReleaseMat
(
&
idx
);
...
...
modules/core/include/opencv2/core/internal.hpp
浏览文件 @
d62bc8cf
...
...
@@ -7,11 +7,12 @@
// copy or use the software.
//
//
//
License Agreement
// License Agreement
// For Open Source Computer Vision Library
//
// Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
// Copyright (C) 2009, Willow Garage Inc., all rights reserved.
// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
// Third party copyrights are property of their respective owners.
//
// Redistribution and use in source and binary forms, with or without modification,
...
...
@@ -40,30 +41,22 @@
//
//M*/
/* The header is for internal use and it is likely to change.
It contains some macro definitions that are used in cxcore, cv, cvaux
and, probably, other libraries. If you need some of this functionality,
the safe way is to copy it into your code and rename the macros.
*/
#ifndef __OPENCV_CORE_INTERNAL_HPP__
#define __OPENCV_CORE_INTERNAL_HPP__
#ifndef __OPENCV_CORE_PRIVATE_HPP__
#define __OPENCV_CORE_PRIVATE_HPP__
#define __BEGIN__ __CV_BEGIN__
#define __END__ __CV_END__
#define EXIT __CV_EXIT__
#ifdef HAVE_IPP
# include "ipp.h"
CV_INLINE
IppiSize
ippiSize
(
int
width
,
int
height
)
{
IppiSize
size
=
{
width
,
height
};
return
size
;
}
#ifndef __OPENCV_BUILD
# error this is a private header which should not be used from outside of the OpenCV library
#endif
#ifndef IPPI_CALL
# define IPPI_CALL(func) CV_Assert((func) >= 0)
#include "opencv2/core.hpp"
#include "cvconfig.h"
#ifdef HAVE_EIGEN
# if defined __GNUC__ && defined __APPLE__
# pragma GCC diagnostic ignored "-Wshadow"
# endif
# include <Eigen/Core>
# include "opencv2/core/eigen.hpp"
#endif
#ifdef HAVE_TBB
...
...
@@ -78,16 +71,6 @@ CV_INLINE IppiSize ippiSize(int width, int height)
# endif
#endif
#ifdef HAVE_EIGEN
# if defined __GNUC__ && defined __APPLE__
# pragma GCC diagnostic ignored "-Wshadow"
# endif
# include <Eigen/Core>
# include "opencv2/core/eigen.hpp"
#endif
#ifdef __cplusplus
namespace
cv
{
#ifdef HAVE_TBB
...
...
@@ -167,33 +150,14 @@ namespace cv
return &classname##_info(); \
}
#endif //__cplusplus
/* default image row align (in bytes) */
#define CV_DEFAULT_IMAGE_ROW_ALIGN 4
/* the alignment of all the allocated buffers */
#define CV_MALLOC_ALIGN 16
/* default alignment for dynamic data strucutures, resided in storages. */
#define CV_STRUCT_ALIGN ((int)sizeof(double))
/* default storage block size */
#define CV_STORAGE_BLOCK_SIZE ((1<<16) - 128)
/* default memory block for sparse array elements */
#define CV_SPARSE_MAT_BLOCK (1<<12)
/* initial hash table size */
#define CV_SPARSE_HASH_SIZE0 (1<<10)
/* maximal average node_count/hash_size ratio beyond which hash table is resized */
#define CV_SPARSE_HASH_RATIO 3
/****************************************************************************************\
* Common declarations *
\****************************************************************************************/
/* the alignment of all the allocated buffers */
#define CV_MALLOC_ALIGN 16
#ifdef __GNUC__
# define CV_DECL_ALIGNED(x) __attribute__ ((aligned (x)))
#elif defined _MSC_VER
...
...
@@ -202,48 +166,45 @@ namespace cv
# define CV_DECL_ALIGNED(x)
#endif
#ifndef CV_IMPL
# define CV_IMPL CV_EXTERN_C
#endif
#define CV_ORIGIN_TL 0
#define CV_ORIGIN_BL 1
/* IEEE754 constants and macros */
#define CV_TOGGLE_FLT(x) ((x)^((int)(x) < 0 ? 0x7fffffff : 0))
#define CV_TOGGLE_DBL(x) \
((x)^((int64)(x) < 0 ? CV_BIG_INT(0x7fffffffffffffff) : 0))
//TODO: remove after dropping sorts
#define CV_LT(a, b) ((a) < (b))
#define CV_TOGGLE_DBL(x) ((x)^((int64)(x) < 0 ? CV_BIG_INT(0x7fffffffffffffff) : 0))
CV_INLINE
void
*
cvAlignPtr
(
const
void
*
ptr
,
int
align
CV_DEFAULT
(
32
)
)
static
inline
void
*
cvAlignPtr
(
const
void
*
ptr
,
int
align
CV_DEFAULT
(
32
)
)
{
assert
(
(
align
&
(
align
-
1
))
==
0
);
CV_DbgAssert
(
(
align
&
(
align
-
1
))
==
0
);
return
(
void
*
)(
((
size_t
)
ptr
+
align
-
1
)
&
~
(
size_t
)(
align
-
1
)
);
}
CV_INLINE
int
cvAlign
(
int
size
,
int
align
)
static
inline
int
cvAlign
(
int
size
,
int
align
)
{
a
ssert
(
(
align
&
(
align
-
1
))
==
0
&&
size
<
INT_MAX
);
CV_DbgA
ssert
(
(
align
&
(
align
-
1
))
==
0
&&
size
<
INT_MAX
);
return
(
size
+
align
-
1
)
&
-
align
;
}
CV_INLINE
CvSize
cvGetMatSize
(
const
CvMat
*
mat
)
static
inline
cv
::
Size
cvGetMatSize
(
const
CvMat
*
mat
)
{
CvSize
size
;
size
.
width
=
mat
->
cols
;
size
.
height
=
mat
->
rows
;
return
size
;
return
cv
::
Size
(
mat
->
cols
,
mat
->
rows
);
}
#define CV_DESCALE(x,n) (((x) + (1 << ((n)-1))) >> (n))
#define CV_FLT_TO_FIX(x,n) cvRound((x)*(1<<(n)))
/****************************************************************************************\
* Structures and macros for integration with IPP *
\****************************************************************************************/
#ifdef HAVE_IPP
# include "ipp.h"
static
inline
IppiSize
ippiSize
(
int
width
,
int
height
)
{
IppiSize
size
=
{
width
,
height
};
return
size
;
}
#endif
#ifndef IPPI_CALL
# define IPPI_CALL(func) CV_Assert((func) >= 0)
#endif
/* IPP-compatible return codes */
typedef
enum
CvStatus
{
...
...
@@ -284,4 +245,4 @@ typedef enum CvStatus
}
CvStatus
;
#endif // __OPENCV_CORE_
INTERNAL
_HPP__
#endif // __OPENCV_CORE_
PRIVATE
_HPP__
modules/core/include/opencv2/core/types_c.h
浏览文件 @
d62bc8cf
...
...
@@ -92,6 +92,10 @@
# define CVAPI(rettype) CV_EXTERN_C CV_EXPORTS rettype CV_CDECL
#endif
#ifndef CV_IMPL
# define CV_IMPL CV_EXTERN_C
#endif
#ifdef __cplusplus
# include "opencv2/core.hpp"
#endif
...
...
modules/core/src/array.cpp
浏览文件 @
d62bc8cf
...
...
@@ -48,6 +48,12 @@
#include "precomp.hpp"
#define CV_ORIGIN_TL 0
#define CV_ORIGIN_BL 1
/* default image row align (in bytes) */
#define CV_DEFAULT_IMAGE_ROW_ALIGN 4
static
struct
{
...
...
modules/core/src/datastructs.cpp
浏览文件 @
d62bc8cf
...
...
@@ -40,6 +40,12 @@
//M*/
#include "precomp.hpp"
/* default alignment for dynamic data strucutures, resided in storages. */
#define CV_STRUCT_ALIGN ((int)sizeof(double))
/* default storage block size */
#define CV_STORAGE_BLOCK_SIZE ((1<<16) - 128)
#define ICV_FREE_PTR(storage) \
((schar*)(storage)->top + (storage)->block_size - (storage)->free_space)
...
...
modules/core/src/precomp.hpp
浏览文件 @
d62bc8cf
...
...
@@ -96,11 +96,22 @@ static inline void ___cudaSafeCall(cudaError_t err, const char *file, const int
#else
# define cudaSafeCall(expr)
#endif
#endif
//HAVE_CUDA
namespace
cv
{
/* default memory block for sparse array elements */
#define CV_SPARSE_MAT_BLOCK (1<<12)
/* initial hash table size */
#define CV_SPARSE_HASH_SIZE0 (1<<10)
/* maximal average node_count/hash_size ratio beyond which hash table is resized */
#define CV_SPARSE_HASH_RATIO 3
// -128.f ... 255.f
extern
const
float
g_8x32fTab
[];
#define CV_8TO32F(x) cv::g_8x32fTab[(x)+128]
...
...
@@ -207,11 +218,6 @@ extern volatile bool USE_AVX;
enum
{
BLOCK_SIZE
=
1024
};
#ifdef HAVE_IPP
static
inline
IppiSize
ippiSize
(
int
width
,
int
height
)
{
IppiSize
sz
=
{
width
,
height
};
return
sz
;
}
static
inline
IppiSize
ippiSize
(
Size
_sz
)
{
IppiSize
sz
=
{
_sz
.
width
,
_sz
.
height
};
return
sz
;
}
#endif
#if defined HAVE_IPP && (IPP_VERSION_MAJOR >= 7)
#define ARITHM_USE_IPP 1
#define IF_IPP(then_call, else_call) then_call
...
...
modules/imgproc/src/color.cpp
浏览文件 @
d62bc8cf
...
...
@@ -92,6 +92,8 @@
#include "precomp.hpp"
#include <limits>
#define CV_DESCALE(x,n) (((x) + (1 << ((n)-1))) >> (n))
namespace
cv
{
...
...
modules/imgproc/src/demosaicing.cpp
浏览文件 @
d62bc8cf
...
...
@@ -44,6 +44,8 @@
#include <limits>
#define CV_DESCALE(x,n) (((x) + (1 << ((n)-1))) >> (n))
namespace
cv
{
...
...
modules/imgproc/src/distransform.cpp
浏览文件 @
d62bc8cf
...
...
@@ -46,6 +46,7 @@ namespace cv
static
const
int
DIST_SHIFT
=
16
;
static
const
int
INIT_DIST0
=
(
INT_MAX
>>
2
);
#define CV_FLT_TO_FIX(x,n) cvRound((x)*(1<<(n)))
static
void
initTopBottom
(
Mat
&
temp
,
int
border
)
...
...
modules/imgproc/src/filter.cpp
浏览文件 @
d62bc8cf
...
...
@@ -193,7 +193,7 @@ void FilterEngine::init( const Ptr<BaseFilter>& _filter2D,
wholeSize
=
Size
(
-
1
,
-
1
);
}
static
const
int
VEC_ALIGN
=
CV_MALLOC_ALIGN
;
#define VEC_ALIGN CV_MALLOC_ALIGN
int
FilterEngine
::
start
(
Size
_wholeSize
,
Rect
_roi
,
int
_maxBufRows
)
{
...
...
modules/legacy/src/precomp.hpp
浏览文件 @
d62bc8cf
...
...
@@ -54,6 +54,10 @@
#include "opencv2/core/utility.hpp"
#include "opencv2/core/internal.hpp"
#define __BEGIN__ __CV_BEGIN__
#define __END__ __CV_END__
#define EXIT __CV_EXIT__
#include "_matrix.h"
CV_INLINE
bool
operator
==
(
CvSize
size1
,
CvSize
size2
);
...
...
modules/ml/src/precomp.hpp
浏览文件 @
d62bc8cf
...
...
@@ -61,6 +61,9 @@
#include <time.h>
#define ML_IMPL CV_IMPL
#define __BEGIN__ __CV_BEGIN__
#define __END__ __CV_END__
#define EXIT __CV_EXIT__
#define CV_MAT_ELEM_FLAG( mat, type, comp, vect, tflag ) \
(( tflag == CV_ROW_SAMPLE ) \
...
...
modules/video/src/lkpyramid.cpp
浏览文件 @
d62bc8cf
...
...
@@ -44,6 +44,8 @@
#include <stdio.h>
#include "lkpyramid.hpp"
#define CV_DESCALE(x,n) (((x) + (1 << ((n)-1))) >> (n))
namespace
{
static
void
calcSharrDeriv
(
const
cv
::
Mat
&
src
,
cv
::
Mat
&
dst
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录