mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve the efficiency as suggested by vpisarev.

Browse Source 
Alter the Rotation enum to be unambiguous as to direction.
This commit is contained in:
Tetragramm 2016-11-02 17:44:13 -05:00
parent 6f7bf653f7
commit ad5c50a923
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/include/opencv2/core.hpp
View File

@ -1023,9 +1023,9 @@ around both axes.
CV_EXPORTS_W void flip(InputArray src, OutputArray dst, int flipCode); CV_EXPORTS_W void flip(InputArray src, OutputArray dst, int flipCode);
enum RotateFlags { enum RotateFlags {
ROTATE_90 = 0, //Rotate 90 degrees clockwise ROTATE_90_CLOCKWISE = 0, //Rotate 90 degrees clockwise
ROTATE_180 = 1, //Rotate 180 degrees clockwise ROTATE_180 = 1, //Rotate 180 degrees clockwise
ROTATE_270 = 2, //Rotate 270 degrees clockwise ROTATE_90_COUNTERCLOCKWISE = 2, //Rotate 270 degrees clockwise
}; };
/** @brief Rotates a 2D array in multiples of 90 degrees. /** @brief Rotates a 2D array in multiples of 90 degrees.
The function rotate rotates the array in one of three different ways: The function rotate rotates the array in one of three different ways:

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

@ -832,14 +832,16 @@ static bool ocl_rotate(InputArray _src, OutputArray _dst, int rotateMode)
{ {
switch (rotateMode) switch (rotateMode)
{ {
case ROTATE_90: case ROTATE_90_CLOCKWISE:
flip(_src.getUMat().t(), _dst, 1); _dst.getUMat() = _src.getUMat().t();
flip(_dst, _dst, 1);
break; break;
case ROTATE_180: case ROTATE_180:
flip(_src, _dst, -1); flip(_src, _dst, -1);
break; break;
case ROTATE_270: case ROTATE_90_COUNTERCLOCKWISE:
flip(_src.getUMat().t(), _dst, 0); _dst.getUMat() = _src.getUMat().t();
flip(_dst, _dst, 0);
break; break;
default: default:
break; break;
@ -856,14 +858,16 @@ void rotate(InputArray _src, OutputArray _dst, int rotateMode)
switch (rotateMode) switch (rotateMode)
{ {
case ROTATE_90: case ROTATE_90_CLOCKWISE:
flip(_src.getMat().t(), _dst, 1); _dst.getMat() = _src.getMat().t();
flip(_dst, _dst, 1);
break; break;
case ROTATE_180: case ROTATE_180:
flip(_src, _dst, -1); flip(_src, _dst, -1);
break; break;
case ROTATE_270: case ROTATE_90_COUNTERCLOCKWISE:
flip(_src.getMat().t(), _dst, 0); _dst.getMat() = _src.getMat().t();
flip(_dst, _dst, 0);
break; break;
default: default:
break; break;