Commit 66058b55 authored by Ian Humphrey's avatar Ian Humphrey
Browse files

Changed OpenCV includes for AlgorithmParameters, FeatureAlgorithmFactory,... 

Changed OpenCV includes for AlgorithmParameters, FeatureAlgorithmFactory, RobustMatcher, and findfeatures to OpenCV2 headers.

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/branches/ipce@7151 41f8697f-d340-4b68-9986-7bafba869bb8
parent c71fe7bd

isis/src/control/apps/findfeatures/AlgorithmParameters.cpp

+2 −3
Original line number Diff line number Diff line
@@ -40,10 +40,9 @@ 
#include <boost/foreach.hpp>



#include <opencv2/opencv.hpp>

#include <opencv2/core.hpp>



#include <opencv2/superres.hpp>

#include <opencv2/xfeatures2d.hpp>

#include <opencv2/superres/superres.hpp>

#include <opencv2/nonfree/nonfree.hpp>



#include "AlgorithmParameters.h"

#include "FileName.h"

isis/src/control/apps/findfeatures/AlgorithmParameters.h

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ namespace Isis { 
 * @internal 

 *   @history 2015-08-18 Kris Becker - Original Version 

 *   @history 2016-04-12 Kris Becker Added class documentation 

 *   @history 2016-10-05 Ian Humphrey & Makayla Shepherd - Changed headers back to OpenCV2.

 */

class AlgorithmParameters {

  public:

isis/src/control/apps/findfeatures/FeatureAlgorithmFactory.cpp

+3 −3
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ 


#include <opencv2/opencv.hpp>



#include <opencv2/superres.hpp>

#include <opencv2/xfeatures2d.hpp>

#include <opencv2/superres/superres.hpp>

#include <opencv2/nonfree/nonfree.hpp>



#include "FileName.h"

#include "IString.h"
@@ -65,7 +65,7 @@ FeatureAlgorithmFactory *FeatureAlgorithmFactory::m_maker = 0; 
 * environment by setting necessary parsing elements, setting the OpenCV error

 * handler to an ISIS handler method, and enabling all OpenCV algorithms for

 * parsing and resolving algorithms.



 */

FeatureAlgorithmFactory::FeatureAlgorithmFactory() : AlgorithmParameters() {

//  This ensures this singleton is shut down when the application exists

   qAddPostRoutine(DieAtExit);

isis/src/control/apps/findfeatures/FeatureAlgorithmFactory.h

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ namespace Isis { 
 * @internal 

 *   @history 2015-10-01 Kris Becker - Original Version 

 *   @history 2016-03-06 Kris Becker Completed documentation 

 *   @history 2016-10-05 Ian Humphrey & Makayla Shepherd - Changed headers to OpenCV2.

 */ 

class FeatureAlgorithmFactory : public AlgorithmParameters {

  public:

isis/src/control/apps/findfeatures/RobustMatcher.cpp

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ 
#include <QTime>



#include <opencv2/opencv.hpp>

#include <opencv2/features2d.hpp>

#include <opencv2/xfeatures2d.hpp>

#include <opencv2/features2d/features2d.hpp>

#include <opencv2/nonfree/features2d.hpp>



// boost library

#include <boost/foreach.hpp>