Remove more old definitions from internal.hpp
This commit is contained in:
@@ -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
|
||||
{
|
||||
|
@@ -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)
|
||||
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user