Permalink
Browse files

Added orthoproject util that uses platefiles

Works .. kinda .. leaves a grid mark. Will have to think out a different method for raster.
  • Loading branch information...
Zack Moratto
Zack Moratto committed Mar 13, 2010
1 parent 66cadc4 commit a834a214b40e0877ddc3dcc5e22aef2833abba4d
Showing with 381 additions and 16 deletions.
  1. +19 −16 configure.ac
  2. +6 −0 src/asp/Tools/Makefile.am
  3. +356 −0 src/asp/Tools/plateorthoproject.cc
View
@@ -161,7 +161,8 @@ AX_PKG_ONE_OF(LAPACK,
AX_PKG(VW_CORE, [BOOST BOOST_THREAD BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM LAPACK], [-lvwCore], [vw/Core/Log.h] )
AX_PKG(VW_MATH, [VW_CORE], [-lvwMath], [vw/Math/LinearAlgebra.h])
AX_PKG(VW_IMAGE, [VW_CORE], [-lvwImage], [vw/Image/ImageView.h])
-AX_PKG(VW_FILEIO, [VW_IMAGE VW_CORE], [-lvwFileIO], [vw/FileIO/DiskImageResourceOpenEXR.h vw/FileIO/DiskImageResourceGDAL.h])
+AX_PKG(VW_FILEIO, [VW_IMAGE], [-lvwFileIO], [vw/FileIO/DiskImageResourceOpenEXR.h vw/FileIO/DiskImageResourceGDAL.h])
+AX_PKG(VW_PLATE, [VW_FILEIO], [-lvwPlate], [vw/Plate/PlateFile.h])
AX_GROUP_PKG(VW, [VW_CORE VW_MATH VW_IMAGE VW_FILEIO])
AX_PKG(VW_CAMERA, [VW BOOST_IOSTREAMS], [-lvwCamera], [vw/Camera/CAHVModel.h])
@@ -269,30 +270,31 @@ AM_CONDITIONAL(HAVE_PKG_OPENSCENEGRAPH, [test "$HAVE_PKG_OPENSCENEGRAPH" = "yes"
AX_GROUP_PKG(BOOST_COMMON, [BOOST BOOST_PROGRAM_OPTIONS])
AX_GROUP_PKG(BOOST_ALL, [BOOST_COMMON BOOST_FILESYSTEM BOOST_SYSTEM BOOST_DATETIME BOOST_THREAD BOOST_IOSTREAMS])
-AX_GROUP_PKG(VW_ALL, [VW VW_CAMERA VW_CARTOGRAPHY VW_STEREO VW_INTEREST_POINT])
+AX_GROUP_PKG(VW_ALL, [VW_CAMERA VW_CARTOGRAPHY VW_STEREO VW_INTEREST_POINT VW])
-AX_MODULE(CORE, [src/asp/Core], [libaspCore.la], yes, [], [BOOST_COMMON BOOST_FILESYSTEM BOOST_SYSTEM BOOST_THREAD VW_ALL], [LAPACK TCMALLOC PROFILER])
+AX_MODULE(CORE, [src/asp/Core], [libaspCore.la], yes, [], [VW_ALL BOOST_COMMON BOOST_FILESYSTEM BOOST_SYSTEM BOOST_THREAD], [LAPACK TCMALLOC PROFILER])
AX_MODULE(SPICEIO, [src/asp/SpiceIO], [libaspSpiceIO.la], yes, [], [VW BOOST SPICE], [TCMALLOC PROFILER] )
-AX_MODULE(ISISIO, [src/asp/IsisIO], [libaspIsisIO.la], yes, [], [BOOST ISIS VW VW_CAMERA VW_CARTOGRAPHY], [TCMALLOC PROFILER] )
+AX_MODULE(ISISIO, [src/asp/IsisIO], [libaspIsisIO.la], yes, [], [ISIS VW_CAMERA VW_CARTOGRAPHY BOOST], [TCMALLOC PROFILER] )
AX_MODULE(SESSIONS, [src/asp/Sessions], [libaspSessions.la], yes, [CORE], [], [SPICEIO ISISIO TCMALLOC PROFILER])
AX_MODULE(MPI, [src/asp/MPI], [], no, [CORE ISISIO], [OPEN_MPI BOOST_MPI BOOST_SERIALIZATION VW_ALL])
-AX_APP(STEREO, [src/asp/Tools], yes, [CORE SESSIONS], [TCMALLOC PROFILER])
-AX_APP(ORTHOPROJECT, [src/asp/Tools], yes, [CORE SESSIONS], [TCMALLOC PROFILER])
-AX_APP(BUNDLEADJUST, [src/asp/Tools], no, [CORE SESSIONS], [TCMALLOC PROFILER])
+AX_APP(STEREO, [src/asp/Tools], yes, [SESSIONS], [TCMALLOC PROFILER])
+AX_APP(ORTHOPROJECT, [src/asp/Tools], yes, [SESSIONS], [TCMALLOC PROFILER])
+AX_APP(BUNDLEADJUST, [src/asp/Tools], no, [SESSIONS], [TCMALLOC PROFILER])
AX_APP(ORBITVIZ, [src/asp/Tools], yes, [SESSIONS], [TCMALLOC PROFILER])
-AX_APP(DISPARITYDEBUG, [src/asp/Tools], yes, [BOOST_COMMON VW VW_STEREO], [TCMALLOC PROFILER])
-AX_APP(POINT2MESH, [src/asp/Tools], yes, [BOOST_COMMON VW OPENSCENEGRAPH], [TCMALLOC PROFILER])
+AX_APP(DISPARITYDEBUG, [src/asp/Tools], yes, [VW_STEREO VW BOOST_COMMON], [TCMALLOC PROFILER])
+AX_APP(POINT2MESH, [src/asp/Tools], yes, [OPENSCENEGRAPH VW BOOST_COMMON], [TCMALLOC PROFILER])
AX_APP(POINT2DEM, [src/asp/Tools], yes, [CORE], [TCMALLOC PROFILER])
AX_APP(RMAX2CAHVOR, [src/asp/Tools], no, [SESSIONS], [TCMALLOC PROFILER])
-AX_APP(RMAXADJUST, [src/asp/Tools], no, [CORE SESSIONS], [TCMALLOC PROFILER])
-AX_APP(BUNDLEVIS, [src/asp/Tools], no, [BOOST_COMMON OPENSCENEGRAPH VW VW_CAMERA], [TCMALLOC PROFILER])
-AX_APP(ISISADJUST, [src/asp/Tools], yes, [CORE ISISIO], [TCMALLOC PROFILER])
+AX_APP(RMAXADJUST, [src/asp/Tools], no, [SESSIONS], [TCMALLOC PROFILER])
+AX_APP(BUNDLEVIS, [src/asp/Tools], no, [OPENSCENEGRAPH VW_CAMERA VW BOOST_COMMON], [TCMALLOC PROFILER])
+AX_APP(ISISADJUST, [src/asp/Tools], yes, [ISISIO CORE], [TCMALLOC PROFILER])
AX_APP(RESULTS, [src/asp/Tools], yes, [ISISIO], [TCMALLOC PROFILER])
-AX_APP(RECONSTRUCT, [src/asp/Tools], no, [BOOST_ALL VW VW_CARTOGRAPHY], [TCMALLOC PROFILER])
-AX_APP(ALIGNDEM, [src/asp/Tools], yes, [BOOST_COMMON VW VW_CARTOGRAPHY VW_INTEREST_POINT], [TCMALLOC PROFILER])
-AX_APP(GEODIFF, [src/asp/Tools], yes, [BOOST_COMMON VW VW_CARTOGRAPHY ISISIO], [TCMALLOC PROFILER])
-AX_APP(DEMPROFILE, [src/asp/Tools], yes, [VW VW_CARTOGRAPHY BOOST_COMMON], [TCMALLOC PROFILER])
+AX_APP(RECONSTRUCT, [src/asp/Tools], no, [VW_CARTOGRAPHY VW BOOST_ALL], [TCMALLOC PROFILER])
+AX_APP(ALIGNDEM, [src/asp/Tools], yes, [VW_CARTOGRAPHY VW_INTEREST_POINT VW BOOST_COMMON], [TCMALLOC PROFILER])
+AX_APP(GEODIFF, [src/asp/Tools], yes, [ISISIO VW BOOST_COMMON], [TCMALLOC PROFILER])
+AX_APP(DEMPROFILE, [src/asp/Tools], yes, [VW_CARTOGRAPHY VW BOOST_COMMON], [TCMALLOC PROFILER])
+AX_APP(PLATEORTHOPROJECT,[src/asp/Tools], no, [SESSIONS ISISIO VW_PLATE], [TCMALLOC PROFILER])
# These are here (instead of inside the APP macro where they belong)
# for backwards compatability with older versions of automake.
@@ -319,6 +321,7 @@ AM_CONDITIONAL(MAKE_APP_RECONSTRUCT, [test "$MAKE_APP_RECONSTRUCT" = "yes"])
AM_CONDITIONAL(MAKE_APP_ALIGNDEM, [test "$MAKE_APP_ALIGNDEM" = "yes"])
AM_CONDITIONAL(MAKE_APP_GEODIFF, [test "$MAKE_APP_GEODIFF" = "yes"])
AM_CONDITIONAL(MAKE_APP_DEMPROFILE, [test "$MAKE_APP_DEMPROFILE" = "yes"])
+AM_CONDITIONAL(MAKE_APP_PLATEORTHOPROJECT, [test "$MAKE_APP_PLATEORTHOPROJECT" = "yes"])
##################################################
# final processing
@@ -107,6 +107,12 @@ if MAKE_APP_DEMPROFILE
dem_profile_LDADD = $(APP_DEMPROFILE_LIBS)
endif
+if MAKE_APP_PLATEORTHOPROJECT
+ bin_PROGRAMS += plateorthoproject
+ plateorthoproject_SOURCES = plateorthoproject.cc
+ plateorthoproject_LDADD = $(APP_PLATEORTHOPROJECT_LIBS)
+endif
+
##############################################################################
# Tests #
##############################################################################
Oops, something went wrong.

0 comments on commit a834a21

Please sign in to comment.