Commit c024073c authored by Jeannie Backer's avatar Jeannie Backer
Browse files

PROG: Removed USE_GUI_QAPP define and reordered includes. References #2262

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6638 41f8697f-d340-4b68-9986-7bafba869bb8
parent e9307a83
Loading
Loading
Loading
Loading
+9 −12
Original line number Diff line number Diff line

// Gotta include this before most all other includes due to int64 definition
// conflict between GEOS and OpenCV
#include <cmath>
#define USE_GUI_QAPP 1
#include "Isis.h"

#include <cmath>
/*#define USE_GUI_QAPP 1*/

#include <QApplication>
#include <QScopedPointer>
#include <QSharedPointer>
#include <QFile>
#include <QTextStream>

// OpenCV stuff
#include "opencv2/core/core.hpp"
#include "opencv2/nonfree/features2d.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/calib3d/calib3d.hpp"

// boost library
#include <boost/foreach.hpp>

@@ -57,15 +63,6 @@
#include "TextFile.h"
#include "UserInterface.h"

// OpenCV stuff
#include "opencv2/core/core.hpp"
#include "opencv2/nonfree/features2d.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/calib3d/calib3d.hpp"

// boost library
#include <boost/foreach.hpp>

using namespace std;
using namespace Isis;