generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some fixes due to the changed policy in DataType & DataDepth handling

Browse Source
This commit is contained in:
Vadim Pisarevsky
2010-10-20 17:43:46 +00:00
parent 7d0feef775
commit be016a75df
6 changed files with 85 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/core/src/copy.cpp
View File

@@ -130,15 +130,15 @@ CopyMaskFunc g_copyMaskFuncTab[] =
0,
copyMask_<Vec<ushort,3> >, // 6
0,
copyMask_<int64>, // 8
copyMask_<Vec<int,2> >, // 8
0, 0, 0,
copyMask_<Vec<int,3> >, // 12
0, 0, 0,
copyMask_<Vec<int64,2> >, // 16
copyMask_<Vec<int,4> >, // 16
0, 0, 0, 0, 0, 0, 0,
copyMask_<Vec<int64,3> >, // 24
copyMask_<Vec<int,6> >, // 24
0, 0, 0, 0, 0, 0, 0,
copyMask_<Vec<int64,4> > // 32
copyMask_<Vec<int,8> > // 32
};
static SetMaskFunc setMaskFuncTab[] =
@@ -151,15 +151,15 @@ static SetMaskFunc setMaskFuncTab[] =
0,
setMask_<Vec<ushort,3> >, // 6
0,
setMask_<int64>, // 8
setMask_<Vec<int,2> >, // 8
0, 0, 0,
setMask_<Vec<int,3> >, // 12
0, 0, 0,
setMask_<Vec<int64,2> >, // 16
setMask_<Vec<int,4> >, // 16
0, 0, 0, 0, 0, 0, 0,
setMask_<Vec<int64,3> >, // 24
setMask_<Vec<int,6> >, // 24
0, 0, 0, 0, 0, 0, 0,
setMask_<Vec<int64,4> > // 32
setMask_<Vec<int,8> > // 32
};
@@ -424,15 +424,15 @@ void flip( const Mat& src, Mat& dst, int flip_mode )
0,
flipHoriz_<Vec<ushort,3> >, // 6
0,
flipHoriz_<int64>, // 8
flipHoriz_<Vec<int,2> >, // 8
0, 0, 0,
flipHoriz_<Vec<int,3> >, // 12
0, 0, 0,
flipHoriz_<Vec<int64,2> >, // 16
flipHoriz_<Vec<int,4> >, // 16
0, 0, 0, 0, 0, 0, 0,
flipHoriz_<Vec<int64,3> >, // 24
flipHoriz_<Vec<int,6> >, // 24
0, 0, 0, 0, 0, 0, 0,
flipHoriz_<Vec<int64,4> > // 32
flipHoriz_<Vec<int,8> > // 32
};
CV_Assert( src.dims <= 2 );

16
modules/core/src/matrix.cpp
View File

@@ -859,15 +859,15 @@ void transpose( const Mat& src, Mat& dst )
0,
transposeI_<Vec<ushort,3> >, // 6
0,
transposeI_<int64>, // 8
transposeI_<Vec<int,2> >, // 8
0, 0, 0,
transposeI_<Vec<int,3> >, // 12
0, 0, 0,
transposeI_<Vec<int64,2> >, // 16
transposeI_<Vec<int,4> >, // 16
0, 0, 0, 0, 0, 0, 0,
transposeI_<Vec<int64,3> >, // 24
transposeI_<Vec<int,6> >, // 24
0, 0, 0, 0, 0, 0, 0,
transposeI_<Vec<int64,4> > // 32
transposeI_<Vec<int,8> > // 32
};
TransposeFunc tab[] =
@@ -880,15 +880,15 @@ void transpose( const Mat& src, Mat& dst )
0,
transpose_<Vec<ushort,3> >, // 6
0,
transpose_<int64>, // 8
transpose_<Vec<int,2> >, // 8
0, 0, 0,
transpose_<Vec<int,3> >, // 12
0, 0, 0,
transpose_<Vec<int64,2> >, // 16
transpose_<Vec<int,4> >, // 16
0, 0, 0, 0, 0, 0, 0,
transpose_<Vec<int64,3> >, // 24
transpose_<Vec<int,6> >, // 24
0, 0, 0, 0, 0, 0, 0,
transpose_<Vec<int64,4> > // 32
transpose_<Vec<int,8> > // 32
};
size_t esz = src.elemSize();

8
modules/core/src/rand.cpp
View File

@@ -699,15 +699,15 @@ void randShuffle( Mat& dst, double iterFactor, RNG* _rng )
0,
randShuffle_<Vec<ushort,3> >, // 6
0,
randShuffle_<int64>, // 8
randShuffle_<Vec<int,2> >, // 8
0, 0, 0,
randShuffle_<Vec<int,3> >, // 12
0, 0, 0,
randShuffle_<Vec<int64,2> >, // 16
randShuffle_<Vec<int,4> >, // 16
0, 0, 0, 0, 0, 0, 0,
randShuffle_<Vec<int64,3> >, // 24
randShuffle_<Vec<int,6> >, // 24
0, 0, 0, 0, 0, 0, 0,
randShuffle_<Vec<int64,4> > // 32
randShuffle_<Vec<int,8> > // 32
};
RNG& rng = _rng ? *_rng : theRNG();

28
modules/core/src/stat.cpp
View File

@@ -135,25 +135,25 @@ Scalar sum( const Mat& m )
sum_<float, double>,
sum_<double, double>, 0,
sumBlock_<Vec<uchar, 2>, Vec<unsigned, 2>, Vec<double, 2>, 1<<24>,
sumBlock_<Vec<uchar, 2>, Vec<int, 2>, Vec<double, 2>, 1<<23>,
sumBlock_<Vec<schar, 2>, Vec<int, 2>, Vec<double, 2>, 1<<24>,
sumBlock_<Vec<ushort, 2>, Vec<unsigned, 2>, Vec<double, 2>, 1<<16>,
sumBlock_<Vec<ushort, 2>, Vec<int, 2>, Vec<double, 2>, 1<<15>,
sumBlock_<Vec<short, 2>, Vec<int, 2>, Vec<double, 2>, 1<<16>,
sum_<Vec<int, 2>, Vec<double, 2> >,
sum_<Vec<float, 2>, Vec<double, 2> >,
sum_<Vec<double, 2>, Vec<double, 2> >, 0,
sumBlock_<Vec<uchar, 3>, Vec<unsigned, 3>, Vec<double, 3>, 1<<24>,
sumBlock_<Vec<uchar, 3>, Vec<int, 3>, Vec<double, 3>, 1<<23>,
sumBlock_<Vec<schar, 3>, Vec<int, 3>, Vec<double, 3>, 1<<24>,
sumBlock_<Vec<ushort, 3>, Vec<unsigned, 3>, Vec<double, 3>, 1<<16>,
sumBlock_<Vec<ushort, 3>, Vec<int, 3>, Vec<double, 3>, 1<<15>,
sumBlock_<Vec<short, 3>, Vec<int, 3>, Vec<double, 3>, 1<<16>,
sum_<Vec<int, 3>, Vec<double, 3> >,
sum_<Vec<float, 3>, Vec<double, 3> >,
sum_<Vec<double, 3>, Vec<double, 3> >, 0,
sumBlock_<Vec<uchar, 4>, Vec<unsigned, 4>, Vec<double, 4>, 1<<24>,
sumBlock_<Vec<uchar, 4>, Vec<int, 4>, Vec<double, 4>, 1<<23>,
sumBlock_<Vec<schar, 4>, Vec<int, 4>, Vec<double, 4>, 1<<24>,
sumBlock_<Vec<ushort, 4>, Vec<unsigned, 4>, Vec<double, 4>, 1<<16>,
sumBlock_<Vec<ushort, 4>, Vec<int, 4>, Vec<double, 4>, 1<<15>,
sumBlock_<Vec<short, 4>, Vec<int, 4>, Vec<double, 4>, 1<<16>,
sum_<Vec<int, 4>, Vec<double, 4> >,
sum_<Vec<float, 4>, Vec<double, 4> >,
@@ -304,29 +304,29 @@ Scalar mean( const Mat& m, const Mat& mask )
{
static MeanMaskFunc tab[]=
{
meanBlock_<uchar, unsigned, double, 1<<24>, 0,
meanBlock_<ushort, unsigned, double, 1<<16>,
meanBlock_<uchar, int, double, 1<<23>, 0,
meanBlock_<ushort, int, double, 1<<15>,
meanBlock_<short, int, double, 1<<16>,
mean_<int, double>,
mean_<float, double>,
mean_<double, double>, 0,
meanBlock_<Vec<uchar, 2>, Vec<unsigned, 2>, Vec<double, 2>, 1<<24>, 0,
meanBlock_<Vec<ushort, 2>, Vec<unsigned, 2>, Vec<double, 2>, 1<<16>,
meanBlock_<Vec<uchar, 2>, Vec<int, 2>, Vec<double, 2>, 1<<23>, 0,
meanBlock_<Vec<ushort, 2>, Vec<int, 2>, Vec<double, 2>, 1<<15>,
meanBlock_<Vec<short, 2>, Vec<int, 2>, Vec<double, 2>, 1<<16>,
mean_<Vec<int, 2>, Vec<double, 2> >,
mean_<Vec<float, 2>, Vec<double, 2> >,
mean_<Vec<double, 2>, Vec<double, 2> >, 0,
meanBlock_<Vec<uchar, 3>, Vec<unsigned, 3>, Vec<double, 3>, 1<<24>, 0,
meanBlock_<Vec<ushort, 3>, Vec<unsigned, 3>, Vec<double, 3>, 1<<16>,
meanBlock_<Vec<uchar, 3>, Vec<int, 3>, Vec<double, 3>, 1<<23>, 0,
meanBlock_<Vec<ushort, 3>, Vec<int, 3>, Vec<double, 3>, 1<<15>,
meanBlock_<Vec<short, 3>, Vec<int, 3>, Vec<double, 3>, 1<<16>,
mean_<Vec<int, 3>, Vec<double, 3> >,
mean_<Vec<float, 3>, Vec<double, 3> >,
mean_<Vec<double, 3>, Vec<double, 3> >, 0,
meanBlock_<Vec<uchar, 4>, Vec<unsigned, 4>, Vec<double, 4>, 1<<24>, 0,
meanBlock_<Vec<ushort, 4>, Vec<unsigned, 4>, Vec<double, 4>, 1<<16>,
meanBlock_<Vec<uchar, 4>, Vec<int, 4>, Vec<double, 4>, 1<<23>, 0,
meanBlock_<Vec<ushort, 4>, Vec<int, 4>, Vec<double, 4>, 1<<15>,
meanBlock_<Vec<short, 4>, Vec<int, 4>, Vec<double, 4>, 1<<16>,
mean_<Vec<int, 4>, Vec<double, 4> >,
mean_<Vec<float, 4>, Vec<double, 4> >,