Fix bug in rotation

Scott Klum
1 parent a1d23324
Showing 3 changed files with 5 additions and 18 deletions
openbr/core/opencvutils.cpp
openbr/plugins/imgproc/rotate.cpp
openbr/plugins/metadata/grid.cpp
@@ -654,10 +654,10 @@ QList&lt;QRectF&gt; OpenCVUtils::rotateRects(const QList&lt;QRectF&gt; &amp;rects, const Mat &amp;ro
 void OpenCVUtils::rotate(const br::Template &src, br::Template &dst, float degrees, bool rotateMat, bool rotatePoints, bool rotateRects, const QPointF &center)
 {
-    const Mat rotMatrix = getRotationMatrix2D(center.isNull() ? Point2f(src.m().rows/2,src.m().cols/2) : toPoint(center), degrees, 1.0);
+    const Mat rotMatrix = getRotationMatrix2D(center.isNull() ? Point2f(src.m().cols / 2, src.m().rows / 2) : toPoint(center), degrees, 1.0);
     if (rotateMat) {
-        warpAffine(src,dst,rotMatrix,Size(src.m().cols,src.m().rows),INTER_AREA,BORDER_REPLICATE);
+        warpAffine(src, dst, rotMatrix, Size(src.m().cols, src.m().rows), INTER_AREA, BORDER_REPLICATE);
         dst.file = src.file;
     } else
         dst = src;
 #include <opencv2/imgproc/imgproc.hpp>
 #include <openbr/plugins/openbr_internal.h>
+#include <openbr/core/opencvutils.h>
 using namespace cv;
@@ -19,21 +20,7 @@ class RotateTransform : public UntrainableTransform
     BR_PROPERTY(int, angle, -90)
     void project(const Template &src, Template &dst) const {
-
-         if(angle == 270 || angle == -90){
-            // Rotate clockwise 270 degrees
-            cv::transpose(src, dst);
-            cv::flip(dst, dst, 0);
-        }else if(angle == 180 || angle == -180){
-            // Rotate clockwise 180 degrees
-            cv::flip(src, dst, -1);
-        }else if(angle == 90 || angle == -270){
-            // Rotate clockwise 90 degrees
-            cv::transpose(src, dst);
-            cv::flip(dst, dst, 1);
-        }else {
-            dst = src;
-        }
+        OpenCVUtils::rotate(src, dst, angle);
     }
 };
@@ -52,7 +52,7 @@ class GridTransform : public UntrainableTransform
                 landmarks.append(QPointF(x,y));
         if (angle > 0) {
-            const Mat rotMatrix = getRotationMatrix2D(Point2f(src.m().rows/2,src.m().cols/2), angle, 1.0);
+            const Mat rotMatrix = getRotationMatrix2D(Point2f(src.m().cols / 2, src.m().rows / 2), angle, 1.0);
             landmarks = OpenCVUtils::rotatePoints(landmarks, rotMatrix);
         }