Permalink
Browse files

all: Make compile with changes perform in VW

  • Loading branch information...
1 parent 8479071 commit 8661219cff4d87bf30208d53ca59d10c19f638ef Zack Moratto committed Dec 22, 2013
@@ -22,6 +22,7 @@
#include <asp/Core/IntegralAutoGainDetector.h>
#include <vw/Core.h>
+#include <vw/Core/Stopwatch.h>
#include <vw/Math.h>
#include <vw/Image/ImageViewBase.h>
#include <vw/Image/MaskViews.h>
@@ -15,7 +15,6 @@
// limitations under the License.
// __END_LICENSE__
-
/// \file OrthoRasterizer.h
///
/// Given a point image and corresponding texture, this class
@@ -33,6 +32,8 @@
// The SoftwareRenderer actual "renders" the 3D scene, textures it,
// and then returns a 2D orthographic view.
#include <asp/Core/SoftwareRenderer.h>
+
+#include <boost/foreach.hpp>
#include <boost/math/special_functions/next.hpp>
namespace vw {
@@ -20,7 +20,7 @@
///
#include <fstream>
-#include <vw/Core/Thread.h>
+#include <vw/Core/RunOnce.h>
#include <vw/Core/Log.h>
#include <asp/Core/Common.h>
@@ -23,6 +23,8 @@
#include <asp/IsisIO/IsisInterfaceMapLineScan.h>
#include <asp/IsisIO/IsisInterfaceLineScan.h>
+#include <iomanip>
+
// VW
#include <vw/Core.h>
@@ -23,6 +23,9 @@
#include <vw/FileIO/DiskImageResourceGDAL.h>
#include <vw/Cartography.h>
+#include <gdal.h>
+#include <gdal_priv.h>
+
using namespace vw;
namespace asp {
@@ -22,6 +22,8 @@
#include <vw/Core/ProgressCallback.h>
#include <asp/Tools/bundlevis.h>
+#include <boost/foreach.hpp>
+
using namespace vw;
// This builds the 3 Axis that represents the camera
View
@@ -22,15 +22,6 @@
/************************************************************************
* File: orbitviz.cc
************************************************************************/
-#include <boost/algorithm/string.hpp>
-#include <boost/program_options.hpp>
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/convenience.hpp>
-#include <boost/filesystem/fstream.hpp>
-namespace po = boost::program_options;
-namespace fs = boost::filesystem;
-
#include <vw/Core.h>
#include <vw/Math.h>
#include <vw/FileIO/KML.h>
@@ -47,6 +38,17 @@ using namespace vw::cartography;
#include <asp/IsisIO/IsisCameraModel.h>
#endif
+#include <iomanip>
+
+#include <boost/algorithm/string.hpp>
+#include <boost/program_options.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/convenience.hpp>
+#include <boost/filesystem/fstream.hpp>
+namespace po = boost::program_options;
+namespace fs = boost::filesystem;
+
struct Options : public asp::BaseOptions {
Options() : loading_image_camera_order(true) {}
// Input
@@ -29,6 +29,8 @@ using namespace vw::cartography;
#include <asp/Core/AntiAliasing.h>
namespace po = boost::program_options;
+#include <vw/Core/Stopwatch.h>
+
#if defined(VW_HAVE_PKG_GDAL) && VW_HAVE_PKG_GDAL==1
#include "ogr_spatialref.h"
#endif

0 comments on commit 8661219

Please sign in to comment.