Commit 16466d53 authored by Jeannie Backer's avatar Jeannie Backer
Browse files

PROG: Neglected to add the Makefile for the findfeatures app. Updated tests. References #2262

git-svn-id: http://subversion.wr.usgs.gov/repos/prog/isis3/trunk@6624 41f8697f-d340-4b68-9986-7bafba869bb8
parent eb7880e9
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
ifeq ($(ISISROOT), $(BLANK))
.SILENT:
error:
	echo "Please set ISISROOT";
else
	include $(ISISROOT)/make/isismake.apps
endif

# Since opencv include path and libs are not in isismake.os
# (so all apps don't link against the large opencv libraries)
# we need to make sure those are added here:
ALLLIBS += $(OPENCVLIBS)
 No newline at end of file
+2 −2
Original line number Diff line number Diff line
@@ -43,9 +43,9 @@ class QDebug;
 * @brief Container for a feature match pair of data sources
 *  
 *  
 * @author 2015-8-18 Kris Becker 
 * @author 2015-08-18 Kris Becker 
 * @internal 
 *   @history 2015-8-18 Kris Becker - Original Version 
 *   @history 2015-08-18 Kris Becker - Original Version 
 */
  class RobustMatcher : public QLogger {
  
+0 −2
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@
#include <boost/foreach.hpp>

#define HAVE_ISNAN
#include "geos_opencv.h"


#include "Application.h"
#include "Camera.h"
+0 −128
Original line number Diff line number Diff line
/* include/geos/platform.h.  Generated from platform.h.in by configure.  */
#ifndef GEOS_PLATFORM_H
#define GEOS_PLATFORM_H

#define GEOS_OPENCV_INTEGRATION

/* Set to 1 if you have `int64_t' type */
/* #undef HAVE_INT64_T_64 */

/* Set to 1 if `long int' is 64 bits */
#define HAVE_LONG_INT_64 1

/* Set to 1 if `long long int' is 64 bits */
/* #undef HAVE_LONG_LONG_INT_64 */

/* Set to 1 if you have ieeefp.h */
/* #undef HAVE_IEEEFP_H */

/* Has finite */
#define HAVE_FINITE 1

/* Has isfinite */
#define HAVE_ISFINITE 1

/* Has isnan */
/* #undef HAVE_ISNAN */

#ifdef HAVE_IEEEFP_H
extern "C"
{
#include <ieeefp.h>
}
#endif

#ifdef HAVE_INT64_T_64
extern "C"
{
#include <inttypes.h>
}
#endif

#if defined(__GNUC__) && defined(_WIN32)
/* For MingW the appropriate definitions are included in
 math.h and float.h but the definitions in 
 math.h are only included if __STRICT_ANSI__
 is not defined.  Since GEOS is compiled with -ansi that
 means those definitions are not available. */
#include <float.h>
#endif

#include <limits> // for std::numeric_limits



//Defines NaN for intel platforms
#define DoubleNotANumber std::numeric_limits<double>::quiet_NaN()

//Don't forget to define infinities
#define DoubleInfinity std::numeric_limits<double>::infinity()
#define DoubleNegInfinity -std::numeric_limits<double>::infinity()

#define DoubleMax std::numeric_limits<double>::max()

// This definition conflicts with OpenCV.  This file should be included
// in every source file that uses both (this was first discovered including
// Chip.h for ISIS usage.  The file "opencv2/core/core.hpp" also (indirectly)
// defines this same type.
#if 0
#ifdef HAVE_INT64_T_64
  typedef int64_t int64;
#else
# ifdef HAVE_LONG_LONG_INT_64
   typedef long long int int64;
# else
   typedef long int int64;
#  ifndef HAVE_LONG_INT_64
#   define INT64_IS_REALLY32 1
#   warning "Could not find 64bit integer definition!"
#  endif
# endif
#endif
#endif

#if defined(HAVE_FINITE) && !defined(HAVE_ISFINITE)
# define FINITE(x) (finite(x))
#else
# if defined(_MSC_VER)
#  define FINITE(x) _finite(static_cast<double>(x))    
# else
#  define FINITE(x) (isfinite(x))
# endif
#endif

#if defined(HAVE_ISNAN)
# define ISNAN(x) (isnan(x))
#else
# if defined(_MSC_VER)
#  define ISNAN(x) _isnan(x)
# elif defined(__MINGW32__)
// sandro furieri: sanitizing MinGW32
#  define ISNAN(x) (std::isnan(x))
# elif defined(__OSX__) || defined(__APPLE__)
   // Hack for OS/X <cmath> incorrectly re-defining isnan() into oblivion.
   // It does leave a version in std.
#  define ISNAN(x) (std::isnan(x))
# elif defined(__sun) || defined(__sun__)
#  include <math.h>
#  define ISNAN(x) (::isnan(x))
# endif
#endif

#ifndef FINITE
#error "Can not compile without finite or isfinite function or macro"
#endif

#ifndef ISNAN
#error "Can not compile without isnan function or macro"
#endif

#else
#if !defined(GEOS_OPENCV_INTEGRATION)
/* Too late! The geos/platform.h file has already been defined! */
#error "geos/platform.h already included!  Must include geos_opencv.h before that file."
#endif

/*  Now include the OpenCV file that defines int64 */
#include "opencv2/core/core.hpp"
#endif
+5 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ commands:
	$(APPNAME) algorithm="sift/sift" \
	           match=$(INPUT)/Sub4-AS15-M-0583_msk.cub \
	           fromlist=$(OUTPUT)/apollo_nadir.lis \
			   tolist=$(OUTPUT)/cubes.txt \
	           tolist=$(OUTPUT)/toList.txt \
	           tonotmatched=$(OUTPUT)/unmatched.txt \
	           maxpoints = 5000 \
	           epitolerance=1.0 \
@@ -20,4 +20,8 @@ commands:
	           debug=false \
	           >& /dev/null; 

	# Need to trim filepaths from TOLIST output
	$(SED) 's|.*/\([^/]*\)|\1|' $(OUTPUT)/toList.txt \
	       >& $(OUTPUT)/cubes.txt;
	$(RM) $(OUTPUT)/toList.txt;
	$(RM) $(OUTPUT)/apollo_nadir.lis;
Loading