Atom feed of this blogbuilding insight3d
I tested insight3d to see if it would be suitable for making a 3d model of my house. It is not, but here's how I got it to build on current 2014 opencv:
diff -x '*.o' -x '*.a' -ru insight3d_original/insight3d/insight3d/ann_1.1.1/Make-config insight3d/insight3d/ann_1.1.1/Make-config
--- insight3d_original/insight3d/insight3d/ann_1.1.1/Make-config 2009-07-23 16:12:54.000000000 -0700
+++ insight3d/insight3d/ann_1.1.1/Make-config 2014-08-15 22:58:33.565338086 -0700
@@ -72,7 +72,7 @@
$(MAKE) targets \
"ANNLIB = libANN.a" \
"C++ = g++" \
- "CFLAGS = -O3" \
+ "CFLAGS = -O3 -m64" \
"MAKELIB = ar ruv" \
"RANLIB = true"
diff -x '*.o' -x '*.a' -ru insight3d_original/insight3d/insight3d/ann_1.1.1/src/Makefile insight3d/insight3d/ann_1.1.1/src/Makefile
--- insight3d_original/insight3d/insight3d/ann_1.1.1/src/Makefile 2009-07-23 16:12:53.000000000 -0700
+++ insight3d/insight3d/ann_1.1.1/src/Makefile 2014-08-15 22:58:41.797545538 -0700
@@ -62,6 +62,8 @@
# Make object files
#-----------------------------------------------------------------------------
+CFLAGS := -m64
+
ANN.o: ANN.cpp
$(C++) -c -I$(INCDIR) $(CFLAGS) ANN.cpp
diff -x '*.o' -x '*.a' -ru insight3d_original/insight3d/insight3d/Makefile insight3d/insight3d/Makefile
--- insight3d_original/insight3d/insight3d/Makefile 2009-07-24 08:24:41.000000000 -0700
+++ insight3d/insight3d/Makefile 2014-08-15 22:58:50.277759237 -0700
@@ -6,7 +6,7 @@
all: insight3d
insight3d: $(OBJECTS) sift_detector
- g++ $(DEBUG) -o insight3d *.o `pkg-config --libs opencv libxml-2.0 sdl gtk+-2.0` ./sift/lib/libfeat.a $(AGARLIB) -llapack -lblas -lGL -lGLU ./sba/libsba.a ./ann_1.1.1/lib/libANN.a
+ g++ -O3 -o insight3d *.o `pkg-config --libs opencv libxml-2.0 sdl gtk+-2.0` ./sift/lib/libfeat.a ./sba/libsba.a -llapack -lblas -lGL -lGLU -lgdk-x11-2.0 -lpthread ./ann_1.1.1/lib/libANN.a
sift_detector:
make -C ./sift
diff -x '*.o' -x '*.a' -ru insight3d_original/insight3d/insight3d/mvg_decomposition.cpp insight3d/insight3d/mvg_decomposition.cpp
--- insight3d_original/insight3d/insight3d/mvg_decomposition.cpp 2009-07-23 16:13:59.000000000 -0700
+++ insight3d/insight3d/mvg_decomposition.cpp 2014-08-15 22:59:09.462242670 -0700
@@ -29,7 +29,8 @@
bool mvg_finite_projection_matrix_decomposition(CvMat * const P, CvMat * const K, CvMat * const R, CvMat * const T)
{
// extract camera center, i.e. calculate the right null vector of P
- CvMat * W = cvCreateMat(4, 1, CV_64F), * V_transposed = cvCreateMat(4, 4, CV_64F);
+ CvMat * W = cvCreateMat(3, 1, CV_64F), * V_transposed = cvCreateMat(4, 4, CV_64F);
+
cvSVD(P, W, NULL, V_transposed, CV_SVD_V_T); // todo check singular values of P for numerical stability
// check for camera at infinity
diff -x '*.o' -x '*.a' -ru insight3d_original/insight3d/insight3d/sift/include/utils.h insight3d/insight3d/sift/include/utils.h
--- insight3d_original/insight3d/insight3d/sift/include/utils.h 2009-07-23 16:13:48.000000000 -0700
+++ insight3d/insight3d/sift/include/utils.h 2014-08-15 22:59:34.934884530 -0700
@@ -156,7 +156,7 @@
@return Returns the basename of \a pathname.
*/
-extern char* basename( const char* pathname );
+//extern char* basename( const char* pathname );
/**
diff -x '*.o' -x '*.a' -ru insight3d_original/insight3d/insight3d/sift/src/imgfeatures.c insight3d/insight3d/sift/src/imgfeatures.c
--- insight3d_original/insight3d/insight3d/sift/src/imgfeatures.c 2009-07-23 16:13:49.000000000 -0700
+++ insight3d/insight3d/sift/src/imgfeatures.c 2014-08-15 22:58:46.277658436 -0700
@@ -366,7 +366,7 @@
cvInitMatHeader( &M, 2, 2, CV_64FC1, m, CV_AUTOSTEP );
cvInitMatHeader( &V, 2, 2, CV_64FC1, v, CV_AUTOSTEP );
cvInitMatHeader( &E, 2, 1, CV_64FC1, e, CV_AUTOSTEP );
- cvEigenVV( &M, &V, &E, DBL_EPSILON );
+ cvEigenVV( &M, &V, &E, DBL_EPSILON, -1, -1);
l1 = 1 / sqrt( e[1] );
l2 = 1 / sqrt( e[0] );
alpha = -atan2( v[1], v[0] );
diff -x '*.o' -x '*.a' -ru insight3d_original/insight3d/insight3d/sift/src/Makefile insight3d/insight3d/sift/src/Makefile
--- insight3d_original/insight3d/insight3d/sift/src/Makefile 2009-07-23 16:13:49.000000000 -0700
+++ insight3d/insight3d/sift/src/Makefile 2014-08-15 22:59:16.130410697 -0700
@@ -1,5 +1,5 @@
CC = gcc
-CFLAGS = -O3
+CFLAGS = -O3 -m64
BIN_DIR = ../bin
INC_DIR = ../include
LIB_DIR = ../lib
diff -x '*.o' -x '*.a' -ru insight3d_original/insight3d/insight3d/sift/src/siftfeat.c insight3d/insight3d/sift/src/siftfeat.c
--- insight3d_original/insight3d/insight3d/sift/src/siftfeat.c 2009-07-23 16:13:49.000000000 -0700
+++ insight3d/insight3d/sift/src/siftfeat.c 2014-08-15 22:59:20.786528024 -0700
@@ -75,7 +75,7 @@
export_features( out_file_name, features, n );
if( out_img_name != NULL )
- cvSaveImage( out_img_name, img );
+ cvSaveImage( out_img_name, img, NULL );
return 0;
}
diff -x '*.o' -x '*.a' -ru insight3d_original/insight3d/insight3d/tool_calibration.cpp insight3d/insight3d/tool_calibration.cpp
--- insight3d_original/insight3d/insight3d/tool_calibration.cpp 2009-07-23 16:13:59.000000000 -0700
+++ insight3d/insight3d/tool_calibration.cpp 2014-08-15 22:59:24.038609970 -0700
@@ -257,7 +257,7 @@
ASSERT(points1->cols == points2->cols, "sizes of matrices containing correspondences do not match");
// compute F
- CvMat * F = opencv_create_matrix(3, 3), * status = cvCreateMat(1, points1->cols, CV_8S);
+ CvMat * F = opencv_create_matrix(3, 3), * status = cvCreateMat(1, points1->cols, CV_8U);
if (!cvFindFundamentalMat(points1, points2, F, CV_FM_RANSAC, epipolar_distance_threshold, 0.999, status))
{
diff -x '*.o' -x '*.a' -ru insight3d_original/insight3d/insight3d/tool_matching.cpp insight3d/insight3d/tool_matching.cpp
--- insight3d_original/insight3d/insight3d/tool_matching.cpp 2009-07-23 16:13:59.000000000 -0700
+++ insight3d/insight3d/tool_matching.cpp 2014-08-15 22:59:27.394694536 -0700
@@ -387,7 +387,7 @@
{
// allocate structures
CvMat * first_points = cvCreateMat(2, correspondences, CV_64F), * second_points = cvCreateMat(2, correspondences, CV_64F);
- CvMat * status = cvCreateMat(1, correspondences, CV_8S);
+ CvMat * status = cvCreateMat(1, correspondences, CV_8U);
cvZero(status);
CvMat * F = cvCreateMat(3, 3, CV_64F);
diff -x '*.o' -x '*.a' -ru insight3d_original/insight3d/insight3d/tool_triangulation.h insight3d/insight3d/tool_triangulation.h
--- insight3d_original/insight3d/insight3d/tool_triangulation.h 2009-07-23 16:13:59.000000000 -0700
+++ insight3d/insight3d/tool_triangulation.h 2014-08-15 22:59:30.806780512 -0700
@@ -32,6 +32,7 @@
#include "mvg_triangulation.h"
#include "ANN/ANN.h"
#include <set>
+#include "/usr/include/opencv2/legacy/legacy.hpp"
void tool_triangulation_create();
void tool_triangulate_vertices_user();
- New comment