Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added compatibility to OpenCV 3.3.1 #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added compatibility to OpenCV 3.3.1 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9afb371
Change compability to OpenCV 3.3.1
renatose Mar 27, 2018
be384cb
Change compability to OpenCV 3.3.1
renatose Mar 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ cmake_minimum_required(VERSION 2.8)
project(detect)

## dependencies
find_package( OpenCV REQUIRED )
include_directories( ${OpenCV_INCLUDE_DIRS} )

include_directories(/usr/include/eigen3)

Expand All @@ -28,4 +30,4 @@ install(TARGETS visiona DESTINATION lib)

install(FILES include/Visiona.h DESTINATION include)
install(FILES include/DebugPlotConfig.h DESTINATION include)
install(FILES include/MarkerDetectorConfig.h DESTINATION include)
install(FILES include/MarkerDetectorConfig.h DESTINATION include)
1 change: 1 addition & 0 deletions include/DebugPlotConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#ifndef DEBUGPLOTCONFIG_H_
#define DEBUGPLOTCONFIG_H_

#include <iomanip>
#include <string>
#include <opencv/cv.h>

Expand Down
3 changes: 2 additions & 1 deletion include/MarkerDetectorConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
#ifndef MARKERDETECTORCONFIG_H_
#define MARKERDETECTORCONFIG_H_

#include <opencv/cv.h>
#include <iostream>
#include <opencv/cv.hpp>
#include <libconfig.h++>

namespace visiona {
Expand Down
2 changes: 1 addition & 1 deletion src/MarkerDetector_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1314,7 +1314,7 @@ void MarkerDetector_impl::buildCircleHolesImage(const EllipsePoly& elps,
}

ofstream f(fname);
f << cv::format(img, "csv") << std::endl;
f << cv::format(img, Formatter::FMT_CSV) << std::endl;
f.close();

}
Expand Down