Commit fc69f628464e650e9a99d0263e15453c3437a4ac
1 parent
21cc65fc
possible linker fix
Showing
1 changed file
with
2 additions
and
7 deletions
openbr/gui/utility.cpp
| 1 | -#include <QImage> | ||
| 2 | #include <limits> | 1 | #include <limits> |
| 3 | #include <vector> | 2 | #include <vector> |
| 4 | #include <opencv2/imgproc/imgproc.hpp> | 3 | #include <opencv2/imgproc/imgproc.hpp> |
| 4 | +#include "utility.h" | ||
| 5 | 5 | ||
| 6 | using namespace cv; | 6 | using namespace cv; |
| 7 | 7 | ||
| 8 | -namespace br | ||
| 9 | -{ | ||
| 10 | - | ||
| 11 | -QImage toQImage(const Mat &mat) | 8 | +QImage br::toQImage(const Mat &mat) |
| 12 | { | 9 | { |
| 13 | // Convert to 8U depth | 10 | // Convert to 8U depth |
| 14 | Mat mat8u; | 11 | Mat mat8u; |
| @@ -46,5 +43,3 @@ QImage toQImage(const Mat &mat) | @@ -46,5 +43,3 @@ QImage toQImage(const Mat &mat) | ||
| 46 | 43 | ||
| 47 | return QImage(mat8uc3.data, mat8uc3.cols, mat8uc3.rows, 3*mat8uc3.cols, QImage::Format_RGB888).copy(); | 44 | return QImage(mat8uc3.data, mat8uc3.cols, mat8uc3.rows, 3*mat8uc3.cols, QImage::Format_RGB888).copy(); |
| 48 | } | 45 | } |
| 49 | - | ||
| 50 | -} // namespace br |