Skip to content
Browse files

core: isisio: sessions: Rework headers

Attempting to enforce include what you use, forward declaring when
possible, and include order:

1. VW/ASP
2. System
3. All else
  • Loading branch information...
1 parent 8661219 commit 7e0b91aa62a3d7a5e6fd20de1783f909dbfd72f9 Zack Moratto committed Dec 23, 2013
Showing with 477 additions and 187 deletions.
  1. +5 −1 src/asp/Core/AffineEpipolar.cc
  2. +6 −1 src/asp/Core/AffineEpipolar.h
  3. +60 −6 src/asp/Core/BlobIndexThreaded.cc
  4. +35 −29 src/asp/Core/BlobIndexThreaded.h
  5. +3 −0 src/asp/Core/BundleAdjustUtils.cc
  6. +16 −4 src/asp/Core/BundleAdjustUtils.h
  7. +16 −5 src/asp/Core/Common.cc
  8. +2 −1 src/asp/Core/DemDisparity.cc
  9. +6 −1 src/asp/Core/DemDisparity.h
  10. +4 −0 src/asp/Core/InterestPointMatching.cc
  11. +1 −2 src/asp/Core/InterestPointMatching.h
  12. +1 −0 src/asp/Core/MedianFilter.cc
  13. +6 −1 src/asp/Core/MedianFilter.h
  14. +2 −1 src/asp/Core/SoftwareRenderer.cc
  15. +9 −3 src/asp/Core/tests/TestBlobIndexThreaded.cxx
  16. +8 −2 src/asp/Core/tests/TestIntegralAutoGainDetector.cxx
  17. +1 −0 src/asp/Core/tests/TestInterestPointMatching.cxx
  18. +6 −4 src/asp/Core/tests/TestSoftwareRenderer.cxx
  19. +7 −2 src/asp/Core/tests/TestThreadedEdgeMask.cxx
  20. +6 −4 src/asp/IsisIO/DiskImageResourceIsis.cc
  21. +7 −1 src/asp/IsisIO/Equation.cc
  22. +5 −3 src/asp/IsisIO/Equation.h
  23. +14 −4 src/asp/IsisIO/IsisAdjustCameraModel.cc
  24. +16 −9 src/asp/IsisIO/IsisAdjustCameraModel.h
  25. +4 −5 src/asp/IsisIO/IsisInterface.cc
  26. +9 −1 src/asp/IsisIO/IsisInterfaceFrame.cc
  27. +10 −5 src/asp/IsisIO/IsisInterfaceFrame.h
  28. +12 −2 src/asp/IsisIO/IsisInterfaceLineScan.cc
  29. +10 −6 src/asp/IsisIO/IsisInterfaceLineScan.h
  30. +4 −1 src/asp/IsisIO/IsisInterfaceMapFrame.h
  31. +20 −6 src/asp/IsisIO/IsisInterfaceMapLineScan.cc
  32. +9 −5 src/asp/IsisIO/PolyEquation.cc
  33. +7 −5 src/asp/IsisIO/RPNEquation.cc
  34. +3 −0 src/asp/IsisIO/tests/TestIsisAdjustCameraModel.cxx
  35. +2 −4 src/asp/IsisIO/tests/TestIsisCameraModel.cxx
  36. +10 −11 src/asp/Sessions/DG/StereoSessionDG.cc
  37. +8 −0 src/asp/Sessions/DG/XML.cc
  38. +7 −2 src/asp/Sessions/DG/XML.h
  39. +9 −3 src/asp/Sessions/DG/XMLBase.h
  40. +10 −3 src/asp/Sessions/ISIS/PhotometricOutlier.cc
  41. +2 −1 src/asp/Sessions/ISIS/PhotometricOutlier.h
  42. +20 −4 src/asp/Sessions/ISIS/StereoSessionIsis.cc
  43. +6 −2 src/asp/Sessions/Pinhole/StereoSessionPinhole.cc
  44. +19 −3 src/asp/Sessions/RPC/RPCModel.cc
  45. +10 −14 src/asp/Sessions/RPC/RPCModel.h
  46. +1 −0 src/asp/Sessions/RPC/RPCModelGen.cc
  47. +7 −2 src/asp/Sessions/RPC/RPCStereoModel.cc
  48. +5 −5 src/asp/Sessions/RPC/StereoSessionRPC.cc
  49. +22 −5 src/asp/Sessions/StereoSession.cc
  50. +0 −1 src/asp/Sessions/StereoSession.h
  51. +9 −7 src/test/Helpers.h
View
6 src/asp/Core/AffineEpipolar.cc
@@ -17,8 +17,12 @@
#include <asp/Core/AffineEpipolar.h>
+#include <vw/Math/Vector.h>
+#include <vw/Math/Matrix.h>
+#include <vw/Math/LinearAlgebra.h>
+#include <vw/InterestPoint/InterestData.h>
-#include <vw/Math.h>
+#include <vector>
using namespace vw;
View
7 src/asp/Core/AffineEpipolar.h
@@ -21,7 +21,12 @@
#include <vw/Math/Vector.h>
#include <vw/Math/Matrix.h>
-#include <vw/InterestPoint/InterestData.h>
+
+namespace vw {
+ namespace ip {
+ struct InterestPoint;
+ }
+}
namespace asp {
View
66 src/asp/Core/BlobIndexThreaded.cc
@@ -20,6 +20,12 @@
///
#include <asp/Core/BlobIndexThreaded.h>
+#include <vw/Core/Log.h>
+#include <vw/Core/Thread.h>
+#include <vw/Core/ThreadPool.h>
+
+#include <math.h>
+
#include <boost/foreach.hpp>
using namespace vw;
@@ -77,6 +83,25 @@ int32 BlobCompressed::size() const {
return sum;
}
+vw::Vector2i const& BlobCompressed::min() const { return m_min; }
+
+vw::Vector2i & BlobCompressed::min() { return m_min; }
+
+vw::int32 BlobCompressed::num_rows() const { return m_row_start.size(); }
+
+std::list<vw::int32> const&
+BlobCompressed::start( vw::uint32 const& index ) const { return m_row_start[index]; }
+
+std::list<vw::int32> const&
+BlobCompressed::end( vw::uint32 const& index ) const { return m_row_end[index]; }
+
+// Access points to intersting information
+vw::uint32 BlobIndexCustom::num_blobs() const { return m_blob_count; }
+
+// Access to blobs
+BlobCompressed const&
+BlobIndexCustom::blob( vw::uint32 const& index ) const { return m_c_blob[index]; }
+
BBox2i BlobCompressed::bounding_box() const {
BBox2i bbox;
bbox.min() = m_min;
@@ -163,8 +188,8 @@ void BlobCompressed::add_row( Vector2i const& start,
(start.y() == m_min.y()+int32(m_row_start.size())-1) ) )
vw_throw(vw::NoImplErr() << "Add_row expects rows to be added in order.\n" );
if ( start.y() == m_min.y()+int32(m_row_start.size()) ) {
- m_row_start.resize(m_row_start.size()+1);
- m_row_end.resize(m_row_start.size());
+ m_row_start.resize(m_row_start.size()+1);
+ m_row_end.resize(m_row_start.size());
} else if ( (start.x() < m_row_start.back().back()+m_min.x()) &&
!m_row_start.back().empty() ) {
// If we are not appending, check to see if were adding to this row in order
@@ -255,7 +280,7 @@ void BlobCompressed::absorb( BlobCompressed const& victim ) {
m_i_str != m_row_start[m_index].end(); m_i_str++, m_i_end++ )
vw_out() << "(" << *m_i_str << "-" << *m_i_end << ")";
vw_out() << "\nTrying to insert singleton: (" << *v_singleton_start << "-"
- << *v_singleton_end << ")\n";
+ << *v_singleton_end << ")\n";
vw_throw( vw::NoImplErr() << "BlobCompressed: Seems to be inserting an overlapping blob compressed object.\n" );
}
@@ -515,11 +540,40 @@ void BlobIndexThreaded::consolidate( Vector2i const& image_size,
int min = ( final_num * j ) / number_of_jobs;
int max = ( final_num * (j+1) ) / number_of_jobs;
boost::shared_ptr<Task> absorb_task(
- new ConsolidateAbsorbTask( m_c_blob, new_c_blob,
- m_blob_bbox, component, m_max_area,
- min, max, append_mutex ) );
+ new ConsolidateAbsorbTask( m_c_blob, new_c_blob,
+ m_blob_bbox, component, m_max_area,
+ min, max, append_mutex ) );
absorb_queue.add_task( absorb_task );
}
absorb_queue.join_all();
m_c_blob = new_c_blob;
}
+
+vw::uint32 BlobIndexThreaded::num_blobs() const { return m_c_blob.size(); }
+void BlobIndexThreaded::blob( vw::uint32 const& index,
+ std::list<vw::Vector2i>& output ) const {
+ m_c_blob[index].decompress(output);
+}
+blob::BlobCompressed const&
+BlobIndexThreaded::compressed_blob( vw::uint32 const& index ) const {
+ return m_c_blob[index]; }
+BlobIndexThreaded::blob_iterator
+BlobIndexThreaded::begin() { return m_c_blob.begin(); }
+BlobIndexThreaded::const_blob_iterator
+BlobIndexThreaded::begin() const { return m_c_blob.begin(); }
+BlobIndexThreaded::blob_iterator
+BlobIndexThreaded::end() { return m_c_blob.end(); }
+BlobIndexThreaded::const_blob_iterator
+BlobIndexThreaded::end() const { return m_c_blob.end(); }
+
+vw::BBox2i const&
+BlobIndexThreaded::blob_bbox( vw::uint32 const& index ) const {
+ return m_blob_bbox[index]; }
+BlobIndexThreaded::bbox_iterator
+BlobIndexThreaded::bbox_begin() { return m_blob_bbox.begin(); }
+BlobIndexThreaded::const_bbox_iterator
+BlobIndexThreaded::bbox_begin() const { return m_blob_bbox.begin(); }
+BlobIndexThreaded::bbox_iterator
+BlobIndexThreaded::bbox_end() { return m_blob_bbox.end(); }
+BlobIndexThreaded::const_bbox_iterator
+BlobIndexThreaded::bbox_end() const { return m_blob_bbox.end(); }
View
64 src/asp/Core/BlobIndexThreaded.h
@@ -22,16 +22,27 @@
#ifndef __BLOB_INDEX_THREADED_H__
#define __BLOB_INDEX_THREADED_H__
-// Standard
-#include <vector>
-
// VW
#include <vw/Core/Log.h>
#include <vw/Core/Thread.h>
#include <vw/Core/ThreadPool.h>
#include <vw/Core/Stopwatch.h>
-#include <vw/Image/Algorithms.h> // include Boost::Graph
-#include <vw/Image/Manipulation.h>
+#include <vw/Image/AlgorithmFunctions.h>
+#include <vw/Image/ImageView.h>
+#include <vw/Image/PixelAccessors.h>
+
+// Standard
+#include <vector>
+#include <deque>
+#include <list>
+#include <ostream>
+
+// Boost
+#include <boost/noncopyable.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/graph/adjacency_list.hpp>
+#include <boost/graph/connected_components.hpp>
+#include <boost/graph/graph_selectors.hpp>
// BlobIndex (Multi) Threaded
///////////////////////////////////////
@@ -64,11 +75,11 @@ namespace blob {
BlobCompressed();
// Standard Access point
- vw::Vector2i const& min() const { return m_min; }
- vw::Vector2i & min() { return m_min; }
- vw::int32 num_rows() const { return m_row_start.size(); }
- std::list<vw::int32> const& start( vw::uint32 const& index ) const { return m_row_start[index]; }
- std::list<vw::int32> const& end( vw::uint32 const& index ) const { return m_row_end[index]; }
+ vw::Vector2i const& min() const;
+ vw::Vector2i & min();
+ vw::int32 num_rows() const;
+ std::list<vw::int32> const& start( vw::uint32 const& index ) const;
+ std::list<vw::int32> const& end( vw::uint32 const& index ) const;
vw::int32 size() const; // Please use sparingly
vw::BBox2i bounding_box() const;
bool intersects( vw::BBox2i const& input ) const;
@@ -267,11 +278,10 @@ namespace blob {
}
// Access points to intersting information
- vw::uint32 num_blobs() const { return m_blob_count; }
+ vw::uint32 num_blobs() const;
// Access to blobs
- BlobCompressed const& blob( vw::uint32 const& index ) const { return m_c_blob[index]; }
-
+ BlobCompressed const& blob( vw::uint32 const& index ) const;
};
// Blob Index Task
@@ -389,28 +399,24 @@ class BlobIndexThreaded {
}
// Access for the users
- vw::uint32 num_blobs() const { return m_c_blob.size(); }
+ vw::uint32 num_blobs() const;
void blob( vw::uint32 const& index,
- std::list<vw::Vector2i>& output ) const {
- m_c_blob[index].decompress(output);
- }
- blob::BlobCompressed const& compressed_blob( vw::uint32 const& index ) const {
- return m_c_blob[index]; }
+ std::list<vw::Vector2i>& output ) const;
+ blob::BlobCompressed const& compressed_blob( vw::uint32 const& index ) const;
typedef std::deque<blob::BlobCompressed>::iterator blob_iterator;
typedef std::deque<blob::BlobCompressed>::const_iterator const_blob_iterator;
- blob_iterator begin() { return m_c_blob.begin(); }
- const_blob_iterator begin() const { return m_c_blob.begin(); }
- blob_iterator end() { return m_c_blob.end(); }
- const_blob_iterator end() const { return m_c_blob.end(); }
+ blob_iterator begin();
+ const_blob_iterator begin() const;
+ blob_iterator end();
+ const_blob_iterator end() const;
- vw::BBox2i const& blob_bbox( vw::uint32 const& index ) const {
- return m_blob_bbox[index]; }
+ vw::BBox2i const& blob_bbox( vw::uint32 const& index ) const;
typedef std::deque<vw::BBox2i>::iterator bbox_iterator;
typedef std::deque<vw::BBox2i>::const_iterator const_bbox_iterator;
- bbox_iterator bbox_begin() { return m_blob_bbox.begin(); }
- const_bbox_iterator bbox_begin() const { return m_blob_bbox.begin(); }
- bbox_iterator bbox_end() { return m_blob_bbox.end(); }
- const_bbox_iterator bbox_end() const { return m_blob_bbox.end(); }
+ bbox_iterator bbox_begin();
+ const_bbox_iterator bbox_begin() const;
+ bbox_iterator bbox_end();
+ const_bbox_iterator bbox_end() const;
};
#endif//__BLOB_INDEX_THREADED_H__
View
3 src/asp/Core/BundleAdjustUtils.cc
@@ -21,10 +21,13 @@
#include <asp/Core/BundleAdjustUtils.h>
+#include <vw/Core/Log.h>
#include <vw/Camera/CameraModel.h>
#include <vw/BundleAdjustment/ControlNetwork.h>
#include <vw/Stereo/StereoModel.h>
+#include <string>
+
using namespace vw;
using namespace vw::camera;
using namespace vw::stereo;
View
20 src/asp/Core/BundleAdjustUtils.h
@@ -22,10 +22,22 @@
#ifndef __BUNDLE_ADJUST_UTILS_H__
#define __BUNDLE_ADJUST_UTILS_H__
-#include <vw/Camera/CameraModel.h>
-#include <vw/BundleAdjustment/ControlNetwork.h>
-#include <vw/Math.h>
-#include <vw/InterestPoint.h>
+#include <vw/Math/Vector.h>
+#include <vw/Math/Quaternion.h>
+
+#include <string>
+#include <vector>
+
+#include <boost/smart_ptr/shared_ptr.hpp>
+
+namespace vw {
+ namespace camera {
+ class CameraModel;
+ }
+ namespace ba {
+ class ControlNetwork;
+ }
+}
void read_adjustments(std::string const& filename, vw::Vector3& position_correction, vw::Quat& pose_correction);
void write_adjustments(std::string const& filename, vw::Vector3 const& position_correction, vw::Quat const& pose_correction);
View
21 src/asp/Core/Common.cc
@@ -15,19 +15,30 @@
// limitations under the License.
// __END_LICENSE__
-
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <boost/filesystem.hpp>
-
-#include <vw/Core/Thread.h>
#include <vw/Core/Log.h>
+#include <vw/Core/System.h>
+#include <vw/Math/BBox.h>
+#include <vw/FileIO/DiskImageResource.h>
#include <asp/Core/Common.h>
+#include <map>
+#include <sstream>
+#include <string>
+#include <vector>
+
#include <vw/config.h>
#include <asp/asp_config.h>
#include <gdal_version.h>
#include <proj_api.h>
+#include <boost/algorithm/string.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/path_traits.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/program_options.hpp>
+
using namespace vw;
namespace po = boost::program_options;
namespace fs = boost::filesystem;
View
3 src/asp/Core/DemDisparity.cc
@@ -19,11 +19,12 @@
/// \file DEMDisparity.cc
///
-#include <vw/Cartography/CameraBBox.h>
#include <vw/Image/ImageView.h>
#include <vw/Image/Transform.h>
#include <vw/Image/MaskViews.h>
#include <vw/FileIO/DiskImageView.h>
+#include <vw/Camera/CameraModel.h>
+#include <vw/Cartography/CameraBBox.h>
#include <vw/Stereo/DisparityMap.h>
#include <vw/InterestPoint/MatrixIO.h>
#include <asp/Core/StereoSettings.h>
View
7 src/asp/Core/DemDisparity.h
@@ -22,12 +22,17 @@
#ifndef __DEM_DISPARITY_H__
#define __DEM_DISPARITY_H__
-#include <vw/Camera/CameraModel.h>
+#include <boost/smart_ptr/shared_ptr.hpp>
// Forward declaration
namespace asp {
class Options;
}
+namespace vw {
+ namespace camera {
+ class CameraModel;
+ }
+}
namespace asp {
View
4 src/asp/Core/InterestPointMatching.cc
@@ -26,6 +26,10 @@ using namespace vw;
namespace asp {
+ EpipolarLinePointMatcher::EpipolarLinePointMatcher( double threshold, double epipolar_threshold,
+ vw::cartography::Datum const& datum ) :
+ m_threshold(threshold), m_epipolar_threshold(epipolar_threshold), m_datum(datum) {}
+
Vector3 EpipolarLinePointMatcher::epipolar_line( Vector2 const& feature,
cartography::Datum const& datum,
camera::CameraModel* cam_ip,
View
3 src/asp/Core/InterestPointMatching.h
@@ -46,8 +46,7 @@ namespace asp {
public:
EpipolarLinePointMatcher( double threshold, double epipolar_threshold,
- vw::cartography::Datum const& datum ) :
- m_threshold(threshold), m_epipolar_threshold(epipolar_threshold), m_datum(datum) {}
+ vw::cartography::Datum const& datum );
// This only returns the indicies
void operator()( vw::ip::InterestPointList const& ip1,
View
1 src/asp/Core/MedianFilter.cc
@@ -17,6 +17,7 @@
#include <asp/Core/MedianFilter.h>
+#include <vw/Math/Vector.h>
using namespace vw;
View
7 src/asp/Core/MedianFilter.h
@@ -24,8 +24,13 @@
#define CALC_PIXEL_NUM_VALS 256
+#include <vw/Core/Functors.h>
+#include <vw/Core/FundamentalTypes.h>
#include <vw/Math/Vector.h>
-#include <vw/Image.h>
+#include <vw/Math/BBox.h>
+#include <vw/Image/ImageView.h>
+#include <vw/Image/EdgeExtension.h>
+#include <vw/Image/PerPixelAccessorViews.h>
namespace vw {
View
3 src/asp/Core/SoftwareRenderer.cc
@@ -44,9 +44,10 @@
#include <vw/Core/Exception.h>
#include <vw/Core/FundamentalTypes.h>
-#include <iostream> // debugging
#include <asp/Core/SoftwareRenderer.h>
+#include <iostream>
+
using namespace std;
using namespace vw;
using namespace stereo;
View
12 src/asp/Core/tests/TestBlobIndexThreaded.cxx
@@ -17,10 +17,16 @@
#include <test/Helpers.h>
-
-#include <vw/FileIO.h>
-#include <vw/Image.h>
#include <asp/Core/BlobIndexThreaded.h>
+#include <vw/Math/BBox.h>
+#include <vw/Math/Vector.h>
+#include <vw/Image/Manipulation.h>
+#include <vw/Image/MaskViews.h>
+#include <vw/Image/PerPixelViews.h>
+#include <vw/Image/PixelMask.h>
+#include <vw/Image/PixelMath.h>
+#include <vw/FileIO/DiskImageView.h>
+
#include <boost/assign/std/vector.hpp>
#include <boost/assign/list_of.hpp>
View
10 src/asp/Core/tests/TestIntegralAutoGainDetector.cxx
@@ -16,10 +16,16 @@
// __END_LICENSE__
#include <test/Helpers.h>
+#include <vw/Math/Functors.h>
+#include <vw/Math/Vector.h>
+#include <vw/Image/ImageView.h>
+#include <vw/Image/ImageMath.h>
+#include <vw/Image/ImageViewRef.h>
+#include <vw/InterestPoint/InterestData.h>
+#include <asp/Core/IntegralAutoGainDetector.h>
+
#include <boost/foreach.hpp>
#include <boost/random/normal_distribution.hpp>
-#include <asp/Core/IntegralAutoGainDetector.h>
-#include <vw/FileIO.h>
using namespace vw;
using namespace asp;
View
1 src/asp/Core/tests/TestInterestPointMatching.cxx
@@ -19,6 +19,7 @@
#include <test/Helpers.h>
#include <asp/Core/InterestPointMatching.h>
#include <vw/Camera/PinholeModel.h>
+#include <vw/Camera/LensDistortion.h>
#include <vw/Cartography/CameraBBox.h>
using namespace vw;
View
10 src/asp/Core/tests/TestSoftwareRenderer.cxx
@@ -17,12 +17,14 @@
#include <test/Helpers.h>
-#include <boost/assign/list_of.hpp>
-#include <boost/assign/std/vector.hpp>
-#include <vw/Image.h>
+#include <vw/Image/ImageView.h>
+#include <vw/Image/Manipulation.h>
#include <asp/Core/SoftwareRenderer.h>
-#include <vw/FileIO.h>
+#include <vector>
+
+#include <boost/assign/list_of.hpp>
+#include <boost/assign/std/vector.hpp>
using namespace vw;
using namespace boost::assign;
View
9 src/asp/Core/tests/TestThreadedEdgeMask.cxx
@@ -17,10 +17,15 @@
#include <test/Helpers.h>
-
-#include <vw/Image/Algorithms.h>
+#include <vw/Math/BBox.h>
+#include <vw/Image/AlgorithmFunctions.h>
+#include <vw/Image/ImageView.h>
+#include <vw/Image/Manipulation.h>
#include <asp/Core/ThreadedEdgeMask.h>
+#include <algorithm>
+#include <vector>
+
using namespace vw;
using namespace asp;
View
10 src/asp/IsisIO/DiskImageResourceIsis.cc
@@ -25,15 +25,17 @@
#endif
#include <vw/Core/Exception.h>
-#include <vw/Image/PerPixelViews.h>
-
+#include <vw/Math/BBox.h>
+#include <vw/Math/Vector.h>
+#include <vw/Image/ImageResource.h>
+#include <vw/Image/PixelTypeInfo.h>
#include <asp/IsisIO/DiskImageResourceIsis.h>
-// Isis Includes
+#include <string>
+
#include <Cube.h>
#include <Portal.h>
#include <SpecialPixel.h>
-#include <Projection.h>
using namespace std;
using namespace boost;
View
8 src/asp/IsisIO/Equation.cc
@@ -15,8 +15,14 @@
// limitations under the License.
// __END_LICENSE__
-
+#include <vw/Core/Exception.h>
#include <asp/IsisIO/Equation.h>
+#include <asp/IsisIO/BaseEquation.h>
+#include <asp/IsisIO/PolyEquation.h>
+#include <asp/IsisIO/RPNEquation.h>
+
+#include <ostream>
+#include <string>
using namespace vw;
using namespace asp;
View
8 src/asp/IsisIO/Equation.h
@@ -19,12 +19,14 @@
#ifndef __ASP_EQUATION_H__
#define __ASP_EQUATION_H__
-#include <asp/IsisIO/BaseEquation.h>
-#include <asp/IsisIO/PolyEquation.h>
-#include <asp/IsisIO/RPNEquation.h>
+#include <iosfwd>
+
+#include <boost/smart_ptr/shared_ptr.hpp>
namespace asp {
+ class BaseEquation;
+
// Useful tools
//-------------------------------------------------------
View
18 src/asp/IsisIO/IsisAdjustCameraModel.cc
@@ -15,16 +15,26 @@
// limitations under the License.
// __END_LICENSE__
-
-// ASP & VW
-#include <asp/IsisIO/IsisAdjustCameraModel.h>
#include <vw/Math/Quaternion.h>
+#include <vw/Math/Vector.h>
+#include <vw/Math/Matrix.h>
+#include <vw/Math/LevenbergMarquardt.h>
+#include <asp/IsisIO/IsisAdjustCameraModel.h>
+#include <asp/IsisIO/BaseEquation.h>
+
+#include <vector>
-// Isis
#include <FileName.h>
#include <CameraFactory.h>
#include <SerialNumber.h>
#include <iTime.h>
+#include <AlphaCube.h> // for AlphaCube
+#include <Camera.h> // for Camera
+#include <CameraDetectorMap.h> // for CameraDetectorMap
+#include <CameraDistortionMap.h> // for CameraDistortionMap
+#include <CameraFocalPlaneMap.h> // for CameraFocalPlaneMap
+#include <Pvl.h> // for Pvl
+#include <SpiceRotation.h> // for SpiceRotation
using namespace vw;
using namespace vw::camera;
View
25 src/asp/IsisIO/IsisAdjustCameraModel.h
@@ -25,22 +25,29 @@
#ifndef __VW_CAMERAMODEL_ISISADJUST_H__
#define __VW_CAMERAMODEL_ISISADJUST_H__
-// ASP & VW
-#include <asp/IsisIO/IsisCameraModel.h>
-#include <asp/IsisIO/Equation.h>
#include <vw/Math/Vector.h>
#include <vw/Math/Quaternion.h>
#include <vw/Math/Matrix.h>
#include <vw/Math/LevenbergMarquardt.h>
+#include <vw/Camera/CameraModel.h>
+
+#include <string>
-// ISIS
#include <Pvl.h>
#include <Camera.h>
-#include <AlphaCube.h>
-#include <CameraDetectorMap.h>
-#include <CameraDistortionMap.h>
-#include <CameraFocalPlaneMap.h>
-#include <CameraGroundMap.h>
+
+#include <boost/smart_ptr/shared_ptr.hpp>
+
+namespace Isis {
+ class AlphaCube;
+ class CameraDetectorMap;
+ class CameraDistortionMap;
+ class CameraFocalPlaneMap;
+}
+
+namespace asp {
+ class BaseEquation;
+}
namespace vw {
namespace camera {
View
9 src/asp/IsisIO/IsisInterface.cc
@@ -16,19 +16,18 @@
// __END_LICENSE__
-// ASP
+#include <vw/Core/Exception.h>
+#include <vw/Math/Vector.h>
#include <asp/IsisIO/IsisInterface.h>
#include <asp/IsisIO/IsisInterfaceMapFrame.h>
#include <asp/IsisIO/IsisInterfaceFrame.h>
#include <asp/IsisIO/IsisInterfaceMapLineScan.h>
#include <asp/IsisIO/IsisInterfaceLineScan.h>
#include <iomanip>
+#include <ostream>
-// VW
-#include <vw/Core.h>
-
-// ISIS
+#include <Distance.h>
#include <Pvl.h>
#include <Camera.h>
#include <FileName.h>
View
10 src/asp/IsisIO/IsisInterfaceFrame.cc
@@ -16,9 +16,17 @@
// __END_LICENSE__
-// ASP
+#include <vw/Math/Matrix.h>
#include <asp/IsisIO/IsisInterfaceFrame.h>
+#include <algorithm>
+#include <vector>
+
+#include <Camera.h>
+#include <CameraDetectorMap.h>
+#include <CameraDistortionMap.h>
+#include <CameraFocalPlaneMap.h>
+
using namespace vw;
using namespace asp;
using namespace asp::isis;
View
15 src/asp/IsisIO/IsisInterfaceFrame.h
@@ -23,15 +23,20 @@
#ifndef __ASP_ISIS_INTERFACE_FRAME_H__
#define __ASP_ISIS_INTERFACE_FRAME_H__
-// ASP
+#include <vw/Math/Vector.h>
+#include <vw/Math/Quaternion.h>
#include <asp/IsisIO/IsisInterface.h>
-// Isis
-#include <CameraDetectorMap.h>
-#include <CameraDistortionMap.h>
-#include <CameraFocalPlaneMap.h>
+#include <string>
+
#include <AlphaCube.h>
+namespace Isis {
+ class CameraDetectorMap;
+ class CameraDistortionMap;
+ class CameraFocalPlaneMap;
+}
+
namespace asp {
namespace isis {
View
14 src/asp/IsisIO/IsisInterfaceLineScan.cc
@@ -15,11 +15,21 @@
// limitations under the License.
// __END_LICENSE__
-
-// ASP
+#include <vw/Math/LevenbergMarquardt.h>
+#include <vw/Math/Matrix.h>
#include <asp/IsisIO/IsisInterfaceLineScan.h>
+
+#include <algorithm>
+#include <vector>
+
+#include <Camera.h>
+#include <CameraDetectorMap.h>
+#include <CameraDistortionMap.h>
+#include <CameraFocalPlaneMap.h>
#include <iTime.h>
+#include <boost/smart_ptr/scoped_ptr.hpp>
+
using namespace vw;
using namespace asp;
using namespace asp::isis;
View
16 src/asp/IsisIO/IsisInterfaceLineScan.h
@@ -23,16 +23,20 @@
#ifndef __ASP_ISIS_INTERFACE_LINESCAN_H__
#define __ASP_ISIS_INTERFACE_LINESCAN_H__
-// VW & ASP
-#include <vw/Math/LevenbergMarquardt.h>
+#include <vw/Math/Vector.h>
+#include <vw/Math/Quaternion.h>
#include <asp/IsisIO/IsisInterface.h>
-// Isis
-#include <CameraDetectorMap.h>
-#include <CameraDistortionMap.h>
-#include <CameraFocalPlaneMap.h>
+#include <string>
+
#include <AlphaCube.h>
+namespace Isis {
+ class CameraDetectorMap;
+ class CameraDistortionMap;
+ class CameraFocalPlaneMap;
+}
+
namespace asp {
namespace isis {
View
5 src/asp/IsisIO/IsisInterfaceMapFrame.h
@@ -23,9 +23,12 @@
#ifndef __ASP_ISIS_INTERFACE_MAP_FRAME_H__
#define __ASP_ISIS_INTERFACE_MAP_FRAME_H__
-// ASP
+#include <vw/Math/Vector.h>
+#include <vw/Math/Quaternion.h>
#include <asp/IsisIO/IsisInterface.h>
+#include <string>
+
// Isis forward declaration
namespace Isis {
class CameraGroundMap;
View
26 src/asp/IsisIO/IsisInterfaceMapLineScan.cc
@@ -16,17 +16,31 @@
// __END_LICENSE__
-// ASP
-#include <vw/Cartography/SimplePointImageManipulation.h>
-#include <vw/Camera/CameraModel.h>
+#include <vw/Math/Matrix.h>
+#include <vw/Math/Quaternion.h>
+#include <vw/Math/Vector.h>
#include <vw/Math/LevenbergMarquardt.h>
+#include <vw/Camera/CameraModel.h>
#include <asp/IsisIO/IsisInterfaceMapLineScan.h>
-// ISIS
-#include <ProjectionFactory.h>
-#include <iTime.h>
+#include <algorithm>
+#include <limits>
+#include <string>
+#include <vector>
+
+#include <Camera.h>
+#include <CameraDistortionMap.h>
+#include <CameraFocalPlaneMap.h>
+#include <CameraGroundMap.h>
#include <Latitude.h>
#include <Longitude.h>
+#include <Projection.h>
+#include <ProjectionFactory.h>
+#include <Sensor.h>
+#include <SpiceRotation.h>
+#include <iTime.h>
+
+#include <boost/smart_ptr/scoped_ptr.hpp>
using namespace vw;
using namespace asp;
View
14 src/asp/IsisIO/PolyEquation.cc
@@ -15,13 +15,17 @@
// limitations under the License.
// __END_LICENSE__
+#include <vw/Core/FundamentalTypes.h>
+#include <vw/Math/Vector.h>
+#include <asp/IsisIO/PolyEquation.h>
-// STL
#include <iomanip>
-// ASP
-#include <asp/IsisIO/PolyEquation.h>
-// Boost
-#include <boost/algorithm/string.hpp>
+#include <vector>
+#include <string>
+#include <algorithm>
+
+#include <boost/algorithm/string/split.hpp>
+#include <boost/algorithm/string/classification.hpp>
using namespace vw;
using namespace asp;
View
12 src/asp/IsisIO/RPNEquation.cc
@@ -15,14 +15,16 @@
// limitations under the License.
// __END_LICENSE__
+#include <vw/Core/Exception.h>
+#include <vw/Math/Vector.h>
+#include <asp/IsisIO/RPNEquation.h>
-// STL
#include <iomanip>
#include <stack>
-// ASP
-#include <asp/IsisIO/RPNEquation.h>
-// BOOST
-#include <boost/algorithm/string.hpp>
+#include <vector>
+
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/split.hpp>
using namespace vw;
using namespace asp;
View
3 src/asp/IsisIO/tests/TestIsisAdjustCameraModel.cxx
@@ -20,6 +20,9 @@
#include <asp/IsisIO/IsisAdjustCameraModel.h>
#include <asp/IsisIO/IsisCameraModel.h>
+#include <asp/IsisIO/PolyEquation.h>
+#include <asp/IsisIO/RPNEquation.h>
+
#include <boost/foreach.hpp>
using namespace vw;
View
6 src/asp/IsisIO/tests/TestIsisCameraModel.cxx
@@ -22,9 +22,7 @@
#include <vw/Core/Debugging.h>
#include <asp/IsisIO/IsisCameraModel.h>
#include <vw/Cartography/SimplePointImageManipulation.h>
-#include <boost/foreach.hpp>
-// Additional Headers required for ISIS
#include <FileName.h>
#include <CameraFactory.h>
#include <ProjectionFactory.h>
@@ -35,10 +33,10 @@
#include <CameraDetectorMap.h>
#include <CameraDistortionMap.h>
#include <Projection.h>
-#include <Latitude.h>
-#include <Longitude.h>
#include <Distance.h>
+#include <boost/foreach.hpp>
+
using namespace vw;
using namespace vw::camera;
View
21 src/asp/Sessions/DG/StereoSessionDG.cc
@@ -18,8 +18,15 @@
/// \file StereoSessionDG.cc
///
+#include <vw/Image/ImageMath.h>
+#include <vw/Image/Manipulation.h>
+#include <vw/Image/MaskViews.h>
+#include <vw/Image/Transform.h>
+#include <vw/Camera/Extrinsics.h>
+#include <vw/Math/EulerAngles.h>
+#include <vw/Math/Matrix.h>
+#include <vw/Cartography/Datum.h>
-// Ames Stereo Pipeline
#include <asp/Core/StereoSettings.h>
#include <asp/Core/InterestPointMatching.h>
#include <asp/Core/AffineEpipolar.h>
@@ -28,21 +35,13 @@
#include <asp/Sessions/RPC/RPCModel.h>
#include <asp/Sessions/DG/XML.h>
-// Vision Workbench
-#include <vw/Camera/Extrinsics.h>
-#include <vw/Math/EulerAngles.h>
-#include <vw/Math/Matrix.h>
-#include <vw/Cartography/GeoTransform.h>
-#include <vw/Cartography/PointImageManipulation.h>
-
-// Std
#include <iostream>
#include <string>
+#include <vector>
+#include <algorithm>
-// Boost
#include <boost/date_time/posix_time/posix_time.hpp>
-// Other
#include <xercesc/util/PlatformUtils.hpp>
using namespace vw;
View
8 src/asp/Sessions/DG/XML.cc
@@ -15,6 +15,10 @@
// limitations under the License.
// __END_LICENSE__
+#include <vw/Core/Exception.h> // for ArgumentErr, vw_throw, etc
+#include <vw/Math/Quaternion.h> // for Quat, Quaternion
+#include <vw/Math/Vector.h> // for Vector, Vector3, Vector4, etc
+#include <vw/Cartography/Datum.h> // for Datum
#include <asp/Sessions/DG/XML.h>
#include <asp/Sessions/RPC/RPCModel.h>
@@ -23,6 +27,10 @@
#include <xercesc/sax/HandlerBase.hpp>
#include <xercesc/util/PlatformUtils.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/lexical_cast.hpp>
+
using namespace vw;
using namespace xercesc;
View
9 src/asp/Sessions/DG/XML.h
@@ -23,10 +23,15 @@
#ifndef __STEREO_SESSION_DG_XML_H__
#define __STEREO_SESSION_DG_XML_H__
-#include <asp/Sessions/DG/XMLBase.h>
-#include <vector>
+#include <vw/Core/FundamentalTypes.h>
#include <vw/Math/Vector.h>
#include <vw/Math/Quaternion.h>
+#include <asp/Sessions/DG/XMLBase.h>
+
+#include <vector>
+#include <string>
+
+#include <boost/smart_ptr/scoped_ptr.hpp>
namespace asp {
View
12 src/asp/Sessions/DG/XMLBase.h
@@ -23,11 +23,17 @@
#ifndef __STEREO_SESSION_DG_XMLBASE_H__
#define __STEREO_SESSION_DG_XMLBASE_H__
-#include <vw/Core.h>
-#include <boost/lexical_cast.hpp>
+#include <vw/Core/Exception.h>
+#include <vw/Core/FundamentalTypes.h>
+
+#include <string>
-#include <xercesc/dom/DOM.hpp>
+#include <xercesc/dom/DOMElement.hpp>
+#include <xercesc/dom/DOMNodeList.hpp>
#include <xercesc/util/XMLString.hpp>
+#include <xercesc/util/Xerces_autoconf_config.hpp>
+
+#include <boost/lexical_cast.hpp>
namespace asp {
View
13 src/asp/Sessions/ISIS/PhotometricOutlier.cc
@@ -20,12 +20,19 @@
///
/// Warning: This code was written with only the Apollo Metric data in mind
-#include <vw/Image.h>
-#include <vw/FileIO.h>
+#include <vw/Image/AlgorithmFunctions.h>
+#include <vw/Image/Algorithms.h>
+#include <vw/Image/Filter.h>
+#include <vw/Image/Convolution.h>
+#include <vw/Image/EdgeExtension.h>
+#include <vw/Image/Manipulation.h>
+#include <vw/Image/MaskViews.h>
+#include <vw/Image/Transform.h>
+#include <vw/FileIO/DiskImageView.h>
#include <vw/Stereo/DisparityMap.h>
-#include <asp/Sessions/ISIS/PhotometricOutlier.h>
#include <asp/Core/StereoSettings.h>
#include <asp/Core/Common.h>
+#include <asp/Sessions/ISIS/PhotometricOutlier.h>
using namespace vw;
using namespace asp;
View
3 src/asp/Sessions/ISIS/PhotometricOutlier.h
@@ -24,10 +24,11 @@
#define __STEREO_SESSION_ISIS_OUTLIER_H__
#include <string>
-#include <asp/Core/Common.h>
namespace asp {
+ class BaseOptions;
+
void photometric_outlier_rejection( BaseOptions const& opt,
std::string const& prefix,
std::string const& input_disparity,
View
24 src/asp/Sessions/ISIS/StereoSessionIsis.cc
@@ -20,12 +20,27 @@
///
// Vision Workbench
-#include <vw/FileIO.h>
+#include <vw/Core/Settings.h>
+#include <vw/Core/Log.h>
#include <vw/Math/Functors.h>
-#include <vw/Math/Geometry.h>
-#include <vw/InterestPoint.h>
+#include <vw/Image/Algorithms.h>
+#include <vw/Image/EdgeExtension.h>
+#include <vw/Image/ImageViewRef.h>
+#include <vw/Image/Manipulation.h>
+#include <vw/Image/ImageMath.h>
+#include <vw/Image/MaskViews.h>
+#include <vw/Image/Statistics.h>
+#include <vw/Image/Transform.h>
+#include <vw/FileIO/DiskImageView.h>
+#include <vw/FileIO/DiskImageResourceGDAL.h>
+#include <vw/FileIO/DiskImageResourceOpenEXR.h>
+#include <vw/Camera/CameraModel.h>
#include <vw/Stereo/DisparityMap.h>
-#include <vw/Cartography.h>
+#include <vw/InterestPoint/Descriptor.h>
+#include <vw/InterestPoint/Detector.h>
+#include <vw/InterestPoint/Matcher.h>
+#include <vw/InterestPoint/MatrixIO.h>
+#include <vw/Cartography/Datum.h>
// Stereo Pipeline
#include <asp/Core/StereoSettings.h>
@@ -35,6 +50,7 @@
#include <asp/IsisIO/IsisCameraModel.h>
#include <asp/IsisIO/IsisAdjustCameraModel.h>
#include <asp/IsisIO/DiskImageResourceIsis.h>
+#include <asp/IsisIO/Equation.h>
#include <asp/Sessions/ISIS/PhotometricOutlier.h>
// Boost
View
8 src/asp/Sessions/Pinhole/StereoSessionPinhole.cc
@@ -22,11 +22,15 @@
#include <asp/Core/StereoSettings.h>
#include <asp/Sessions/Pinhole/StereoSessionPinhole.h>
-#include <vw/Camera.h>
+#include <vw/Math/BBox.h>
+#include <vw/Math/Geometry.h>
+#include <vw/Math/Matrix.h>
+#include <vw/Math/RANSAC.h>
+#include <vw/Math/Vector.h>
#include <vw/Image/ImageViewRef.h>
#include <vw/Image/MaskViews.h>
+#include <vw/Camera.h>
#include <vw/Stereo/DisparityMap.h>
-#include <vw/Math.h>
#include <boost/shared_ptr.hpp>
#include <boost/filesystem/operations.hpp>
View
22 src/asp/Sessions/RPC/RPCModel.cc
@@ -16,16 +16,20 @@
// __END_LICENSE__
-#include <asp/Sessions/RPC/RPCModel.h>
+
#include <vw/Math/Vector.h>
-#include <vw/FileIO/GdalIO.h>
#include <vw/FileIO/DiskImageResourceGDAL.h>
-#include <vw/Cartography.h>
+#include <vw/Cartography/Datum.h>
+#include <vw/Cartography/GeoReference.h>
+#include <asp/Sessions/RPC/RPCModel.h>
#include <gdal.h>
#include <gdal_priv.h>
+#include <boost/smart_ptr/scoped_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+
using namespace vw;
namespace asp {
@@ -436,4 +440,16 @@ namespace asp {
return dir;
}
+ std::ostream& operator<<(std::ostream& os, const RPCModel& rpc) {
+ os << "RPC Model:" << std::endl
+ << "Line Numerator: " << rpc.line_num_coeff() << std::endl
+ << "Line Denominator: " << rpc.line_den_coeff() << std::endl
+ << "Samp Numerator: " << rpc.sample_num_coeff() << std::endl
+ << "Samp Denominator: " << rpc.sample_den_coeff() << std::endl
+ << "XY Offset: " << rpc.xy_offset() << std::endl
+ << "XY Scale: " << rpc.xy_scale() << std::endl
+ << "Geodetic Offset: " << rpc.lonlatheight_offset() << std::endl
+ << "Geodetic Scale: " << rpc.lonlatheight_scale();
+ return os;
+ }
}
View
24 src/asp/Sessions/RPC/RPCModel.h
@@ -26,10 +26,18 @@
#ifndef __STEREO_SESSION_RPC_MODEL_H__
#define __STEREO_SESSION_RPC_MODEL_H__
-#include <vw/FileIO/DiskImageResourceGDAL.h>
+#include <vw/Math/Matrix.h>
+#include <vw/Math/Vector.h>
#include <vw/Camera/CameraModel.h>
#include <vw/Cartography/Datum.h>
+#include <string>
+#include <ostream>
+
+namespace vw {
+ class DiskImageResourceGDAL;
+}
+
namespace asp {
class RPCModel : public vw::camera::CameraModel {
@@ -113,19 +121,7 @@ namespace asp {
};
- inline std::ostream& operator<<(std::ostream& os, const RPCModel& rpc) {
- os << "RPC Model:" << std::endl
- << "Line Numerator: " << rpc.line_num_coeff() << std::endl
- << "Line Denominator: " << rpc.line_den_coeff() << std::endl
- << "Samp Numerator: " << rpc.sample_num_coeff() << std::endl
- << "Samp Denominator: " << rpc.sample_den_coeff() << std::endl
- << "XY Offset: " << rpc.xy_offset() << std::endl
- << "XY Scale: " << rpc.xy_scale() << std::endl
- << "Geodetic Offset: " << rpc.lonlatheight_offset() << std::endl
- << "Geodetic Scale: " << rpc.lonlatheight_scale();
- return os;
-
- }
+ std::ostream& operator<<(std::ostream& os, const RPCModel& rpc);
}
#endif //__STEREO_SESSION_RPC_MODEL_H__
View
1 src/asp/Sessions/RPC/RPCModelGen.cc
@@ -17,6 +17,7 @@
#include <asp/Sessions/RPC/RPCModelGen.h>
+#include <asp/Sessions/RPC/RPCModel.h>
using namespace vw;
View
9 src/asp/Sessions/RPC/RPCStereoModel.cc
@@ -15,9 +15,14 @@
// limitations under the License.
// __END_LICENSE__
-
-#include <vw/Camera/CameraModel.h>
+#include <vw/Core/Log.h>
+#include <vw/Math/Functors.h>
+#include <vw/Math/Matrix.h>
#include <vw/Math/LevenbergMarquardt.h>
+#include <vw/Math/Vector.h>
+#include <vw/Camera/CameraModel.h>
+#include <vw/Cartography/Datum.h>
+
#include <asp/Sessions/RPC/RPCModel.h>
#include <asp/Sessions/RPC/RPCStereoModel.h>
View
10 src/asp/Sessions/RPC/StereoSessionRPC.cc
@@ -19,15 +19,15 @@
/// \file StereoSessionRPC.cc
///
-// Ames Stereo Pipeline
-#include <asp/Core/StereoSettings.h>
-#include <asp/Core/InterestPointMatching.h>
+#include <vw/Camera/CameraModel.h>
+
#include <asp/Sessions/RPC/StereoSessionRPC.h>
#include <asp/Sessions/DG/XML.h>
#include <asp/Sessions/RPC/RPCModel.h>
-// Vision Workbench
-#include <vw/Camera/CameraModel.h>
+#include <string>
+
+#include <boost/smart_ptr/shared_ptr.hpp>
using namespace vw;
using namespace asp;
View
27 src/asp/Sessions/StereoSession.cc
@@ -18,14 +18,31 @@
/// \file StereoSession.cc
///
-
-#include <asp/Core/StereoSettings.h>
-#include <asp/Sessions.h>
-
#include <vw/Core/Exception.h>
-#include <vw/Stereo/DisparityMap.h>
+#include <vw/Core/Log.h>
+#include <vw/Math/Vector.h>
+#include <vw/Image/ImageViewRef.h>
+#include <vw/Image/PixelMask.h>
+#include <vw/Image/PixelTypeInfo.h>
+#include <vw/FileIO/DiskImageResource.h>
+#include <vw/FileIO/DiskImageView.h>
+
+#include <asp/asp_config.h>
+#include <asp/Core/StereoSettings.h>
+#include <asp/Core/Common.h>
+#include <asp/Sessions/DG/StereoSessionDG.h>
+#include <asp/Sessions/DGMapRPC/StereoSessionDGMapRPC.h>
+#include <asp/Sessions/ISIS/StereoSessionIsis.h>
+#include <asp/Sessions/NadirPinhole/StereoSessionNadirPinhole.h>
+#include <asp/Sessions/Pinhole/StereoSessionPinhole.h>
+#include <asp/Sessions/RPC/StereoSessionRPC.h>
+#include <asp/Sessions/StereoSession.h>
#include <map>
+#include <utility>
+#include <string>
+#include <ostream>
+#include <limits>
using namespace vw;
View
1 src/asp/Sessions/StereoSession.h
@@ -28,7 +28,6 @@
#include <vw/Math/Functors.h>
#include <vw/Math/Geometry.h>
-#include <vw/Math/RANSAC.h>
#include <vw/InterestPoint.h>
#include <boost/shared_ptr.hpp>
View
16 src/test/Helpers.h
@@ -19,20 +19,22 @@
#ifndef __VW_TESTS_CONFIG_TEST_H__
#define __VW_TESTS_CONFIG_TEST_H__
+#include <vw/config.h>
+#include <vw/Core/Log.h>
+#include <vw/Math/Vector.h>
+#include <vw/Math/Matrix.h>
+#include <vw/Image/PixelTypeInfo.h>
+#include <vw/Image/PixelMath.h>
+
#include <gtest/gtest_ASP.h>
#include <cmath>
#include <complex>
#include <string>
-#include <boost/function.hpp>
#include <queue>
#include <cstdlib>
-#include <vw/config.h>
-#include <vw/Core/Log.h>
-#include <vw/Math/Vector.h>
-#include <vw/Math/Matrix.h>
-#include <vw/Image/PixelTypeInfo.h>
-#include <vw/Image/PixelMath.h>
+#include <boost/function.hpp>
+#include <boost/range/iterator_range_core.hpp>
#if defined(VW_ENABLE_EXCEPTIONS) && (VW_ENABLE_EXCEPTIONS==1)
#define HAS_EXCEPTIONS(x) x

0 comments on commit 7e0b91a

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