Peter M. Groen / openbr

Commit 412d8058c8381473d0f2b83c070048a29368821f

Authored by bhklein
1 parent 9fb55c75

rotate degrees int -> float

Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
openbr/core/opencvutils.cpp
  View file @412d805
@@ -561,7 +561,7 @@ void OpenCVUtils::pad(const br::TemplateList &src, br::TemplateList &dst, bool p @@ -561,7 +561,7 @@ void OpenCVUtils::pad(const br::TemplateList &src, br::TemplateList &dst, bool p
561 } 561 }
562 } 562 }
563 563
564 -void OpenCVUtils::rotate(const br::Template &src, br::Template &dst, int degrees, bool rotateMat, bool rotatePoints, bool rotateRects) 564 +void OpenCVUtils::rotate(const br::Template &src, br::Template &dst, float degrees, bool rotateMat, bool rotatePoints, bool rotateRects)
565 { 565 {
566 Mat rotMatrix = getRotationMatrix2D(Point2f(src.m().rows/2,src.m().cols/2),degrees,1.0); 566 Mat rotMatrix = getRotationMatrix2D(Point2f(src.m().rows/2,src.m().cols/2),degrees,1.0);
567 if (rotateMat) { 567 if (rotateMat) {
@@ -613,7 +613,7 @@ void OpenCVUtils::rotate(const br::Template &src, br::Template &dst, int degrees @@ -613,7 +613,7 @@ void OpenCVUtils::rotate(const br::Template &src, br::Template &dst, int degrees
613 } 613 }
614 } 614 }
615 615
616 -void OpenCVUtils::rotate(const br::TemplateList &src, br::TemplateList &dst, int degrees, bool rotateMat, bool rotatePoints, bool rotateRects) 616 +void OpenCVUtils::rotate(const br::TemplateList &src, br::TemplateList &dst, float degrees, bool rotateMat, bool rotatePoints, bool rotateRects)
617 { 617 {
618 for (int i=0; i<src.size(); i++) { 618 for (int i=0; i<src.size(); i++) {
619 br::Template t; 619 br::Template t;
openbr/core/opencvutils.h
  View file @412d805
@@ -105,8 +105,8 @@ namespace OpenCVUtils @@ -105,8 +105,8 @@ namespace OpenCVUtils
105 void group(QList<cv::Rect> &rects, QList<float> &confidences, float confidenceThreshold, int minNeighbors, float epsilon, bool useMax=false); 105 void group(QList<cv::Rect> &rects, QList<float> &confidences, float confidenceThreshold, int minNeighbors, float epsilon, bool useMax=false);
106 void pad(const br::Template &src, br::Template &dst, bool padMat, const QList<int> &padding, bool padPoints, bool padRects, int border=0, int value=0); 106 void pad(const br::Template &src, br::Template &dst, bool padMat, const QList<int> &padding, bool padPoints, bool padRects, int border=0, int value=0);
107 void pad(const br::TemplateList &src, br::TemplateList &dst, bool padMat, const QList<int> &padding, bool padPoints, bool padRects, int border=0, int value=0); 107 void pad(const br::TemplateList &src, br::TemplateList &dst, bool padMat, const QList<int> &padding, bool padPoints, bool padRects, int border=0, int value=0);
108 - void rotate(const br::Template &src, br::Template &dst, int degrees, bool rotateMat=true, bool rotatePoints=true, bool rotateRects=true);  
109 - void rotate(const br::TemplateList &src, br::TemplateList &dst, int degrees, bool rotateMat=true, bool rotatePoint=true, bool rotateRects=true); 108 + void rotate(const br::Template &src, br::Template &dst, float degrees, bool rotateMat=true, bool rotatePoints=true, bool rotateRects=true);
  109 + void rotate(const br::TemplateList &src, br::TemplateList &dst, float degrees, bool rotateMat=true, bool rotatePoint=true, bool rotateRects=true);
110 void flip(const br::Template &src, br::Template &dst, int axis, bool flipMat=true, bool flipPoints=true, bool flipRects=true); 110 void flip(const br::Template &src, br::Template &dst, int axis, bool flipMat=true, bool flipPoints=true, bool flipRects=true);
111 void flip(const br::TemplateList &src, br::TemplateList &dst, int axis, bool flipMat=true, bool flipPoints=true, bool flipRects=true); 111 void flip(const br::TemplateList &src, br::TemplateList &dst, int axis, bool flipMat=true, bool flipPoints=true, bool flipRects=true);
112 112