Skip to content
Browse files

Fixed a few bugs in the rmax_adjust code. It's now read to serve as a…

… baseline for improving the rest of the bundle adjustment framework.
  • Loading branch information...
1 parent f1055a5 commit 71fd712a0c5272630bf936d962ec13cb33c4a25b @broxtronix broxtronix committed May 29, 2008
Showing with 7 additions and 9 deletions.
  1. +1 −1 configure.ac
  2. +5 −5 src/RMAX/RmaxInterestPoint.cc
  3. +1 −0 src/RMAX/RmaxInterestPoint.h
  4. +0 −3 src/rmax_adjust.cc
View
2 configure.ac
@@ -275,7 +275,7 @@ AX_APP(POINT2DEM, [src], no, [BOOST BOOST_PROGRAM_OPTIONS VW VW_CARTOGRAPHY])
AX_APP(NURBS, [src], no, [BOOST BOOST_PROGRAM_OPTIONS VW MBA])
AX_APP(CTXIMAGE, [src], no, [BOOST BOOST_PROGRAM_OPTIONS VW VW_CARTOGRAPHY])
AX_APP(RMAX2CAHVOR, [src], no, [BOOST VW VW_CAMERA BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM])
-AX_APP(RMAXADJUST, [src], no, [BOOST BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM VW VW_CAMERA VW_STEREO LAPACK])
+AX_APP(RMAXADJUST, [src], no, [BOOST BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM VW VW_CAMERA VW_STEREO VW_INTEREST_POINT LAPACK])
##################################################
# final processing
View
10 src/RMAX/RmaxInterestPoint.cc
@@ -28,11 +28,11 @@ static std::string suffix_from_filename(std::string const& filename) {
// Returns the name of the binary file containing the extracted
// interest points.
-bool check_for_ipfiles(std::vector<std::string> > files) {
+bool check_for_ipfiles(std::vector<std::string> files) {
- for (unsigned i = 0; i < files.size; ++i) {
+ for (unsigned i = 0; i < files.size(); ++i) {
- keyfile = prefix_from_filename(files[i]) + ".vwip";
+ std::string keyfile = prefix_from_filename(files[i]) + ".vwip";
if ( !exists( keyfile ) ) {
vw_out(ErrorMessage) << "Missing interest point file: " << keyfile << ". Regenerate it using the ipfind utility.\n";
return false;
@@ -79,8 +79,8 @@ void match_interest_points(std::string image_filename1, std::string image_filena
// RANSAC needs the matches as a vector, and so does the matcher.
// this is messy, but for now we simply make a copy.
std::vector<InterestPoint> ip1, ip2;
- ip1 = read_key_file(ip_filename1);
- ip2 = read_key_file(ip_filename2);
+ ip1 = read_binary_ip_file(ip_filename1);
+ ip2 = read_binary_ip_file(ip_filename2);
std::cout << "Matching " << ip_filename1 << " and " << ip_filename2 << "... " << std::flush;
InterestPointMatcher<L2NormMetric,NullConstraint> matcher(matcher_threshold);
View
1 src/RMAX/RmaxInterestPoint.h
@@ -11,5 +11,6 @@ std::string detect_interest_points(std::string image_filename);
void match_interest_points(std::string ip_filename1, std::string ip_filename2,
std::vector<vw::Vector2> &final_ip1, std::vector<vw::Vector2> &final_ip2);
+bool check_for_ipfiles(std::vector<std::string> files);
#endif // __RMAX_INTEREST_POINTS_H__
View
3 src/rmax_adjust.cc
@@ -157,9 +157,6 @@ int main(int argc, char* argv[]) {
if (!vm.count("bundles") ) {
- // First, detect all of the interest points. These points must be
- // cached in a binary *.vwip file, which can be generated using
- // the VW ipfind tool.
if (!check_for_ipfiles(image_files))
exit(0);

0 comments on commit 71fd712

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