projects
/
opencv
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update the trunk to the OpenCV's CVS (2008-07-14)
[opencv]
/
cxcore
/
include
/
cxmisc.h
diff --git
a/cxcore/include/cxmisc.h
b/cxcore/include/cxmisc.h
index
75e2b2c
..
9a04cdf
100644
(file)
--- a/
cxcore/include/cxmisc.h
+++ b/
cxcore/include/cxmisc.h
@@
-109,7
+109,7
@@
#endif
#if 0 /*def CV_CHECK_FOR_NANS*/
#endif
#if 0 /*def CV_CHECK_FOR_NANS*/
- #define CV_CHECK_NANS( arr ) cvCheckArray((arr))
+ #define CV_CHECK_NANS( arr ) cvCheckArray((arr))
#else
#define CV_CHECK_NANS( arr )
#endif
#else
#define CV_CHECK_NANS( arr )
#endif
@@
-192,9
+192,9
@@
#define CV_NONZERO(a) ((a) != 0)
#define CV_NONZERO_FLT(a) (((a)+(a)) != 0)
#define CV_NONZERO(a) ((a) != 0)
#define CV_NONZERO_FLT(a) (((a)+(a)) != 0)
-/* general-purpose saturation macros */
+/* general-purpose saturation macros */
#define CV_CAST_8U(t) (uchar)(!((t) & ~255) ? (t) : (t) > 0 ? 255 : 0)
#define CV_CAST_8U(t) (uchar)(!((t) & ~255) ? (t) : (t) > 0 ? 255 : 0)
-#define CV_CAST_8S(t) (char)(!(((t)+128) & ~255) ? (t) : (t) > 0 ? 127 : -128)
+#define CV_CAST_8S(t) (schar)(!(((t)+128) & ~255) ? (t) : (t) > 0 ? 127 : -128)
#define CV_CAST_16U(t) (ushort)(!((t) & ~65535) ? (t) : (t) > 0 ? 65535 : 0)
#define CV_CAST_16S(t) (short)(!(((t)+32768) & ~65535) ? (t) : (t) > 0 ? 32767 : -32768)
#define CV_CAST_32S(t) (int)(t)
#define CV_CAST_16U(t) (ushort)(!((t) & ~65535) ? (t) : (t) > 0 ? 65535 : 0)
#define CV_CAST_16S(t) (short)(!(((t)+32768) & ~65535) ? (t) : (t) > 0 ? 32767 : -32768)
#define CV_CAST_32S(t) (int)(t)
@@
-224,7
+224,7
@@
#define CV_UN_ENTRY_C1(worktype) \
worktype s0 = scalar[0]
#define CV_UN_ENTRY_C1(worktype) \
worktype s0 = scalar[0]
-
+
#define CV_UN_ENTRY_C2(worktype) \
worktype s0 = scalar[0], s1 = scalar[1]
#define CV_UN_ENTRY_C2(worktype) \
worktype s0 = scalar[0], s1 = scalar[1]
@@
-273,14
+273,14
@@
CvFastDiv;
CV_INLINE CvFastDiv cvFastDiv( int divisor )
{
CvFastDiv fastdiv;
CV_INLINE CvFastDiv cvFastDiv( int divisor )
{
CvFastDiv fastdiv;
-
+
assert( divisor >= 1 );
uint64 temp = ((uint64)1 << CV_FAST_DIV_SHIFT)/divisor;
fastdiv.divisor = divisor;
fastdiv.delta = (unsigned)(((temp & 1) ^ 1) + divisor - 1);
fastdiv.scale = (unsigned)((temp + 1) >> 1);
assert( divisor >= 1 );
uint64 temp = ((uint64)1 << CV_FAST_DIV_SHIFT)/divisor;
fastdiv.divisor = divisor;
fastdiv.delta = (unsigned)(((temp & 1) ^ 1) + divisor - 1);
fastdiv.scale = (unsigned)((temp + 1) >> 1);
-
+
return fastdiv;
}
return fastdiv;
}
@@
-361,7
+361,7
@@
CV_INLINE CvFastDiv cvFastDiv( int divisor )
/****************************************************************************************\
/****************************************************************************************\
-
+
Generic implementation of QuickSort algorithm.
----------------------------------------------
Using this macro user can declare customized sort function that can be much faster
Generic implementation of QuickSort algorithm.
----------------------------------------------
Using this macro user can declare customized sort function that can be much faster
@@
-595,7
+595,7
@@
void func_name( T *array, size_t total, user_data_type aux )
/* IPP-compatible return codes */
typedef enum CvStatus
/* IPP-compatible return codes */
typedef enum CvStatus
-{
+{
CV_BADMEMBLOCK_ERR = -113,
CV_INPLACE_NOT_SUPPORTED_ERR= -112,
CV_UNMATCHED_ROI_ERR = -111,
CV_BADMEMBLOCK_ERR = -113,
CV_INPLACE_NOT_SUPPORTED_ERR= -112,
CV_UNMATCHED_ROI_ERR = -111,
@@
-671,10
+671,10
@@
CvStatus;
#endif
#define IPCVAPI_EX(type,name,ipp_name,ipp_search_modules,args) \
#endif
#define IPCVAPI_EX(type,name,ipp_name,ipp_search_modules,args) \
- IPCVAPI(type,CV_STDCALL,name,args)
+ IPCVAPI(type,CV_STDCALL,name,args)
#define IPCVAPI_C_EX(type,name,ipp_name,ipp_search_modules,args)\
#define IPCVAPI_C_EX(type,name,ipp_name,ipp_search_modules,args)\
- IPCVAPI(type,CV_CDECL,name,args)
+ IPCVAPI(type,CV_CDECL,name,args)
#ifndef IPCVAPI_IMPL
#define IPCVAPI_IMPL(type,name,args,arg_names) \
#ifndef IPCVAPI_IMPL
#define IPCVAPI_IMPL(type,name,args,arg_names) \