Permalink
Browse files

core: Make ASP compliant with Boost 1.50

-> Thread depends on System
-> FS only ships version 3 now.
  • Loading branch information...
1 parent 7560bc4 commit fcb2612717dd0227497e2c80dc0fe3b5521ceb41 Zack Moratto committed Jul 13, 2012
View
@@ -152,7 +152,7 @@ AX_PKG_BOOST([BOOST_PROGRAM_OPTIONS BOOST_SYSTEM BOOST_FILESYSTEM BOOST_THREAD B
BOOST_REGEX,
[AX_PKG_BOOST_LIB(REGEX, [-lboost_regex], [boost/regex.hpp], [boost::regex(".*");])],
BOOST_DATETIME,
- [AX_PKG_BOOST_LIB(DATETIME, [-lboost_date_time], [boost/date_time/gregorian/gregorian_types.hpp])],
+ [AX_PKG_BOOST_LIB(DATETIME, [-lboost_date_time], [boost/date_time/gregorian/gregorian_types.hpp], [], [$PKG_BOOST_SYSTEM_LIBS])],
BOOST_THREAD,
[AX_PKG_BOOST_LIB(THREAD, [-lboost_thread], [boost/thread/thread.hpp], [boost::mutex();], [$PKG_BOOST_DATETIME_LIBS], [boost/thread/condition.hpp])],
BOOST_IOSTREAMS,
@@ -451,7 +451,7 @@ AM_CONDITIONAL(MAKE_APP_STEREOGUI, [test "$MAKE_APP_STEREOGUI" = "yes"])
# final processing
##################################################
-ASP_CPPFLAGS="-I\${top_srcdir}/src $OTHER_CPPFLAGS -DBOOST_FILESYSTEM_VERSION=2"
+ASP_CPPFLAGS="-I\${top_srcdir}/src $OTHER_CPPFLAGS"
ASP_LDFLAGS="$OTHER_LDFLAGS"
# Do this last, to make sure it's not overridden
View
@@ -130,7 +130,7 @@ asp::check_command_line( int argc, char *argv[], BaseOptions& opt,
bool asp::has_cam_extension( std::string const& input ) {
boost::filesystem::path ipath( input );
- std::string ext = ipath.extension();
+ std::string ext = ipath.extension().string();
if ( ext == ".cahvor" || ext == ".cahv" ||
ext == ".pin" || ext == ".pinhole" ||
ext == ".tsai" || ext == ".cmod" ||
@@ -67,7 +67,7 @@ namespace asp {
std::vector<ip::InterestPoint> matched_ip1, matched_ip2;
std::string match_filename =
fs::path( input_file1 ).replace_extension("").string() + "__" +
- fs::path( input_file2 ).stem() + ".match";
+ fs::path( input_file2 ).stem().string() + ".match";
if ( fs::exists( match_filename ) ) {
// Is there a match file linking these 2 image?
@@ -71,7 +71,7 @@ void handle_arguments( int argc, char *argv[], Options& opt ) {
positional, positional_desc, usage );
if ( opt.output_prefix.empty() )
- opt.output_prefix = fs::path(opt.input_file_name).stem();
+ opt.output_prefix = fs::path(opt.input_file_name).stem().string();
}
template <class PixelT>
@@ -59,7 +59,7 @@ void handle_arguments( int argc, char *argv[], Options& opt ) {
positional, positional_desc, usage );
if ( opt.output_prefix.empty() )
- opt.output_prefix = fs::path(opt.img_file).stem();
+ opt.output_prefix = fs::path(opt.img_file).stem().string();
}
int main( int argc, char** argv ) {
@@ -192,7 +192,7 @@ int main(int argc, char* argv[]) {
// If the user hasn't specified a stereo session type, we take a
// guess here based on the file suffixes.
if ( opt.stereo_session.empty() ) {
- std::string ext = fs::path(opt.camera_model_file).extension();
+ std::string ext = fs::path(opt.camera_model_file).extension().string();
if ( ext == ".cahvor" || ext == ".cmod" ||
ext == ".cahv" || ext == ".pin" || ext == ".tsai" ) {
vw_out() << "\t--> Detected pinhole camera files. Executing pinhole stereo pipeline.\n";
@@ -170,7 +170,7 @@ approximate_search_range( std::string const& left_image,
right_ip_file = fs::path( right_image ).replace_extension("vwip").string(),
match_file =
fs::path( left_image ).replace_extension("").string() + "__" +
- fs::path( right_image ).stem() + ".match";
+ fs::path( right_image ).stem().string() + ".match";
// Building / Loading Interest point data
if ( fs::exists(match_file) ) {

0 comments on commit fcb2612

Please sign in to comment.