Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed

Browse Source
pull/2381/head
Elena Gvozdeva 11 years ago
parent 7b552c0493
commit 48e7bc6b30
1 changed files with 97 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 132
      modules/imgproc/src/imgwarp.cpp

132
modules/imgproc/src/imgwarp.cpp
Unescape View File

@ -55,7 +55,7 @@ static IppStatus sts = ippInit();
namespace cv namespace cv
{ {
#if defined (HAVE_IPP) && ((IPP_VERSION_MAJOR == 7 && IPP_VERSION_MINOR >= 1) || IPP_VERSION_MAJOR > 7) #if defined (HAVE_IPP) && (IPP_VERSION_MAJOR*100 + IPP_VERSION_MINOR >= 701)
typedef IppStatus (CV_STDCALL* ippiResizeFunc)(const void*, int, const void*, int, IppiPoint, IppiSize, IppiBorderType, void*, void*, Ipp8u*); typedef IppStatus (CV_STDCALL* ippiResizeFunc)(const void*, int, const void*, int, IppiPoint, IppiSize, IppiBorderType, void*, void*, Ipp8u*);
#endif #endif
@ -1864,7 +1864,7 @@ static int computeResizeAreaTab( int ssize, int dsize, int cn, double scale, Dec
return k; return k;
} }
#if defined (HAVE_IPP) && ((IPP_VERSION_MAJOR == 7 && IPP_VERSION_MINOR >= 1) || IPP_VERSION_MAJOR > 7) #if defined (HAVE_IPP) && (IPP_VERSION_MAJOR*100 + IPP_VERSION_MINOR >= 701)
class IPPresizeInvoker : class IPPresizeInvoker :
public ParallelLoopBody public ParallelLoopBody
{ {
@ -1884,40 +1884,100 @@ public:
if (mode == (int)ippLinear) if (mode == (int)ippLinear)
{ {
func = switch (type)
type == CV_8UC1 ? (ippiResizeFunc)ippiResizeLinear_8u_C1R : {
type == CV_8UC3 ? (ippiResizeFunc)ippiResizeLinear_8u_C3R : case CV_8UC1:
type == CV_8UC4 ? (ippiResizeFunc)ippiResizeLinear_8u_C4R : func = (ippiResizeFunc)ippiResizeLinear_8u_C1R;
type == CV_16UC1 ? (ippiResizeFunc)ippiResizeLinear_16u_C1R : break;
type == CV_16UC3 ? (ippiResizeFunc)ippiResizeLinear_16u_C3R : case CV_8UC3:
type == CV_16UC4 ? (ippiResizeFunc)ippiResizeLinear_16u_C4R : func = (ippiResizeFunc)ippiResizeLinear_8u_C3R;
type == CV_16SC1 ? (ippiResizeFunc)ippiResizeLinear_16s_C1R : break;
type == CV_16SC3 ? (ippiResizeFunc)ippiResizeLinear_16s_C3R : case CV_8UC4:
type == CV_16SC4 ? (ippiResizeFunc)ippiResizeLinear_16s_C4R : func = (ippiResizeFunc)ippiResizeLinear_8u_C4R;
type == CV_32FC1 ? (ippiResizeFunc)ippiResizeLinear_32f_C1R : break;
type == CV_32FC3 ? (ippiResizeFunc)ippiResizeLinear_32f_C3R : case CV_16UC1:
type == CV_32FC4 ? (ippiResizeFunc)ippiResizeLinear_32f_C4R : func = (ippiResizeFunc)ippiResizeLinear_16u_C1R;
type == CV_64FC1 ? (ippiResizeFunc)ippiResizeLinear_64f_C1R : break;
type == CV_64FC3 ? (ippiResizeFunc)ippiResizeLinear_64f_C3R : case CV_16UC3:
type == CV_64FC4 ? (ippiResizeFunc)ippiResizeLinear_64f_C4R : func = (ippiResizeFunc)ippiResizeLinear_16u_C3R;
0; break;
case CV_16UC4:
func = (ippiResizeFunc)ippiResizeLinear_16u_C4R;
break;
case CV_16SC1:
func = (ippiResizeFunc)ippiResizeLinear_16s_C1R;
break;
case CV_16SC3:
func = (ippiResizeFunc)ippiResizeLinear_16s_C3R;
break;
case CV_16SC4:
func = (ippiResizeFunc)ippiResizeLinear_16s_C4R;
break;
case CV_32FC1:
func = (ippiResizeFunc)ippiResizeLinear_32f_C1R;
break;
case CV_32FC3:
func = (ippiResizeFunc)ippiResizeLinear_32f_C3R;
break;
case CV_32FC4:
func = (ippiResizeFunc)ippiResizeLinear_32f_C4R;
break;
case CV_64FC1:
func = (ippiResizeFunc)ippiResizeLinear_64f_C1R;
break;
case CV_64FC3:
func = (ippiResizeFunc)ippiResizeLinear_64f_C3R;
break;
case CV_64FC4:
func = (ippiResizeFunc)ippiResizeLinear_64f_C4R;
break;
default:
break;
}
} }
else if (mode == (int)ippCubic) else if (mode == (int)ippCubic)
{ {
func = switch (type)
type == CV_8UC1 ? (ippiResizeFunc)ippiResizeCubic_8u_C1R : {
type == CV_8UC3 ? (ippiResizeFunc)ippiResizeCubic_8u_C3R : case CV_8UC1:
type == CV_8UC4 ? (ippiResizeFunc)ippiResizeCubic_8u_C4R : func = (ippiResizeFunc)ippiResizeCubic_8u_C1R;
type == CV_16UC1 ? (ippiResizeFunc)ippiResizeCubic_16u_C1R : break;
type == CV_16UC3 ? (ippiResizeFunc)ippiResizeCubic_16u_C3R : case CV_8UC3:
type == CV_16UC4 ? (ippiResizeFunc)ippiResizeCubic_16u_C4R : func = (ippiResizeFunc)ippiResizeCubic_8u_C3R;
type == CV_16SC1 ? (ippiResizeFunc)ippiResizeCubic_16s_C1R : break;
type == CV_16SC3 ? (ippiResizeFunc)ippiResizeCubic_16s_C3R : case CV_8UC4:
type == CV_16SC4 ? (ippiResizeFunc)ippiResizeCubic_16s_C4R : func = (ippiResizeFunc)ippiResizeCubic_8u_C4R;
type == CV_32FC1 ? (ippiResizeFunc)ippiResizeCubic_32f_C1R : break;
type == CV_32FC3 ? (ippiResizeFunc)ippiResizeCubic_32f_C3R : case CV_16UC1:
type == CV_32FC4 ? (ippiResizeFunc)ippiResizeCubic_32f_C4R : func = (ippiResizeFunc)ippiResizeCubic_16u_C1R;
0; break;
case CV_16UC3:
func = (ippiResizeFunc)ippiResizeCubic_16u_C3R;
break;
case CV_16UC4:
func = (ippiResizeFunc)ippiResizeCubic_16u_C4R;
break;
case CV_16SC1:
func = (ippiResizeFunc)ippiResizeCubic_16s_C1R;
break;
case CV_16SC3:
func = (ippiResizeFunc)ippiResizeCubic_16s_C3R;
break;
case CV_16SC4:
func = (ippiResizeFunc)ippiResizeCubic_16s_C4R;
break;
case CV_32FC1:
func = (ippiResizeFunc)ippiResizeCubic_32f_C1R;
break;
case CV_32FC3:
func = (ippiResizeFunc)ippiResizeCubic_32f_C3R;
break;
case CV_32FC4:
func = (ippiResizeFunc)ippiResizeCubic_32f_C4R;
break;
default:
break;
}
} }
if( func == 0 ) if( func == 0 )
@ -2050,7 +2110,7 @@ public:
status = ippiResizeGetSrcOffset_32f((IppiResizeSpec_32f*)pSpec, dstOffset, &srcOffset); status = ippiResizeGetSrcOffset_32f((IppiResizeSpec_32f*)pSpec, dstOffset, &srcOffset);
break; break;
case CV_64F: case CV_64F:
itemSize = 4; itemSize = 8;
status = ippiResizeGetBufferSize_64f((IppiResizeSpec_64f*)pSpec, dstSize, cn, &bufsize); status = ippiResizeGetBufferSize_64f((IppiResizeSpec_64f*)pSpec, dstSize, cn, &bufsize);
if (status == ippStsNoErr) if (status == ippStsNoErr)
status = ippiResizeGetSrcOffset_64f((IppiResizeSpec_64f*)pSpec, dstOffset, &srcOffset); status = ippiResizeGetSrcOffset_64f((IppiResizeSpec_64f*)pSpec, dstOffset, &srcOffset);
@ -2403,7 +2463,7 @@ void cv::resize( InputArray _src, OutputArray _dst, Size dsize,
double scale_x = 1./inv_scale_x, scale_y = 1./inv_scale_y; double scale_x = 1./inv_scale_x, scale_y = 1./inv_scale_y;
int k, sx, sy, dx, dy; int k, sx, sy, dx, dy;
#if defined (HAVE_IPP) && ((IPP_VERSION_MAJOR == 7 && IPP_VERSION_MINOR >= 1) || IPP_VERSION_MAJOR > 7) #if defined (HAVE_IPP) && (IPP_VERSION_MAJOR*100 + IPP_VERSION_MINOR >= 701)
#define IPP_RESIZE_EPS 1.e-10 #define IPP_RESIZE_EPS 1.e-10
double ex = fabs((double)dsize.width/src.cols - inv_scale_x)/inv_scale_x; double ex = fabs((double)dsize.width/src.cols - inv_scale_x)/inv_scale_x;
@ -2762,7 +2822,7 @@ struct RemapVec_8u
{ {
int cn = _src.channels(), x = 0, sstep = (int)_src.step; int cn = _src.channels(), x = 0, sstep = (int)_src.step;
if( (cn != 1 && cn != 3 && cn != 4) || !checkHardwareSupport(CV_CPU_SSE2)|| if( (cn != 1 && cn != 3 && cn != 4) || !checkHardwareSupport(CV_CPU_SSE2) ||
sstep > 0x8000 ) sstep > 0x8000 )
return 0; return 0;

Write Preview
Loading…
Cancel
Save