Skip to content
Browse files

removed isis dependency for geodiff, cleaned up some headers

  • Loading branch information...
1 parent fa72c7d commit 267ee873b23cd122bb4bf331712922ebb7eb41ca @khusmann khusmann committed with zmoratto Aug 12, 2010
Showing with 1 addition and 13 deletions.
  1. +1 −1 configure.ac
  2. +0 −12 src/asp/Tools/geodiff.cc
View
2 configure.ac
@@ -363,7 +363,7 @@ AX_APP(ISISADJUST, [src/asp/Tools], yes, [VW_BUNDLEADJUSTMENT ISISIO CORE]
AX_APP(RESULTS, [src/asp/Tools], yes, [ISISIO])
AX_APP(RECONSTRUCT, [src/asp/Tools], no, [VW_PHOTOMETRY VW_CARTOGRAPHY VW])
AX_APP(ALIGNDEM, [src/asp/Tools], yes, [VW_CARTOGRAPHY VW_INTEREST_POINT])
-AX_APP(GEODIFF, [src/asp/Tools], yes, [ISISIO VW BOOST])
+AX_APP(GEODIFF, [src/asp/Tools], yes, [VW_CARTOGRAPHY VW BOOST])
AX_APP(DEMPROFILE, [src/asp/Tools], yes, [VW_CARTOGRAPHY VW])
AX_APP(PLATEORTHOPROJECT,[src/asp/Tools], no, [SESSIONS ISISIO VW_PLATE])
AX_APP(HSVMERGE, [src/asp/Tools], yes, [VW_CARTOGRAPHY VW])
View
12 src/asp/Tools/geodiff.cc
@@ -14,24 +14,14 @@ namespace fs = boost::filesystem;
#include <vw/FileIO.h>
#include <vw/Image.h>
#include <vw/Cartography.h>
-#include <vw/InterestPoint.h>
#include <vw/Math.h>
-#include <vw/Mosaic/ImageComposite.h>
-
-#include <asp/IsisIO/DiskImageResourceIsis.h>
using std::cout;
using std::endl;
using std::string;
using namespace vw;
using namespace vw::cartography;
-using namespace vw::ip;
-
-// Allows FileIO to correctly read/write these pixel types
-namespace vw {
- template<> struct PixelFormatID<Vector3> { static const PixelFormatEnum value = VW_PIXEL_GENERIC_3_CHANNEL; };
-}
int main( int argc, char *argv[] ) {
string dem1_name, dem2_name, output_prefix;
@@ -75,8 +65,6 @@ int main( int argc, char *argv[] ) {
DiskImageView<double> dem1_dmg(dem1_name), dem2_dmg(dem2_name);
- DiskImageResourceIsis dem2_isis_rsrc(dem2_name);
-
GeoReference dem1_georef, dem2_georef;
read_georeference(dem1_georef, dem1_rsrc);
read_georeference(dem2_georef, dem2_rsrc);

0 comments on commit 267ee87

Please sign in to comment.
Something went wrong with that request. Please try again.