|
2630
|
1 |
--- OpenCV-2.1.0.orig/src/cxcore/cxdxt.cpp 2010-04-05 21:24:44.000000000 -0400
|
|
|
2 |
+++ OpenCV-2.1.0/src/cxcore/cxdxt.cpp 2010-05-13 01:25:31.114860092 -0400
|
|
|
3 |
@@ -455,53 +455,53 @@
|
|
|
4 |
#endif
|
|
|
5 |
|
|
|
6 |
#ifdef HAVE_IPP
|
|
|
7 |
-static void ippsDFTFwd_CToC( const Complex<float>* src, Complex<float>* dst,
|
|
|
8 |
+static inline void ippsDFTFwd_CToC( const Complex<float>* src, Complex<float>* dst,
|
|
|
9 |
const void* spec, uchar* buf)
|
|
|
10 |
{
|
|
|
11 |
ippsDFTFwd_CToC_32fc( (const Ipp32fc*)src, (Ipp32fc*)dst,
|
|
|
12 |
(const IppsDFTSpec_C_32fc*)spec, buf);
|
|
|
13 |
}
|
|
|
14 |
|
|
|
15 |
-static void ippsDFTFwd_CToC( const Complex<double>* src, Complex<double>* dst,
|
|
|
16 |
+static inline void ippsDFTFwd_CToC( const Complex<double>* src, Complex<double>* dst,
|
|
|
17 |
const void* spec, uchar* buf)
|
|
|
18 |
{
|
|
|
19 |
ippsDFTFwd_CToC_64fc( (const Ipp64fc*)src, (Ipp64fc*)dst,
|
|
|
20 |
(const IppsDFTSpec_C_64fc*)spec, buf);
|
|
|
21 |
}
|
|
|
22 |
|
|
|
23 |
-static void ippsDFTInv_CToC( const Complex<float>* src, Complex<float>* dst,
|
|
|
24 |
+static inline void ippsDFTInv_CToC( const Complex<float>* src, Complex<float>* dst,
|
|
|
25 |
const void* spec, uchar* buf)
|
|
|
26 |
{
|
|
|
27 |
ippsDFTInv_CToC_32fc( (const Ipp32fc*)src, (Ipp32fc*)dst,
|
|
|
28 |
(const IppsDFTSpec_C_32fc*)spec, buf);
|
|
|
29 |
}
|
|
|
30 |
|
|
|
31 |
-static void ippsDFTInv_CToC( const Complex<double>* src, Complex<double>* dst,
|
|
|
32 |
+static inline void ippsDFTInv_CToC( const Complex<double>* src, Complex<double>* dst,
|
|
|
33 |
const void* spec, uchar* buf)
|
|
|
34 |
{
|
|
|
35 |
ippsDFTInv_CToC_64fc( (const Ipp64fc*)src, (Ipp64fc*)dst,
|
|
|
36 |
(const IppsDFTSpec_C_64fc*)spec, buf);
|
|
|
37 |
}
|
|
|
38 |
|
|
|
39 |
-static void ippsDFTFwd_RToPack( const float* src, float* dst,
|
|
|
40 |
+static inline void ippsDFTFwd_RToPack( const float* src, float* dst,
|
|
|
41 |
const void* spec, uchar* buf)
|
|
|
42 |
{
|
|
|
43 |
ippsDFTFwd_RToPack_32f( src, dst, (const IppsDFTSpec_R_32f*)spec, buf);
|
|
|
44 |
}
|
|
|
45 |
|
|
|
46 |
-static void ippsDFTFwd_RToPack( const double* src, double* dst,
|
|
|
47 |
+static inline void ippsDFTFwd_RToPack( const double* src, double* dst,
|
|
|
48 |
const void* spec, uchar* buf)
|
|
|
49 |
{
|
|
|
50 |
ippsDFTFwd_RToPack_64f( src, dst, (const IppsDFTSpec_R_64f*)spec, buf);
|
|
|
51 |
}
|
|
|
52 |
|
|
|
53 |
-static void ippsDFTInv_PackToR( const float* src, float* dst,
|
|
|
54 |
+static inline void ippsDFTInv_PackToR( const float* src, float* dst,
|
|
|
55 |
const void* spec, uchar* buf)
|
|
|
56 |
{
|
|
|
57 |
ippsDFTInv_PackToR_32f( src, dst, (const IppsDFTSpec_R_32f*)spec, buf);
|
|
|
58 |
}
|
|
|
59 |
|
|
|
60 |
-static void ippsDFTInv_PackToR( const double* src, double* dst,
|
|
|
61 |
+static inline void ippsDFTInv_PackToR( const double* src, double* dst,
|
|
|
62 |
const void* spec, uchar* buf)
|
|
|
63 |
{
|
|
|
64 |
ippsDFTInv_PackToR_64f( src, dst, (const IppsDFTSpec_R_64f*)spec, buf);
|