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

Changes to compile under Ubuntu Linux #6

Open
wants to merge 1 commit into
base: apriltag
Choose a base branch
from
Open

Changes to compile under Ubuntu Linux #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion application/AprilCalib/AprilCalib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ int main(const int argc, const char **argv )
tagli("the Calibration Rig is:\n"<<std::string(gRig));
AprilCalibprocessor processor;
processor.isPhoto = is->isClass<helper::ImageSource_Photo>();
processor.outputDir = helper::legalDir( cfg.get("outputDir", is->getSourceDir()) );
//processor.outputDir = helper::legalDir( cfg.get("outputDir", is->getSourceDir()) );
{//create outputDir
#ifdef _WIN32
std::string cmd = "if not exist \"" + processor.outputDir + "\" mkdir \"" + processor.outputDir + "\"";
Expand Down
18 changes: 11 additions & 7 deletions include/AllOpenCVHeaders.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,32 @@

#include "opencv2/opencv.hpp"

/*
#if (CV_MAJOR_VERSION*100+CV_MINOR_VERSION*10+CV_SUBMINOR_VERSION)>=233
#include "opencv2/nonfree/nonfree.hpp"
//#include "opencv2/nonfree/nonfree.hpp"
#include "opencv2/contrib/contrib.hpp"
#include "opencv2/legacy/legacy.hpp"
#endif
*/

#pragma once

#include <opencv2/core/version.hpp>

///////////////////////////////////////////////////////////////////////
// defines for headers
//

#if CV_MAJOR_VERSION == 2
#define UTIL_OPENCV_HEADER(module) <opencv2/##module/##module.hpp>
#define UTIL_OPENCV_HEADER(module) <opencv2/module/module.hpp>
#elif CV_MAJOR_VERSION == 3
#define UTIL_OPENCV_HEADER(module) <opencv2/##module.hpp>
#define UTIL_OPENCV_HEADER(module) <opencv2/module.hpp>
#endif


// include those headers by default
#include UTIL_OPENCV_HEADER(core)
#include UTIL_OPENCV_HEADER(imgproc)
#include UTIL_OPENCV_HEADER(highgui)
//#include UTIL_OPENCV_HEADER(core)
//#include UTIL_OPENCV_HEADER(imgproc)
//#include UTIL_OPENCV_HEADER(highgui)

// additional headers can be specified as follows
//#include UTIL_OPENCV_HEADER(features2d)
Expand Down