From: Pablo d'A. <da...@us...> - 2007-04-15 21:03:32
|
Update of /cvsroot/hugin/hugin/src/tools In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv22150/tools Modified Files: Makefile.am align_image_stack.cpp zhang_undistort.cpp Log Message: updates for the build system Index: align_image_stack.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/tools/align_image_stack.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- align_image_stack.cpp 13 Mar 2007 22:36:48 -0000 1.1 +++ align_image_stack.cpp 15 Apr 2007 21:03:27 -0000 1.2 @@ -244,7 +244,7 @@ SrcPanoImage srcImg; srcImg.setFilename(files[0]); - bool ok = initImageFromFile(srcImg, focalLength, cropFactor); + initImageFromFile(srcImg, focalLength, cropFactor); if (srcImg.getSize().x == 0 || srcImg.getSize().y == 0) { cerr << "Could not decode image: " << files[0] << "Unsupported image file format"; return 1; @@ -271,13 +271,13 @@ OptimizeVector optvars(1); // loop to add images and control points between them. - for (int i = 1; i < nFiles; i++) { + for (int i = 1; i < (int) nFiles; i++) { if (g_verbose > 0) { cout << "Creating control points between " << files[i-1] << " and " << files[i] << endl; } // add next image. srcImg.setFilename(files[i]); - bool ok = initImageFromFile(srcImg, focalLength, cropFactor); + initImageFromFile(srcImg, focalLength, cropFactor); if (srcImg.getSize().x == 0 || srcImg.getSize().y == 0) { cerr << "Could not decode image: " << files[i] << "Unsupported image file format"; return 1; @@ -319,7 +319,7 @@ // remove all points with error higher than a specified threshold CPVector cps = pano.getCtrlPoints(); CPVector newCPs; - for (int i=0; i < cps.size(); i++) { + for (int i=0; i < (int)cps.size(); i++) { if (cps[i].error < cpErrorThreshold) { newCPs.push_back(cps[i]); } Index: zhang_undistort.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/tools/zhang_undistort.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- zhang_undistort.cpp 28 Apr 2006 07:14:21 -0000 1.7 +++ zhang_undistort.cpp 15 Apr 2007 21:03:27 -0000 1.8 @@ -38,6 +38,7 @@ #include "panoinc.h" #include "vigra_ext/ImageTransforms.h" +#include "vigra_ext/utils.h" #include <tiff.h> @@ -104,6 +105,8 @@ ZhangCalibData c; }; +template <class T> +T NoOp(T x) { return x;} int main(int argc, char *argv[]) { @@ -139,14 +142,14 @@ StreamMultiProgressDisplay disp(cout); - - + PassThroughFunctor<SrcPixelType> ptfRGB; // transform the image using cubic interpolation. transformImage(srcImageRange(distorted), destImageRange(undistorted), destImage(alpha), Diff2D(1,1), func, + ptfRGB, false, vigra_ext::INTERP_CUBIC, disp); Index: Makefile.am =================================================================== RCS file: /cvsroot/hugin/hugin/src/tools/Makefile.am,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- Makefile.am 13 Mar 2007 22:36:48 -0000 1.19 +++ Makefile.am 15 Apr 2007 21:03:27 -0000 1.20 @@ -2,10 +2,18 @@ DEFAULT_INCLUDES="-I." INCLUDES = -I$(top_builddir)/src/include -I${top_srcdir}/src/foreign -I${top_srcdir}/src/include -AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(JPEG_FLAGS) $(TIFF_FLAGS) $(PANO_FLAGS) -AM_LDFLAGS = $(LIB_JPEG) $(LIB_TIFF) $(LIB_PANO) $(BOOST_THREAD_LIB) +AM_CPPFLAGS = $(BOOST_CPPFLAGS) $(JPEG_FLAGS) $(TIFF_FLAGS) $(PANO_FLAGS) $(OPENEXR_CFLAGS) +AM_LDFLAGS = $(LIB_JPEG) $(LIB_TIFF) $(LIB_PANO) $(BOOST_THREAD_LIB) $(OPENEXR_LIBS) -bin_PROGRAMS = align_image_stack nona autooptimiser zhang_undistort color_correct_tiff fulla +bin_PROGRAMS = align_image_stack nona vig_optimize autooptimiser fulla +#zhang_undistort color_correct_tiff + +img2vips_SOURCES = img2vips.cpp +img2vips_CPPFLAGS = $(VIPS_CFLAGS) +img2vips_LDADD = ${top_builddir}/src/common/libcommon.la \ + ${top_builddir}/src/foreign/vigra_impex/libvigra_impex.la \ + ${top_builddir}/src/vigra_ext/libvigra_ext.la \ + $(VIPS_LIBS) nona_SOURCES = nona.cpp nona_LDADD = ${top_builddir}/src/Panorama/libpanorama.la \ @@ -39,6 +47,14 @@ ${top_builddir}/src/foreign/vigra_impex/libvigra_impex.la \ ${top_builddir}/src/vigra_ext/libvigra_ext.la +vig_optimize_SOURCES = vig_optimize.cpp +vig_optimize_LDADD = ${top_builddir}/src/Panorama/libpanorama.la $(BOOST_THREAD_LIB) \ + ${top_builddir}/src/common/libcommon.la \ + ${top_builddir}/src/foreign/vigra_impex/libvigra_impex.la \ + ${top_builddir}/src/jhead/libjhead.la \ + ${top_builddir}/src/vigra_ext/libvigra_ext.la \ + ${top_builddir}/src/foreign/levmar/liblevmar.la + align_image_stack_SOURCES = align_image_stack.cpp align_image_stack_LDADD = ${top_builddir}/src/Panorama/libpanorama.la $(BOOST_THREAD_LIB) \ ${top_builddir}/src/common/libcommon.la \ @@ -47,12 +63,6 @@ ${top_builddir}/src/vigra_ext/libvigra_ext.la -#vig_optimize_SOURCES = vig_optimize.cpp -#vig_optimize_LDADD = ${top_builddir}/src/Panorama/libpanorama.la $(BOOST_THREAD_LIB) \ -# ${top_builddir}/src/common/libcommon.la \ -# ${top_builddir}/src/foreign/vigra_impex/libvigra_impex.la \ -# ${top_builddir}/src/jhead/libjhead.la \ -# ${top_builddir}/src/vigra_ext/libvigra_ext.la # DGSW remove automatch.cpp from the list below if you uncomment automatch_SOURCES and automatch_LDADD EXTRA_DIST = nona.vcproj automatch.cpp |