From: <ip...@us...> - 2007-06-03 17:21:29
|
Revision: 2033 http://hugin.svn.sourceforge.net/hugin/?rev=2033&view=rev Author: ippei Date: 2007-06-03 10:21:26 -0700 (Sun, 03 Jun 2007) Log Message: ----------- Updated the local code; ignored the future problem with merging because this branch is just the repository to dump my code, not keep track of changes from the past. Let me work on the future for now. Added Paths: ----------- hugin/branches/ippei/sources/ hugin/branches/ippei/sources/Doxyfile hugin/branches/ippei/sources/Foreign/ hugin/branches/ippei/sources/Foreign/.cvsignore hugin/branches/ippei/sources/Foreign/CMakeLists.txt hugin/branches/ippei/sources/Foreign/VIGRA_LICENSE hugin/branches/ippei/sources/Foreign/exiv2/ hugin/branches/ippei/sources/Foreign/exiv2/COPYING hugin/branches/ippei/sources/Foreign/exiv2/Makefile hugin/branches/ippei/sources/Foreign/exiv2/README hugin/branches/ippei/sources/Foreign/exiv2/config/ hugin/branches/ippei/sources/Foreign/exiv2/config/Doxyfile hugin/branches/ippei/sources/Foreign/exiv2/config/Makefile hugin/branches/ippei/sources/Foreign/exiv2/config/aclocal.m4 hugin/branches/ippei/sources/Foreign/exiv2/config/config.guess hugin/branches/ippei/sources/Foreign/exiv2/config/config.h.in hugin/branches/ippei/sources/Foreign/exiv2/config/config.mk.in hugin/branches/ippei/sources/Foreign/exiv2/config/config.rpath hugin/branches/ippei/sources/Foreign/exiv2/config/config.sub hugin/branches/ippei/sources/Foreign/exiv2/config/configure.ac hugin/branches/ippei/sources/Foreign/exiv2/config/exiv2.pc.in hugin/branches/ippei/sources/Foreign/exiv2/config/install-sh hugin/branches/ippei/sources/Foreign/exiv2/config/ltmain.sh hugin/branches/ippei/sources/Foreign/exiv2/config/mkinstalldirs hugin/branches/ippei/sources/Foreign/exiv2/configure hugin/branches/ippei/sources/Foreign/exiv2/doc/ hugin/branches/ippei/sources/Foreign/exiv2/doc/ChangeLog hugin/branches/ippei/sources/Foreign/exiv2/doc/Makefile hugin/branches/ippei/sources/Foreign/exiv2/doc/cmd.txt hugin/branches/ippei/sources/Foreign/exiv2/doc/include/ hugin/branches/ippei/sources/Foreign/exiv2/doc/include/ascending.png hugin/branches/ippei/sources/Foreign/exiv2/doc/include/blank.png hugin/branches/ippei/sources/Foreign/exiv2/doc/include/descending.png hugin/branches/ippei/sources/Foreign/exiv2/doc/include/exiv2-components.png hugin/branches/ippei/sources/Foreign/exiv2/doc/include/sortabletable.css hugin/branches/ippei/sources/Foreign/exiv2/doc/include/sortabletable.js hugin/branches/ippei/sources/Foreign/exiv2/doc/index.html hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/ hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/Makefile hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/__CrwMapping__ hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/__doctype__ hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/__header2__ hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/__index1__ hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/__index2__ hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/__index3__ hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/__maintitle__ hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/__makernotes__ hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/crw-mapping.html.in hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/exiv2.dot hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/gen.py hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/getting-started.html.in hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/gpl-license.html.in hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/iptc.awk hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/iptc.xsl hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/makernote.html.in hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/tags-canon.html.in hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/tags-exif.html.in hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/tags-fujifilm.html.in hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/tags-iptc.html.in hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/tags-minolta.html.in hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/tags-nikon.html.in hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/tags-olympus.html.in hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/tags-panasonic.html.in hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/tags-sigma.html.in hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/tags-sony.html.in hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/tags.awk hugin/branches/ippei/sources/Foreign/exiv2/doc/templates/tags.xsl hugin/branches/ippei/sources/Foreign/exiv2/msvc/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/addmoddel/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/addmoddel/addmoddel.vcproj hugin/branches/ippei/sources/Foreign/exiv2/msvc/crwparse/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/crwparse/crwparse.vcproj hugin/branches/ippei/sources/Foreign/exiv2/msvc/exifcomment/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/exifcomment/exifcomment.vcproj hugin/branches/ippei/sources/Foreign/exiv2/msvc/exifdata-test/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/exifdata-test/exifdata-test.vcproj hugin/branches/ippei/sources/Foreign/exiv2/msvc/exifprint/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/exifprint/exifprint.vcproj hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2/exiv2.vcproj hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2.sln hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2com/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2com/ReadMe.txt hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2com/exif.cpp hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2com/exif.h hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2com/exif.rgs hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2com/exiv2com.cpp hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2com/exiv2com.def hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2com/exiv2com.idl hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2com/exiv2com.rc hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2com/exiv2com.rgs hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2com/exiv2com.vcproj hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2com/exiv2comPS.vcproj hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2com/exiv2comps.def hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2com/resource.h hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2com/sample/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2com/sample/default.asp hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2com/sample/sample.jpg hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2com/stdafx.cpp hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2com/stdafx.h hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2lib/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/exiv2lib/exiv2lib.vcproj hugin/branches/ippei/sources/Foreign/exiv2/msvc/exivsimple/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/exivsimple/exivsimple.cpp hugin/branches/ippei/sources/Foreign/exiv2/msvc/exivsimple/exivsimple.h hugin/branches/ippei/sources/Foreign/exiv2/msvc/exivsimple/exivsimple.vcproj hugin/branches/ippei/sources/Foreign/exiv2/msvc/exivsimple/stdafx.cpp hugin/branches/ippei/sources/Foreign/exiv2/msvc/exivsimple/stdafx.h hugin/branches/ippei/sources/Foreign/exiv2/msvc/ifd-test/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/ifd-test/ifd-test.vcproj hugin/branches/ippei/sources/Foreign/exiv2/msvc/iotest/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/iotest/iotest.vcproj hugin/branches/ippei/sources/Foreign/exiv2/msvc/iptceasy/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/iptceasy/iptceasy.vcproj hugin/branches/ippei/sources/Foreign/exiv2/msvc/iptcprint/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/iptcprint/iptcprint.vcproj hugin/branches/ippei/sources/Foreign/exiv2/msvc/iptctest/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/iptctest/iptctest.vcproj hugin/branches/ippei/sources/Foreign/exiv2/msvc/largeiptc-test/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/largeiptc-test/largeiptc-test.vcproj hugin/branches/ippei/sources/Foreign/exiv2/msvc/makernote-test/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/makernote-test/makernote-test.vcproj hugin/branches/ippei/sources/Foreign/exiv2/msvc/metacopy/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/metacopy/metacopy.vcproj hugin/branches/ippei/sources/Foreign/exiv2/msvc/taglist/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/taglist/taglist.vcproj hugin/branches/ippei/sources/Foreign/exiv2/msvc/utiltest/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/utiltest/utiltest.vcproj hugin/branches/ippei/sources/Foreign/exiv2/msvc/write-test/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/write-test/write-test.vcproj hugin/branches/ippei/sources/Foreign/exiv2/msvc/write2-test/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/write2-test/write2-test.vcproj hugin/branches/ippei/sources/Foreign/exiv2/po/ hugin/branches/ippei/sources/Foreign/exiv2/po/ChangeLog hugin/branches/ippei/sources/Foreign/exiv2/po/LINGUAS hugin/branches/ippei/sources/Foreign/exiv2/po/Makefile.in.in hugin/branches/ippei/sources/Foreign/exiv2/po/Makevars hugin/branches/ippei/sources/Foreign/exiv2/po/POTFILES.in hugin/branches/ippei/sources/Foreign/exiv2/po/Rules-quot hugin/branches/ippei/sources/Foreign/exiv2/po/boldquot.sed hugin/branches/ippei/sources/Foreign/exiv2/po/de.gmo hugin/branches/ippei/sources/Foreign/exiv2/po/de.po hugin/branches/ippei/sources/Foreign/exiv2/po/en@boldquot.header hugin/branches/ippei/sources/Foreign/exiv2/po/en@quot.header hugin/branches/ippei/sources/Foreign/exiv2/po/es.gmo hugin/branches/ippei/sources/Foreign/exiv2/po/es.po hugin/branches/ippei/sources/Foreign/exiv2/po/exiv2.pot hugin/branches/ippei/sources/Foreign/exiv2/po/fi.gmo hugin/branches/ippei/sources/Foreign/exiv2/po/fi.po hugin/branches/ippei/sources/Foreign/exiv2/po/fr.gmo hugin/branches/ippei/sources/Foreign/exiv2/po/fr.po hugin/branches/ippei/sources/Foreign/exiv2/po/insert-header.sin hugin/branches/ippei/sources/Foreign/exiv2/po/pl.gmo hugin/branches/ippei/sources/Foreign/exiv2/po/pl.po hugin/branches/ippei/sources/Foreign/exiv2/po/quot.sed hugin/branches/ippei/sources/Foreign/exiv2/po/remove-potcdate.sin hugin/branches/ippei/sources/Foreign/exiv2/po/ru.gmo hugin/branches/ippei/sources/Foreign/exiv2/po/ru.po hugin/branches/ippei/sources/Foreign/exiv2/po/stamp-po hugin/branches/ippei/sources/Foreign/exiv2/src/ hugin/branches/ippei/sources/Foreign/exiv2/src/Makefile hugin/branches/ippei/sources/Foreign/exiv2/src/Todo hugin/branches/ippei/sources/Foreign/exiv2/src/actions.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/actions.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/addmoddel.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/basicio.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/basicio.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/canonmn.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/canonmn.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/cr2image.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/cr2image.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/crwedit.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/crwimage.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/crwimage.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/crwparse.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/dataarea-test.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/datasets.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/datasets.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/doxygen.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/doxygen.hpp.in hugin/branches/ippei/sources/Foreign/exiv2/src/error.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/error.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/exif.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/exif.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/exifcomment.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/exifdata-test.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/exifprint.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/exiv2.1 hugin/branches/ippei/sources/Foreign/exiv2/src/exiv2.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/exiv2.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/exv_msvc.h hugin/branches/ippei/sources/Foreign/exiv2/src/fujimn.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/fujimn.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/futils.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/futils.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/getopt_win32.c hugin/branches/ippei/sources/Foreign/exiv2/src/getopt_win32.h hugin/branches/ippei/sources/Foreign/exiv2/src/i18n.h hugin/branches/ippei/sources/Foreign/exiv2/src/ifd-test.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/ifd.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/ifd.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/image.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/image.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/iotest.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/iptc.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/iptc.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/iptceasy.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/iptcprint.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/iptctest.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/jpgimage.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/jpgimage.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/key-test.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/largeiptc-test.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/localtime.c hugin/branches/ippei/sources/Foreign/exiv2/src/makernote-test.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/makernote.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/makernote.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/makernote2.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/makernote2.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/metacopy.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/metacopy.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/metadatum.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/metadatum.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/minoltamn.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/minoltamn.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/mn.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/mrwimage.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/mrwimage.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/nikonmn.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/nikonmn.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/olympusmn.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/olympusmn.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/panasonicmn.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/panasonicmn.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/path-test.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/pngchunk.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/pngchunk.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/pngimage.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/pngimage.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/private.h hugin/branches/ippei/sources/Foreign/exiv2/src/rafimage.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/rafimage.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/rcsid.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/sigmamn.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/sigmamn.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/sonymn.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/sonymn.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/taglist.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/tags.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/tags.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/tiffcomposite.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/tiffcomposite.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/tifffwd.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/tiffimage.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/tiffimage.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/tiffparse.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/tiffparser.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/tiffparser.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/tiffvisitor.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/tiffvisitor.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/timegm.h hugin/branches/ippei/sources/Foreign/exiv2/src/types.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/types.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/tzfile.h hugin/branches/ippei/sources/Foreign/exiv2/src/utils.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/utils.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/utiltest.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/value.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/value.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/version.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/version.hpp hugin/branches/ippei/sources/Foreign/exiv2/src/write-test.cpp hugin/branches/ippei/sources/Foreign/exiv2/src/write2-test.cpp hugin/branches/ippei/sources/Foreign/getopt/ hugin/branches/ippei/sources/Foreign/getopt/LICENSE hugin/branches/ippei/sources/Foreign/getopt/include/ hugin/branches/ippei/sources/Foreign/getopt/include/getopt.h hugin/branches/ippei/sources/Foreign/getopt/src/ hugin/branches/ippei/sources/Foreign/getopt/src/getopt.c hugin/branches/ippei/sources/Foreign/getopt/src/msvs/ hugin/branches/ippei/sources/Foreign/getopt/src/msvs/.cvsignore hugin/branches/ippei/sources/Foreign/getopt/src/msvs/README.THIS hugin/branches/ippei/sources/Foreign/getopt/src/msvs/_makebin.bat hugin/branches/ippei/sources/Foreign/getopt/src/msvs/_makeclean.bat hugin/branches/ippei/sources/Foreign/getopt/src/msvs/_makedist.bat hugin/branches/ippei/sources/Foreign/getopt/src/msvs/_setenv.bat hugin/branches/ippei/sources/Foreign/getopt/src/msvs/getopt.dsp hugin/branches/ippei/sources/Foreign/getopt/src/msvs/getopt.dsw hugin/branches/ippei/sources/Foreign/getopt/src/msvs/getopt.sln hugin/branches/ippei/sources/Foreign/getopt/src/msvs/getopt.vcproj hugin/branches/ippei/sources/Foreign/lensdb/ hugin/branches/ippei/sources/Foreign/lensdb/PTLensDB.c hugin/branches/ippei/sources/Foreign/lensdb/PTLensDB.h hugin/branches/ippei/sources/Foreign/levmar/ hugin/branches/ippei/sources/Foreign/levmar/Axb.c hugin/branches/ippei/sources/Foreign/levmar/Axb_core.c hugin/branches/ippei/sources/Foreign/levmar/CMakeLists.txt hugin/branches/ippei/sources/Foreign/levmar/LICENSE hugin/branches/ippei/sources/Foreign/levmar/Makefile.am hugin/branches/ippei/sources/Foreign/levmar/Makefile.icc hugin/branches/ippei/sources/Foreign/levmar/Makefile.vc hugin/branches/ippei/sources/Foreign/levmar/README.txt hugin/branches/ippei/sources/Foreign/levmar/lm.c hugin/branches/ippei/sources/Foreign/levmar/lm.h hugin/branches/ippei/sources/Foreign/levmar/lm_core.c hugin/branches/ippei/sources/Foreign/levmar/lmbc.c hugin/branches/ippei/sources/Foreign/levmar/lmbc_core.c hugin/branches/ippei/sources/Foreign/levmar/lmdemo.c hugin/branches/ippei/sources/Foreign/levmar/lmlec.c hugin/branches/ippei/sources/Foreign/levmar/lmlec_core.c hugin/branches/ippei/sources/Foreign/levmar/misc.c hugin/branches/ippei/sources/Foreign/levmar/misc.h hugin/branches/ippei/sources/Foreign/levmar/misc_core.c hugin/branches/ippei/sources/Foreign/vigra/ hugin/branches/ippei/sources/Foreign/vigra/accessor.hxx hugin/branches/ippei/sources/Foreign/vigra/affinegeometry.hxx hugin/branches/ippei/sources/Foreign/vigra/array_vector.hxx hugin/branches/ippei/sources/Foreign/vigra/basicgeometry.hxx hugin/branches/ippei/sources/Foreign/vigra/basicimage.hxx hugin/branches/ippei/sources/Foreign/vigra/basicimageview.hxx hugin/branches/ippei/sources/Foreign/vigra/bordertreatment.hxx hugin/branches/ippei/sources/Foreign/vigra/boundarytensor.hxx hugin/branches/ippei/sources/Foreign/vigra/codec.hxx hugin/branches/ippei/sources/Foreign/vigra/colorconversions.hxx hugin/branches/ippei/sources/Foreign/vigra/combineimages.hxx hugin/branches/ippei/sources/Foreign/vigra/config.hxx hugin/branches/ippei/sources/Foreign/vigra/contourcirculator.hxx hugin/branches/ippei/sources/Foreign/vigra/convolution.hxx hugin/branches/ippei/sources/Foreign/vigra/copyimage.hxx hugin/branches/ippei/sources/Foreign/vigra/cornerdetection.hxx hugin/branches/ippei/sources/Foreign/vigra/diff2d.hxx hugin/branches/ippei/sources/Foreign/vigra/distancetransform.hxx hugin/branches/ippei/sources/Foreign/vigra/edgedetection.hxx hugin/branches/ippei/sources/Foreign/vigra/eigensystem.hxx hugin/branches/ippei/sources/Foreign/vigra/error.hxx hugin/branches/ippei/sources/Foreign/vigra/fftw.hxx hugin/branches/ippei/sources/Foreign/vigra/fftw3.hxx hugin/branches/ippei/sources/Foreign/vigra/fixedpoint.hxx hugin/branches/ippei/sources/Foreign/vigra/flatmorphology.hxx hugin/branches/ippei/sources/Foreign/vigra/functorexpression.hxx hugin/branches/ippei/sources/Foreign/vigra/functortraits.hxx hugin/branches/ippei/sources/Foreign/vigra/gaborfilter.hxx hugin/branches/ippei/sources/Foreign/vigra/gaussians.hxx hugin/branches/ippei/sources/Foreign/vigra/gradient_energy_tensor.hxx hugin/branches/ippei/sources/Foreign/vigra/imagecontainer.hxx hugin/branches/ippei/sources/Foreign/vigra/imageinfo.hxx hugin/branches/ippei/sources/Foreign/vigra/imageiterator.hxx hugin/branches/ippei/sources/Foreign/vigra/imageiteratoradapter.hxx hugin/branches/ippei/sources/Foreign/vigra/impex.hxx hugin/branches/ippei/sources/Foreign/vigra/initimage.hxx hugin/branches/ippei/sources/Foreign/vigra/inspectimage.hxx hugin/branches/ippei/sources/Foreign/vigra/interpolating_accessor.hxx hugin/branches/ippei/sources/Foreign/vigra/iteratoradapter.hxx hugin/branches/ippei/sources/Foreign/vigra/iteratortags.hxx hugin/branches/ippei/sources/Foreign/vigra/iteratortraits.hxx hugin/branches/ippei/sources/Foreign/vigra/labelimage.hxx hugin/branches/ippei/sources/Foreign/vigra/linear_algebra.hxx hugin/branches/ippei/sources/Foreign/vigra/linear_solve.hxx hugin/branches/ippei/sources/Foreign/vigra/localminmax.hxx hugin/branches/ippei/sources/Foreign/vigra/mathutil.hxx hugin/branches/ippei/sources/Foreign/vigra/matrix.hxx hugin/branches/ippei/sources/Foreign/vigra/memory.hxx hugin/branches/ippei/sources/Foreign/vigra/metaprogramming.hxx hugin/branches/ippei/sources/Foreign/vigra/multi_array.hxx hugin/branches/ippei/sources/Foreign/vigra/multi_convolution.hxx hugin/branches/ippei/sources/Foreign/vigra/multi_impex.hxx hugin/branches/ippei/sources/Foreign/vigra/multi_iterator.hxx hugin/branches/ippei/sources/Foreign/vigra/multi_pointoperators.hxx hugin/branches/ippei/sources/Foreign/vigra/navigator.hxx hugin/branches/ippei/sources/Foreign/vigra/noise_normalization.hxx hugin/branches/ippei/sources/Foreign/vigra/nonlineardiffusion.hxx hugin/branches/ippei/sources/Foreign/vigra/numerictraits.hxx hugin/branches/ippei/sources/Foreign/vigra/orientedtensorfilters.hxx hugin/branches/ippei/sources/Foreign/vigra/pixelneighborhood.hxx hugin/branches/ippei/sources/Foreign/vigra/polynomial.hxx hugin/branches/ippei/sources/Foreign/vigra/rational.hxx hugin/branches/ippei/sources/Foreign/vigra/recursiveconvolution.hxx hugin/branches/ippei/sources/Foreign/vigra/resampling_convolution.hxx hugin/branches/ippei/sources/Foreign/vigra/resizeimage.hxx hugin/branches/ippei/sources/Foreign/vigra/rfftw.hxx hugin/branches/ippei/sources/Foreign/vigra/rgbvalue.hxx hugin/branches/ippei/sources/Foreign/vigra/seededregiongrowing.hxx hugin/branches/ippei/sources/Foreign/vigra/separableconvolution.hxx hugin/branches/ippei/sources/Foreign/vigra/sized_int.hxx hugin/branches/ippei/sources/Foreign/vigra/slanted_edge_mtf.hxx hugin/branches/ippei/sources/Foreign/vigra/splineimageview.hxx hugin/branches/ippei/sources/Foreign/vigra/splines.hxx hugin/branches/ippei/sources/Foreign/vigra/static_assert.hxx hugin/branches/ippei/sources/Foreign/vigra/stdconvolution.hxx hugin/branches/ippei/sources/Foreign/vigra/stdimage.hxx hugin/branches/ippei/sources/Foreign/vigra/stdimagefunctions.hxx hugin/branches/ippei/sources/Foreign/vigra/symmetry.hxx hugin/branches/ippei/sources/Foreign/vigra/tensorutilities.hxx hugin/branches/ippei/sources/Foreign/vigra/tiff.hxx hugin/branches/ippei/sources/Foreign/vigra/tinyvector.hxx hugin/branches/ippei/sources/Foreign/vigra/transformimage.hxx hugin/branches/ippei/sources/Foreign/vigra/tuple.hxx hugin/branches/ippei/sources/Foreign/vigra/utilities.hxx hugin/branches/ippei/sources/Foreign/vigra/vigra.vcproj hugin/branches/ippei/sources/Foreign/vigra/watersheds.hxx hugin/branches/ippei/sources/Foreign/vigra/windows.h hugin/branches/ippei/sources/Foreign/vigra_impex/ hugin/branches/ippei/sources/Foreign/vigra_impex/.cvsignore hugin/branches/ippei/sources/Foreign/vigra_impex/CMakeLists.txt hugin/branches/ippei/sources/Foreign/vigra_impex/auto_file.hxx hugin/branches/ippei/sources/Foreign/vigra_impex/bmp.cxx hugin/branches/ippei/sources/Foreign/vigra_impex/bmp.hxx hugin/branches/ippei/sources/Foreign/vigra_impex/byteorder.cxx hugin/branches/ippei/sources/Foreign/vigra_impex/byteorder.hxx hugin/branches/ippei/sources/Foreign/vigra_impex/codecmanager.cxx hugin/branches/ippei/sources/Foreign/vigra_impex/codecmanager.hxx hugin/branches/ippei/sources/Foreign/vigra_impex/error.hxx hugin/branches/ippei/sources/Foreign/vigra_impex/exr.cxx hugin/branches/ippei/sources/Foreign/vigra_impex/exr.hxx hugin/branches/ippei/sources/Foreign/vigra_impex/gif.cxx hugin/branches/ippei/sources/Foreign/vigra_impex/gif.hxx hugin/branches/ippei/sources/Foreign/vigra_impex/hdr.cxx hugin/branches/ippei/sources/Foreign/vigra_impex/hdr.hxx hugin/branches/ippei/sources/Foreign/vigra_impex/iccjpeg.c hugin/branches/ippei/sources/Foreign/vigra_impex/iccjpeg.h hugin/branches/ippei/sources/Foreign/vigra_impex/imageinfo.cxx hugin/branches/ippei/sources/Foreign/vigra_impex/jpeg.cxx hugin/branches/ippei/sources/Foreign/vigra_impex/jpeg.hxx hugin/branches/ippei/sources/Foreign/vigra_impex/png.cxx hugin/branches/ippei/sources/Foreign/vigra_impex/png.hxx hugin/branches/ippei/sources/Foreign/vigra_impex/pnm.cxx hugin/branches/ippei/sources/Foreign/vigra_impex/pnm.hxx hugin/branches/ippei/sources/Foreign/vigra_impex/rgbe.c hugin/branches/ippei/sources/Foreign/vigra_impex/rgbe.h hugin/branches/ippei/sources/Foreign/vigra_impex/sun.cxx hugin/branches/ippei/sources/Foreign/vigra_impex/sun.hxx hugin/branches/ippei/sources/Foreign/vigra_impex/tiff.cxx hugin/branches/ippei/sources/Foreign/vigra_impex/tiff.hxx hugin/branches/ippei/sources/Foreign/vigra_impex/viff.cxx hugin/branches/ippei/sources/Foreign/vigra_impex/viff.hxx hugin/branches/ippei/sources/Foreign/vigra_impex/void_vector.cxx hugin/branches/ippei/sources/Foreign/vigra_impex/void_vector.hxx hugin/branches/ippei/sources/Hugin1/ hugin/branches/ippei/sources/Hugin1/.cvsignore hugin/branches/ippei/sources/Hugin1/CMakeLists.txt hugin/branches/ippei/sources/Hugin1/hugin/ hugin/branches/ippei/sources/Hugin1/hugin/.cvsignore hugin/branches/ippei/sources/Hugin1/hugin/AssistantPanel.cpp hugin/branches/ippei/sources/Hugin1/hugin/AutoCtrlPointCreator.cpp hugin/branches/ippei/sources/Hugin1/hugin/CMakeLists.txt hugin/branches/ippei/sources/Hugin1/hugin/CPEditorPanel.cpp hugin/branches/ippei/sources/Hugin1/hugin/CPFineTuneFrame.cpp hugin/branches/ippei/sources/Hugin1/hugin/CPImageCtrl.cpp hugin/branches/ippei/sources/Hugin1/hugin/CPListFrame.cpp hugin/branches/ippei/sources/Hugin1/hugin/CPZoomDisplayPanel.cpp hugin/branches/ippei/sources/Hugin1/hugin/CommandHistory.cpp hugin/branches/ippei/sources/Hugin1/hugin/CropPanel.cpp hugin/branches/ippei/sources/Hugin1/hugin/HFOVDialog.cpp hugin/branches/ippei/sources/Hugin1/hugin/ImageCache.cpp hugin/branches/ippei/sources/Hugin1/hugin/ImagesList.cpp hugin/branches/ippei/sources/Hugin1/hugin/ImagesPanel.cpp hugin/branches/ippei/sources/Hugin1/hugin/LensPanel.cpp hugin/branches/ippei/sources/Hugin1/hugin/LocalizedFileTipProvider.cpp hugin/branches/ippei/sources/Hugin1/hugin/MainFrame.cpp hugin/branches/ippei/sources/Hugin1/hugin/Makefile.am hugin/branches/ippei/sources/Hugin1/hugin/MyExternalCmdExecDialog.cpp hugin/branches/ippei/sources/Hugin1/hugin/MyProgressDialog.cpp hugin/branches/ippei/sources/Hugin1/hugin/NonaStitcherPanel.cpp hugin/branches/ippei/sources/Hugin1/hugin/OptimizePanel.cpp hugin/branches/ippei/sources/Hugin1/hugin/OptimizePhotometricPanel.cpp hugin/branches/ippei/sources/Hugin1/hugin/PTStitcherPanel.cpp hugin/branches/ippei/sources/Hugin1/hugin/PTWXDlg.cpp hugin/branches/ippei/sources/Hugin1/hugin/PanoDruid.cpp hugin/branches/ippei/sources/Hugin1/hugin/PanoPanel.cpp hugin/branches/ippei/sources/Hugin1/hugin/Plot2D.cpp hugin/branches/ippei/sources/Hugin1/hugin/PreferencesDialog.cpp hugin/branches/ippei/sources/Hugin1/hugin/PreviewFrame.cpp hugin/branches/ippei/sources/Hugin1/hugin/PreviewPanel.cpp hugin/branches/ippei/sources/Hugin1/hugin/RunStitcherFrame.cpp hugin/branches/ippei/sources/Hugin1/hugin/TextKillFocusHandler.cpp hugin/branches/ippei/sources/Hugin1/hugin/UniversalCursor.cpp hugin/branches/ippei/sources/Hugin1/hugin/VigCorrDialog.cpp hugin/branches/ippei/sources/Hugin1/hugin/gnome-mime-application-x-ptoptimizer-script.png hugin/branches/ippei/sources/Hugin1/hugin/hugin.desktop hugin/branches/ippei/sources/Hugin1/hugin/hugin.vcproj hugin/branches/ippei/sources/Hugin1/hugin/hugin.xml hugin/branches/ippei/sources/Hugin1/hugin/huginApp.cpp hugin/branches/ippei/sources/Hugin1/hugin/hugin_rc.rc hugin/branches/ippei/sources/Hugin1/hugin/po/ hugin/branches/ippei/sources/Hugin1/hugin/po/.cvsignore hugin/branches/ippei/sources/Hugin1/hugin/po/CMakeLists.txt hugin/branches/ippei/sources/Hugin1/hugin/po/LINGUAS hugin/branches/ippei/sources/Hugin1/hugin/po/Makevars hugin/branches/ippei/sources/Hugin1/hugin/po/POTFILES.in hugin/branches/ippei/sources/Hugin1/hugin/po/ca_ES.po hugin/branches/ippei/sources/Hugin1/hugin/po/cs_CZ.po hugin/branches/ippei/sources/Hugin1/hugin/po/de.po hugin/branches/ippei/sources/Hugin1/hugin/po/es.po hugin/branches/ippei/sources/Hugin1/hugin/po/fr.po hugin/branches/ippei/sources/Hugin1/hugin/po/hu.po hugin/branches/ippei/sources/Hugin1/hugin/po/hugin.pot hugin/branches/ippei/sources/Hugin1/hugin/po/it.po hugin/branches/ippei/sources/Hugin1/hugin/po/ja.po hugin/branches/ippei/sources/Hugin1/hugin/po/nl.po hugin/branches/ippei/sources/Hugin1/hugin/po/pl.po hugin/branches/ippei/sources/Hugin1/hugin/po/pt_BR.po hugin/branches/ippei/sources/Hugin1/hugin/po/ru.po hugin/branches/ippei/sources/Hugin1/hugin/po/sk.po hugin/branches/ippei/sources/Hugin1/hugin/po/sv.po hugin/branches/ippei/sources/Hugin1/hugin/po/uk.po hugin/branches/ippei/sources/Hugin1/hugin/po/zh_CN.po hugin/branches/ippei/sources/Hugin1/hugin/win_prep.h hugin/branches/ippei/sources/Hugin1/hugin/wxPanoCommand.cpp hugin/branches/ippei/sources/Hugin1/hugin/xrc/ hugin/branches/ippei/sources/Hugin1/hugin/xrc/.cvsignore hugin/branches/ippei/sources/Hugin1/hugin/xrc/CMakeLists.txt hugin/branches/ippei/sources/Hugin1/hugin/xrc/Makefile.am hugin/branches/ippei/sources/Hugin1/hugin/xrc/about.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/anchor_orientation.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/assistant_panel.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/cp_editor_panel.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/cp_list_frame.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/crop_panel.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/ hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/.cvsignore hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/1leftarrow.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/1rightarrow.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/CMakeLists.txt hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/CPCursor0.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/CPCursor1.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/CPCursor2.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/CPCursor3.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/CPCursor4.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/CPCursor5.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/CPCursor6.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/Makefile.am hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/about.htm hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/about_fr.htm hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/about_pl.htm hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/center_pano.xpm hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/close.xpm hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/cursor_cp_pick.cur hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/druid.control.128.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/druid.images.128.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/druid.lenses.128.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/druid.optimize.128.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/druid.stitch.128.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/edit_add.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/editcopy.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/editcut.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/editdelete.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/editpaste.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/filenew.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/fileopen.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/filesave.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/filesaveas.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/find.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/fit_pano.xpm hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_common/ hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_common/Makefile.am hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_common/horiz-guide.jpg hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_common/hugin.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_common/problem-circle.jpg hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_en_EN/ hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_en_EN/.cvsignore hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_en_EN/FAQ.html hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_en_EN/Makefile.am hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_en_EN/contents.html hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_en_EN/hugin.hhc hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_en_EN/hugin.hhk hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_en_EN/hugin.hhp hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_en_EN/keyboard.html hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_en_EN/license.html hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_en_EN/manual.html hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_fr_FR/ hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_fr_FR/.cvsignore hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_fr_FR/FAQ.html hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_fr_FR/Makefile.am hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_fr_FR/contents.html hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_fr_FR/hugin.hhc hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_fr_FR/hugin.hhk hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_fr_FR/hugin.hhp hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_fr_FR/keyboard.html hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_fr_FR/license.html hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/help_fr_FR/manual.html hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/icon.ico hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/icon.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/icon_128x128.ico hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/icon_128x128.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/icon_16x16.ico hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/icon_32x32.ico hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/icon_48x48.ico hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/icon_48x48.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/icon_64x64.ico hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/icon_72x72.ico hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/icon_96x96.ico hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/info.xpm hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/keyboard_pl.html hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/list.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/logo.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/make_nona_enblend hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/manual.html hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/nona_enblend.mk hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/nona_multilayer.mk hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/nona_smartblend.mk hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/optimize.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/optimize.xpm hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/preview.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/preview_auto_update.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/preview_num_transform.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/preview_show_all.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/preview_show_none.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/print.xpm hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/ptmender_enblend.mk hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/ptmender_smartblend.mk hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/redo.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/reload.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/searchfind.xpm hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/splash.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/straighten_pano.xpm hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/tips.txt hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/undo.png hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/zoomin.xpm hugin/branches/ippei/sources/Hugin1/hugin/xrc/data/zoomout.xpm hugin/branches/ippei/sources/Hugin1/hugin/xrc/edit_script_dialog.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/edit_text.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/help.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/images_panel.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/keyboard_help.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/lens_panel.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/main_frame.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/main_menu.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/main_menubar.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/main_tool.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/nona_panel.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/optimize_panel.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/optimize_photo_panel.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/pano_panel.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/pref_dialog.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/preview_frame.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/ptstitcher_panel.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/run_optimizer_frame.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/run_stitcher_frame.xrc hugin/branches/ippei/sources/Hugin1/hugin/xrc/vig_corr_dlg.xrc hugin/branches/ippei/sources/Hugin1/include/ hugin/branches/ippei/sources/Hugin1/include/.cvsignore hugin/branches/ippei/sources/Hugin1/include/PT/ hugin/branches/ippei/sources/Hugin1/include/PT/ImageGraph.h hugin/branches/ippei/sources/Hugin1/include/PT/ImageTransforms.h hugin/branches/ippei/sources/Hugin1/include/PT/PTOptimise.h hugin/branches/ippei/sources/Hugin1/include/PT/PanoCommand.h hugin/branches/ippei/sources/Hugin1/include/PT/PanoImage.h hugin/branches/ippei/sources/Hugin1/include/PT/PanoToolsInterface.h hugin/branches/ippei/sources/Hugin1/include/PT/Panorama.h hugin/branches/ippei/sources/Hugin1/include/PT/PanoramaMemento.h hugin/branches/ippei/sources/Hugin1/include/PT/PhotometricOptimizer.h hugin/branches/ippei/sources/Hugin1/include/PT/Process.h hugin/branches/ippei/sources/Hugin1/include/PT/RandomPointSampler.h hugin/branches/ippei/sources/Hugin1/include/PT/RemappedPanoImage.h hugin/branches/ippei/sources/Hugin1/include/PT/SimpleStitcher.h hugin/branches/ippei/sources/Hugin1/include/PT/SpaceTransform.h hugin/branches/ippei/sources/Hugin1/include/PT/Stitcher.h hugin/branches/ippei/sources/Hugin1/include/PT/Transforms.h hugin/branches/ippei/sources/Hugin1/include/PT/utils.h hugin/branches/ippei/sources/Hugin1/include/common/ hugin/branches/ippei/sources/Hugin1/include/common/Command.h hugin/branches/ippei/sources/Hugin1/include/common/Matrix3.h hugin/branches/ippei/sources/Hugin1/include/common/PTLensDB.h hugin/branches/ippei/sources/Hugin1/include/common/Vector3.h hugin/branches/ippei/sources/Hugin1/include/common/eig_jacobi.h hugin/branches/ippei/sources/Hugin1/include/common/graph.h hugin/branches/ippei/sources/Hugin1/include/common/lu.h hugin/branches/ippei/sources/Hugin1/include/common/math.h hugin/branches/ippei/sources/Hugin1/include/common/platform.h hugin/branches/ippei/sources/Hugin1/include/common/stl_utils.h hugin/branches/ippei/sources/Hugin1/include/common/utils.h hugin/branches/ippei/sources/Hugin1/include/common/wxPlatform.h hugin/branches/ippei/sources/Hugin1/include/hugin/ hugin/branches/ippei/sources/Hugin1/include/hugin/.cvsignore hugin/branches/ippei/sources/Hugin1/include/hugin/AnchorPositionCtrl.h hugin/branches/ippei/sources/Hugin1/include/hugin/AssistantPanel.h hugin/branches/ippei/sources/Hugin1/include/hugin/AutoCtrlPointCreator.h hugin/branches/ippei/sources/Hugin1/include/hugin/CPEditorPanel.h hugin/branches/ippei/sources/Hugin1/include/hugin/CPEditorPanelHandler.h hugin/branches/ippei/sources/Hugin1/include/hugin/CPEditorTest.h hugin/branches/ippei/sources/Hugin1/include/hugin/CPFineTuneFrame.h hugin/branches/ippei/sources/Hugin1/include/hugin/CPImageCtrl.h hugin/branches/ippei/sources/Hugin1/include/hugin/CPListFrame.h hugin/branches/ippei/sources/Hugin1/include/hugin/CPZoomDisplayPanel.h hugin/branches/ippei/sources/Hugin1/include/hugin/CommandHistory.h hugin/branches/ippei/sources/Hugin1/include/hugin/CropPanel.h hugin/branches/ippei/sources/Hugin1/include/hugin/HFOVDialog.h hugin/branches/ippei/sources/Hugin1/include/hugin/ImageCache.h hugin/branches/ippei/sources/Hugin1/include/hugin/ImageProcessing.h hugin/branches/ippei/sources/Hugin1/include/hugin/ImagesList.h hugin/branches/ippei/sources/Hugin1/include/hugin/ImagesPanel.h hugin/branches/ippei/sources/Hugin1/include/hugin/LensPanel.h hugin/branches/ippei/sources/Hugin1/include/hugin/LocalizedFileTipProvider.h hugin/branches/ippei/sources/Hugin1/include/hugin/MainFrame.h hugin/branches/ippei/sources/Hugin1/include/hugin/MyExternalCmdExecDialog.h hugin/branches/ippei/sources/Hugin1/include/hugin/MyProgressDialog.h hugin/branches/ippei/sources/Hugin1/include/hugin/NonaStitcherPanel.h hugin/branches/ippei/sources/Hugin1/include/hugin/OptimizePanel.h hugin/branches/ippei/sources/Hugin1/include/hugin/OptimizePhotometricPanel.h hugin/branches/ippei/sources/Hugin1/include/hugin/PTStitcherPanel.h hugin/branches/ippei/sources/Hugin1/include/hugin/PTWXDlg.h hugin/branches/ippei/sources/Hugin1/include/hugin/PanoDruid.h hugin/branches/ippei/sources/Hugin1/include/hugin/PanoPanel.h hugin/branches/ippei/sources/Hugin1/include/hugin/Plot2D.h hugin/branches/ippei/sources/Hugin1/include/hugin/PreferencesDialog.h hugin/branches/ippei/sources/Hugin1/include/hugin/PreviewFrame.h hugin/branches/ippei/sources/Hugin1/include/hugin/PreviewPanel.h hugin/branches/ippei/sources/Hugin1/include/hugin/RunStitcherFrame.h hugin/branches/ippei/sources/Hugin1/include/hugin/StitcherPanel.h hugin/branches/ippei/sources/Hugin1/include/hugin/TextKillFocusHandler.h hugin/branches/ippei/sources/Hugin1/include/hugin/UniversalCursor.h hugin/branches/ippei/sources/Hugin1/include/hugin/VigCorrDialog.h hugin/branches/ippei/sources/Hugin1/include/hugin/config.h.tmpl hugin/branches/ippei/sources/Hugin1/include/hugin/config_defaults.h hugin/branches/ippei/sources/Hugin1/include/hugin/huginApp.h hugin/branches/ippei/sources/Hugin1/include/hugin/wxPanoCommand.h hugin/branches/ippei/sources/Hugin1/include/hugin/xrc/ hugin/branches/ippei/sources/Hugin1/include/hugin/xrc/xh_tbctl.h hugin/branches/ippei/sources/Hugin1/include/jhead/ hugin/branches/ippei/sources/Hugin1/include/jhead/jhead.h hugin/branches/ippei/sources/Hugin1/include/panoinc.h hugin/branches/ippei/sources/Hugin1/include/panoinc_WX.h hugin/branches/ippei/sources/Hugin1/jhead/ hugin/branches/ippei/sources/Hugin1/jhead/CMakeLists.txt hugin/branches/ippei/sources/Hugin1/jhead/exif.cpp hugin/branches/ippei/sources/Hugin1/jhead/jpgfile.cpp hugin/branches/ippei/sources/Hugin1/nona_gui/ hugin/branches/ippei/sources/Hugin1/nona_gui/.cvsignore hugin/branches/ippei/sources/Hugin1/nona_gui/CMakeLists.txt hugin/branches/ippei/sources/Hugin1/nona_gui/Makefile.am hugin/branches/ippei/sources/Hugin1/nona_gui/nona_gui.cpp hugin/branches/ippei/sources/Hugin1/nona_gui/nona_gui.vcproj hugin/branches/ippei/sources/Hugin1/nona_gui/nona_gui_rc.rc hugin/branches/ippei/sources/Hugin1/nona_gui/po/ hugin/branches/ippei/sources/Hugin1/nona_gui/po/.cvsignore hugin/branches/ippei/sources/Hugin1/nona_gui/po/LINGUAS hugin/branches/ippei/sources/Hugin1/nona_gui/po/Makevars hugin/branches/ippei/sources/Hugin1/nona_gui/po/POTFILES.in hugin/branches/ippei/sources/Hugin1/nona_gui/po/cs_CZ.po hugin/branches/ippei/sources/Hugin1/nona_gui/po/de.po hugin/branches/ippei/sources/Hugin1/nona_gui/po/fr.po hugin/branches/ippei/sources/Hugin1/nona_gui/po/hu.po hugin/branches/ippei/sources/Hugin1/nona_gui/po/nl.po hugin/branches/ippei/sources/Hugin1/nona_gui/po/nona_gui.pot hugin/branches/ippei/sources/Hugin1/nona_gui/po/pl.po hugin/branches/ippei/sources/Hugin1/nona_gui/po/pt_BR.po hugin/branches/ippei/sources/Hugin1/nona_gui/po/ru.po hugin/branches/ippei/sources/Hugin1/nona_gui/po/sk.po hugin/branches/ippei/sources/Hugin1/nona_gui/po/zh_CN.po hugin/branches/ippei/sources/Hugin1/tests/ hugin/branches/ippei/sources/Hugin1/tests/.cvsignore hugin/branches/ippei/sources/Hugin1/tests/Makefile.am hugin/branches/ippei/sources/Hugin1/tests/old/ hugin/branches/ippei/sources/Hugin1/tests/old/Makefile hugin/branches/ippei/sources/Hugin1/tests/old/common.cpp hugin/branches/ippei/sources/Hugin1/tests/old/imageproc.cpp hugin/branches/ippei/sources/Hugin1/tests/old/interpolator.cpp hugin/branches/ippei/sources/Hugin1/tests/old/panorama.cpp hugin/branches/ippei/sources/Hugin1/tests/old/panotools.cpp hugin/branches/ippei/sources/Hugin1/tests/old/phasecorrelation.cpp hugin/branches/ippei/sources/Hugin1/tests/old/real_template.png hugin/branches/ippei/sources/Hugin1/tests/old/result_corr.png hugin/branches/ippei/sources/Hugin1/tests/old/result_corr_2.png hugin/branches/ippei/sources/Hugin1/tests/old/subject.png hugin/branches/ippei/sources/Hugin1/tests/old/template.png hugin/branches/ippei/sources/Hugin1/tests/old/transforms.cpp hugin/branches/ippei/sources/Hugin1/tests/old/vigra_ext.cpp hugin/branches/ippei/sources/Hugin1/tests/test_projections.cpp hugin/branches/ippei/sources/Hugin1/tools/ hugin/branches/ippei/sources/Hugin1/tools/.cvsignore hugin/branches/ippei/sources/Hugin1/tools/CMakeLists.txt hugin/branches/ippei/sources/Hugin1/tools/Makefile.am hugin/branches/ippei/sources/Hugin1/tools/align_image_stack.cpp hugin/branches/ippei/sources/Hugin1/tools/align_img_stack.vcproj hugin/branches/ippei/sources/Hugin1/tools/automatch.cpp hugin/branches/ippei/sources/Hugin1/tools/autooptimiser.cpp hugin/branches/ippei/sources/Hugin1/tools/autooptimiser.vcproj hugin/branches/ippei/sources/Hugin1/tools/color_correct_tiff.cpp hugin/branches/ippei/sources/Hugin1/tools/fulla.cpp hugin/branches/ippei/sources/Hugin1/tools/fulla.vcproj hugin/branches/ippei/sources/Hugin1/tools/img2vips.cpp hugin/branches/ippei/sources/Hugin1/tools/nona.cpp hugin/branches/ippei/sources/Hugin1/tools/nona.vcproj hugin/branches/ippei/sources/Hugin1/tools/vig_optimize.cpp hugin/branches/ippei/sources/Hugin1/tools/vig_optimize.vcproj hugin/branches/ippei/sources/Hugin1/tools/zhang_undistort.cpp hugin/branches/ippei/sources/Hugin1/tools_vips/ hugin/branches/ippei/sources/Hugin1/tools_vips/CMakeLists.txt hugin/branches/ippei/sources/Hugin1/tools_vips/hdrmerge_vips.cpp hugin/branches/ippei/sources/Hugin1/tools_vips/img2vips.cpp hugin/branches/ippei/sources/HuginBase/ hugin/branches/ippei/sources/HuginBase/include/ hugin/branches/ippei/sources/HuginBase/include/hugin_base/ hugin/branches/ippei/sources/HuginBase/include/hugin_base/PT (old)/ hugin/branches/ippei/sources/HuginBase/include/hugin_base/PT (old)/ImageTransforms.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/PT (old)/Transforms.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/PT (old)/utils.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/algorithms/ hugin/branches/ippei/sources/HuginBase/include/hugin_base/algorithms/AutoCtrlPointCreator.cpp hugin/branches/ippei/sources/HuginBase/include/hugin_base/algorithms/PTStitcherPanel.cpp hugin/branches/ippei/sources/HuginBase/include/hugin_base/algorithms/PhotometricOptimizer.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/algorithms/RandomPointSampler.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/algorithms/Stitcher.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/algorithms/nona/ hugin/branches/ippei/sources/HuginBase/include/hugin_base/algorithms/nona/NonaStitcherPanel.cpp hugin/branches/ippei/sources/HuginBase/include/hugin_base/algorithms/nona/RemappedPanoImage.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/algorithms/nona/SimpleStitcher.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/algorithms/nona/SpaceTransform.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/algorithms/optimiser/ hugin/branches/ippei/sources/HuginBase/include/hugin_base/algorithms/optimiser/ImageGraph.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/algorithms/optimiser/PTOptimise.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/appbase/ hugin/branches/ippei/sources/HuginBase/include/hugin_base/appbase/Command.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/appbase/CommandHistory.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/common/ hugin/branches/ippei/sources/HuginBase/include/hugin_base/common/platform.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/common/stl_utils.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/common/utils.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/common/wxPlatform.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/huginapp/ hugin/branches/ippei/sources/HuginBase/include/hugin_base/huginapp/ImageCache.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/huginapp/PanoCommand.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/lensdb/ hugin/branches/ippei/sources/HuginBase/include/hugin_base/math/ hugin/branches/ippei/sources/HuginBase/include/hugin_base/math/Matrix3.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/math/Vector3.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/math/eig_jacobi.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/math/graph.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/math/lu.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/math/math.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/panodata/ hugin/branches/ippei/sources/HuginBase/include/hugin_base/panodata/PanoImage.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/panodata/Panorama.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/panodata/PanoramaMemento.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/panotools/ hugin/branches/ippei/sources/HuginBase/include/hugin_base/panotools/PTOptimise.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/panotools/PanoToolsInterface.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/ hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/.cvsignore hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/Correlation.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/FitPolynom.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/FunctorAccessor.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/HDRUtils.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/ImageTransforms.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/Interpolators.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/MultiLayerImage.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/MultiThreadOperations.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/NearestFeatureTransform.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/Pyramid.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/ROIImage.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/RansacParameterEstimator.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/VigQuotientEstimator.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/VignettingCorrection.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/blend.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/emor.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/impexalpha.hxx hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/lut.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/pyramid2.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/ransac.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/tiffUtils.h hugin/branches/ippei/sources/HuginBase/include/hugin_base/vigra_ext/utils.h hugin/branches/ippei/sources/HuginBase/src/ hugin/branches/ippei/sources/HuginBase/src/Panorama (old)/ hugin/branches/ippei/sources/HuginBase/src/Panorama (old)/.cvsignore hugin/branches/ippei/sources/HuginBase/src/Panorama (old)/CMakeLists.txt hugin/branches/ippei/sources/HuginBase/src/Panorama (old)/SpaceTransform.cpp hugin/branches/ippei/sources/HuginBase/src/Panorama (old)/utils.cpp hugin/branches/ippei/sources/HuginBase/src/algorithms/ hugin/branches/ippei/sources/HuginBase/src/algorithms/AutoCtrlPointCreator.h hugin/branches/ippei/sources/HuginBase/src/algorithms/PTStitcherPanel.cpp hugin/branches/ippei/sources/HuginBase/src/algorithms/PhotometricOptimizer.cpp hugin/branches/ippei/sources/HuginBase/src/algorithms/RandomPointSampler.h hugin/branches/ippei/sources/HuginBase/src/algorithms/nona/ hugin/branches/ippei/sources/HuginBase/src/algorithms/nona/NonaStitcherPanel.cpp hugin/branches/ippei/sources/HuginBase/src/algorithms/nona/RemappedPanoImage.h hugin/branches/ippei/sources/HuginBase/src/algorithms/nona/SimpleStitcher.h hugin/branches/ippei/sources/HuginBase/src/algorithms/nona/SpaceTransform.h hugin/branches/ippei/sources/HuginBase/src/algorithms/nona/Stitcher.cpp hugin/branches/ippei/sources/HuginBase/src/algorithms/nona/Stitcher1.cpp hugin/branches/ippei/sources/HuginBase/src/algorithms/nona/Stitcher2.cpp hugin/branches/ippei/sources/HuginBase/src/algorithms/nona/Stitcher3.cpp hugin/branches/ippei/sources/HuginBase/src/algorithms/nona/Stitcher4.cpp hugin/branches/ippei/sources/HuginBase/src/algorithms/optimiser/ hugin/branches/ippei/sources/HuginBase/src/algorithms/optimiser/ImageGraph.cpp hugin/branches/ippei/sources/HuginBase/src/algorithms/optimiser/PTOptimise.cpp hugin/branches/ippei/sources/HuginBase/src/appbase/ hugin/branches/ippei/sources/HuginBase/src/appbase/Command.h hugin/branches/ippei/sources/HuginBase/src/appbase/CommandHistory.h hugin/branches/ippei/sources/HuginBase/src/common/ hugin/branches/ippei/sources/HuginBase/src/common/CMakeLists.txt hugin/branches/ippei/sources/HuginBase/src/common/utils.cpp hugin/branches/ippei/sources/HuginBase/src/huginapp/ hugin/branches/ippei/sources/HuginBase/src/huginapp/ImageCache.h hugin/branches/ippei/sources/HuginBase/src/huginapp/PanoCommand.h hugin/branches/ippei/sources/HuginBase/src/math/ hugin/branches/ippei/sources/HuginBase/src/math/eig_jacobi.cpp hugin/branches/ippei/sources/HuginBase/src/math/graph.cpp hugin/branches/ippei/sources/HuginBase/src/math/lu.c hugin/branches/ippei/sources/HuginBase/src/panodata/ hugin/branches/ippei/sources/HuginBase/src/panodata/PanoImage.cpp hugin/branches/ippei/sources/HuginBase/src/panodata/Panorama.cpp hugin/branches/ippei/sources/HuginBase/src/panodata/PanoramaMem... [truncated message content] |
From: <ip...@us...> - 2007-06-03 17:24:34
|
Revision: 2034 http://hugin.svn.sourceforge.net/hugin/?rev=2034&view=rev Author: ippei Date: 2007-06-03 10:24:33 -0700 (Sun, 03 Jun 2007) Log Message: ----------- initial commit continued Removed Paths: ------------- hugin/branches/ippei/mac/ hugin/branches/ippei/sources/Foreign/exiv2/doc/ hugin/branches/ippei/sources/Foreign/exiv2/msvc/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2007-06-03 17:30:31
|
Revision: 2035 http://hugin.svn.sourceforge.net/hugin/?rev=2035&view=rev Author: ippei Date: 2007-06-03 10:30:30 -0700 (Sun, 03 Jun 2007) Log Message: ----------- initial commit continued Added Paths: ----------- hugin/branches/ippei/mac/ hugin/branches/ippei/mac/Documents/ hugin/branches/ippei/mac/Documents/HOWTO-autopanosift.txt hugin/branches/ippei/mac/Documents/ReadMe-HuginOSX.txt hugin/branches/ippei/mac/ExternalPrograms/ hugin/branches/ippei/mac/ExternalPrograms/boost_1_33_1 hugin/branches/ippei/mac/ExternalPrograms/howto.txt hugin/branches/ippei/mac/ExternalPrograms/repository hugin/branches/ippei/mac/ExternalPrograms/scripts/ hugin/branches/ippei/mac/ExternalPrograms/scripts/SetEnv-ppc.txt hugin/branches/ippei/mac/ExternalPrograms/scripts/SetEnv-universal-TigerOnly.txt hugin/branches/ippei/mac/ExternalPrograms/scripts/SetEnv-universal.txt hugin/branches/ippei/mac/ExternalPrograms/scripts/autopano-sift-C.sh hugin/branches/ippei/mac/ExternalPrograms/scripts/boost.sh hugin/branches/ippei/mac/ExternalPrograms/scripts/clens.sh hugin/branches/ippei/mac/ExternalPrograms/scripts/enblend.sh hugin/branches/ippei/mac/ExternalPrograms/scripts/enblend3.sh hugin/branches/ippei/mac/ExternalPrograms/scripts/lcms.sh hugin/branches/ippei/mac/ExternalPrograms/scripts/libglew.sh hugin/branches/ippei/mac/ExternalPrograms/scripts/libjpeg.sh hugin/branches/ippei/mac/ExternalPrograms/scripts/libpng.sh hugin/branches/ippei/mac/ExternalPrograms/scripts/libtiff.sh hugin/branches/ippei/mac/ExternalPrograms/scripts/libxmi.sh hugin/branches/ippei/mac/ExternalPrograms/scripts/openexr.sh hugin/branches/ippei/mac/ExternalPrograms/scripts/pano12.sh hugin/branches/ippei/mac/ExternalPrograms/scripts/pano13.sh hugin/branches/ippei/mac/ExternalPrograms/scripts/wxmac26.sh hugin/branches/ippei/mac/ExternalPrograms/scripts/wxmac27.sh hugin/branches/ippei/mac/ExternalPrograms/scripts/wxmac28.sh hugin/branches/ippei/mac/ExternalPrograms/wxWidgets-2.7.0-1 hugin/branches/ippei/mac/Hugin-Info.plist hugin/branches/ippei/mac/Hugin.icns hugin/branches/ippei/mac/Hugin.xcodeproj/ hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj hugin/branches/ippei/mac/HuginFiles.icns hugin/branches/ippei/mac/autopano-complete-mac.sh hugin/branches/ippei/mac/build_using_cmdline.sh hugin/branches/ippei/mac/build_using_cmdline.txt hugin/branches/ippei/mac/config.h hugin/branches/ippei/mac/install2bundle.sh hugin/branches/ippei/mac/localised.sh hugin/branches/ippei/mac/nona_gui-Info.plist Added: hugin/branches/ippei/mac/Documents/HOWTO-autopanosift.txt =================================================================== --- hugin/branches/ippei/mac/Documents/HOWTO-autopanosift.txt (rev 0) +++ hugin/branches/ippei/mac/Documents/HOWTO-autopanosift.txt 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1,29 @@ +How to set up Autopano-SIFT on Mac for HuginOSX + + +Autopano-SIFT is a set of .Net programs that can automatically generate control points from a set of images. There are two ways of using Autopano-SIFT from HuginOSX. One is very easy, but does not always work, and hence not supported. The other should work as long as you set up autopano-sift correctly, but it involves editing shell script. + + +Steps: + +1. You need to install .Net environment called Mono. You can get its Framework installer package from <http://www.mono-project.com/Downloads>. You need administrator password for your computer. + +2. Download Autopano-SIFT compiled for Mono environment from the author's homepage <http://user.cs.tu-berlin.de/~nowozin/autopano-sift/>, and read its readme and license files. + +3. Use PutAutopanoSiftToHuginOSX program comes with HuginOSX to put the relevant files into HuginOSX's application package. That's all. If that did not work, you could try the next method, or give up (sorry). + + +If you tried step 3 and it did not work, you might want to proceed to the alternative installation. From this step, however, I assume you have some knowledge in unix. + +4. We have to set up autopano-complete.sh comes with Autopano-SIFT. First, set AUTOPANO_PATH variable so that the script can find the .Net executables where ever the current path is. If you place the script and the executables in the same directory, `dirname "$0"` may work. Next, you need to replace every occurrence of "generatekeys.exe" with "generatekeys-sd.exe". Now the script should be ready. Launch the Terminal and try out the script. Typical usage would be "./autopano-complete.sh -o project.pto image1 image2" (-h option gives you the arguments you can use, but please note the long format with -- is not available on Mac and other BSD systems). + +5. If the script works fine with you from any current directory, then it should be ready for hugin as well. Please open hugin's Preferences and in the Autopano tab, specify the path to the script as the custom Autopano-SIFT program. + + +What exactly HuginOSX does: + +HuginOSX has a customised script file inside the application bundle. If the custom program is not specified, HuginOSX checks whether all three autopano-sift files (autopano, generatekeys-sd, libsift) are inside the bundle, and calls its own script if they are there. If you specify the custom program, HuginOSX simply uses that one assuming it works. + + +This document was originally written by Ippei UKAI (Copyleft 2006) +Last Modified: $Id: HOWTO-autopanosift.txt 1703 2006-08-13 10:41:25Z ippei $ \ No newline at end of file Added: hugin/branches/ippei/mac/Documents/ReadMe-HuginOSX.txt =================================================================== --- hugin/branches/ippei/mac/Documents/ReadMe-HuginOSX.txt (rev 0) +++ hugin/branches/ippei/mac/Documents/ReadMe-HuginOSX.txt 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1,98 @@ +======================== + Read Me - HuginOSX 0.6 +======================== + +HuginOSX (hugin on Mac OS X) +http://hugin.sourceforge.net/ + + + +License Agreements + +The programs included in this package are mainly released under GPL although some of them may contain different licenses. Please refer to the License and Readme files attached to each program. If you do not agree with any of those license agreements, please delete the relevant program immediately. The license of HuginOSX follows that of hugin on the other platforms, which is found in the "readme and license" folder. + + + +Requirements + +Mac OS X 10.3.9 or above, either on PPC or Intel machine + +(Users with Intel CPU may still experiense minor problems. We appreciate your report. If there is a serious problem, you can try running HuginOSX with Rosetta to work around: http://docs.info.apple.com/article.html?artnum=303120 ) + + + +Typical Installation Procedure + +1. Read through the read-me and license files. + +2. Copy HuginOSX.app to /Applications folder or other locations of your preference. + +3. (Optional) Install Autopano-sift: + - Download and install Mono Framework (http://mono-project.com/) + - Download Autopano-sift for Mono environment (http://user.cs.tu-berlin.de/~nowozin/autopano-sift/) + - Launch PutAutopanoSiftToHuginOSX + - Select "bin" folder in the autopano-sift package, and then HuginOSX.app that you have just installed + + + +Usage + +Basic usage of HuginOSX is not different from that of other platforms. Some of helpful resources are found in the "Help" menu, and you can find more on the web. The basic steps are: +1 add images to the project, +2 set the field of view of your lens (in degrees) etc., +3 add control points, +4 set the anchor point, which becomes the centre point of the resulting photo +5 execute optimiser that puts the images in the best place according to the control points, and +6 stitch the images together. +There are many tutorials on the web, which might assist you to get started with hugin and the panorama photography. + + + +External commnad-line tools that can be used from inside HuginOSX + +- enblend by Andrew Mihal, http://enblend.sourceforge.net/ +This command-line program blends your panorama nicely. The program is already integrated into HuginOSX and no custom installation is required. For a reference, you can read its readme file in the "readme and licence" folder, however using enblend from command line may require separate installation of enblend tool. + +- autopano-sift by Sebastian Nowozin, http://user.cs.tu-berlin.de/~nowozin/autopano-sift/ +This is a set of .Net programs that can automatically add control points. We are not including this software in this package. Please read the tutorial in tools/autopano-sift/ folder in order to set up this software for your Mac and hugin. + +PTStitcher from the original Panorama Tools by Helmut Dersch and autopano by Alexandre Jenny have no source available to the public, and there are no versions available for OSX. + + + + +Free tools for doing panorama on Mac + +Command-line tools whose Mac binaries are available from hugin project +- nona The stitching engine of hugin. For use with other tools like clens. +- mergepto Merges two hugin project files. +- clens from Panorama Tools project, http://panotools.sourceforge.net/ +- enblend by Andrew Mihal, http://enblend.sourceforge.net/ + +Other recommended free tools +- PanoGLViewerOSX from hugin Project, http://sourceforge.net/projects/hugin/download/ +- autopano-sift by Sebastian Nowozin, http://user.cs.tu-berlin.de/~nowozin/autopano-sift/ +- MakeCubic from Apple Computer, http://developer.apple.com/quicktime/quicktimeintro/tools/index.html#qtvr +- XBlend from Kekus Digital, http://www.kekus.com/xblend/ +- PangeaVR Plugin from Pangea Software, http://www.pangeasoft.net/pano/plugin/ +- PanoView (Japanese Only) by Yoshiaki Katayanagi, http://www.jizoh.jp/pages/download.html + + + +Known Problems + +- autopano-sift sometimes does not work when nested inside the application package. + + + +Contacts + +- See the homepage (http://hugin.sourceforge.net/) first. +- Visit the project page on SourceForge (http://sourceforge.net/projects/hugin) if you are interested in the developement. +- The mainling list for everyone who cares about hugin (http://www.email-lists.org/mailman/listinfo/ptx) would welcome any questions and/or help from you. +- Recent OSX porting is mainly proceeded by Ippei UKAI (ipp...@ma...). He's on the above mailing list as well, so using the mailing list should work fine. Note he's a university student and probably busy during term times. + + + +This document was originally written by Ippei UKAI (Copyleft 2006) +Last Modified: $Id: ReadMe-HuginOSX.txt 1719 2006-08-17 20:16:28Z ippei $ \ No newline at end of file Added: hugin/branches/ippei/mac/ExternalPrograms/boost_1_33_1 =================================================================== --- hugin/branches/ippei/mac/ExternalPrograms/boost_1_33_1 (rev 0) +++ hugin/branches/ippei/mac/ExternalPrograms/boost_1_33_1 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1 @@ +link /Users/ippei/dev/hugin/ExternalPrograms/boost_1_33_1 \ No newline at end of file Property changes on: hugin/branches/ippei/mac/ExternalPrograms/boost_1_33_1 ___________________________________________________________________ Name: svn:special + * Added: hugin/branches/ippei/mac/ExternalPrograms/howto.txt =================================================================== --- hugin/branches/ippei/mac/ExternalPrograms/howto.txt (rev 0) +++ hugin/branches/ippei/mac/ExternalPrograms/howto.txt 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1,16 @@ +External Programs + +(This is for 10.4 or above) + +HOWTO: +1. Download the source. You typically want to place it in the "ExternalPrograms" folder. +2. Edit ExternalPrograms/scripts/SetEnv-*.txt file appropriately. Especially the myREPOSITORYDIR variable. +3. Open a Terminal window (bash is preferred). +5. 'cd' into the directory of source you want to compile. (eg. 'cd ExternalPrograms/jpeg-6b') +4. Set the variables for the compilation. (eg. 'source ../scripts/SetEnv-universal.txt') +6. Using the appropriate shell script, build the source. (eg. 'sh ../scripts/libjpeg.sh') + +RESULT: +The programs and libraries will be installed into $myREPOSITORYDIR, which you can manage independently from the systems you are currently using (e.g /usr, /usr/local, /opt, /sw). Using symbolic links for example, it is possible to share those libraries to be linked with different versions of hugin. + +$Id: howto.txt 1902 2007-02-04 22:27:47Z ippei $ \ No newline at end of file Added: hugin/branches/ippei/mac/ExternalPrograms/repository =================================================================== --- hugin/branches/ippei/mac/ExternalPrograms/repository (rev 0) +++ hugin/branches/ippei/mac/ExternalPrograms/repository 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1 @@ +link /Users/ippei/dev/hugin/ExternalPrograms/Repository-universal \ No newline at end of file Property changes on: hugin/branches/ippei/mac/ExternalPrograms/repository ___________________________________________________________________ Name: svn:special + * Added: hugin/branches/ippei/mac/ExternalPrograms/scripts/SetEnv-ppc.txt =================================================================== --- hugin/branches/ippei/mac/ExternalPrograms/scripts/SetEnv-ppc.txt (rev 0) +++ hugin/branches/ippei/mac/ExternalPrograms/scripts/SetEnv-ppc.txt 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1,20 @@ +# PPC: + +# has to be the absolute path from / +#myREPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository"; +myREPOSITORYDIR="/Users/ippei/dev/hugin/ExternalPrograms/Repository-ppc"; + +mkdir -p $myREPOSITORYDIR; + +export \ + REPOSITORYDIR="$myREPOSITORYDIR" \ + ARCHS="ppc" \ + ppcTARGET="powerpc-apple-darwin7" \ + i386TARGET="" \ + ppcMACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \ + i386MACSDKDIR="" \ + ppcONLYARG="-mcpu=G3 -mtune=G3" \ + i386ONLYARG="" \ + OTHERARGs=""; + +# $Id: SetEnv-ppc.txt 1902 2007-02-04 22:27:47Z ippei $ Added: hugin/branches/ippei/mac/ExternalPrograms/scripts/SetEnv-universal-TigerOnly.txt =================================================================== --- hugin/branches/ippei/mac/ExternalPrograms/scripts/SetEnv-universal-TigerOnly.txt (rev 0) +++ hugin/branches/ippei/mac/ExternalPrograms/scripts/SetEnv-universal-TigerOnly.txt 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1,20 @@ +# Universal: + +# has to be the absolute path from / +#myREPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository"; +myREPOSITORYDIR="/Users/ippei/dev/hugin/ExternalPrograms/Repository-universal"; + +mkdir -p $myREPOSITORYDIR; + +export \ + REPOSITORYDIR="$myREPOSITORYDIR" \ + ARCHS="ppc i386" \ + ppcTARGET="powerpc-apple-darwin8" \ + i386TARGET="i386-apple-darwin8" \ + ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ + i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ + ppcONLYARG="-mcpu=G3 -mtune=G4 -mmacosx-version-min=10.4" \ + i386ONLYARG="-ftree-vectorize -mmacosx-version-min=10.4" \ + OTHERARGs=""; + +# $Id: SetEnv-universal-TigerOnly.txt 1902 2007-02-04 22:27:47Z ippei $ Added: hugin/branches/ippei/mac/ExternalPrograms/scripts/SetEnv-universal.txt =================================================================== --- hugin/branches/ippei/mac/ExternalPrograms/scripts/SetEnv-universal.txt (rev 0) +++ hugin/branches/ippei/mac/ExternalPrograms/scripts/SetEnv-universal.txt 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1,20 @@ +# Universal: + +# has to be the absolute path from / +#myREPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository"; +myREPOSITORYDIR="/Users/ippei/dev/hugin/ExternalPrograms/Repository-universal"; + +mkdir -p $myREPOSITORYDIR; + +export \ + REPOSITORYDIR="$myREPOSITORYDIR" \ + ARCHS="ppc i386" \ + ppcTARGET="powerpc-apple-darwin7" \ + i386TARGET="i386-apple-darwin8" \ + ppcMACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \ + i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ + ppcONLYARG="-mcpu=G3 -mtune=G4 -mmacosx-version-min=10.3" \ + i386ONLYARG="-ftree-vectorize -mmacosx-version-min=10.4" \ + OTHERARGs=""; + +# $Id: SetEnv-universal.txt 1902 2007-02-04 22:27:47Z ippei $ Added: hugin/branches/ippei/mac/ExternalPrograms/scripts/autopano-sift-C.sh =================================================================== --- hugin/branches/ippei/mac/ExternalPrograms/scripts/autopano-sift-C.sh (rev 0) +++ hugin/branches/ippei/mac/ExternalPrograms/scripts/autopano-sift-C.sh 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1,100 @@ +# -------------------- +# autopano-sift-C +# -------------------- +# $Id: autopano-sift-C.sh 1905 2007-02-05 00:11:26Z ippei $ + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin8" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ +# OTHERARGs=""; + + + +# init + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + TARGET=$ppc64TARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppc64ONLYARG" + fi + + make clean; + make all \ + prefix="$REPOSITORYDIR" \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CPPFLAGS="-I/usr/include/libxml2 -I$REPOSITORYDIR/include -I$REPOSITORYDIR/include/pano12" \ + LDFLAGS="-arch $ARCH -L. -L$REPOSITORYDIR/lib -dead_strip -prebind" \ + LDLIBS="-lsift -lpano12 -lxml2 -lm -ltiff -ljpeg -lz"\ + NEXT_ROOT="$MACSDKDIR"; + + install ./autopano ./generatekeys $REPOSITORYDIR/arch/$ARCH/bin; + +done + + +# merge execs + +for program in bin/autopano bin/generatekeys +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; + strip "$REPOSITORYDIR/$program"; + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; + + strip "$REPOSITORYDIR/$program"; + +done Added: hugin/branches/ippei/mac/ExternalPrograms/scripts/boost.sh =================================================================== --- hugin/branches/ippei/mac/ExternalPrograms/scripts/boost.sh (rev 0) +++ hugin/branches/ippei/mac/ExternalPrograms/scripts/boost.sh 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1,23 @@ +# ------------------ +# boost +# ------------------ +# $Id: boost.sh 1902 2007-02-04 22:27:47Z ippei $ + +# prepare +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository"; + + +# install + +rm -rf "$REPOSITORYDIR/include/boost"; +cp -R "./boost" "$REPOSITORYDIR/include/"; + + +# patch + +gcc_hpp="$REPOSITORYDIR/include/boost/config/compiler/gcc.hpp" + +mv "$gcc_hpp" "$gcc_hpp copy"; + +cat "$gcc_hpp copy" | sed /^.*versions\ check:$/q > "$gcc_hpp"; +echo "// -- version check removed in order to use newer gcc. --" >> "$gcc_hpp"; Added: hugin/branches/ippei/mac/ExternalPrograms/scripts/clens.sh =================================================================== --- hugin/branches/ippei/mac/ExternalPrograms/scripts/clens.sh (rev 0) +++ hugin/branches/ippei/mac/ExternalPrograms/scripts/clens.sh 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1,109 @@ +# ------------------ +# enblend +# ------------------ +# $Id: clens.sh 1902 2007-02-04 22:27:47Z ippei $ + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin8" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ +# OTHERARGs=""; + + +# init + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + TARGET=$ppc64TARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppc64ONLYARG" + fi + + env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip -prebind" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + ; + + make clean; + make install \ + prefix="$REPOSITORYDIR" \ + ZLIBLIB="$MACSDKDIR/usr/lib" \ + ZLIBINC="$MACSDKDIR/usr/include" \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O3 -funroll-loops -dead_strip" \ + LDFLAGS="-L$REPOSITORYDIR/lib -L. -L$ZLIBLIB -lpng12 -lz" \ + NEXT_ROOT="$MACSDKDIR" \ + LIBPATH="$REPOSITORYDIR/arch/$ARCH/lib" \ + BINPATH="$REPOSITORYDIR/arch/$ARCH/bin"; + +done + + +# merge execs + +for program in bin/clens +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; + strip "$REPOSITORYDIR/$program"; + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; + + strip "$REPOSITORYDIR/$program"; + +done Added: hugin/branches/ippei/mac/ExternalPrograms/scripts/enblend.sh =================================================================== --- hugin/branches/ippei/mac/ExternalPrograms/scripts/enblend.sh (rev 0) +++ hugin/branches/ippei/mac/ExternalPrograms/scripts/enblend.sh 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1,113 @@ +# ------------------ +# enblend +# ------------------ +# $Id: enblend.sh 1902 2007-02-04 22:27:47Z ippei $ + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin8" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ +# OTHERARGs=""; + + + +# init + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + + +# patch + +# 2.5 universal +if [ ! -f "configure copy" ] +then + cp "configure" "configure copy"; + cat "configure" | sed -e "s/^#define malloc rpl_malloc/\/\/#define malloc rpl_malloc/" -e "s/^#define HAVE_MALLOC 0/#define HAVE_MALLOC 1/"> "configure"; +fi + + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + TARGET=$ppc64TARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppc64ONLYARG" + fi + + env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip -prebind" \ + LIBS="-lz -ljpeg" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + ; + + make clean; + make install; + +done + + +# merge execs + +for program in bin/enblend +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; + strip "$REPOSITORYDIR/$program"; + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; + + strip "$REPOSITORYDIR/$program"; + +done Added: hugin/branches/ippei/mac/ExternalPrograms/scripts/enblend3.sh =================================================================== --- hugin/branches/ippei/mac/ExternalPrograms/scripts/enblend3.sh (rev 0) +++ hugin/branches/ippei/mac/ExternalPrograms/scripts/enblend3.sh 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1,102 @@ +# ------------------ +# enblend 3.0 +# ------------------ +# $Id: enblend3.sh 1908 2007-02-05 14:59:45Z ippei $ + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin7" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ +# OTHERARGs=""; + + + +# init + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + TARGET=$ppc64TARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppc64ONLYARG" + fi + + env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include -I/System/Library/Frameworks/GLUT.framework/Headers -I/System/Library/Frameworks/OpenGL.framework/Headers" \ + LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip -prebind" \ + LIBS="-lz -ljpeg -framework GLUT -framework OpenGL -framework AGL" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + ; + + make clean; + make install; + +done + + +# merge execs + +for program in bin/enblend +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; + strip "$REPOSITORYDIR/$program"; + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; + + strip "$REPOSITORYDIR/$program"; + +done Added: hugin/branches/ippei/mac/ExternalPrograms/scripts/lcms.sh =================================================================== --- hugin/branches/ippei/mac/ExternalPrograms/scripts/lcms.sh (rev 0) +++ hugin/branches/ippei/mac/ExternalPrograms/scripts/lcms.sh 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1,107 @@ +# ------------------ +# lcms +# ------------------ +# $Id: lcms.sh 1902 2007-02-04 22:27:47Z ippei $ + + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin8" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ +# OTHERARGs=""; + + +# init + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + TARGET=$ppc64TARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppc64ONLYARG" + fi + + env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -funroll-loops -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -funroll-loops -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip -prebind" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + --enable-static --disable-shared; + + make clean; + make all; + make install; + +done + + +# merge liblcms + +for liba in lib/liblcms.a +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + +done + + +# merge execs + +#for program in bin/icctrans bin/jpegicc bin/tifficc bin/icclink bin/icc2ps bin/tiffdiff bin/wtpt Added: hugin/branches/ippei/mac/ExternalPrograms/scripts/libglew.sh =================================================================== --- hugin/branches/ippei/mac/ExternalPrograms/scripts/libglew.sh (rev 0) +++ hugin/branches/ippei/mac/ExternalPrograms/scripts/libglew.sh 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1,100 @@ +# ------------------ +# libpng +# ------------------ +# $Id: libglew.sh 1908 2007-02-05 14:59:45Z ippei $ + + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin8" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ +# OTHERARGs=""; + + +# init + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + TARGET=$ppc64TARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppc64ONLYARG" + fi + + make clean; + make install \ + GLEW_DEST="$REPOSITORYDIR/arch/$ARCH" \ + CC="cc -isysroot $MACSDKDIR -arch $ARCH $ARCHARGs -dead_strip" \ + LD="cc -isysroot $MACSDKDIR -arch $ARCH"; + +done + + +# merge libs + +for liba in lib/libGLEW.a +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + +done + + +# install includes + +cp -R include/GL $REPOSITORYDIR/include/; Added: hugin/branches/ippei/mac/ExternalPrograms/scripts/libjpeg.sh =================================================================== --- hugin/branches/ippei/mac/ExternalPrograms/scripts/libjpeg.sh (rev 0) +++ hugin/branches/ippei/mac/ExternalPrograms/scripts/libjpeg.sh 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1,103 @@ +# ------------------ +# libjpeg +# ------------------ +# $Id: libjpeg.sh 1902 2007-02-04 22:27:47Z ippei $ + + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin8" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ +# OTHERARGs=""; + + +# init + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + + +# compile + +cp /usr/share/libtool/config* ./; + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + TARGET=$ppc64TARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppc64ONLYARG" + fi + + env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -funroll-loops -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -funroll-loops -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip -prebind" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + --enable-static --disable-shared; + + make clean; + make install-lib; + +done + + +# merge libjpeg + +for liba in lib/libjpeg.a +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + +done Added: hugin/branches/ippei/mac/ExternalPrograms/scripts/libpng.sh =================================================================== --- hugin/branches/ippei/mac/ExternalPrograms/scripts/libpng.sh (rev 0) +++ hugin/branches/ippei/mac/ExternalPrograms/scripts/libpng.sh 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1,109 @@ +# ------------------ +# libpng +# ------------------ +# $Id: libpng.sh 1902 2007-02-04 22:27:47Z ippei $ + + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin8" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ +# OTHERARGs=""; + + +# init + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + + +# compile + +cp scripts/makefile.darwin makefile; + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + TARGET=$ppc64TARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppc64ONLYARG" + fi + + make clean; + make install-static \ + prefix="$REPOSITORYDIR" \ + ZLIBLIB="$MACSDKDIR/usr/lib" \ + ZLIBINC="$MACSDKDIR/usr/include" \ + CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + LDFLAGS="-L$REPOSITORYDIR/lib -L. -L$ZLIBLIB -lpng12 -lz" \ + NEXT_ROOT="$MACSDKDIR" \ + LIBPATH="$REPOSITORYDIR/arch/$ARCH/lib" \ + BINPATH="$REPOSITORYDIR/arch/$ARCH/bin"; + +done + + +# merge libpng + +for liba in lib/libpng12.a +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + +done + + +if [ ! -f "$REPOSITORYDIR/lib/libpng.a" ] +then + cd $REPOSITORYDIR/lib; + ln -s libpng12.a libpng.a; +fi Added: hugin/branches/ippei/mac/ExternalPrograms/scripts/libtiff.sh =================================================================== --- hugin/branches/ippei/mac/ExternalPrograms/scripts/libtiff.sh (rev 0) +++ hugin/branches/ippei/mac/ExternalPrograms/scripts/libtiff.sh 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1,152 @@ +# ------------------ +# libtiff +# ------------------ +# $Id: libtiff.sh 1902 2007-02-04 22:27:47Z ippei $ + + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin7" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ +# OTHERARGs=""; + + +# init + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + TARGET=$ppc64TARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppc64ONLYARG" + fi + + env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -funroll-loops -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -funroll-loops -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip -prebind" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + --disable-shared --with-apple-opengl-framework; + + make clean; + cd ./port; make; + cd ../libtiff; make install; + cd ../; + + rm $REPOSITORYDIR/include/tiffconf.h; + cp "./libtiff/tiffconf.h" "$REPOSITORYDIR/arch/$ARCH/include/tiffconf.h"; + +done + + +# merge libtiff + +for liba in lib/libtiff.a lib/libtiffxx.a +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + +done + + +# merge config.h + +for conf_h in include/tiffconf.h +do + + echo "" > "$REPOSITORYDIR/$conf_h"; + + if [ $NUMARCH -eq 1 ] + then + mv $REPOSITORYDIR/arch/$ARCHS/$conf_h $REPOSITORYDIR/$conf_h; + continue; + fi + + for ARCH in $ARCHS + do + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + echo "#if defined(__i386__)" >> "$REPOSITORYDIR/$conf_h"; + echo "" >> "$REPOSITORYDIR/$conf_h"; + cat "$REPOSITORYDIR/arch/$ARCH/$conf_h" >> "$REPOSITORYDIR/$conf_h"; + echo "" >> "$REPOSITORYDIR/$conf_h"; + echo "#endif" >> "$REPOSITORYDIR/$conf_h"; + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + echo "#if defined(__ppc__)" >> "$REPOSITORYDIR/$conf_h"; + echo "" >> "$REPOSITORYDIR/$conf_h"; + cat "$REPOSITORYDIR/arch/$ARCH/$conf_h" >> "$REPOSITORYDIR/$conf_h"; + echo "" >> "$REPOSITORYDIR/$conf_h"; + echo "#endif" >> "$REPOSITORYDIR/$conf_h"; + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + echo "#if defined(__ppc64__)" >> "$REPOSITORYDIR/$conf_h"; + echo "" >> "$REPOSITORYDIR/$conf_h"; + cat "$REPOSITORYDIR/arch/$ARCH/$conf_h" >> "$REPOSITORYDIR/$conf_h"; + echo "" >> "$REPOSITORYDIR/$conf_h"; + echo "#endif" >> "$REPOSITORYDIR/$conf_h"; + fi + done + +done + + + + Added: hugin/branches/ippei/mac/ExternalPrograms/scripts/libxmi.sh =================================================================== --- hugin/branches/ippei/mac/ExternalPrograms/scripts/libxmi.sh (rev 0) +++ hugin/branches/ippei/mac/ExternalPrograms/scripts/libxmi.sh 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1,103 @@ +# ------------------ +# libxmi +# ------------------ +# $Id: libxmi.sh 1902 2007-02-04 22:27:47Z ippei $ + + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin8" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ +# OTHERARGs=""; + + +# init + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + TARGET=$ppc64TARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppc64ONLYARG" + fi + + env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -funroll-loops -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -funroll-loops -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip -prebind" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + --enable-static --disable-shared; + + make clean; + make all; + make install; + +done + + +# merge libxmi + +for liba in lib/libxmi.a +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + +done + Added: hugin/branches/ippei/mac/ExternalPrograms/scripts/openexr.sh =================================================================== --- hugin/branches/ippei/mac/ExternalPrograms/scripts/openexr.sh (rev 0) +++ hugin/branches/ippei/mac/ExternalPrograms/scripts/openexr.sh 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1,128 @@ +# ------------------ +# openexr +# ------------------ +# $Id: openexr.sh 2004 2007-05-11 00:17:50Z ippei $ + + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin7" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.3.9.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ +# OTHERARGs=""; + + +# init + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + TARGET=$ppc64TARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppc64ONLYARG" + fi + + env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip -prebind" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + --disable-shared; + + make clean; + make all; + make install; + +done + + +# merge + +for liba in lib/libIlmThread.a lib/libIlmImf.a lib/libImath.a lib/libIex.a lib/libHalf.a +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + +done + + +# merge execs + +for program in bin/exrheader bin/exrstdattr bin/exrmaketiled bin/exrenvmap bin/exrmakepreview +do + + LIPOARGs="" + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; + continue + fi + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; + +done + + + Added: hugin/branches/ippei/mac/ExternalPrograms/scripts/pano12.sh =================================================================== --- hugin/branches/ippei/mac/ExternalPrograms/scripts/pano12.sh (rev 0) +++ hugin/branches/ippei/mac/ExternalPrograms/scripts/pano12.sh 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1,133 @@ +# ------------------ +# pano12 +# ------------------ +# $Id: pano12.sh 1902 2007-02-04 22:27:47Z ippei $ + + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin8" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ +# OTHERARGs=""; + + + +# init + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + TARGET=$ppc64TARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppc64ONLYARG" + fi + + env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -gfull -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -gfull -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip -prebind" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + --with-java=$MACSDKDIR/System/Library/Frameworks/JavaVM.framework/Versions/Current \ + --with-zlib=$MACSDKDIR/usr \ + --with-png=$REPOSITORYDIR \ + --with-jpeg=$REPOSITORYDIR \ + --with-tiff=$REPOSITORYDIR \ + --disable-shared; + + make clean; + make install; + +done + + +# merge libpano12 + + +for liba in lib/libpano12.a +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + +done + + +# merge execs + +for program in bin/panoinfo bin/PTblender bin/PTmender bin/PTOptimizer bin/PTtiff2psd +do + + LIPOARGs="" + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; + continue + fi + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; + +done + + Added: hugin/branches/ippei/mac/ExternalPrograms/scripts/pano13.sh =================================================================== --- hugin/branches/ippei/mac/ExternalPrograms/scripts/pano13.sh (rev 0) +++ hugin/branches/ippei/mac/ExternalPrograms/scripts/pano13.sh 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1,133 @@ +# ------------------ +# pano13 +# ------------------ +# $Id: pano13.sh 1904 2007-02-05 00:10:54Z ippei $ + + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin8" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ +# OTHERARGs=""; + + + +# init + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + TARGET=$ppc64TARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppc64ONLYARG" + fi + + env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -gfull -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -gfull -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip -prebind" \ + NEXT_ROOT="$MACSDKDIR" \ + ./configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + --with-java=$MACSDKDIR/System/Library/Frameworks/JavaVM.framework/Versions/Current \ + --with-zlib=$MACSDKDIR/usr \ + --with-png=$REPOSITORYDIR \ + --with-jpeg=$REPOSITORYDIR \ + --with-tiff=$REPOSITORYDIR \ + --disable-shared; + + make clean; + make install; + +done + + +# merge libpano13 + + +for liba in lib/libpano13.a +do + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$liba" "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + continue + fi + + LIPOARGs="" + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$liba"; + ranlib "$REPOSITORYDIR/$liba"; + +done + + +# merge execs + +for program in bin/panoinfo bin/PTblender bin/PTcrop bin/PTinfo bin/PTmasker bin/PTmender bin/PToptimizer bin/PTroller bin/PTtiff2psd bin/PTtiffdump bin/PTuncrop +do + + LIPOARGs="" + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCHS/$program" "$REPOSITORYDIR/$program"; + continue + fi + + for ARCH in $ARCHS + do + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$program" + done + + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$program"; + +done + + Added: hugin/branches/ippei/mac/ExternalPrograms/scripts/wxmac26.sh =================================================================== --- hugin/branches/ippei/mac/ExternalPrograms/scripts/wxmac26.sh (rev 0) +++ hugin/branches/ippei/mac/ExternalPrograms/scripts/wxmac26.sh 2007-06-03 17:30:30 UTC (rev 2035) @@ -0,0 +1,182 @@ +# ------------------ +# wxMac 2.6 +# ------------------ +# $Id: wxmac26.sh 1902 2007-02-04 22:27:47Z ippei $ + + +# prepare + +# export REPOSITORYDIR="/PATH2HUGIN/mac/ExternalPrograms/repository" \ +# ARCHS="ppc i386" \ +# ppcTARGET="powerpc-apple-darwin8" \ +# i386TARGET="i386-apple-darwin8" \ +# ppcMACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# i386MACSDKDIR="/Developer/SDKs/MacOSX10.4u.sdk" \ +# ppcONLYARG="-mcpu=G3 -mtune=G4" \ +# i386ONLYARG="-mfpmath=sse -msse2 -mtune=pentium-m -ftree-vectorize" \ +# ppc64ONLYARG="-mcpu=G5 -mtune=G5 -ftree-vectorize" \ +# OTHERARGs=""; + + +# init + +let NUMARCH="0" + +for i in $ARCHS +do + NUMARCH=$(($NUMARCH + 1)) +done + +mkdir -p "$REPOSITORYDIR/bin"; +mkdir -p "$REPOSITORYDIR/lib"; +mkdir -p "$REPOSITORYDIR/include"; + + +# compile + +for ARCH in $ARCHS +do + + mkdir -p "osx-$ARCH-build"; + cd "osx-$ARCH-build"; + + mkdir -p "$REPOSITORYDIR/arch/$ARCH/bin"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/lib"; + mkdir -p "$REPOSITORYDIR/arch/$ARCH/include"; + + ARCHARGs="" + MACSDKDIR="" + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + TARGET=$i386TARGET + MACSDKDIR=$i386MACSDKDIR + ARCHARGs="$i386ONLYARG" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + TARGET=$ppcTARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppcONLYARG" + elif [ $ARCH = "ppc64" -o $ARCH = "ppc970" ] + then + TARGET=$ppc64TARGET + MACSDKDIR=$ppcMACSDKDIR + ARCHARGs="$ppc64ONLYARG" + fi + + + env CFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CXXFLAGS="-isysroot $MACSDKDIR -arch $ARCH $ARCHARGs $OTHERARGs -O2 -dead_strip" \ + CPPFLAGS="-I$REPOSITORYDIR/include" \ + LDFLAGS="-L$REPOSITORYDIR/lib -dead_strip -prebind" \ + NEXT_ROOT="$MACSDKDIR" \ + ../configure --prefix="$REPOSITORYDIR" --disable-dependency-tracking \ + --host="$TARGET" --exec-prefix=$REPOSITORYDIR/arch/$ARCH \ + --disable-debug --disable-shared --enable-monolithic --enable-unicode --with-opengl; + + + make clean; + make install; + + cd ../; + +done + + +# merge libwx + +for libname in lib/libwx_macu-2.6 lib/libwx_macu_gl-2.6 lib/libwxexpat-2.6 lib/libwxregexu-2.6 +do + + LIPOARGs="" + + for ARCH in $ARCHS + do + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + liba="$libname-i386-apple-darwin8.a" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + liba="$libname.a" + fi + + if [ $NUMARCH -eq 1 ] + then + mv "$REPOSITORYDIR/arch/$ARCH/$liba" "$REPOSITORYDIR/$libname.a"; + ranlib "$REPOSITORYDIR/$libname.a"; + continue + fi + + LIPOARGs="$LIPOARGs $REPOSITORYDIR/arch/$ARCH/$liba" + done + + if [ $NUMARCH -gt 1 ] + then + lipo $LIPOARGs -create -output "$REPOSITORYDIR/$libname.a"; + ranlib "$REPOSITORYDIR/$libname.a"; + fi + +done + + +# merge setup.h + +for confname in "wx/setup.h" +do + + wxmacconf="lib/wx/include/mac-unicode-release-static-2.6/$confname" + + echo "" > "$REPOSITORYDIR/$wxmacconf"; + + if [ $NUMARCH -eq 1 ] + then + ARCH=$ARCHS + + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + conf_h="lib/wx/include/i386-apple-darwin8-mac-unicode-release-static-2.6/$confname" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + conf_h="$wxmacconf" + fi + + mkdir -p `dirname $REPOSITORYDIR/$wxmacconf`; + mv "$REPOSITORYDIR/arch/$ARCH/$conf_h" "$REPOSITORYDIR/$wxmacconf"; + continue + fi + + for ARCH in $ARCHS + do + if [ $ARCH = "i386" -o $ARCH = "i686" ] + then + conf_h="lib/wx/include/i386-apple-darwin8-mac-unicode-release-static-2.6/$confname" + elif [ $ARCH = "ppc" -o $ARCH = "ppc750" -o $ARCH = "ppc7400" ] + then + conf_h="$wxmacconf" + fi + + mkdir -p `dirname $REPOSITORYDIR/$wxmacconf`; + + if... [truncated message content] |
From: <ip...@us...> - 2007-06-03 21:39:19
|
Revision: 2045 http://hugin.svn.sourceforge.net/hugin/?rev=2045&view=rev Author: ippei Date: 2007-06-03 14:39:14 -0700 (Sun, 03 Jun 2007) Log Message: ----------- merging headers and codes directories Modified Paths: -------------- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj Added Paths: ----------- hugin/branches/ippei/src/ Removed Paths: ------------- hugin/branches/ippei/sources/ Modified: hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-06-03 21:31:51 UTC (rev 2044) +++ hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-06-03 21:39:14 UTC (rev 2045) @@ -2021,7 +2021,7 @@ /* Begin PBXProject section */ 57FC3AC10675E43600C3E0AC /* Project object */ = { isa = PBXProject; - buildConfigurationList = 571DA83D088E59C20058F246 /* Build configuration list for PBXProject "HuginOSX" */; + buildConfigurationList = 571DA83D088E59C20058F246 /* Build configuration list for PBXProject "Hugin" */; hasScannedForEncodings = 1; knownRegions = ( English, @@ -3946,7 +3946,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 571DA83D088E59C20058F246 /* Build configuration list for PBXProject "HuginOSX" */ = { + 571DA83D088E59C20058F246 /* Build configuration list for PBXProject "Hugin" */ = { isa = XCConfigurationList; buildConfigurations = ( 5745FC2A094E1E6400E6B672 /* Debug */, Copied: hugin/branches/ippei/src (from rev 2044, hugin/branches/ippei/sources) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2007-06-26 12:17:58
|
Revision: 2163 http://hugin.svn.sourceforge.net/hugin/?rev=2163&view=rev Author: ippei Date: 2007-06-26 05:17:41 -0700 (Tue, 26 Jun 2007) Log Message: ----------- new xcode for building on mac Modified Paths: -------------- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj Added Paths: ----------- hugin/branches/ippei/src/hugin_config_mac.h Removed Paths: ------------- hugin/branches/ippei/mac/config.h Modified: hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-06-26 12:15:32 UTC (rev 2162) +++ hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-06-26 12:17:41 UTC (rev 2163) @@ -7,180 +7,91 @@ objects = { /* Begin PBXAggregateTarget section */ - 570878D2067BC56F0057B4D7 /* all */ = { + 57C486290C3121E8002D79F1 /* copy hugin_config.h */ = { isa = PBXAggregateTarget; - buildConfigurationList = 571DA7FF088E59C20058F246 /* Build configuration list for PBXAggregateTarget "all" */; + buildConfigurationList = 57C4862A0C312226002D79F1 /* Build configuration list for PBXAggregateTarget "copy hugin_config.h" */; buildPhases = ( + 57C4863E0C3122C4002D79F1 /* ShellScript */, ); dependencies = ( - 570878D6067BC5770057B4D7 /* PBXTargetDependency */, - 57452BCB094E3D6C00E6B672 /* PBXTargetDependency */, - 57452BCD094E3D6E00E6B672 /* PBXTargetDependency */, ); - name = all; - productName = all; + name = "copy hugin_config.h"; + productName = "copy hugin_config.h"; }; - 573B8F54067BA9CF00B7B355 /* apps */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 571DA7FB088E59C20058F246 /* Build configuration list for PBXAggregateTarget "apps" */; - buildPhases = ( - ); - dependencies = ( - 57CBEFDE06BC7F4E00C43FF5 /* PBXTargetDependency */, - 57CF92A406BD7BBE00780AC5 /* PBXTargetDependency */, - ); - name = apps; - productName = apps; - }; - 573B9036067BADC600B7B355 /* tools */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 571DA7F7088E59C20058F246 /* Build configuration list for PBXAggregateTarget "tools" */; - buildPhases = ( - ); - dependencies = ( - 573F340109F7ADA70088B333 /* PBXTargetDependency */, - 573F33FF09F7AD9A0088B333 /* PBXTargetDependency */, - 573F33FD09F7AD8F0088B333 /* PBXTargetDependency */, - 573F33FB09F7AD8F0088B333 /* PBXTargetDependency */, - 573F33F909F7AD8F0088B333 /* PBXTargetDependency */, - ); - name = tools; - productName = "tools apps"; - }; - 5749FA15067B7DE400A6EDD4 /* lib */ = { - isa = PBXAggregateTarget; - buildConfigurationList = 571DA7DB088E59C20058F246 /* Build configuration list for PBXAggregateTarget "lib" */; - buildPhases = ( - ); - dependencies = ( - 5749FA17067B7E0A00A6EDD4 /* PBXTargetDependency */, - 5749FA1B067B7E0A00A6EDD4 /* PBXTargetDependency */, - 57CBEFE206BC853000C43FF5 /* PBXTargetDependency */, - 57C1707509A1262900FAF325 /* PBXTargetDependency */, - 5749FA1F067B7E0A00A6EDD4 /* PBXTargetDependency */, - 5720E49D0BD4578100E63404 /* PBXTargetDependency */, - 5749FA21067B7E0A00A6EDD4 /* PBXTargetDependency */, - ); - name = lib; - productName = lib; - }; /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 5702996E07F967CB00F1FF15 /* HuginFiles.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5702996D07F967CB00F1FF15 /* HuginFiles.icns */; }; - 5711523606BC6562004F4FA7 /* exif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114FF906BC2302004F4FA7 /* exif.cpp */; }; - 5711523706BC6562004F4FA7 /* jpgfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114FFB06BC2303004F4FA7 /* jpgfile.cpp */; }; 571152F806BC6E4C004F4FA7 /* bmp.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0306BC2301004F4FA7 /* bmp.cxx */; }; 571152F906BC6E58004F4FA7 /* byteorder.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0506BC2301004F4FA7 /* byteorder.cxx */; }; 571152FE06BC6E8E004F4FA7 /* codecmanager.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0706BC2301004F4FA7 /* codecmanager.cxx */; }; - 5720E4740BD456CD00E63404 /* exif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114FF906BC2302004F4FA7 /* exif.cpp */; }; - 5720E4750BD456CD00E63404 /* jpgfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114FFB06BC2303004F4FA7 /* jpgfile.cpp */; }; 5720E4900BD4575000E63404 /* Axb.c in Sources */ = {isa = PBXBuildFile; fileRef = 5720E47C0BD4575000E63404 /* Axb.c */; }; 5720E4920BD4575000E63404 /* lm.c in Sources */ = {isa = PBXBuildFile; fileRef = 5720E4850BD4575000E63404 /* lm.c */; }; 5720E4940BD4575000E63404 /* lmbc.c in Sources */ = {isa = PBXBuildFile; fileRef = 5720E4880BD4575000E63404 /* lmbc.c */; }; 5720E4970BD4575000E63404 /* lmlec.c in Sources */ = {isa = PBXBuildFile; fileRef = 5720E48B0BD4575000E63404 /* lmlec.c */; }; 5720E4990BD4575000E63404 /* misc.c in Sources */ = {isa = PBXBuildFile; fileRef = 5720E48D0BD4575000E63404 /* misc.c */; }; - 5720E49F0BD457B600E63404 /* liblevmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* liblevmar.a */; }; - 573B8FE1067BAC7B00B7B355 /* libpanorama.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F92E067B654900A6EDD4 /* libpanorama.a */; }; - 573B8FE2067BAC8400B7B355 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; - 573B8FE3067BAC9000B7B355 /* libcommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5750CC8606774D0300B049DC /* libcommon.a */; }; - 573B8FE5067BACA500B7B355 /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; 573F330509F79BAA0088B333 /* iccjpeg.c in Sources */ = {isa = PBXBuildFile; fileRef = 573F330409F79BAA0088B333 /* iccjpeg.c */; }; - 573F330C09F79C550088B333 /* Plot2D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 577D3D0E09A0D78E004C6964 /* Plot2D.cpp */; }; - 573F330D09F79C550088B333 /* PTWXDlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 573F330A09F79C140088B333 /* PTWXDlg.cpp */; }; - 573F330E09F79CE00088B333 /* CPFineTuneFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 573BCD1508409610001D8D54 /* CPFineTuneFrame.cpp */; }; - 573F330F09F79D0D0088B333 /* UniversalCursor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F4406BC2302004F4FA7 /* UniversalCursor.cpp */; }; - 573F339809F7AB110088B333 /* libpanorama.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F92E067B654900A6EDD4 /* libpanorama.a */; }; - 573F339909F7AB110088B333 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; - 573F339A09F7AB110088B333 /* libcommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5750CC8606774D0300B049DC /* libcommon.a */; }; - 573F339B09F7AB110088B333 /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; - 573F339C09F7AB110088B333 /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; - 573F339D09F7AB110088B333 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; - 573F339E09F7AB110088B333 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; - 573F339F09F7AB110088B333 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; - 573F33A009F7AB110088B333 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; - 573F33BD09F7AB190088B333 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; - 573F33CA09F7ABD20088B333 /* libvigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libvigra_ext.a */; }; - 573F33D709F7AC260088B333 /* libpanorama.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F92E067B654900A6EDD4 /* libpanorama.a */; }; - 573F33D809F7AC260088B333 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; - 573F33D909F7AC260088B333 /* libcommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5750CC8606774D0300B049DC /* libcommon.a */; }; - 573F33DA09F7AC260088B333 /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; - 573F33DB09F7AC260088B333 /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; - 573F33DC09F7AC260088B333 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; - 573F33DD09F7AC260088B333 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; - 573F33DE09F7AC260088B333 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; - 573F33DF09F7AC260088B333 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; - 573F33E909F7AC500088B333 /* libvigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libvigra_ext.a */; }; - 573F33F209F7AC760088B333 /* color_correct_tiff.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 577D3D2009A0D814004C6964 /* color_correct_tiff.cpp */; }; - 573F33F609F7AC7C0088B333 /* fulla.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 573F332C09F79F300088B333 /* fulla.cpp */; }; - 573F33F709F7AC880088B333 /* zhang_undistort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 570E7B5206FC917900D23E0D /* zhang_undistort.cpp */; }; - 57452BA5094E3C7400E6B672 /* libpanorama.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F92E067B654900A6EDD4 /* libpanorama.a */; }; - 57452BA6094E3C7400E6B672 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; - 57452BA7094E3C7400E6B672 /* libcommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5750CC8606774D0300B049DC /* libcommon.a */; }; - 57452BA8094E3C7400E6B672 /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; - 57452BA9094E3C7400E6B672 /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; - 57452BAA094E3C7400E6B672 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; - 57452BAB094E3C7400E6B672 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; - 57452BAC094E3C7400E6B672 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; - 57452BAD094E3C7400E6B672 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; - 57452BBC094E3CC900E6B672 /* autooptimiser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5711505E06BC2303004F4FA7 /* autooptimiser.cpp */; }; - 574716D606B8AF260020D6E7 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; - 574716D906B8AF260020D6E7 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; - 574F3EBD081FF2350086E561 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 574F3EBC081FF2350086E561 /* QuickTime.framework */; }; - 574F3EBE081FF2350086E561 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 574F3EBC081FF2350086E561 /* QuickTime.framework */; }; - 574F3EE9081FF3BC0086E561 /* libwxexpat-2.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989545068E2F22009F90BF /* libwxexpat-2.7.a */; }; - 574F3F20082004870086E561 /* libwxexpat-2.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989545068E2F22009F90BF /* libwxexpat-2.7.a */; }; - 574F3F2F082005980086E561 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 574F3F2E082005980086E561 /* IOKit.framework */; }; - 574F3F30082005980086E561 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 574F3F2E082005980086E561 /* IOKit.framework */; }; - 5751ABF90BDD4EBC003A7B5C /* OptimizePhotometricPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5751ABF80BDD4EBC003A7B5C /* OptimizePhotometricPanel.cpp */; }; - 577092FC06BD7388004058A1 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; - 577092FD06BD7388004058A1 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; - 5770930006BD7424004058A1 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; - 5770930906BD754A004058A1 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; - 5770930A06BD754A004058A1 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; + 5771F4DD0C2FEE0900736343 /* exif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F4DA0C2FEE0900736343 /* exif.cpp */; }; + 5771F4DE0C2FEE0900736343 /* jpgfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F4DC0C2FEE0900736343 /* jpgfile.cpp */; }; + 5771F5EE0C3007F300736343 /* platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F5EB0C3007F300736343 /* platform.h */; }; + 5771F5EF0C3007F300736343 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F5EC0C3007F300736343 /* utils.cpp */; }; + 5771F5F00C3007F300736343 /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F5ED0C3007F300736343 /* utils.h */; }; + 5771F6190C30107200736343 /* stl_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F6170C30106A00736343 /* stl_utils.h */; }; + 5771F6430C3011FD00736343 /* jhead.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F4DB0C2FEE0900736343 /* jhead.h */; }; + 5771F6E10C301B7200736343 /* lm.h in Headers */ = {isa = PBXBuildFile; fileRef = 5720E4860BD4575000E63404 /* lm.h */; }; + 5771F6E20C301B7200736343 /* misc.h in Headers */ = {isa = PBXBuildFile; fileRef = 5720E48E0BD4575000E63404 /* misc.h */; }; + 5771F73B0C301FC100736343 /* MultiThreadOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F72A0C301FC100736343 /* MultiThreadOperations.cpp */; }; + 5771F73C0C301FC100736343 /* emor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F7330C301FC100736343 /* emor.cpp */; }; + 5771F7480C30205600736343 /* Correlation.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7230C301FC100736343 /* Correlation.h */; }; + 5771F7490C30205600736343 /* FitPolynom.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7240C301FC100736343 /* FitPolynom.h */; }; + 5771F74A0C30205600736343 /* FunctorAccessor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7250C301FC100736343 /* FunctorAccessor.h */; }; + 5771F74B0C30205600736343 /* HDRUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7260C301FC100736343 /* HDRUtils.h */; }; + 5771F74C0C30205600736343 /* ImageTransforms.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7270C301FC100736343 /* ImageTransforms.h */; }; + 5771F74D0C30205600736343 /* Interpolators.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7280C301FC100736343 /* Interpolators.h */; }; + 5771F74E0C30205600736343 /* MultiLayerImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7290C301FC100736343 /* MultiLayerImage.h */; }; + 5771F74F0C30205600736343 /* MultiThreadOperations.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F72B0C301FC100736343 /* MultiThreadOperations.h */; }; + 5771F7500C30205600736343 /* NearestFeatureTransform.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F72C0C301FC100736343 /* NearestFeatureTransform.h */; }; + 5771F7510C30205600736343 /* Pyramid.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F72D0C301FC100736343 /* Pyramid.h */; }; + 5771F7520C30205600736343 /* ROIImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F72E0C301FC100736343 /* ROIImage.h */; }; + 5771F7530C30205600736343 /* RansacParameterEstimator.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F72F0C301FC100736343 /* RansacParameterEstimator.h */; }; + 5771F7540C30205600736343 /* VigQuotientEstimator.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7300C301FC100736343 /* VigQuotientEstimator.h */; }; + 5771F7550C30205600736343 /* VignettingCorrection.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7310C301FC100736343 /* VignettingCorrection.h */; }; + 5771F7560C30205600736343 /* blend.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7320C301FC100736343 /* blend.h */; }; + 5771F7570C30205600736343 /* emor.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7340C301FC100736343 /* emor.h */; }; + 5771F7580C30205600736343 /* impexalpha.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7350C301FC100736343 /* impexalpha.hxx */; }; + 5771F7590C30205600736343 /* lut.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7360C301FC100736343 /* lut.h */; }; + 5771F75A0C30205600736343 /* pyramid2.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7370C301FC100736343 /* pyramid2.h */; }; + 5771F75B0C30205600736343 /* ransac.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7380C301FC100736343 /* ransac.h */; }; + 5771F75C0C30205600736343 /* tiffUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7390C301FC100736343 /* tiffUtils.h */; }; + 5771F75D0C30205600736343 /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F73A0C301FC100736343 /* utils.h */; }; + 5771F75E0C30206600736343 /* barrier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709209A12DE400FAF325 /* barrier.cpp */; }; + 5771F75F0C30206600736343 /* condition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709309A12DE400FAF325 /* condition.cpp */; }; + 5771F7600C30206600736343 /* exceptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709409A12DE400FAF325 /* exceptions.cpp */; }; + 5771F7610C30206600736343 /* mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709509A12DE400FAF325 /* mutex.cpp */; }; + 5771F7620C30206600736343 /* once.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709609A12DE400FAF325 /* once.cpp */; }; + 5771F7630C30206600736343 /* recursive_mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709709A12DE400FAF325 /* recursive_mutex.cpp */; }; + 5771F7640C30206600736343 /* thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709809A12DE400FAF325 /* thread.cpp */; }; + 5771F7650C30206600736343 /* tss_dll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709909A12DE400FAF325 /* tss_dll.cpp */; }; + 5771F7660C30206600736343 /* tss_hooks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709A09A12DE400FAF325 /* tss_hooks.cpp */; }; + 5771F7670C30206600736343 /* tss_null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709B09A12DE400FAF325 /* tss_null.cpp */; }; + 5771F7680C30206600736343 /* tss_pe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709C09A12DE400FAF325 /* tss_pe.cpp */; }; + 5771F7690C30206600736343 /* tss.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709D09A12DE400FAF325 /* tss.cpp */; }; + 5771F76A0C30206600736343 /* xtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709E09A12DE400FAF325 /* xtime.cpp */; }; + 5771F7C90C3021B000736343 /* Matrix3.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7C00C3021B000736343 /* Matrix3.h */; }; + 5771F7CA0C3021B000736343 /* Vector3.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7C10C3021B000736343 /* Vector3.h */; }; + 5771F7CB0C3021B000736343 /* eig_jacobi.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F7C20C3021B000736343 /* eig_jacobi.cpp */; }; + 5771F7CC0C3021B000736343 /* eig_jacobi.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7C30C3021B000736343 /* eig_jacobi.h */; }; + 5771F7CD0C3021B000736343 /* graph.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F7C40C3021B000736343 /* graph.cpp */; }; + 5771F7CE0C3021B000736343 /* graph.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7C50C3021B000736343 /* graph.h */; }; + 5771F7CF0C3021B000736343 /* lu.c in Sources */ = {isa = PBXBuildFile; fileRef = 5771F7C60C3021B000736343 /* lu.c */; }; + 5771F7D00C3021B000736343 /* lu.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F7C70C3021B000736343 /* lu.h */; }; + 5771F83C0C3026D200736343 /* PTLensDB.c in Sources */ = {isa = PBXBuildFile; fileRef = 5771F83A0C3026D200736343 /* PTLensDB.c */; }; + 5771F83D0C3026D200736343 /* PTLensDB.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F83B0C3026D200736343 /* PTLensDB.h */; }; 577785FD0BF3439D0041F8FF /* exr.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 577785FB0BF3439D0041F8FF /* exr.cxx */; }; - 5777860B0BF3477A0041F8FF /* libIlmImf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.a */; }; - 5777860C0BF3477B0041F8FF /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; - 577786120BF347B80041F8FF /* libIex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.a */; }; - 577786130BF347B80041F8FF /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.a */; }; - 577786190BF348E90041F8FF /* libHalf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.a */; }; - 577D3D0909A0D759004C6964 /* wxPanoCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 577D3D0809A0D759004C6964 /* wxPanoCommand.cpp */; }; - 577D3D0B09A0D76D004C6964 /* VigCorrDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 577D3D0A09A0D76D004C6964 /* VigCorrDialog.cpp */; }; 578ED0000A8D0C160028A7FB /* hdr.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 578ECFFC0A8D0C150028A7FB /* hdr.cxx */; }; 578ED0010A8D0C160028A7FB /* rgbe.c in Sources */ = {isa = PBXBuildFile; fileRef = 578ECFFE0A8D0C160028A7FB /* rgbe.c */; }; - 5798954A068E2F22009F90BF /* libwx_macu-2.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.7.a */; }; - 57989569068E2FA3009F90BF /* libwxregexu-2.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989565068E2FA3009F90BF /* libwxregexu-2.7.a */; }; - 57989582068E2FD8009F90BF /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; - 57A6048C0B4B6321008F4039 /* HFOVDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57A6048B0B4B6321008F4039 /* HFOVDialog.cpp */; }; - 57A91BD807FD85E30013AE47 /* autopano-complete-mac.sh in Resources */ = {isa = PBXBuildFile; fileRef = 57A91BD707FD85E30013AE47 /* autopano-complete-mac.sh */; }; - 57ABCA7509F7F126005D8908 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; - 57ABCA7609F7F126005D8908 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; - 57B8C3C3083A4B6900283C06 /* MyExternalCmdExecDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57B8C3C2083A4B6900283C06 /* MyExternalCmdExecDialog.cpp */; }; - 57BF84F20B3CB214006829C2 /* AssistantPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57BF84F00B3CB214006829C2 /* AssistantPanel.cpp */; }; - 57BF84F30B3CB214006829C2 /* CropPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57BF84F10B3CB214006829C2 /* CropPanel.cpp */; }; - 57BF87B30B3CC4DF006829C2 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; - 57BF87B40B3CC4E0006829C2 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; - 57BF87B50B3CC4E0006829C2 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; - 57BF87B70B3CC4E2006829C2 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; - 57BF87B80B3CC4E3006829C2 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; - 57BF87B90B3CC4E3006829C2 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; - 57BF8AC00B3CC73D006829C2 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; - 57C1707D09A1268C00FAF325 /* libvigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libvigra_ext.a */; }; - 57C1707E09A126A600FAF325 /* libvigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libvigra_ext.a */; }; - 57C1707F09A126AC00FAF325 /* libvigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libvigra_ext.a */; }; - 57C1709F09A12DE400FAF325 /* barrier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709209A12DE400FAF325 /* barrier.cpp */; }; - 57C170A009A12DE400FAF325 /* condition.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709309A12DE400FAF325 /* condition.cpp */; }; - 57C170A109A12DE400FAF325 /* exceptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709409A12DE400FAF325 /* exceptions.cpp */; }; - 57C170A209A12DE400FAF325 /* mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709509A12DE400FAF325 /* mutex.cpp */; }; - 57C170A309A12DE400FAF325 /* once.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709609A12DE400FAF325 /* once.cpp */; }; - 57C170A409A12DE400FAF325 /* recursive_mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709709A12DE400FAF325 /* recursive_mutex.cpp */; }; - 57C170A509A12DE400FAF325 /* thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709809A12DE400FAF325 /* thread.cpp */; }; - 57C170A609A12DE400FAF325 /* tss_dll.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709909A12DE400FAF325 /* tss_dll.cpp */; }; - 57C170A709A12DE400FAF325 /* tss_hooks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709A09A12DE400FAF325 /* tss_hooks.cpp */; }; - 57C170A809A12DE400FAF325 /* tss_null.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709B09A12DE400FAF325 /* tss_null.cpp */; }; - 57C170A909A12DE400FAF325 /* tss_pe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709C09A12DE400FAF325 /* tss_pe.cpp */; }; - 57C170AA09A12DE400FAF325 /* tss.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709D09A12DE400FAF325 /* tss.cpp */; }; - 57C170AB09A12DE400FAF325 /* xtime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C1709E09A12DE400FAF325 /* xtime.cpp */; }; + 57C4868E0C31299E002D79F1 /* hugin_math.h in Headers */ = {isa = PBXBuildFile; fileRef = 57C4868D0C31299E002D79F1 /* hugin_math.h */; }; + 57C486C60C312BA8002D79F1 /* Vector3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C486C50C312BA8002D79F1 /* Vector3.cpp */; }; + 57C487360C313A2C002D79F1 /* Matrix3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C487350C313A2C002D79F1 /* Matrix3.cpp */; }; 57CBEE2C06BC713500C43FF5 /* gif.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0A06BC2301004F4FA7 /* gif.cxx */; }; 57CBEE2D06BC713C00C43FF5 /* imageinfo.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0C06BC2301004F4FA7 /* imageinfo.cxx */; }; 57CBEE2E06BC713F00C43FF5 /* jpeg.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0D06BC2301004F4FA7 /* jpeg.cxx */; }; @@ -190,441 +101,35 @@ 57CBEE3206BC715C00C43FF5 /* tiff.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F1606BC2301004F4FA7 /* tiff.cxx */; }; 57CBEE3306BC716200C43FF5 /* viff.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F1806BC2301004F4FA7 /* viff.cxx */; }; 57CBEE3406BC716600C43FF5 /* void_vector.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F1A06BC2301004F4FA7 /* void_vector.cxx */; }; - 57CBEE9A06BC777E00C43FF5 /* ImageCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F2A06BC2301004F4FA7 /* ImageCache.cpp */; }; - 57CBEE9B06BC777E00C43FF5 /* MyProgressDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F3406BC2301004F4FA7 /* MyProgressDialog.cpp */; }; - 57CBEEED06BC7A3E00C43FF5 /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; - 57CBEEEE06BC7AF800C43FF5 /* nona.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5711506106BC2303004F4FA7 /* nona.cpp */; }; - 57CBEEF706BC7B7C00C43FF5 /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; - 57CBEFC306BC7E8F00C43FF5 /* huginApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F2906BC2301004F4FA7 /* huginApp.cpp */; }; - 57CBEFC406BC7E8F00C43FF5 /* ImagesList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F2E06BC2301004F4FA7 /* ImagesList.cpp */; }; - 57CBEFC506BC7E8F00C43FF5 /* AutoCtrlPointCreator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F1F06BC2301004F4FA7 /* AutoCtrlPointCreator.cpp */; }; - 57CBEFC606BC7E8F00C43FF5 /* MainFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F3206BC2301004F4FA7 /* MainFrame.cpp */; }; - 57CBEFC706BC7E8F00C43FF5 /* CPImageCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F2406BC2301004F4FA7 /* CPImageCtrl.cpp */; }; - 57CBEFC806BC7E8F00C43FF5 /* CPEditorPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F2106BC2301004F4FA7 /* CPEditorPanel.cpp */; }; - 57CBEFC906BC7E8F00C43FF5 /* LensPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F3106BC2301004F4FA7 /* LensPanel.cpp */; }; - 57CBEFCA06BC7E8F00C43FF5 /* ImagesPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F2F06BC2301004F4FA7 /* ImagesPanel.cpp */; }; - 57CBEFCC06BC7E8F00C43FF5 /* CommandHistory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F2006BC2301004F4FA7 /* CommandHistory.cpp */; }; - 57CBEFCD06BC7E8F00C43FF5 /* PanoPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F3806BC2301004F4FA7 /* PanoPanel.cpp */; }; - 57CBEFCE06BC7E8F00C43FF5 /* NonaStitcherPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F3506BC2301004F4FA7 /* NonaStitcherPanel.cpp */; }; - 57CBEFCF06BC7E8F00C43FF5 /* PTStitcherPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F3F06BC2302004F4FA7 /* PTStitcherPanel.cpp */; }; - 57CBEFD006BC7E8F00C43FF5 /* PreviewFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F3D06BC2302004F4FA7 /* PreviewFrame.cpp */; }; - 57CBEFD106BC7E8F00C43FF5 /* PreviewPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F3E06BC2302004F4FA7 /* PreviewPanel.cpp */; }; - 57CBEFD306BC7E8F00C43FF5 /* OptimizePanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F3606BC2301004F4FA7 /* OptimizePanel.cpp */; }; - 57CBEFD506BC7E8F00C43FF5 /* RunStitcherFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F4106BC2302004F4FA7 /* RunStitcherFrame.cpp */; }; - 57CBEFD606BC7E8F00C43FF5 /* CPListFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F2506BC2301004F4FA7 /* CPListFrame.cpp */; }; - 57CBEFD706BC7E8F00C43FF5 /* TextKillFocusHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F4306BC2302004F4FA7 /* TextKillFocusHandler.cpp */; }; - 57CBEFDA06BC7E8F00C43FF5 /* PanoDruid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57114F3706BC2301004F4FA7 /* PanoDruid.cpp */; }; - 57CF89C406BCA06B00998705 /* HuginOSX.icns in Resources */ = {isa = PBXBuildFile; fileRef = 57114EA006BC2301004F4FA7 /* HuginOSX.icns */; }; - 57CF928906BD7B7000780AC5 /* nona_gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5711501C06BC2303004F4FA7 /* nona_gui.cpp */; }; - 57CF928A06BD7B7800780AC5 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9B067B80F000A6EDD4 /* Carbon.framework */; }; - 57CF928B06BD7B7800780AC5 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9C067B80F000A6EDD4 /* Cocoa.framework */; }; - 57CF928C06BD7B7800780AC5 /* libcommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5750CC8606774D0300B049DC /* libcommon.a */; }; - 57CF928D06BD7B7800780AC5 /* libhuginwxutils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F987067B696900A6EDD4 /* libhuginwxutils.a */; }; - 57CF928E06BD7B7800780AC5 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; - 57CF928F06BD7B7800780AC5 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; - 57CF929006BD7B7800780AC5 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; - 57CF929206BD7B7800780AC5 /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; - 57CF929306BD7B7800780AC5 /* libpanorama.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F92E067B654900A6EDD4 /* libpanorama.a */; }; - 57CF929406BD7B7800780AC5 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; - 57CF929506BD7B7800780AC5 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; - 57CF929706BD7B7800780AC5 /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; - 57CF929906BD7B7800780AC5 /* libwx_macu-2.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.7.a */; }; - 57CF929F06BD7B7800780AC5 /* libwxregexu-2.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989565068E2FA3009F90BF /* libwxregexu-2.7.a */; }; - 57CF92A006BD7B7800780AC5 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; - 57CF92A106BD7B7800780AC5 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 573C3861067C789F00A5DBE0 /* System.framework */; }; - 57CF92A206BD7B7800780AC5 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 573C3862067C789F00A5DBE0 /* WebKit.framework */; }; - 57D14A4806B8A3D100D8A03D /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; - 57D30901074433490006004D /* libpthread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989595068E2FEC009F90BF /* libpthread.dylib */; }; - 57D5DCF3073FE2CF0027E52F /* PreferencesDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57D5DCF2073FE2CF0027E52F /* PreferencesDialog.cpp */; }; - 57D70EE50A8BEB4800AB281E /* enblend in CopyFiles */ = {isa = PBXBuildFile; fileRef = 570D581A082A9ED50030E768 /* enblend */; }; - 57DEBDB908E8947B008F6E81 /* libhuginwxutils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F987067B696900A6EDD4 /* libhuginwxutils.a */; }; - 57E7827A0681074B0070F6AA /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9B067B80F000A6EDD4 /* Carbon.framework */; }; - 57E7827B0681074B0070F6AA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9C067B80F000A6EDD4 /* Cocoa.framework */; }; - 57E7827C0681074B0070F6AA /* libcommon.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5750CC8606774D0300B049DC /* libcommon.a */; }; - 57E7827E0681074B0070F6AA /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; - 57E782810681074B0070F6AA /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; - 57E782820681074B0070F6AA /* libpanorama.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F92E067B654900A6EDD4 /* libpanorama.a */; }; - 57E782900681074B0070F6AA /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 573C3861067C789F00A5DBE0 /* System.framework */; }; - 57E782910681074B0070F6AA /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 573C3862067C789F00A5DBE0 /* WebKit.framework */; }; - 57EEC3EF08CD09CA00B6A197 /* LocalizedFileTipProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EEC3EE08CD09C900B6A197 /* LocalizedFileTipProvider.cpp */; }; /* End PBXBuildFile section */ -/* Begin PBXBuildRule section */ - 57177E890677815800A367AE /* PBXBuildRule */ = { - isa = PBXBuildRule; - compilerSpec = com.apple.compilers.gcc; - filePatterns = "*.hxx"; - fileType = sourcecode.cpp; - isEditable = 1; - outputFiles = ( - ); - script = ""; - }; -/* End PBXBuildRule section */ - /* Begin PBXContainerItemProxy section */ - 5700FE2A0681E72A00B01AE2 /* PBXContainerItemProxy */ = { + 5771F63E0C3011D700736343 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4; - remoteInfo = jhead; + remoteGlobalIDString = 5771F5D60C3006E900736343; + remoteInfo = hugin_utils; }; - 5700FE2C0681E72A00B01AE2 /* PBXContainerItemProxy */ = { + 5771F76B0C30206E00736343 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5750CC8506774D0300B049DC; - remoteInfo = common; + remoteGlobalIDString = 5771F7440C30202B00736343; + remoteInfo = boost_thread; }; - 5700FE320681E72A00B01AE2 /* PBXContainerItemProxy */ = { + 57C4864A0C31240A002D79F1 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5749F92D067B654900A6EDD4; - remoteInfo = panorama; + remoteGlobalIDString = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + remoteInfo = "copy hugin_config.h"; }; - 570878D5067BC5770057B4D7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5749FA15067B7DE400A6EDD4; - remoteInfo = lib; - }; - 5720E49C0BD4578100E63404 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5720E4720BD456CD00E63404; - remoteInfo = levmar; - }; - 5720E4A10BD457C900E63404 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5720E4720BD456CD00E63404; - remoteInfo = levmar; - }; - 573B8FD8067BAC6200B7B355 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4; - remoteInfo = jhead; - }; - 573B8FDA067BAC6200B7B355 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5750CC8506774D0300B049DC; - remoteInfo = common; - }; - 573B8FDE067BAC6200B7B355 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5749F92D067B654900A6EDD4; - remoteInfo = panorama; - }; - 573F338E09F7AB110088B333 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4; - remoteInfo = jhead; - }; - 573F339009F7AB110088B333 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5750CC8506774D0300B049DC; - remoteInfo = common; - }; - 573F339209F7AB110088B333 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5749F92D067B654900A6EDD4; - remoteInfo = panorama; - }; - 573F339409F7AB110088B333 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5711524906BC6709004F4FA7; - remoteInfo = vigra_impex; - }; - 573F33C809F7ABB70088B333 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 57C1705809A125DE00FAF325; - remoteInfo = vigra_ext; - }; - 573F33CD09F7AC260088B333 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4; - remoteInfo = jhead; - }; - 573F33CF09F7AC260088B333 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5750CC8506774D0300B049DC; - remoteInfo = common; - }; - 573F33D109F7AC260088B333 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5749F92D067B654900A6EDD4; - remoteInfo = panorama; - }; - 573F33D309F7AC260088B333 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5711524906BC6709004F4FA7; - remoteInfo = vigra_impex; - }; - 573F33F009F7AC690088B333 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 57C1705809A125DE00FAF325; - remoteInfo = vigra_ext; - }; - 573F33F809F7AD8F0088B333 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 573F33CB09F7AC260088B333; - remoteInfo = fulla; - }; - 573F33FA09F7AD8F0088B333 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 573F33AA09F7AB190088B333; - remoteInfo = color_correct_tiff; - }; - 573F33FC09F7AD8F0088B333 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 573F338C09F7AB110088B333; - remoteInfo = zhang_undistort; - }; - 573F33FE09F7AD9A0088B333 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 57452B99094E3C7400E6B672; - remoteInfo = autooptimiser; - }; - 573F340009F7ADA70088B333 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 573B8FD5067BAC4600B7B355; - remoteInfo = nona; - }; - 57452B9B094E3C7400E6B672 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4; - remoteInfo = jhead; - }; - 57452B9D094E3C7400E6B672 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5750CC8506774D0300B049DC; - remoteInfo = common; - }; - 57452B9F094E3C7400E6B672 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5749F92D067B654900A6EDD4; - remoteInfo = panorama; - }; - 57452BA1094E3C7400E6B672 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5711524906BC6709004F4FA7; - remoteInfo = vigra_impex; - }; - 57452BCA094E3D6C00E6B672 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 573B9036067BADC600B7B355; - remoteInfo = tools; - }; - 57452BCC094E3D6E00E6B672 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 573B8F54067BA9CF00B7B355; - remoteInfo = apps; - }; - 5749FA16067B7E0A00A6EDD4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4; - remoteInfo = jhead; - }; - 5749FA1A067B7E0A00A6EDD4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5750CC8506774D0300B049DC; - remoteInfo = common; - }; - 5749FA1E067B7E0A00A6EDD4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5749F92D067B654900A6EDD4; - remoteInfo = panorama; - }; - 5749FA20067B7E0A00A6EDD4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5749F986067B696900A6EDD4; - remoteInfo = wximageproc; - }; - 574F3F38082006B80086E561 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5749F986067B696900A6EDD4; - remoteInfo = huginwxutils; - }; - 579354B006EAA70F003F2DE7 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5711524906BC6709004F4FA7; - remoteInfo = vigra_impex; - }; - 57C1707409A1262900FAF325 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 57C1705809A125DE00FAF325; - remoteInfo = vigra_ext; - }; - 57C1707609A1263300FAF325 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 57C1705809A125DE00FAF325; - remoteInfo = vigra_ext; - }; - 57C1707809A1263A00FAF325 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 57C1705809A125DE00FAF325; - remoteInfo = vigra_ext; - }; - 57C1707A09A1264E00FAF325 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 57C1705809A125DE00FAF325; - remoteInfo = vigra_ext; - }; - 57CBEFDD06BC7F4E00C43FF5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 57E7825E068107210070F6AA; - remoteInfo = HuginOSX; - }; - 57CBEFE106BC853000C43FF5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5711524906BC6709004F4FA7; - remoteInfo = vigra_impex; - }; - 57CF92A306BD7BBE00780AC5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 57CF926806BD7AD100780AC5; - remoteInfo = "nona_gui OSX"; - }; - 57DD5A8908490C1A006C50E4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4; - remoteInfo = jhead; - }; - 57DD5A8B08490C1A006C50E4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5750CC8506774D0300B049DC; - remoteInfo = common; - }; - 57DD5A8D08490C1A006C50E4 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5749F92D067B654900A6EDD4; - remoteInfo = panorama; - }; - 57DEBDAA08E89456008F6E81 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5749F986067B696900A6EDD4; - remoteInfo = huginwxutils; - }; - 57DF5F490943BD9B00D67E88 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5711524906BC6709004F4FA7; - remoteInfo = vigra_impex; - }; - 57DF5F4D0943BDBC00D67E88 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; - proxyType = 1; - remoteGlobalIDString = 5711524906BC6709004F4FA7; - remoteInfo = vigra_impex; - }; /* End PBXContainerItemProxy section */ -/* Begin PBXCopyFilesBuildPhase section */ - 57D70EE30A8BEB2F00AB281E /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 6; - files = ( - 57D70EE50A8BEB4800AB281E /* enblend in CopyFiles */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXCopyFilesBuildPhase section */ - /* Begin PBXFileReference section */ 5702996D07F967CB00F1FF15 /* HuginFiles.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = HuginFiles.icns; sourceTree = "<group>"; }; 570D581A082A9ED50030E768 /* enblend */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = enblend; path = bin/enblend; sourceTree = "<group>"; }; - 570E7B5206FC917900D23E0D /* zhang_undistort.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = zhang_undistort.cpp; sourceTree = "<group>"; }; 57114E9F06BC2301004F4FA7 /* HuginOSX-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "HuginOSX-Info.plist"; sourceTree = "<group>"; }; 57114EA006BC2301004F4FA7 /* HuginOSX.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = HuginOSX.icns; sourceTree = "<group>"; }; 57114F0206BC2301004F4FA7 /* auto_file.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = auto_file.hxx; sourceTree = "<group>"; }; @@ -651,102 +156,13 @@ 57114F1906BC2301004F4FA7 /* viff.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = viff.hxx; sourceTree = "<group>"; }; 57114F1A06BC2301004F4FA7 /* void_vector.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = void_vector.cxx; sourceTree = "<group>"; }; 57114F1B06BC2301004F4FA7 /* void_vector.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = void_vector.hxx; sourceTree = "<group>"; }; - 57114F1F06BC2301004F4FA7 /* AutoCtrlPointCreator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = AutoCtrlPointCreator.cpp; sourceTree = "<group>"; }; - 57114F2006BC2301004F4FA7 /* CommandHistory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CommandHistory.cpp; sourceTree = "<group>"; }; - 57114F2106BC2301004F4FA7 /* CPEditorPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CPEditorPanel.cpp; sourceTree = "<group>"; }; - 57114F2406BC2301004F4FA7 /* CPImageCtrl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CPImageCtrl.cpp; sourceTree = "<group>"; }; - 57114F2506BC2301004F4FA7 /* CPListFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CPListFrame.cpp; sourceTree = "<group>"; }; - 57114F2906BC2301004F4FA7 /* huginApp.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = huginApp.cpp; sourceTree = "<group>"; }; - 57114F2A06BC2301004F4FA7 /* ImageCache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ImageCache.cpp; sourceTree = "<group>"; }; - 57114F2E06BC2301004F4FA7 /* ImagesList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ImagesList.cpp; sourceTree = "<group>"; }; - 57114F2F06BC2301004F4FA7 /* ImagesPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ImagesPanel.cpp; sourceTree = "<group>"; }; - 57114F3106BC2301004F4FA7 /* LensPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = LensPanel.cpp; sourceTree = "<group>"; }; - 57114F3206BC2301004F4FA7 /* MainFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MainFrame.cpp; sourceTree = "<group>"; }; - 57114F3406BC2301004F4FA7 /* MyProgressDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MyProgressDialog.cpp; sourceTree = "<group>"; }; - 57114F3506BC2301004F4FA7 /* NonaStitcherPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = NonaStitcherPanel.cpp; sourceTree = "<group>"; }; - 57114F3606BC2301004F4FA7 /* OptimizePanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = OptimizePanel.cpp; sourceTree = "<group>"; }; - 57114F3706BC2301004F4FA7 /* PanoDruid.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PanoDruid.cpp; sourceTree = "<group>"; }; - 57114F3806BC2301004F4FA7 /* PanoPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PanoPanel.cpp; sourceTree = "<group>"; }; - 57114F3D06BC2302004F4FA7 /* PreviewFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PreviewFrame.cpp; sourceTree = "<group>"; }; - 57114F3E06BC2302004F4FA7 /* PreviewPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PreviewPanel.cpp; sourceTree = "<group>"; }; - 57114F3F06BC2302004F4FA7 /* PTStitcherPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PTStitcherPanel.cpp; sourceTree = "<group>"; }; - 57114F4106BC2302004F4FA7 /* RunStitcherFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RunStitcherFrame.cpp; sourceTree = "<group>"; }; - 57114F4306BC2302004F4FA7 /* TextKillFocusHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextKillFocusHandler.cpp; sourceTree = "<group>"; }; - 57114F4406BC2302004F4FA7 /* UniversalCursor.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = UniversalCursor.cpp; sourceTree = "<group>"; }; - 57114F4506BC2302004F4FA7 /* win_prep.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = win_prep.h; sourceTree = "<group>"; }; - 57114F9D06BC2302004F4FA7 /* Command.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Command.h; sourceTree = "<group>"; }; - 57114F9E06BC2302004F4FA7 /* graph.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = graph.h; sourceTree = "<group>"; }; - 57114F9F06BC2302004F4FA7 /* math.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = math.h; sourceTree = "<group>"; }; - 57114FA006BC2302004F4FA7 /* Matrix3.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Matrix3.h; sourceTree = "<group>"; }; - 57114FA106BC2302004F4FA7 /* platform.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = platform.h; sourceTree = "<group>"; }; - 57114FA206BC2302004F4FA7 /* stl_utils.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = stl_utils.h; sourceTree = "<group>"; }; - 57114FA306BC2302004F4FA7 /* utils.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; }; - 57114FA406BC2302004F4FA7 /* Vector3.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Vector3.h; sourceTree = "<group>"; }; - 57114FA706BC2302004F4FA7 /* AnchorPositionCtrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AnchorPositionCtrl.h; sourceTree = "<group>"; }; - 57114FA806BC2302004F4FA7 /* AutoCtrlPointCreator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AutoCtrlPointCreator.h; sourceTree = "<group>"; }; - 57114FA906BC2302004F4FA7 /* CommandHistory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CommandHistory.h; sourceTree = "<group>"; }; - 57114FAB06BC2302004F4FA7 /* CPEditorPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CPEditorPanel.h; sourceTree = "<group>"; }; - 57114FAC06BC2302004F4FA7 /* CPEditorPanelHandler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CPEditorPanelHandler.h; sourceTree = "<group>"; }; - 57114FAD06BC2302004F4FA7 /* CPEditorTest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CPEditorTest.h; sourceTree = "<group>"; }; - 57114FAE06BC2302004F4FA7 /* CPImageCtrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CPImageCtrl.h; sourceTree = "<group>"; }; - 57114FAF06BC2302004F4FA7 /* CPListFrame.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CPListFrame.h; sourceTree = "<group>"; }; - 57114FB006BC2302004F4FA7 /* huginApp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = huginApp.h; sourceTree = "<group>"; }; - 57114FB106BC2302004F4FA7 /* ImageCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageCache.h; sourceTree = "<group>"; }; - 57114FB506BC2302004F4FA7 /* ImageProcessing.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageProcessing.h; sourceTree = "<group>"; }; - 57114FB606BC2302004F4FA7 /* ImagesList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImagesList.h; sourceTree = "<group>"; }; - 57114FB706BC2302004F4FA7 /* Im... [truncated message content] |
From: <ip...@us...> - 2007-06-26 12:33:41
|
Revision: 2164 http://hugin.svn.sourceforge.net/hugin/?rev=2164&view=rev Author: ippei Date: 2007-06-26 05:33:39 -0700 (Tue, 26 Jun 2007) Log Message: ----------- vigra_ext compiles okay Modified Paths: -------------- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj hugin/branches/ippei/src/hugin_base/vigra_ext/MultiThreadOperations.h hugin/branches/ippei/src/hugin_base/vigra_ext/utils.h Modified: hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-06-26 12:17:41 UTC (rev 2163) +++ hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-06-26 12:33:39 UTC (rev 2164) @@ -122,7 +122,7 @@ isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; /* End PBXContainerItemProxy section */ @@ -130,8 +130,8 @@ /* Begin PBXFileReference section */ 5702996D07F967CB00F1FF15 /* HuginFiles.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = HuginFiles.icns; sourceTree = "<group>"; }; 570D581A082A9ED50030E768 /* enblend */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = enblend; path = bin/enblend; sourceTree = "<group>"; }; - 57114E9F06BC2301004F4FA7 /* HuginOSX-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "HuginOSX-Info.plist"; sourceTree = "<group>"; }; - 57114EA006BC2301004F4FA7 /* HuginOSX.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = HuginOSX.icns; sourceTree = "<group>"; }; + 57114E9F06BC2301004F4FA7 /* Hugin-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "Hugin-Info.plist"; sourceTree = "<group>"; }; + 57114EA006BC2301004F4FA7 /* Hugin.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Hugin.icns; sourceTree = "<group>"; }; 57114F0206BC2301004F4FA7 /* auto_file.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = auto_file.hxx; sourceTree = "<group>"; }; 57114F0306BC2301004F4FA7 /* bmp.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = bmp.cxx; sourceTree = "<group>"; }; 57114F0406BC2301004F4FA7 /* bmp.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = bmp.hxx; sourceTree = "<group>"; }; @@ -286,7 +286,6 @@ 5749FA9C067B80F000A6EDD4 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = "<group>"; }; 574F3EBC081FF2350086E561 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = System/Library/Frameworks/QuickTime.framework; sourceTree = "<group>"; }; 574F3F2E082005980086E561 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = "<group>"; }; - 5751D8630939F1E9001477EA /* project.pbxproj */ = {isa = PBXFileReference; lastKnownFileType = text.pbxproject; name = project.pbxproj; path = HuginOSX.xcodeproj/project.pbxproj; sourceTree = "<group>"; }; 577092FA06BD7388004058A1 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = lib/libpng.a; sourceTree = "<group>"; }; 577092FB06BD7388004058A1 /* libtiff.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtiff.a; path = lib/libtiff.a; sourceTree = "<group>"; }; 5771F4D90C2FEE0900736343 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; }; @@ -345,6 +344,7 @@ 577786100BF347B80041F8FF /* libIex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libIex.a; path = lib/libIex.a; sourceTree = "<group>"; }; 577786110BF347B80041F8FF /* libIlmThread.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libIlmThread.a; path = lib/libIlmThread.a; sourceTree = "<group>"; }; 577786180BF348E90041F8FF /* libHalf.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libHalf.a; path = lib/libHalf.a; sourceTree = "<group>"; }; + 578414E10C313E7500546EAD /* project.pbxproj */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.pbxproject; name = project.pbxproj; path = Hugin.xcodeproj/project.pbxproj; sourceTree = "<group>"; }; 578ECFFC0A8D0C150028A7FB /* hdr.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hdr.cxx; sourceTree = "<group>"; }; 578ECFFD0A8D0C160028A7FB /* hdr.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = hdr.hxx; sourceTree = "<group>"; }; 578ECFFE0A8D0C160028A7FB /* rgbe.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = rgbe.c; sourceTree = "<group>"; }; @@ -408,11 +408,11 @@ 57114E9E06BC2301004F4FA7 /* mac */ = { isa = PBXGroup; children = ( - 5751D8600939F1C0001477EA /* HuginOSX.xcodeproj */, - 57114E9F06BC2301004F4FA7 /* HuginOSX-Info.plist */, + 5751D8600939F1C0001477EA /* Hugin.xcodeproj */, + 57114E9F06BC2301004F4FA7 /* Hugin-Info.plist */, 57CF926B06BD7AD100780AC5 /* nona_gui-Info.plist */, 57A91BD707FD85E30013AE47 /* autopano-complete-mac.sh */, - 57114EA006BC2301004F4FA7 /* HuginOSX.icns */, + 57114EA006BC2301004F4FA7 /* Hugin.icns */, 5702996D07F967CB00F1FF15 /* HuginFiles.icns */, 57B8C693083AB7F400283C06 /* localised.sh */, 573E2E440B76AC5100E86281 /* ExternalPrograms */, @@ -717,12 +717,12 @@ path = /Developer/SDKs/MacOSX10.4u.sdk; sourceTree = "<absolute>"; }; - 5751D8600939F1C0001477EA /* HuginOSX.xcodeproj */ = { + 5751D8600939F1C0001477EA /* Hugin.xcodeproj */ = { isa = PBXGroup; children = ( - 5751D8630939F1E9001477EA /* project.pbxproj */, + 578414E10C313E7500546EAD /* project.pbxproj */, ); - name = HuginOSX.xcodeproj; + name = Hugin.xcodeproj; sourceTree = "<group>"; }; 5771F4D80C2FEE0900736343 /* jhead */ = { @@ -889,7 +889,7 @@ path = src; sourceTree = "<group>"; }; - 57CCCC23086C9530000EBC4A /* attached */ = { + 57CCCC23086C9530000EBC4A /* hugin-new */ = { isa = PBXGroup; children = ( 57CCCC5C086C9651000EBC4A /* utils */, @@ -904,9 +904,9 @@ 57CCCC4E086C957E000EBC4A /* README */, 57CCCC50086C957E000EBC4A /* TODO */, ); - name = attached; - path = /Users/ippei/dev/hugin/hugin; - sourceTree = "<absolute>"; + name = "hugin-new"; + path = ..; + sourceTree = SOURCE_ROOT; }; 57FC3ABD0675E43600C3E0AC = { isa = PBXGroup; @@ -917,7 +917,7 @@ 57C1708E09A12D7500FAF325 /* boost */, 5745FC05094E1D5400E6B672 /* External */, 573B8F3E067BA2EB00B7B355 /* Product */, - 57CCCC23086C9530000EBC4A /* attached */, + 57CCCC23086C9530000EBC4A /* hugin-new */, ); sourceTree = "<group>"; }; Modified: hugin/branches/ippei/src/hugin_base/vigra_ext/MultiThreadOperations.h =================================================================== --- hugin/branches/ippei/src/hugin_base/vigra_ext/MultiThreadOperations.h 2007-06-26 12:17:41 UTC (rev 2163) +++ hugin/branches/ippei/src/hugin_base/vigra_ext/MultiThreadOperations.h 2007-06-26 12:33:39 UTC (rev 2164) @@ -24,9 +24,11 @@ #ifndef _MULTITHREADOPERATIONS_H #define _MULTITHREADOPERATIONS_H + #include <boost/thread.hpp> #include <boost/bind.hpp> +#include <hugin_utils/utils.h> #include <vigra/utilities.hxx> namespace vigra_ext Modified: hugin/branches/ippei/src/hugin_base/vigra_ext/utils.h =================================================================== --- hugin/branches/ippei/src/hugin_base/vigra_ext/utils.h 2007-06-26 12:17:41 UTC (rev 2163) +++ hugin/branches/ippei/src/hugin_base/vigra_ext/utils.h 2007-06-26 12:33:39 UTC (rev 2164) @@ -26,7 +26,7 @@ #ifndef VIGRA_EXT_UTILS_H #define VIGRA_EXT_UTILS_H -#include <common/math.h> +#include <hugin_math/math.h> #include <vigra/rgbvalue.hxx> #include <vigra/transformimage.hxx> #include <cmath> @@ -559,7 +559,7 @@ { float scale = float(max) - min; for (int i=0; i<65536; i++) { - lut[i] = utils::roundi(pow((float(i)-min)/scale, gamma)*255); + lut[i] = hugin_utils::roundi(pow((float(i)-min)/scale, gamma)*255); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2007-06-28 17:23:03
|
Revision: 2189 http://hugin.svn.sourceforge.net/hugin/?rev=2189&view=rev Author: ippei Date: 2007-06-28 10:22:58 -0700 (Thu, 28 Jun 2007) Log Message: ----------- misc. Modified Paths: -------------- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj hugin/branches/ippei/src/hugin_base/algorithms/PointSampler.h hugin/branches/ippei/src/hugin_base/panotools/PanoToolsOptimizerWrapper.h hugin/branches/ippei/src/hugin_base/vigra_ext/ImageTransforms.h hugin/branches/ippei/src/hugin_base/vigra_ext/MultiThreadOperations.h hugin/branches/ippei/src/hugin_base/vigra_ext/utils.h Modified: hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-06-28 17:19:40 UTC (rev 2188) +++ hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-06-28 17:22:58 UTC (rev 2189) @@ -24,6 +24,13 @@ 571152F806BC6E4C004F4FA7 /* bmp.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0306BC2301004F4FA7 /* bmp.cxx */; }; 571152F906BC6E58004F4FA7 /* byteorder.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0506BC2301004F4FA7 /* byteorder.cxx */; }; 571152FE06BC6E8E004F4FA7 /* codecmanager.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0706BC2301004F4FA7 /* codecmanager.cxx */; }; + 571300790C33D44400252FE3 /* PanoToolsInterface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5713006F0C33D43B00252FE3 /* PanoToolsInterface.cpp */; }; + 5713007A0C33D44400252FE3 /* PanoToolsInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 571300700C33D43B00252FE3 /* PanoToolsInterface.h */; }; + 5713007B0C33D44400252FE3 /* PanoToolsOptimizerWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 571300710C33D43B00252FE3 /* PanoToolsOptimizerWrapper.cpp */; }; + 5713007C0C33D44400252FE3 /* PanoToolsOptimizerWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 571300720C33D43B00252FE3 /* PanoToolsOptimizerWrapper.h */; }; + 571300830C33D49200252FE3 /* PanoramaOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 571300810C33D49200252FE3 /* PanoramaOptions.cpp */; }; + 571300840C33D49200252FE3 /* PanoramaOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 571300820C33D49200252FE3 /* PanoramaOptions.h */; }; + 5713010B0C33E3DD00252FE3 /* PanoramaData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5713010A0C33E3DD00252FE3 /* PanoramaData.h */; }; 5720E4900BD4575000E63404 /* Axb.c in Sources */ = {isa = PBXBuildFile; fileRef = 5720E47C0BD4575000E63404 /* Axb.c */; }; 5720E4920BD4575000E63404 /* lm.c in Sources */ = {isa = PBXBuildFile; fileRef = 5720E4850BD4575000E63404 /* lm.c */; }; 5720E4940BD4575000E63404 /* lmbc.c in Sources */ = {isa = PBXBuildFile; fileRef = 5720E4880BD4575000E63404 /* lmbc.c */; }; @@ -112,6 +119,7 @@ 577785FD0BF3439D0041F8FF /* exr.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 577785FB0BF3439D0041F8FF /* exr.cxx */; }; 578ED0000A8D0C160028A7FB /* hdr.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 578ECFFC0A8D0C150028A7FB /* hdr.cxx */; }; 578ED0010A8D0C160028A7FB /* rgbe.c in Sources */ = {isa = PBXBuildFile; fileRef = 578ECFFE0A8D0C160028A7FB /* rgbe.c */; }; + 5797B9ED0C33EB4D00F3DEE6 /* DestPanoImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5797B9EC0C33EB4D00F3DEE6 /* DestPanoImage.h */; }; 57C4868E0C31299E002D79F1 /* hugin_math.h in Headers */ = {isa = PBXBuildFile; fileRef = 57C4868D0C31299E002D79F1 /* hugin_math.h */; }; 57C486C60C312BA8002D79F1 /* Vector3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C486C50C312BA8002D79F1 /* Vector3.cpp */; }; 57C487360C313A2C002D79F1 /* Matrix3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C487350C313A2C002D79F1 /* Matrix3.cpp */; }; @@ -182,6 +190,14 @@ 5711524A06BC6709004F4FA7 /* libvigra_impex.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libvigra_impex.a; sourceTree = BUILT_PRODUCTS_DIR; }; 57115FB60B7778FE00B522DF /* scripts */ = {isa = PBXFileReference; lastKnownFileType = folder; path = scripts; sourceTree = "<group>"; }; 5711F7E6094F3F3800F668CD /* setup.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = setup.h; path = "lib/wx/include/mac-unicode-release-static-2.7/wx/setup.h"; sourceTree = "<group>"; }; + 571300650C33D41F00252FE3 /* libhugin_panotools.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_panotools.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 5713006F0C33D43B00252FE3 /* PanoToolsInterface.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PanoToolsInterface.cpp; sourceTree = "<group>"; }; + 571300700C33D43B00252FE3 /* PanoToolsInterface.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PanoToolsInterface.h; sourceTree = "<group>"; }; + 571300710C33D43B00252FE3 /* PanoToolsOptimizerWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PanoToolsOptimizerWrapper.cpp; sourceTree = "<group>"; }; + 571300720C33D43B00252FE3 /* PanoToolsOptimizerWrapper.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PanoToolsOptimizerWrapper.h; sourceTree = "<group>"; }; + 571300810C33D49200252FE3 /* PanoramaOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PanoramaOptions.cpp; sourceTree = "<group>"; }; + 571300820C33D49200252FE3 /* PanoramaOptions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PanoramaOptions.h; sourceTree = "<group>"; }; + 5713010A0C33E3DD00252FE3 /* PanoramaData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PanoramaData.h; sourceTree = "<group>"; }; 5720E47A0BD456CD00E63404 /* liblevmar.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblevmar.a; sourceTree = BUILT_PRODUCTS_DIR; }; 5720E47C0BD4575000E63404 /* Axb.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = Axb.c; sourceTree = "<group>"; }; 5720E47D0BD4575000E63404 /* Axb_core.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = Axb_core.c; sourceTree = "<group>"; }; @@ -397,7 +413,8 @@ 578ECFFD0A8D0C160028A7FB /* hdr.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = hdr.hxx; sourceTree = "<group>"; }; 578ECFFE0A8D0C160028A7FB /* rgbe.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = rgbe.c; sourceTree = "<group>"; }; 578ECFFF0A8D0C160028A7FB /* rgbe.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = rgbe.h; sourceTree = "<group>"; }; - 57906E890C105F7B00A6C3FE /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = ../src; sourceTree = "<group>"; }; + 57906E890C105F7B00A6C3FE /* hugin_base */ = {isa = PBXFileReference; lastKnownFileType = folder; name = hugin_base; path = ../src/hugin_base; sourceTree = "<group>"; }; + 5797B9EC0C33EB4D00F3DEE6 /* DestPanoImage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DestPanoImage.h; sourceTree = "<group>"; }; 57989544068E2F22009F90BF /* libwx_macu-2.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libwx_macu-2.7.a"; path = "lib/libwx_macu-2.7.a"; sourceTree = "<group>"; }; 57989545068E2F22009F90BF /* libwxexpat-2.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libwxexpat-2.7.a"; path = "lib/libwxexpat-2.7.a"; sourceTree = "<group>"; }; 57989565068E2FA3009F90BF /* libwxregexu-2.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libwxregexu-2.7.a"; path = "lib/libwxregexu-2.7.a"; sourceTree = "<group>"; }; @@ -623,6 +640,17 @@ path = ..; sourceTree = "<group>"; }; + 5713006E0C33D43B00252FE3 /* panotools */ = { + isa = PBXGroup; + children = ( + 5713006F0C33D43B00252FE3 /* PanoToolsInterface.cpp */, + 571300700C33D43B00252FE3 /* PanoToolsInterface.h */, + 571300710C33D43B00252FE3 /* PanoToolsOptimizerWrapper.cpp */, + 571300720C33D43B00252FE3 /* PanoToolsOptimizerWrapper.h */, + ); + path = panotools; + sourceTree = "<group>"; + }; 5720E47B0BD4575000E63404 /* levmar */ = { isa = PBXGroup; children = ( @@ -657,9 +685,12 @@ 573B8F3F067BA2F900B7B355 /* lib */ = { isa = PBXGroup; children = ( + 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */, + 5759DA4F0C327D680043F754 /* libhugin_panodata.a */, + 571300650C33D41F00252FE3 /* libhugin_panotools.a */, 5771F5D70C3006E900736343 /* libhugin_utils.a */, + 5771F77A0C30216F00736343 /* libhugin_math.a */, 5771F7450C30202B00736343 /* libboost_thread.a */, - 5771F77A0C30216F00736343 /* libhugin_math.a */, 5720E47A0BD456CD00E63404 /* liblevmar.a */, 5749F8A3067B60CA00A6EDD4 /* libjhead.a */, 57C1706C09A125DE00FAF325 /* libvigra_ext.a */, @@ -798,10 +829,14 @@ children = ( 5759EF250C32B1740043F754 /* ControlPoint.cpp */, 5759EF260C32B1740043F754 /* ControlPoint.h */, + 5797B9EC0C33EB4D00F3DEE6 /* DestPanoImage.h */, 5759DA5F0C327DC90043F754 /* PanoImage.cpp */, 5759EF770C32B69F0043F754 /* Lens.cpp */, 5759EF780C32B69F0043F754 /* Lens.h */, 5759DA600C327DC90043F754 /* PanoImage.h */, + 5713010A0C33E3DD00252FE3 /* PanoramaData.h */, + 571300810C33D49200252FE3 /* PanoramaOptions.cpp */, + 571300820C33D49200252FE3 /* PanoramaOptions.h */, 5759EE7B0C32A9FA0043F754 /* PanoramaVariable.cpp */, 5759EE7D0C32AA050043F754 /* PanoramaVariable.h */, 5759EEE00C32AE100043F754 /* SrcPanoImage.cpp */, @@ -829,6 +864,7 @@ 5771F7BF0C3021B000736343 /* hugin_math */, 5771F7200C301FC100736343 /* vigra_ext */, 5759DA590C327DC90043F754 /* panodata */, + 5713006E0C33D43B00252FE3 /* panotools */, ); path = hugin_base; sourceTree = "<group>"; @@ -976,7 +1012,7 @@ path = src; sourceTree = "<group>"; }; - 57CCCC23086C9530000EBC4A /* hugin-new */ = { + 57CCCC23086C9530000EBC4A /* attached */ = { isa = PBXGroup; children = ( 57CCCC5C086C9651000EBC4A /* utils */, @@ -991,28 +1027,35 @@ 57CCCC4E086C957E000EBC4A /* README */, 57CCCC50086C957E000EBC4A /* TODO */, ); - name = "hugin-new"; + name = attached; path = ..; sourceTree = SOURCE_ROOT; }; 57FC3ABD0675E43600C3E0AC = { isa = PBXGroup; children = ( - 57906E890C105F7B00A6C3FE /* src */, + 57906E890C105F7B00A6C3FE /* hugin_base */, 579D36060C0EFD4D00BFC58C /* src */, 57114E9E06BC2301004F4FA7 /* mac */, 57C1708E09A12D7500FAF325 /* boost */, 5745FC05094E1D5400E6B672 /* External */, 573B8F3E067BA2EB00B7B355 /* Product */, - 57CCCC23086C9530000EBC4A /* hugin-new */, - 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */, - 5759DA4F0C327D680043F754 /* libhugin_panodata.a */, + 57CCCC23086C9530000EBC4A /* attached */, ); sourceTree = "<group>"; }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ + 571300610C33D41F00252FE3 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 5713007A0C33D44400252FE3 /* PanoToolsInterface.h in Headers */, + 5713007C0C33D44400252FE3 /* PanoToolsOptimizerWrapper.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 5759D9A80C32713F0043F754 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -1037,6 +1080,9 @@ 5759EEE30C32AE100043F754 /* SrcPanoImage.h in Headers */, 5759EF280C32B1740043F754 /* ControlPoint.h in Headers */, 5759EF7A0C32B69F0043F754 /* Lens.h in Headers */, + 571300840C33D49200252FE3 /* PanoramaOptions.h in Headers */, + 5713010B0C33E3DD00252FE3 /* PanoramaData.h in Headers */, + 5797B9ED0C33EB4D00F3DEE6 /* DestPanoImage.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1142,6 +1188,22 @@ productReference = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; productType = "com.apple.product-type.library.static"; }; + 571300640C33D41F00252FE3 /* panotools */ = { + isa = PBXNativeTarget; + buildConfigurationList = 571300690C33D43600252FE3 /* Build configuration list for PBXNativeTarget "panotools" */; + buildPhases = ( + 571300610C33D41F00252FE3 /* Headers */, + 571300620C33D41F00252FE3 /* Sources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = panotools; + productName = panotools; + productReference = 571300650C33D41F00252FE3 /* libhugin_panotools.a */; + productType = "com.apple.product-type.library.static"; + }; 5720E4720BD456CD00E63404 /* levmar */ = { isa = PBXNativeTarget; buildConfigurationList = 5720E4760BD456CD00E63404 /* Build configuration list for PBXNativeTarget "levmar" */; @@ -1324,6 +1386,7 @@ 5771F7790C30216F00736343 /* hugin_math */, 5759D9AB0C32713F0043F754 /* appbase */, 5759DA4E0C327D680043F754 /* panodata */, + 571300640C33D41F00252FE3 /* panotools */, ); }; /* End PBXProject section */ @@ -1370,6 +1433,15 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 571300620C33D41F00252FE3 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 571300790C33D44400252FE3 /* PanoToolsInterface.cpp in Sources */, + 5713007B0C33D44400252FE3 /* PanoToolsOptimizerWrapper.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 5720E4730BD456CD00E63404 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1412,6 +1484,7 @@ 5759EEE20C32AE100043F754 /* SrcPanoImage.cpp in Sources */, 5759EF270C32B1740043F754 /* ControlPoint.cpp in Sources */, 5759EF790C32B69F0043F754 /* Lens.cpp in Sources */, + 571300830C33D49200252FE3 /* PanoramaOptions.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1493,6 +1566,34 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ + 5713006A0C33D43600252FE3 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = hugin_panotools; + }; + name = Debug; + }; + 5713006B0C33D43600252FE3 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = hugin_panotools; + }; + name = Development; + }; + 5713006C0C33D43600252FE3 /* Development ZeroLink */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = hugin_panotools; + }; + name = "Development ZeroLink"; + }; + 5713006D0C33D43600252FE3 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = hugin_panotools; + }; + name = Release; + }; 5720E4770BD456CD00E63404 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2108,6 +2209,17 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 571300690C33D43600252FE3 /* Build configuration list for PBXNativeTarget "panotools" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 5713006A0C33D43600252FE3 /* Debug */, + 5713006B0C33D43600252FE3 /* Development */, + 5713006C0C33D43600252FE3 /* Development ZeroLink */, + 5713006D0C33D43600252FE3 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; 571DA7AB088E59C20058F246 /* Build configuration list for PBXNativeTarget "jhead" */ = { isa = XCConfigurationList; buildConfigurations = ( Modified: hugin/branches/ippei/src/hugin_base/algorithms/PointSampler.h =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithms/PointSampler.h 2007-06-28 17:19:40 UTC (rev 2188) +++ hugin/branches/ippei/src/hugin_base/algorithms/PointSampler.h 2007-06-28 17:22:58 UTC (rev 2189) @@ -19,9 +19,8 @@ protected: /// typedef vigra_ext::ImageInterpolator<vigra::FRGBImage::const_traverser, - vigra::FRGBImage::ConstAccessor, - vigra_ext::interp_cubic> - InterpolImg; + vigra::FRGBImage::ConstAccessor, + vigra_ext::interp_cubic > InterpolImg; /// void extractPoints(AppBase::ProgressReporter& progress); @@ -99,7 +98,7 @@ /** * */ - class GreedyPointSampler + class AllPointSampler : PointSampler { public: /// @@ -162,7 +161,7 @@ /** * */ - class RandomPointSampler + class RandomPointSampler : PointSampler { public: /// Modified: hugin/branches/ippei/src/hugin_base/panotools/PanoToolsOptimizerWrapper.h =================================================================== --- hugin/branches/ippei/src/hugin_base/panotools/PanoToolsOptimizerWrapper.h 2007-06-28 17:19:40 UTC (rev 2188) +++ hugin/branches/ippei/src/hugin_base/panotools/PanoToolsOptimizerWrapper.h 2007-06-28 17:22:58 UTC (rev 2189) @@ -53,7 +53,6 @@ * \param cps control points * \param progDisplay progress display * - */ void optimize(PanoramaData & pano, const char * script = 0); Modified: hugin/branches/ippei/src/hugin_base/vigra_ext/ImageTransforms.h =================================================================== --- hugin/branches/ippei/src/hugin_base/vigra_ext/ImageTransforms.h 2007-06-28 17:19:40 UTC (rev 2188) +++ hugin/branches/ippei/src/hugin_base/vigra_ext/ImageTransforms.h 2007-06-28 17:22:58 UTC (rev 2189) @@ -35,8 +35,8 @@ #include <vigra/impex.hxx> #include <vigra_ext/impexalpha.hxx> -#include <common/math.h> -#include <common/utils.h> +#include <hugin_math/hugin_math.h> +#include <hugin_utils/utils.h> #include "MultiThreadOperations.h" #include <boost/thread/thread.hpp> @@ -86,7 +86,7 @@ vigra::Diff2D destUL, Interpolator interp, bool warparound, - utils::MultiProgressDisplay & prog) + AppBase::MultiProgressDisplay & prog) { vigra::Diff2D destSize = dest.second - dest.first; Modified: hugin/branches/ippei/src/hugin_base/vigra_ext/MultiThreadOperations.h =================================================================== --- hugin/branches/ippei/src/hugin_base/vigra_ext/MultiThreadOperations.h 2007-06-28 17:19:40 UTC (rev 2188) +++ hugin/branches/ippei/src/hugin_base/vigra_ext/MultiThreadOperations.h 2007-06-28 17:22:58 UTC (rev 2189) @@ -24,11 +24,11 @@ #ifndef _MULTITHREADOPERATIONS_H #define _MULTITHREADOPERATIONS_H +#include <hugin_utils/utils.h> #include <boost/thread.hpp> #include <boost/bind.hpp> -#include <hugin_utils/utils.h> #include <vigra/utilities.hxx> namespace vigra_ext Modified: hugin/branches/ippei/src/hugin_base/vigra_ext/utils.h =================================================================== --- hugin/branches/ippei/src/hugin_base/vigra_ext/utils.h 2007-06-28 17:19:40 UTC (rev 2188) +++ hugin/branches/ippei/src/hugin_base/vigra_ext/utils.h 2007-06-28 17:22:58 UTC (rev 2189) @@ -26,7 +26,7 @@ #ifndef VIGRA_EXT_UTILS_H #define VIGRA_EXT_UTILS_H -#include <hugin_math/math.h> +#include <hugin_math/hugin_math.h> #include <vigra/rgbvalue.hxx> #include <vigra/transformimage.hxx> #include <cmath> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2007-07-05 10:58:29
|
Revision: 2228 http://hugin.svn.sourceforge.net/hugin/?rev=2228&view=rev Author: ippei Date: 2007-07-05 03:58:25 -0700 (Thu, 05 Jul 2007) Log Message: ----------- nona stitcher algorithms compile Modified Paths: -------------- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj hugin/branches/ippei/src/hugin_base/algorithm/PanoramaAlgorithm.h hugin/branches/ippei/src/hugin_base/algorithm/StitcherAlgorithm.h hugin/branches/ippei/src/hugin_base/algorithms/nona/FitPanorama.cpp hugin/branches/ippei/src/hugin_base/algorithms/nona/NonaFileStitcher.h hugin/branches/ippei/src/hugin_base/algorithms/nona/NonaImageStitcher.h hugin/branches/ippei/src/hugin_base/algorithms/panotools/PTOptimizer.cpp Added Paths: ----------- hugin/branches/ippei/src/hugin_base/algorithms/nona/NonaFileStitcher.cpp hugin/branches/ippei/src/hugin_base/algorithms/nona/NonaImageStitcher.cpp Modified: hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-07-05 06:03:11 UTC (rev 2227) +++ hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-07-05 10:58:25 UTC (rev 2228) @@ -70,6 +70,10 @@ 5759EF280C32B1740043F754 /* ControlPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EF260C32B1740043F754 /* ControlPoint.h */; }; 5759EF790C32B69F0043F754 /* Lens.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759EF770C32B69F0043F754 /* Lens.cpp */; }; 5759EF7A0C32B69F0043F754 /* Lens.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EF780C32B69F0043F754 /* Lens.h */; }; + 576DA17B0C3CF8A5006E8D90 /* NonaImageStitcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576DA1790C3CF8A5006E8D90 /* NonaImageStitcher.cpp */; }; + 576DA17C0C3CF8A5006E8D90 /* NonaImageStitcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 576DA17A0C3CF8A5006E8D90 /* NonaImageStitcher.h */; }; + 576DA2200C3D04F4006E8D90 /* NonaFileStitcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576DA21E0C3D04F4006E8D90 /* NonaFileStitcher.cpp */; }; + 576DA2210C3D04F4006E8D90 /* NonaFileStitcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 576DA21F0C3D04F4006E8D90 /* NonaFileStitcher.h */; }; 5771F4DD0C2FEE0900736343 /* exif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F4DA0C2FEE0900736343 /* exif.cpp */; }; 5771F4DE0C2FEE0900736343 /* jpgfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F4DC0C2FEE0900736343 /* jpgfile.cpp */; }; 5771F5EE0C3007F300736343 /* platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F5EB0C3007F300736343 /* platform.h */; }; @@ -401,6 +405,10 @@ 5759EF260C32B1740043F754 /* ControlPoint.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ControlPoint.h; sourceTree = "<group>"; }; 5759EF770C32B69F0043F754 /* Lens.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Lens.cpp; sourceTree = "<group>"; }; 5759EF780C32B69F0043F754 /* Lens.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Lens.h; sourceTree = "<group>"; }; + 576DA1790C3CF8A5006E8D90 /* NonaImageStitcher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = NonaImageStitcher.cpp; path = algorithms/nona/NonaImageStitcher.cpp; sourceTree = "<group>"; }; + 576DA17A0C3CF8A5006E8D90 /* NonaImageStitcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NonaImageStitcher.h; path = algorithms/nona/NonaImageStitcher.h; sourceTree = "<group>"; }; + 576DA21E0C3D04F4006E8D90 /* NonaFileStitcher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = NonaFileStitcher.cpp; path = algorithms/nona/NonaFileStitcher.cpp; sourceTree = "<group>"; }; + 576DA21F0C3D04F4006E8D90 /* NonaFileStitcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NonaFileStitcher.h; path = algorithms/nona/NonaFileStitcher.h; sourceTree = "<group>"; }; 577092FA06BD7388004058A1 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = lib/libpng.a; sourceTree = "<group>"; }; 577092FB06BD7388004058A1 /* libtiff.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtiff.a; path = lib/libtiff.a; sourceTree = "<group>"; }; 5771F4D90C2FEE0900736343 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; }; @@ -1098,6 +1106,10 @@ 5785A30E0C3BE6DD00DD8BD8 /* CenterHorizontally.h */, 5785A39F0C3BED7F00DD8BD8 /* FitPanorama.cpp */, 5785A3A00C3BED7F00DD8BD8 /* FitPanorama.h */, + 576DA21E0C3D04F4006E8D90 /* NonaFileStitcher.cpp */, + 576DA21F0C3D04F4006E8D90 /* NonaFileStitcher.h */, + 576DA1790C3CF8A5006E8D90 /* NonaImageStitcher.cpp */, + 576DA17A0C3CF8A5006E8D90 /* NonaImageStitcher.h */, ); name = nona; sourceTree = "<group>"; @@ -1233,8 +1245,8 @@ children = ( 57EA83990C3A7A9500E4965E /* basic */, 5785A3080C3BE6AF00DD8BD8 /* nona */, + 5785A1B20C3BD12E00DD8BD8 /* panorama_makefile */, 5785A2200C3BD73700DD8BD8 /* panotools */, - 5785A1B20C3BD12E00DD8BD8 /* panorama_makefile */, 5785A55F0C3BF04500DD8BD8 /* photometric */, 5785A08E0C3BA90900DD8BD8 /* point_sampler */, ); @@ -1411,6 +1423,8 @@ 5785A3120C3BE6DD00DD8BD8 /* CenterHorizontally.h in Headers */, 5785A3A20C3BED7F00DD8BD8 /* FitPanorama.h in Headers */, 5785A5630C3BF04500DD8BD8 /* PhotometricOptimizer.h in Headers */, + 576DA17C0C3CF8A5006E8D90 /* NonaImageStitcher.h in Headers */, + 576DA2210C3D04F4006E8D90 /* NonaFileStitcher.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1854,6 +1868,8 @@ 5785A3110C3BE6DD00DD8BD8 /* CalculateFOV.cpp in Sources */, 5785A3A10C3BED7F00DD8BD8 /* FitPanorama.cpp in Sources */, 5785A5620C3BF04500DD8BD8 /* PhotometricOptimizer.cpp in Sources */, + 576DA17B0C3CF8A5006E8D90 /* NonaImageStitcher.cpp in Sources */, + 576DA2200C3D04F4006E8D90 /* NonaFileStitcher.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2590,6 +2606,7 @@ isa = XCBuildConfiguration; buildSettings = { HEADER_SEARCH_PATHS = ( + ../src/foreign, ../src/foreign/vigra, ../src/hugin_base, "$(inherited)", @@ -2602,6 +2619,7 @@ isa = XCBuildConfiguration; buildSettings = { HEADER_SEARCH_PATHS = ( + ../src/foreign, ../src/foreign/vigra, ../src/hugin_base, "$(inherited)", @@ -2614,6 +2632,7 @@ isa = XCBuildConfiguration; buildSettings = { HEADER_SEARCH_PATHS = ( + ../src/foreign, ../src/foreign/vigra, ../src/hugin_base, "$(inherited)", @@ -2626,6 +2645,7 @@ isa = XCBuildConfiguration; buildSettings = { HEADER_SEARCH_PATHS = ( + ../src/foreign, ../src/foreign/vigra, ../src/hugin_base, "$(inherited)", Modified: hugin/branches/ippei/src/hugin_base/algorithm/PanoramaAlgorithm.h =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithm/PanoramaAlgorithm.h 2007-07-05 06:03:11 UTC (rev 2227) +++ hugin/branches/ippei/src/hugin_base/algorithm/PanoramaAlgorithm.h 2007-07-05 10:58:25 UTC (rev 2228) @@ -70,12 +70,20 @@ } /// runs the algorithm. - virtual PanoramaAlgorithm& run() + virtual void run() { o_successful = runAlgorithm(); - return *this; } + /// runs the algorithm. + template<class AlgorithmClass> + AlgorithmClass& run() + { + AlgorithmClass& THIS = static_cast<AlgorithmClass&>(*this); + THIS.run(); + return THIS; + } + /** implementation of the algorithm. * You should override with your algorithm's implementiation. */ Modified: hugin/branches/ippei/src/hugin_base/algorithm/StitcherAlgorithm.h =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithm/StitcherAlgorithm.h 2007-07-05 06:03:11 UTC (rev 2227) +++ hugin/branches/ippei/src/hugin_base/algorithm/StitcherAlgorithm.h 2007-07-05 10:58:25 UTC (rev 2228) @@ -84,7 +84,7 @@ /// stitch to file output - class ImageStitcherAlgorithm : StitcherAlgorithm + class ImageStitcherAlgorithm : public StitcherAlgorithm { protected: @@ -113,7 +113,7 @@ /// stitch to file output - class FileOutputStitcherAlgorithm : StitcherAlgorithm + class FileOutputStitcherAlgorithm : public StitcherAlgorithm { protected: @@ -143,9 +143,10 @@ /** reserved for future use; allows more control over the filenames of output. * the current implementation is identical to that of FileOutputStitcherAlgorithm. */ - class MultiFileOutputStitcherAlgorithm : FileOutputStitcherAlgorithm + class MultiFileOutputStitcherAlgorithm : public FileOutputStitcherAlgorithm { - + /// + virtual ~MultiFileOutputStitcherAlgorithm(); }; Modified: hugin/branches/ippei/src/hugin_base/algorithms/nona/FitPanorama.cpp =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithms/nona/FitPanorama.cpp 2007-07-05 06:03:11 UTC (rev 2227) +++ hugin/branches/ippei/src/hugin_base/algorithms/nona/FitPanorama.cpp 2007-07-05 10:58:25 UTC (rev 2228) @@ -36,7 +36,7 @@ { // FIXME: doesn't work properly for fisheye and mirror projections, // it will not calculate a vfov bigger than 180. - FDiff2D fov = static_cast<CalculateFOV&>(CalculateFOV(panorama).run()).getResultFOV(); + FDiff2D fov = CalculateFOV(panorama).run<CalculateFOV>().getResultFOV(); // use estimated fov to calculate a suitable panorama height. // calculate VFOV based on current panorama Added: hugin/branches/ippei/src/hugin_base/algorithms/nona/NonaFileStitcher.cpp =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithms/nona/NonaFileStitcher.cpp (rev 0) +++ hugin/branches/ippei/src/hugin_base/algorithms/nona/NonaFileStitcher.cpp 2007-07-05 10:58:25 UTC (rev 2228) @@ -0,0 +1,57 @@ +// -*- c-basic-offset: 4 -*- +/** @file +* +* @author Ippei UKAI <ipp...@ma...> +* +* $Id: $ +* +* This is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public +* License as published by the Free Software Foundation; either +* version 2 of the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this software; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. +* +* Hereby the author, Ippei UKAI, grant the license of this particular file to +* be relaxed to the GNU Lesser General Public License as published by the Free +* Software Foundation; either version 2 of the License, or (at your option) +* any later version. Please note however that when the file is linked to or +* compiled with other files in this library, the GNU General Public License as +* mentioned above is likely to restrict the terms of use further. +* +*/ + +#include "NonaFileStitcher.h" + +#include <nona/Stitcher.h> + +namespace HuginBase { + + using namespace AppBase; + using namespace Nona; + + + bool NonaFileOutputStitcher::runStitcher() + { + MultiProgressDisplay* progDisp + = MultiProgressDisplayAdaptor::newMultiProgressDisplay(getProgressDisplay()); + + stitchPanorama(o_panorama, + o_panoramaOptions, + *progDisp, + o_filename, + o_usedImages); + + delete progDisp; + return true; + } + + +} //namespace \ No newline at end of file Modified: hugin/branches/ippei/src/hugin_base/algorithms/nona/NonaFileStitcher.h =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithms/nona/NonaFileStitcher.h 2007-07-05 06:03:11 UTC (rev 2227) +++ hugin/branches/ippei/src/hugin_base/algorithms/nona/NonaFileStitcher.h 2007-07-05 10:58:25 UTC (rev 2228) @@ -28,13 +28,17 @@ * */ +#ifndef _NONAFILESTITCHER_H +#define _NONAFILESTITCHER_H -using namespace AppBase; -using namespace Nona; +#include <algorithm/StitcherAlgorithm.h> + namespace HuginBase { - + using namespace AppBase; + + /** This class will use the stitchPanorama function of nona. The filename * may be automatically modified preserving only the basename. */ @@ -42,12 +46,13 @@ { public: - NonaFileOutputStitcher(const PanoramaData& panoramaData, - ProgressDisplay* progressDisplay, - const PanoramaOptions& options, - const UIntSet& usedImages, - const String& filename) - : FileOutputStitcherAlgorithm(panoramaData, options, usedImages, progressDisplay, filename, true) + /// + NonaFileOutputStitcher(PanoramaData& panoramaData, + ProgressDisplay* progressDisplay, + const PanoramaOptions& options, + const UIntSet& usedImages, + const String& filename) + : FileOutputStitcherAlgorithm(panoramaData, progressDisplay, options, usedImages, filename, true) {}; /// @@ -61,4 +66,6 @@ }; -}; \ No newline at end of file +}; + +#endif \ No newline at end of file Added: hugin/branches/ippei/src/hugin_base/algorithms/nona/NonaImageStitcher.cpp =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithms/nona/NonaImageStitcher.cpp (rev 0) +++ hugin/branches/ippei/src/hugin_base/algorithms/nona/NonaImageStitcher.cpp 2007-07-05 10:58:25 UTC (rev 2228) @@ -0,0 +1,94 @@ +// -*- c-basic-offset: 4 -*- +/** @file +* +* @author Ippei UKAI <ipp...@ma...> +* +* $Id: $ +* +* This is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public +* License as published by the Free Software Foundation; either +* version 2 of the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this software; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. +* +* Hereby the author, Ippei UKAI, grant the license of this particular file to +* be relaxed to the GNU Lesser General Public License as published by the Free +* Software Foundation; either version 2 of the License, or (at your option) +* any later version. Please note however that when the file is linked to or +* compiled with other files in this library, the GNU General Public License as +* mentioned above is likely to restrict the terms of use further. +* +*/ + +#include "NonaImageStitcher.h" + + +namespace HuginBase { + + using namespace AppBase; + using namespace Nona; + + + bool NonaImageStitcher::runStitcher() + { + MultiProgressDisplay* progDisp + = MultiProgressDisplayAdaptor::newMultiProgressDisplay(getProgressDisplay()); + + StackingBlender blender; + SimpleStitcher<DestImage, DestAlpha> stitcher(o_panorama, *progDisp); + stitcher.stitch(o_panoramaOptions, o_usedImages, + destImageRange(o_panoImage), destImage(o_alpha), + o_remapper, + blender); + + delete progDisp; + + return true; + } + + + bool NonaDifferenceImageStitcher::runStitcher() + { + MultiProgressDisplay* progDisp + = MultiProgressDisplayAdaptor::newMultiProgressDisplay(getProgressDisplay()); + + ReduceToDifferenceFunctor<vigra::RGBValue<float> > func; + ReduceStitcher<DestImage, DestAlpha> stitcher(o_panorama, *progDisp); + stitcher.stitch(o_panoramaOptions, o_usedImages, + destImageRange(o_panoImage), destImage(o_alpha), + o_remapper, + func); + + delete progDisp; + + return true; + } + + + bool NonaHDRImageStitcher::runStitcher() + { + MultiProgressDisplay* progDisp + = MultiProgressDisplayAdaptor::newMultiProgressDisplay(getProgressDisplay()); + + ReduceToHDRFunctor<vigra::RGBValue<float> > func; + ReduceStitcher<DestImage, DestAlpha> stitcher(o_panorama, *progDisp); + stitcher.stitch(o_panoramaOptions, o_usedImages, + destImageRange(o_panoImage), destImage(o_alpha), + o_remapper, + func); + + delete progDisp; + + return true; + } + + +} // namespace \ No newline at end of file Modified: hugin/branches/ippei/src/hugin_base/algorithms/nona/NonaImageStitcher.h =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithms/nona/NonaImageStitcher.h 2007-07-05 06:03:11 UTC (rev 2227) +++ hugin/branches/ippei/src/hugin_base/algorithms/nona/NonaImageStitcher.h 2007-07-05 10:58:25 UTC (rev 2228) @@ -28,52 +28,52 @@ * */ +#ifndef _NONAIMAGESTITCHER_H +#define _NONAIMAGESTITCHER_H -using namespace AppBase; -using namespace Nona; +#include <algorithm/StitcherAlgorithm.h> +#include <nona/Stitcher.h> +#include <nona/ImageRemapper.h> + + namespace HuginBase { + using namespace AppBase; + using namespace Nona; + + /** * */ - class NonaImageStitcher : ImageStitcherAlgorithm + class NonaImageStitcher : public ImageStitcherAlgorithm { + protected: + typedef SingleImageRemapper<DestImage,DestAlpha> ImageMapper; + public: /// - NonaImageStitcher(const PanoramaData& panoramaData, - ProgressDisplay* progressDisplay, - const PanoramaOptions& options, - const UIntSet& usedImages, - DestImage& panoImage, DestAlpha& alpha - SingleImageRemapper& remapper) + NonaImageStitcher(PanoramaData& panoramaData, + ProgressDisplay* progressDisplay, + const PanoramaOptions& options, + const UIntSet& usedImages, + DestImage& panoImage, DestAlpha& alpha, + ImageMapper& remapper) : ImageStitcherAlgorithm(panoramaData, progressDisplay, options, usedImages, panoImage, alpha), o_remapper(remapper) {}; + + /// + ~NonaImageStitcher() {}; protected: /// - virtual bool runStitcher() - { - MultiProgressDisplayAdaptor* progDisp - = MultiProgressDisplayAdaptor::newMultiProgressDisplay(getProgressDisplay()); - - StackingBlender blender; - SimpleStitcher<DestImage, DestAlpha> stitcher(o_panorama, *progDisp); - stitcher.stitch(opts, usedImages, - destImageRange(o_panoImage), destImage(o_alpha), - o_remapper, - blender); - - delete progDisp; - - return true; - } + virtual bool runStitcher(); protected: - SingleImageRemapper& o_remapper; + ImageMapper& o_remapper; }; @@ -81,83 +81,56 @@ /** * */ - class NonaDifferenceImageStitcher : ImageStitcherAlgorithm + class NonaDifferenceImageStitcher : public NonaImageStitcher { - public: - /// - NonaDifferenceImageStitcher(const PanoramaData& panoramaData, - ProgressDisplay* progressDisplay, - const PanoramaOptions& options, - const UIntSet& usedImages, - DestImage& panoImage, DestAlpha& alpha, SingleImageRemapper& remapper) - : NonaImageStitcher(panoramaData, progressDisplay, options, usedImages, panoImage, alpha, remapper) - {}; - - /// - ~NonaDifferenceImageStitcher(); - + public: + /// + NonaDifferenceImageStitcher(PanoramaData& panoramaData, + ProgressDisplay* progressDisplay, + const PanoramaOptions& options, + const UIntSet& usedImages, + DestImage& panoImage, DestAlpha& alpha, + ImageMapper& remapper) + : NonaImageStitcher(panoramaData, progressDisplay, options, usedImages, panoImage, alpha, remapper) + {}; - protected: - /// - virtual bool runStitcher() - { - MultiProgressDisplayAdaptor* progDisp - = MultiProgressDisplayAdaptor::newMultiProgressDisplay(getProgressDisplay()); + /// + ~NonaDifferenceImageStitcher() {}; - ReduceToDifferenceFunctor<RGBValue<float>> func; - ReduceStitcher<DestImage, DestAlpha> stitcher(o_panorama, *progDisp); - stitcher.stitch(opts, usedImages, - destImageRange(o_panoImage), destImage(o_alpha), - o_remapper, - func); + + protected: + /// + virtual bool runStitcher(); - delete progDisp; - - return true; - } - }; /** * */ - class NonaHDRImageStitcher : NonaImageStitcher + class NonaHDRImageStitcher : public NonaImageStitcher { - public: - /// - NonaHDRImageStitcher(const PanoramaData& panoramaData, - ProgressDisplay* progressDisplay, - const PanoramaOptions& options, - const UIntSet& usedImages, - DestImage& panoImage, DestAlpha& alpha, SingleImageRemapper& remapper) - : NonaImageStitcher(panoramaData, progressDisplay, options, usedImages, panoImage, alpha, remapper) - {}; - - /// - ~NonaHDRImageStitcher(); - + public: + /// + NonaHDRImageStitcher(PanoramaData& panoramaData, + ProgressDisplay* progressDisplay, + const PanoramaOptions& options, + const UIntSet& usedImages, + DestImage& panoImage, DestAlpha& alpha, + ImageMapper& remapper) + : NonaImageStitcher(panoramaData, progressDisplay, options, usedImages, panoImage, alpha, remapper) + {}; - protected: - /// - virtual bool runStitcher() - { - MultiProgressDisplayAdaptor* progDisp - = MultiProgressDisplayAdaptor::newMultiProgressDisplay(getProgressDisplay()); + /// + ~NonaHDRImageStitcher() {}; - ReduceToHDRFunctor<RGBValue<float>> hdrmerge; - ReduceStitcher<DestImage, DestAlpha> stitcher(o_panorama, *progDisp); - stitcher.stitch(opts, usedImages, - destImageRange(o_panoImage), destImage(o_alpha), - o_remapper, - hdrmerge); - - delete progDisp; - - return true; - } + + protected: + /// + virtual bool runStitcher(); }; -}; \ No newline at end of file +} // namespace +#endif // _H \ No newline at end of file Modified: hugin/branches/ippei/src/hugin_base/algorithms/panotools/PTOptimizer.cpp =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithms/panotools/PTOptimizer.cpp 2007-07-05 06:03:11 UTC (rev 2227) +++ hugin/branches/ippei/src/hugin_base/algorithms/panotools/PTOptimizer.cpp 2007-07-05 10:58:25 UTC (rev 2228) @@ -166,7 +166,7 @@ // check if this is a 360 deg pano. CenterHorizontally(optPano).run(); - FDiff2D fov = static_cast<CalculateFOV&>(CalculateFOV(optPano).run()).getResultFOV(); + FDiff2D fov = CalculateFOV(optPano).run<CalculateFOV>().getResultFOV(); if (fov.x >= 359) { // optimize HFOV for 360 deg panos This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2007-07-07 15:18:02
|
Revision: 2234 http://hugin.svn.sourceforge.net/hugin/?rev=2234&view=rev Author: ippei Date: 2007-07-07 08:17:43 -0700 (Sat, 07 Jul 2007) Log Message: ----------- files missed out from last commit Modified Paths: -------------- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj hugin/branches/ippei/src/hugin_base/huginapp/ImageCache.cpp hugin/branches/ippei/src/hugin_base/huginapp/ImageCache.h hugin/branches/ippei/src/hugin_base/huginapp/PanoCommand.h hugin/branches/ippei/src/hugin_base/nona/ImageRemapper.h hugin/branches/ippei/src/hugin_base/panodata/Panorama.cpp hugin/branches/ippei/src/hugin_base/panodata/Panorama.h hugin/branches/ippei/src/hugin_base/panodata/PanoramaData.h Added Paths: ----------- hugin/branches/ippei/src/hugin_base/huginapp/CachedImageRemapper.cpp hugin/branches/ippei/src/hugin_base/huginapp/CachedImageRemapper.h Modified: hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-07-06 22:39:13 UTC (rev 2233) +++ hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-07-07 15:17:43 UTC (rev 2234) @@ -31,6 +31,10 @@ 571300830C33D49200252FE3 /* PanoramaOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 571300810C33D49200252FE3 /* PanoramaOptions.cpp */; }; 571300840C33D49200252FE3 /* PanoramaOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 571300820C33D49200252FE3 /* PanoramaOptions.h */; }; 5713010B0C33E3DD00252FE3 /* PanoramaData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5713010A0C33E3DD00252FE3 /* PanoramaData.h */; }; + 571DD7E10C3E935F0027A85E /* PTStitcherStitcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 571DD7DF0C3E935F0027A85E /* PTStitcherStitcher.cpp */; }; + 571DD82D0C3E97CD0027A85E /* PTmenderStitcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 571DD82B0C3E97CD0027A85E /* PTmenderStitcher.h */; }; + 571DD82E0C3E97CD0027A85E /* PTmenderStitcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 571DD82C0C3E97CD0027A85E /* PTmenderStitcher.cpp */; }; + 571DD8310C3E97F70027A85E /* PTStitcherStitcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 571DD8300C3E97F70027A85E /* PTStitcherStitcher.h */; }; 5720E4900BD4575000E63404 /* Axb.c in Sources */ = {isa = PBXBuildFile; fileRef = 5720E47C0BD4575000E63404 /* Axb.c */; }; 5720E4920BD4575000E63404 /* lm.c in Sources */ = {isa = PBXBuildFile; fileRef = 5720E4850BD4575000E63404 /* lm.c */; }; 5720E4940BD4575000E63404 /* lmbc.c in Sources */ = {isa = PBXBuildFile; fileRef = 5720E4880BD4575000E63404 /* lmbc.c */; }; @@ -74,6 +78,11 @@ 576DA17C0C3CF8A5006E8D90 /* NonaImageStitcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 576DA17A0C3CF8A5006E8D90 /* NonaImageStitcher.h */; }; 576DA2200C3D04F4006E8D90 /* NonaFileStitcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576DA21E0C3D04F4006E8D90 /* NonaFileStitcher.cpp */; }; 576DA2210C3D04F4006E8D90 /* NonaFileStitcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 576DA21F0C3D04F4006E8D90 /* NonaFileStitcher.h */; }; + 576EC4AB0C3FC9750076A417 /* CachedImageRemapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576EC4A60C3FC9750076A417 /* CachedImageRemapper.cpp */; }; + 576EC4AC0C3FC9750076A417 /* CachedImageRemapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 576EC4A70C3FC9750076A417 /* CachedImageRemapper.h */; }; + 576EC4AD0C3FC9750076A417 /* ImageCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576EC4A80C3FC9750076A417 /* ImageCache.cpp */; }; + 576EC4AE0C3FC9750076A417 /* ImageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 576EC4A90C3FC9750076A417 /* ImageCache.h */; }; + 576EC4AF0C3FC9750076A417 /* PanoCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = 576EC4AA0C3FC9750076A417 /* PanoCommand.h */; }; 5771F4DD0C2FEE0900736343 /* exif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F4DA0C2FEE0900736343 /* exif.cpp */; }; 5771F4DE0C2FEE0900736343 /* jpgfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F4DC0C2FEE0900736343 /* jpgfile.cpp */; }; 5771F5EE0C3007F300736343 /* platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F5EB0C3007F300736343 /* platform.h */; }; @@ -242,6 +251,10 @@ 571300810C33D49200252FE3 /* PanoramaOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PanoramaOptions.cpp; sourceTree = "<group>"; }; 571300820C33D49200252FE3 /* PanoramaOptions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PanoramaOptions.h; sourceTree = "<group>"; }; 5713010A0C33E3DD00252FE3 /* PanoramaData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PanoramaData.h; sourceTree = "<group>"; }; + 571DD7DF0C3E935F0027A85E /* PTStitcherStitcher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = PTStitcherStitcher.cpp; path = algorithms/external/PTStitcherStitcher.cpp; sourceTree = "<group>"; }; + 571DD82B0C3E97CD0027A85E /* PTmenderStitcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PTmenderStitcher.h; path = algorithms/external/PTmenderStitcher.h; sourceTree = "<group>"; }; + 571DD82C0C3E97CD0027A85E /* PTmenderStitcher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = PTmenderStitcher.cpp; path = algorithms/external/PTmenderStitcher.cpp; sourceTree = "<group>"; }; + 571DD8300C3E97F70027A85E /* PTStitcherStitcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PTStitcherStitcher.h; path = algorithms/external/PTStitcherStitcher.h; sourceTree = "<group>"; }; 5720E47A0BD456CD00E63404 /* liblevmar.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblevmar.a; sourceTree = BUILT_PRODUCTS_DIR; }; 5720E47C0BD4575000E63404 /* Axb.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = Axb.c; sourceTree = "<group>"; }; 5720E47D0BD4575000E63404 /* Axb_core.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = Axb_core.c; sourceTree = "<group>"; }; @@ -409,6 +422,12 @@ 576DA17A0C3CF8A5006E8D90 /* NonaImageStitcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NonaImageStitcher.h; path = algorithms/nona/NonaImageStitcher.h; sourceTree = "<group>"; }; 576DA21E0C3D04F4006E8D90 /* NonaFileStitcher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = NonaFileStitcher.cpp; path = algorithms/nona/NonaFileStitcher.cpp; sourceTree = "<group>"; }; 576DA21F0C3D04F4006E8D90 /* NonaFileStitcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NonaFileStitcher.h; path = algorithms/nona/NonaFileStitcher.h; sourceTree = "<group>"; }; + 576EC4990C3FC9300076A417 /* libhuginapp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhuginapp.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 576EC4A60C3FC9750076A417 /* CachedImageRemapper.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CachedImageRemapper.cpp; sourceTree = "<group>"; }; + 576EC4A70C3FC9750076A417 /* CachedImageRemapper.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedImageRemapper.h; sourceTree = "<group>"; }; + 576EC4A80C3FC9750076A417 /* ImageCache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ImageCache.cpp; sourceTree = "<group>"; }; + 576EC4A90C3FC9750076A417 /* ImageCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageCache.h; sourceTree = "<group>"; }; + 576EC4AA0C3FC9750076A417 /* PanoCommand.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PanoCommand.h; sourceTree = "<group>"; }; 577092FA06BD7388004058A1 /* libpng.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpng.a; path = lib/libpng.a; sourceTree = "<group>"; }; 577092FB06BD7388004058A1 /* libtiff.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtiff.a; path = lib/libtiff.a; sourceTree = "<group>"; }; 5771F4D90C2FEE0900736343 /* CMakeLists.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = CMakeLists.txt; sourceTree = "<group>"; }; @@ -742,6 +761,17 @@ path = panotools; sourceTree = "<group>"; }; + 571DD7DC0C3E93340027A85E /* external */ = { + isa = PBXGroup; + children = ( + 571DD82C0C3E97CD0027A85E /* PTmenderStitcher.cpp */, + 571DD82B0C3E97CD0027A85E /* PTmenderStitcher.h */, + 571DD7DF0C3E935F0027A85E /* PTStitcherStitcher.cpp */, + 571DD8300C3E97F70027A85E /* PTStitcherStitcher.h */, + ); + name = external; + sourceTree = "<group>"; + }; 5720E47B0BD4575000E63404 /* levmar */ = { isa = PBXGroup; children = ( @@ -959,6 +989,18 @@ path = panodata; sourceTree = "<group>"; }; + 576EC4A40C3FC9750076A417 /* huginapp */ = { + isa = PBXGroup; + children = ( + 576EC4A60C3FC9750076A417 /* CachedImageRemapper.cpp */, + 576EC4A70C3FC9750076A417 /* CachedImageRemapper.h */, + 576EC4A80C3FC9750076A417 /* ImageCache.cpp */, + 576EC4A90C3FC9750076A417 /* ImageCache.h */, + 576EC4AA0C3FC9750076A417 /* PanoCommand.h */, + ); + path = huginapp; + sourceTree = "<group>"; + }; 5771F4D80C2FEE0900736343 /* jhead */ = { isa = PBXGroup; children = ( @@ -974,15 +1016,16 @@ isa = PBXGroup; children = ( 5759D9B40C3271640043F754 /* appbase */, + 57EA83940C3A7A0C00E4965E /* algorithm */, + 57EA83A40C3A7CD700E4965E /* algorithms */, + 5771F7BF0C3021B000736343 /* hugin_math */, 5771F5E70C3007CE00736343 /* hugin_utils */, - 5771F7BF0C3021B000736343 /* hugin_math */, - 5771F7200C301FC100736343 /* vigra_ext */, + 576EC4A40C3FC9750076A417 /* huginapp */, + 57237F410C391052005818A4 /* nona */, 5759DA590C327DC90043F754 /* panodata */, 57B88E610C36CD8F00EC6519 /* photometric */, 5713006E0C33D43B00252FE3 /* panotools */, - 57237F410C391052005818A4 /* nona */, - 57EA83940C3A7A0C00E4965E /* algorithm */, - 57EA83A40C3A7CD700E4965E /* algorithms */, + 5771F7200C301FC100736343 /* vigra_ext */, ); path = hugin_base; sourceTree = "<group>"; @@ -1244,6 +1287,7 @@ isa = PBXGroup; children = ( 57EA83990C3A7A9500E4965E /* basic */, + 571DD7DC0C3E93340027A85E /* external */, 5785A3080C3BE6AF00DD8BD8 /* nona */, 5785A1B20C3BD12E00DD8BD8 /* panorama_makefile */, 5785A2200C3BD73700DD8BD8 /* panotools */, @@ -1263,6 +1307,7 @@ 5745FC05094E1D5400E6B672 /* External */, 573B8F3E067BA2EB00B7B355 /* Product */, 57CCCC23086C9530000EBC4A /* attached */, + 576EC4990C3FC9300076A417 /* libhuginapp.a */, ); sourceTree = "<group>"; }; @@ -1321,6 +1366,16 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 576EC4950C3FC9300076A417 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 576EC4AC0C3FC9750076A417 /* CachedImageRemapper.h in Headers */, + 576EC4AE0C3FC9750076A417 /* ImageCache.h in Headers */, + 576EC4AF0C3FC9750076A417 /* PanoCommand.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 5771F5D30C3006E900736343 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -1425,6 +1480,8 @@ 5785A5630C3BF04500DD8BD8 /* PhotometricOptimizer.h in Headers */, 576DA17C0C3CF8A5006E8D90 /* NonaImageStitcher.h in Headers */, 576DA2210C3D04F4006E8D90 /* NonaFileStitcher.h in Headers */, + 571DD82D0C3E97CD0027A85E /* PTmenderStitcher.h in Headers */, + 571DD8310C3E97F70027A85E /* PTStitcherStitcher.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1543,6 +1600,22 @@ productReference = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; productType = "com.apple.product-type.library.static"; }; + 576EC4980C3FC9300076A417 /* huginapp */ = { + isa = PBXNativeTarget; + buildConfigurationList = 576EC49F0C3FC9500076A417 /* Build configuration list for PBXNativeTarget "huginapp" */; + buildPhases = ( + 576EC4950C3FC9300076A417 /* Headers */, + 576EC4960C3FC9300076A417 /* Sources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = huginapp; + productName = huginapp; + productReference = 576EC4990C3FC9300076A417 /* libhuginapp.a */; + productType = "com.apple.product-type.library.static"; + }; 5771F5D60C3006E900736343 /* hugin_utils */ = { isa = PBXNativeTarget; buildConfigurationList = 5771F5DA0C30076C00736343 /* Build configuration list for PBXNativeTarget "hugin_utils" */; @@ -1679,6 +1752,7 @@ 571300640C33D41F00252FE3 /* panotools */, 574092290C393E6600D16607 /* nona */, 57EA83850C3A798A00E4965E /* algorithms */, + 576EC4980C3FC9300076A417 /* huginapp */, ); }; /* End PBXProject section */ @@ -1795,6 +1869,15 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 576EC4960C3FC9300076A417 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 576EC4AB0C3FC9750076A417 /* CachedImageRemapper.cpp in Sources */, + 576EC4AD0C3FC9750076A417 /* ImageCache.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 5771F5D40C3006E900736343 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1870,6 +1953,8 @@ 5785A5620C3BF04500DD8BD8 /* PhotometricOptimizer.cpp in Sources */, 576DA17B0C3CF8A5006E8D90 /* NonaImageStitcher.cpp in Sources */, 576DA2200C3D04F4006E8D90 /* NonaFileStitcher.cpp in Sources */, + 571DD7E10C3E935F0027A85E /* PTStitcherStitcher.cpp in Sources */, + 571DD82E0C3E97CD0027A85E /* PTmenderStitcher.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2306,6 +2391,54 @@ }; name = Development; }; + 576EC4A00C3FC9500076A417 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/hugin_base, + ../src/foreign/vigra, + "$(inherited)", + ); + PRODUCT_NAME = huginapp; + }; + name = Debug; + }; + 576EC4A10C3FC9500076A417 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/hugin_base, + ../src/foreign/vigra, + "$(inherited)", + ); + PRODUCT_NAME = huginapp; + }; + name = Development; + }; + 576EC4A20C3FC9500076A417 /* Development ZeroLink */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/hugin_base, + ../src/foreign/vigra, + "$(inherited)", + ); + PRODUCT_NAME = huginapp; + }; + name = "Development ZeroLink"; + }; + 576EC4A30C3FC9500076A417 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/hugin_base, + ../src/foreign/vigra, + "$(inherited)", + ); + PRODUCT_NAME = huginapp; + }; + name = Release; + }; 5771F5DB0C30076C00736343 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2745,6 +2878,17 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + 576EC49F0C3FC9500076A417 /* Build configuration list for PBXNativeTarget "huginapp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 576EC4A00C3FC9500076A417 /* Debug */, + 576EC4A10C3FC9500076A417 /* Development */, + 576EC4A20C3FC9500076A417 /* Development ZeroLink */, + 576EC4A30C3FC9500076A417 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; 5771F5DA0C30076C00736343 /* Build configuration list for PBXNativeTarget "hugin_utils" */ = { isa = XCConfigurationList; buildConfigurations = ( Added: hugin/branches/ippei/src/hugin_base/huginapp/CachedImageRemapper.cpp =================================================================== --- hugin/branches/ippei/src/hugin_base/huginapp/CachedImageRemapper.cpp (rev 0) +++ hugin/branches/ippei/src/hugin_base/huginapp/CachedImageRemapper.cpp 2007-07-07 15:17:43 UTC (rev 2234) @@ -0,0 +1,202 @@ +// -*- c-basic-offset: 4 -*- + +/** @file ImageCache.cpp + * + * @brief implementation of ImageCache Class + * + * @author Pablo d'Angelo <pab...@we...> + * + * $Id: ImageCache.cpp 1997 2007-05-09 21:14:15Z dangelo $ + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include "CachedImageRemapper.h" + +//#include <config.h> +//#include "panoinc_WX.h" +// +//#include "panoinc.h" +// +//#include <fstream> +// +//#include <vigra/basicimage.hxx> +#include <vigra/basicimageview.hxx> +//#include <vigra/rgbvalue.hxx> +//#include <vigra/impex.hxx> +//#include <vigra/error.hxx> +//#include <vigra_ext/utils.h> +//#include <vigra_ext/impexalpha.hxx> +//#include <vigra_ext/Pyramid.h> +//#include <vigra_ext/ImageTransforms.h> +//#include <vigra_ext/FunctorAccessor.h> +//#include <PT/Stitcher.h> +//#include <vigra/functorexpression.hxx> +// +//#include "hugin/ImageCache.h" +//#include "hugin/config_defaults.h" +// +//#include <vigra/sized_int.hxx> + + +namespace HuginBase { + +//using namespace std; +using namespace vigra; +//using namespace vigra_ext; +//using namespace hugin_utils; +//using namespace functor; + + + +SmallRemappedImageCache::~SmallRemappedImageCache() +{ + invalidate(); +} + +SmallRemappedImageCache::MRemappedImage * +SmallRemappedImageCache::getRemapped(const PanoramaData& pano, + const PanoramaOptions & popts, + unsigned int imgNr, + AppBase::MultiProgressDisplay& progress) +{ + // always map to HDR mode. curve and exposure is applied in preview window, for speed + PanoramaOptions opts = popts; + opts.outputMode = PanoramaOptions::OUTPUT_HDR; + opts.outputExposureValue = 0.0; + + // return old image, if already in cache and if it has changed since the last rendering + if (set_contains(m_images, imgNr)) { + // return cached image if the parameters of the image have not changed + SrcPanoImage oldParam = m_imagesParam[imgNr]; + if (oldParam == pano.getSrcImage(imgNr) + && m_panoOpts[imgNr].getHFOV() == opts.getHFOV() + && m_panoOpts[imgNr].getWidth() == opts.getWidth() + && m_panoOpts[imgNr].getHeight() == opts.getHeight() + && m_panoOpts[imgNr].getProjection() == opts.getProjection() + && m_panoOpts[imgNr].getProjectionParameters() == opts.getProjectionParameters() + ) + { + DEBUG_DEBUG("using cached remapped image " << imgNr); + return m_images[imgNr]; + } + } + + // WARNING: this might invalidate images that are stored somewhere.. + ImageCache::getInstance().softFlush(); + + typedef BasicImageView<RGBValue<unsigned char> > BRGBImageView; + +// typedef NumericTraits<PixelType>::RealPromote RPixelType; + + // remap image + DEBUG_DEBUG("remapping image " << imgNr); + + // load image + const PanoImage & img = pano.getImage(imgNr); + const ImageOptions & iopts = img.getOptions(); + + ImageCache::EntryPtr e = ImageCache::getInstance().getSmallImage(img.getFilename().c_str()); + if ( (e->image8->width() == 0) && (e->imageFloat->width() == 0) ) { + throw std::runtime_error("could not retrieve small source image for preview generation"); + } + Size2D srcImgSize; + if (e->image8->width() > 0) + srcImgSize = e->image8->size(); + else + srcImgSize = e->imageFloat->size(); + + MRemappedImage *remapped = new MRemappedImage; + SrcPanoImage srcPanoImg = pano.getSrcImage(imgNr); + // adjust distortion parameters for small preview image + srcPanoImg.resize(srcImgSize); + + FImage srcFlat; + // use complete image, by supplying an empty mask image + BImage srcMask; + + if (iopts.m_vigCorrMode & ImageOptions::VIGCORR_FLATFIELD) { + ImageCache::EntryPtr e = ImageCache::getInstance().getSmallImage(iopts.m_flatfield.c_str()); + if (!e) { + throw std::runtime_error("could not retrieve flatfield image for preview generation"); + } + if (e->image8->width()) { + srcFlat.resize(e->image8->size()); + copyImage(srcImageRange(*(e->image8), + RGBToGrayAccessor<RGBValue<UInt8> >()), + destImage(srcFlat)); + } else { + srcFlat.resize(e->imageFloat->size()); + copyImage(srcImageRange(*(e->imageFloat), + RGBToGrayAccessor<RGBValue<float> >()), + destImage(srcFlat)); + } + } + progress.pushTask(AppBase::ProgressTask("remapping", "", 0)); + + if (e->imageFloat->width()) { + // remap image + remapImage(*(e->imageFloat), + srcMask, + srcFlat, + srcPanoImg, + opts, + *remapped, + progress); + } else { + remapImage(*(e->image8), + srcMask, + srcFlat, + srcPanoImg, + opts, + *remapped, + progress); + } + + progress.popTask(); + + m_images[imgNr] = remapped; + m_imagesParam[imgNr] = pano.getSrcImage(imgNr); + m_panoOpts[imgNr] = opts; + return remapped; +} + + +void SmallRemappedImageCache::invalidate() +{ + DEBUG_DEBUG("Clear remapped cache"); + for(std::map<unsigned int, MRemappedImage*>::iterator it = m_images.begin(); + it != m_images.end(); ++it) + { + delete (*it).second; + } + // remove all images + m_images.clear(); + m_imagesParam.clear(); +} + +void SmallRemappedImageCache::invalidate(unsigned int imgNr) +{ + DEBUG_DEBUG("Remove " << imgNr << " from remapped cache"); + if (set_contains(m_images, imgNr)) { + delete (m_images[imgNr]); + m_images.erase(imgNr); + m_imagesParam.erase(imgNr); + } +} + + +} //namespace \ No newline at end of file Added: hugin/branches/ippei/src/hugin_base/huginapp/CachedImageRemapper.h =================================================================== --- hugin/branches/ippei/src/hugin_base/huginapp/CachedImageRemapper.h (rev 0) +++ hugin/branches/ippei/src/hugin_base/huginapp/CachedImageRemapper.h 2007-07-07 15:17:43 UTC (rev 2234) @@ -0,0 +1,100 @@ +// -*- c-basic-offset: 4 -*- +/** @file ImageCache.h + * + * @author Pablo d'Angelo <pab...@we...> + * + * $Id: ImageCache.h 1988 2007-05-08 22:55:04Z dangelo $ + * + * This is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef _CACHEDIMAGEREMAPPER_H +#define _CACHEDIMAGEREMAPPER_H + +#include <nona/ImageRemapper.h> + +#include <map> +#include <boost/shared_ptr.hpp> +#include <huginapp/ImageCache.h> + +//#include <common/utils.h> + + + +namespace HuginBase { + + +/** class to cache remapped images, loaded from the hugin small + * image cache. + * + * This is meant to be used by the preview stitcher. + */ +class SmallRemappedImageCache : public Nona::SingleImageRemapper<vigra::FRGBImage, vigra::BImage> +{ + + typedef Nona::RemappedPanoImage<vigra::FRGBImage, vigra::BImage> MRemappedImage; + + +public: + /// + virtual ~SmallRemappedImageCache(); + + +public: + /// + virtual MRemappedImage* getRemapped(const PanoramaData & pano, + const PanoramaOptions & opts, + unsigned int imgNr, + AppBase::MultiProgressDisplay & progress); + + /// +// virtual MRemappedImage* getRemapped(const std::string & filename, +// const vigra::Diff2D & origSrcSize, +// const vigra::Diff2D & srcSize, +// VariableMap srcVars, +// Lens::LensProjectionFormat srcProj, +// ImageOptions imgOpts, +// const vigra::Diff2D &destSize, +// PanoramaOptions::ProjectionFormat destProj, +// double destHFOV, +// utils::MultiProgressDisplay & progress); + + + virtual void release(MRemappedImage* d) + { + // NOP, will be done by invalidate.. + } + + /** invalidates all images */ + void invalidate(); + + /** invalidate a specific image */ + void invalidate(unsigned int imgNr); + + +protected: + std::map<unsigned, MRemappedImage*> m_images; + + // descriptions of the remapped image. useful to determine + // if it has to be updated or not + std::map<unsigned, SrcPanoImage> m_imagesParam; + std::map<unsigned, PanoramaOptions> m_panoOpts; + +}; + + +} //namespace +#endif // _IMAGECACHE_H Modified: hugin/branches/ippei/src/hugin_base/huginapp/ImageCache.cpp =================================================================== --- hugin/branches/ippei/src/hugin_base/huginapp/ImageCache.cpp 2007-07-06 22:39:13 UTC (rev 2233) +++ hugin/branches/ippei/src/hugin_base/huginapp/ImageCache.cpp 2007-07-07 15:17:43 UTC (rev 2234) @@ -24,63 +24,59 @@ * */ -#include <config.h> -#include "panoinc_WX.h" +#include "ImageCache.h" -#include "panoinc.h" +//#include <config.h> +//#include "panoinc_WX.h" +// +//#include "panoinc.h" +// +//#include <fstream> +#include <iostream> -#include <fstream> - -#include <vigra/basicimage.hxx> -#include <vigra/basicimageview.hxx> -#include <vigra/rgbvalue.hxx> +#include <vigra/inspectimage.hxx> +#include <vigra/accessor.hxx> +//#include <vigra/basicimage.hxx> +//#include <vigra/basicimageview.hxx> +//#include <vigra/rgbvalue.hxx> #include <vigra/impex.hxx> -#include <vigra/error.hxx> +//#include <vigra/error.hxx> #include <vigra_ext/utils.h> #include <vigra_ext/impexalpha.hxx> #include <vigra_ext/Pyramid.h> -#include <vigra_ext/ImageTransforms.h> +//#include <vigra_ext/ImageTransforms.h> #include <vigra_ext/FunctorAccessor.h> -#include <PT/Stitcher.h> +//#include <PT/Stitcher.h> #include <vigra/functorexpression.hxx> +// +//#include "hugin/ImageCache.h" +//#include "hugin/config_defaults.h" +// +#include <vigra/sized_int.hxx> -#include "hugin/ImageCache.h" -#include "hugin/config_defaults.h" -#include <vigra/sized_int.hxx> +namespace HuginBase { + using namespace std; -using namespace vigra; -using namespace vigra_ext; -using namespace utils; -using namespace PT; using namespace vigra::functor; +//using namespace vigra_ext; +//using namespace hugin_utils; +//using namespace vigra::functor; - -template <class T1> -struct GetRange; - -// define the scale factors to map from the alpha channel type (T2) -// to valid alpha channels in image type (T1) -// T1: image type -// T2: alpha type -// S: scale factor (given as type of T1). +// ImageCache::GetRange implementation #define VIGRA_EXT_GETRANGE(T1, MI,MA) \ template<> \ -struct GetRange<T1> \ +T1 ImageCache::GetRange<T1>::min() \ { \ - static T1 min() \ -{ \ return MI; \ } \ - static T1 max() \ +template<> \ +T1 ImageCache::GetRange<T1>::max() \ { \ return MA; \ } \ -}; - -// conversion from/to unsigned char VIGRA_EXT_GETRANGE(vigra::UInt8, 0, 255); VIGRA_EXT_GETRANGE(vigra::Int16, 0, 32767); VIGRA_EXT_GETRANGE(vigra::UInt16, 0, 65535); @@ -91,22 +87,21 @@ #undef VIGRA_EXT_GETRANGE -ImageCache * ImageCache::instance = 0; -ImageCache::ImageCache() - : m_progress(0), m_accessCounter(0) -{ -} -ImageCache::~ImageCache() +ImageCache * ImageCache::instance = NULL; + +ImageCache& ImageCache::getInstance() { - images.clear(); -// delete instance; - instance = 0; + if (instance == NULL) + { + instance = new ImageCache(); + } + return *instance; } -// blubber + void ImageCache::removeImage(const std::string & filename) { map<string, EntryPtr>::iterator it = images.find(filename); @@ -151,7 +146,7 @@ void ImageCache::softFlush() { - long upperBound = wxConfigBase::Get()->Read(wxT("/ImageCache/UpperBound"), 100 * 1024 * 1024l); + long upperBound = 100 * 1024 * 1024l; long purgeToSize = long(0.75 * upperBound); // calculate used memory @@ -176,7 +171,7 @@ } long pyrMem = 0; - std::map<std::string, BImage*>::iterator pyrIt; + std::map<std::string, vigra::BImage*>::iterator pyrIt; for(pyrIt=pyrImages.begin(); pyrIt != pyrImages.end(); pyrIt++) { pyrMem += pyrIt->second->width() * pyrIt->second->height(); } @@ -212,7 +207,7 @@ while (purgeAmount > purgedMem) { bool deleted = false; if (pyrImages.size() > 0) { - BImage * imgPtr = (*(pyrImages.begin())).second; + vigra::BImage * imgPtr = (*(pyrImages.begin())).second; purgedMem += imgPtr->width() * imgPtr->height(); delete imgPtr; pyrImages.erase(pyrImages.begin()); @@ -253,16 +248,7 @@ } -ImageCache & ImageCache::getInstance() -{ - if (!instance) { - instance = new ImageCache(); - } - return *instance; -} - - /* struct ApplyGammaFunctor { @@ -298,28 +284,28 @@ */ -#if 0 -/// add a scalar to all components, might break other stuff, therefore define just here -template <class V1, class V2> -inline -vigra::RGBValue<V1> -operator+(const vigra::RGBValue<V1> l, V2 const & r) -{ - return vigra::RGBValue<V1>(l.red() + r, l.green() + r, l.blue() + r); -} +//#if 0 +///// add a scalar to all components, might break other stuff, therefore define just here +//template <class V1, class V2> +//inline +//vigra::RGBValue<V1> +//operator+(const vigra::RGBValue<V1> l, V2 const & r) +//{ +// return vigra::RGBValue<V1>(l.red() + r, l.green() + r, l.blue() + r); +//} +// +///// subtract a scalar to all components, might break other stuff, therefore define just here +//template <class V1, class V2> +//inline +//vigra::RGBValue<V1> +//operator-(const vigra::RGBValue<V1> l, V2 const & r) +//{ +// return vigra::RGBValue<V1>(l.red() - r, l.green() - r, l.blue() - r); +//} +//#endif -/// subtract a scalar to all components, might break other stuff, therefore define just here -template <class V1, class V2> -inline -vigra::RGBValue<V1> -operator-(const vigra::RGBValue<V1> l, V2 const & r) -{ - return vigra::RGBValue<V1>(l.red() - r, l.green() - r, l.blue() - r); -} -#endif - -void convertTo8Bit(vigra::FRGBImage & src, std::string origType, vigra::BRGBImage & dest) +void ImageCache::convertTo8Bit(vigra::FRGBImage & src, std::string origType, vigra::BRGBImage & dest) { // code to apply the mapping to 8 bit // always scaled from 0..1 for integer images. @@ -329,44 +315,44 @@ double min=0; double max=1; - int mapping = wxConfigBase::Get()->Read(wxT("/ImageCache/MappingInteger"), HUGIN_IMGCACHE_MAPPING_INTEGER); + int mapping = HUGIN_IMGCACHE_MAPPING_INTEGER; // float needs to be from min ... max. if (origType == "FLOAT" || origType == "DOUBLE") { - vigra::RGBToGrayAccessor<RGBValue<float> > ga; + vigra::RGBToGrayAccessor<vigra::RGBValue<float> > ga; vigra::FindMinMax<float> minmax; // init functor vigra::inspectImage(srcImageRange(src, ga), minmax); min = minmax.min; max = minmax.max; - mapping = wxConfigBase::Get()->Read(wxT("/ImageCache/MappingFloat"), HUGIN_IMGCACHE_MAPPING_FLOAT); + mapping = HUGIN_IMGCACHE_MAPPING_FLOAT; } - applyMapping(srcImageRange(src), destImage(dest), min, max, mapping); + vigra_ext::applyMapping(srcImageRange(src), destImage(dest), min, max, mapping); } -struct MyMultFunc -{ - MyMultFunc(double f) - { - m = f; - } - double m; +//struct MyMultFunc +//{ +// MyMultFunc(double f) +// { +// m = f; +// } +// double m; +// +// template<class T> +// T +// operator()(T v) const +// { +// return vigra::NumericTraits<T>::fromRealPromote(v*m); +// } +//}; - template<class T> - T - operator()(T v) const - { - return vigra::NumericTraits<T>::fromRealPromote(v*m); - } -}; - template <class SrcPixelType, class DestIterator, class DestAccessor> -void importAndConvertImage(const ImageImportInfo & info, - vigra::pair<DestIterator, DestAccessor> dest, - const std::string & type) +void ImageCache::importAndConvertImage(const vigra::ImageImportInfo & info, + vigra::pair<DestIterator, DestAccessor> dest, + const std::string & type) { typedef typename DestAccessor::value_type DestPixelType; @@ -378,8 +364,8 @@ // integer image.. scale to 0 .. 1 double scale = 1.0/vigra_ext::LUTTraits<SrcPixelType>::max(); // DestPixelType factor(scale); - Multiply<double> f(scale); - transformImage(dest.first, dest.first+ Diff2D(info.width(), info.height()), dest.second, + vigra_ext::Multiply<double> f(scale); + transformImage(dest.first, dest.first+ vigra::Diff2D(info.width(), info.height()), dest.second, dest.first, dest.second, Arg1()*Param(scale)); } @@ -389,9 +375,9 @@ template <class SrcPixelType, class DestIterator, class DestAccessor> -void importAndConvertGrayImage(const ImageImportInfo & info, - vigra::pair<DestIterator, DestAccessor> dest, - wxString type) +void ImageCache::importAndConvertGrayImage(const ImageImportInfo & info, + vigra::pair<DestIterator, DestAccessor> dest, + wxString type) { typedef typename DestAccessor::value_type DestPixelType; @@ -427,9 +413,9 @@ template <class SrcPixelType, class DestIterator, class DestAccessor> -void importAndConvertGrayAlphaImage(const ImageImportInfo & info, - vigra::pair<DestIterator, DestAccessor> dest, - wxString type) +void ImageCache::importAndConvertGrayAlphaImage(const ImageImportInfo & info, + vigra::pair<DestIterator, DestAccessor> dest, + wxString type) { typedef typename DestAccessor::value_type DestPixelType; typedef typename DestPixelType::value_type DestComponentType; @@ -468,10 +454,10 @@ template <class SrcPixelType, class DestIterator, class DestAccessor, class MaskIterator, class MaskAccessor> -void importAndConvertAlphaImage(const ImageImportInfo & info, - vigra::pair<DestIterator, DestAccessor> dest, - vigra::pair<MaskIterator, MaskAccessor> mask, - const std::string & type) +void ImageCache::importAndConvertAlphaImage(const vigra::ImageImportInfo & info, + vigra::pair<DestIterator, DestAccessor> dest, + vigra::pair<MaskIterator, MaskAccessor> mask, + const std::string & type) { typedef typename DestAccessor::value_type DestPixelType; typedef typename DestPixelType::value_type DestComponentType; @@ -485,7 +471,7 @@ vigra::importImageAlpha(info, dest, mask); double scale = 1.0/vigra_ext::LUTTraits<SrcPixelType>::max(); DestPixelType factor(scale); - transformImage(dest.first, dest.first+ Diff2D(info.width(), info.height()), dest.second, + transformImage(dest.first, dest.first+ vigra::Diff2D(info.width(), info.height()), dest.second, dest.first, dest.second, Arg1()*Param(scale)); } @@ -510,9 +496,10 @@ return it->second; } else { if (m_progress) { - m_progress->pushTask(ProgressTask((const char *)wxString::Format(_("Loading image %s"),wxString(utils::stripPath(filename).c_str(), *wxConvCurrent).c_str()).mb_str(), "", 0)); + char* message; + sprintf(message, "Loading image %s",hugin_utils::stripPath(filename).c_str()); + m_progress->pushTask(AppBase::ProgressTask(std::string(message), "", 0)); } - wxBusyCursor wait; #if 1 // load images with VIGRA impex, and store either 8 bit or float images std::string pixelTypeStr; @@ -521,7 +508,7 @@ ImageCache8Ptr mask(new vigra::BImage); try { - ImageImportInfo info(filename.c_str()); + vigra::ImageImportInfo info(filename.c_str()); int bands = info.numBands(); int extraBands = info.numExtraBands(); @@ -536,42 +523,42 @@ imgFloat->resize(info.size()); } - wxString pixelTypeWX(pixelType, *wxConvCurrent); +//wxString pixelTypeWX(pixelType, *wxConvCurrent); if ( bands == 1) { // load and convert image to 8 bit, if needed if (strcmp(pixelType, "UINT8") == 0 ) { vigra::importImage(info, destImage(*img8, - VectorComponentAccessor<RGBValue<vigra::UInt8> >(0))); - copyImage(srcImageRange(*img8, VectorComponentAccessor<RGBValue<vigra::UInt8> >(0)), - destImage(*img8, VectorComponentAccessor<RGBValue<vigra::UInt8> >(1))); - copyImage(srcImageRange(*img8, VectorComponentAccessor<RGBValue<vigra::UInt8> >(0)), - destImage(*img8, VectorComponentAccessor<RGBValue<vigra::UInt8> >(2))); + vigra::VectorComponentAccessor<vigra::RGBValue<vigra::UInt8> >(0))); + copyImage(srcImageRange(*img8, vigra::VectorComponentAccessor<vigra::RGBValue<vigra::UInt8> >(0)), + destImage(*img8, vigra::VectorComponentAccessor<vigra::RGBValue<vigra::UInt8> >(1))); + copyImage(srcImageRange(*img8, vigra::VectorComponentAccessor<vigra::RGBValue<vigra::UInt8> >(0)), + destImage(*img8, vigra::VectorComponentAccessor<vigra::RGBValue<vigra::UInt8> >(2))); } else { if (strcmp(pixelType, "INT16") == 0 ) { importAndConvertImage<vigra::Int16> (info, destImage(*imgFloat, - VectorComponentAccessor<RGBValue<float> >(0)), pixelType); + vigra::VectorComponentAccessor<vigra::RGBValue<float> >(0)), pixelType); } else if (strcmp(pixelType, "UINT16") == 0 ) { importAndConvertImage<vigra::UInt16>(info, destImage(*imgFloat, - VectorComponentAccessor<RGBValue<float> >(0)), pixelType); + vigra::VectorComponentAccessor<vigra::RGBValue<float> >(0)), pixelType); } else if (strcmp(pixelType, "UINT32") == 0 ) { importAndConvertImage<vigra::UInt32>(info, destImage(*imgFloat, - VectorComponentAccessor<vigra::RGBValue<float> >(0)), pixelType); + vigra::VectorComponentAccessor<vigra::RGBValue<float> >(0)), pixelType); } else if (strcmp(pixelType, "INT32") == 0 ) { importAndConvertImage<vigra::Int32>(info, destImage(*imgFloat, - VectorComponentAccessor<RGBValue<float> >(0)), pixelType); + vigra::VectorComponentAccessor<vigra::RGBValue<float> >(0)), pixelType); } else if (strcmp(pixelType, "FLOAT") == 0 ) { importAndConvertImage<float>(info, destImage(*imgFloat, - VectorComponentAccessor<RGBValue<float> >(0)), pixelType); + vigra::VectorComponentAccessor<vigra::RGBValue<float> >(0)), pixelType); } else if (strcmp(pixelType, "DOUBLE") == 0 ) { importAndConvertImage<double>(info, destImage(*imgFloat, - VectorComponentAccessor<RGBValue<float> >(0)), pixelType); + vigra::VectorComponentAccessor<vigra::RGBValue<float> >(0)), pixelType); } else { DEBUG_FATAL("Unsupported pixel type: " << pixelType); } - copyImage(srcImageRange(*imgFloat, VectorComponentAccessor<RGBValue<float> >(0)), - destImage(*imgFloat, VectorComponentAccessor<RGBValue<float> >(1))); - copyImage(srcImageRange(*imgFloat, VectorComponentAccessor<RGBValue<float> >(0)), - destImage(*imgFloat, VectorComponentAccessor<RGBValue<float> >(2))); + copyImage(srcImageRange(*imgFloat, vigra::VectorComponentAccessor<vigra::RGBValue<float> >(0)), + destImage(*imgFloat, vigra::VectorComponentAccessor<vigra::RGBValue<float> >(1))); + copyImage(srcImageRange(*imgFloat, vigra::VectorComponentAccessor<vigra::RGBValue<float> >(0)), + destImage(*imgFloat, vigra::VectorComponentAccessor<vigra::RGBValue<float> >(2))); } } else if (bands == 3 && extraBands == 0) { DEBUG_DEBUG( pixelType); @@ -579,17 +566,17 @@ if (strcmp(pixelType, "UINT8") == 0 ) { vigra::importImage(info, destImage(*img8)); } else if (strcmp(pixelType, "INT16") == 0 ) { - importAndConvertImage<RGBValue<vigra::Int16> > (info, destImage(*imgFloat), pixelType); + importAndConvertImage<vigra::RGBValue<vigra::Int16> > (info, destImage(*imgFloat), pixelType); } else if (strcmp(pixelType, "UINT16") == 0 ) { - importAndConvertImage<RGBValue<vigra::UInt16> >(info, destImage(*imgFloat), pixelType); + importAndConvertImage<vigra::RGBValue<vigra::UInt16> >(info, destImage(*imgFloat), pixelType); } else if (strcmp(pixelType, "UINT32") == 0 ) { - importAndConvertImage<RGBValue<vigra::UInt32> >(info, destImage(*imgFloat), pixelType); + importAndConvertImage<vigra::RGBValue<vigra::UInt32> >(info, destImage(*imgFloat), pixelType); } else if (strcmp(pixelType, "INT32") == 0 ) { - importAndConvertImage<RGBValue<vigra::Int32> >(info, destImage(*imgFloat), pixelType); + importAndConvertImage<vigra::RGBValue<vigra::Int32> >(info, destImage(*imgFloat), pixelType); } else if (strcmp(pixelType, "FLOAT") == 0 ) { - importAndConvertImage<RGBValue<float> >(info, destImage(*imgFloat), pixelType); + importAndConvertImage<vigra::RGBValue<float> >(info, destImage(*imgFloat), pixelType); } else if (strcmp(pixelType, "DOUBLE") == 0 ) { - importAndConvertImage<RGBValue<double> >(info, destImage(*imgFloat), pixelType); + importAndConvertImage<vigra::RGBValue<double> >(info, destImage(*imgFloat), pixelType); } else { DEBUG_FATAL("Unsupported pixel type: " << pixelType); } @@ -646,7 +633,7 @@ } } catch (std::exception & e) { // could not load image.. - wxLogError(wxString::Format(_("Error during image reading: %s"), wxString(e.what(),*wxConvCurrent).c_str())); + DEBUG_FATAL("Error during image reading: " << e.what()); throw; } @@ -685,9 +672,11 @@ if (it != images.end()) { return it->second; } else { - wxBusyCursor wait; - if (m_progress) { - m_progress->pushTask(ProgressTask((const char *)wxString::Format(_("Scaling image %s"),wxString(utils::stripPath(filename).c_str(), *wxConvCurrent).c_str()).mb_str(), "", 0)); + if (m_progress) + { + char* message; + sprintf(message, "Scaling image %s",hugin_utils::stripPath(filename).c_str()); + m_progress->pushTask(AppBase::ProgressTask(std::string(message), "", 0)); } DEBUG_DEBUG("creating small image " << name ); EntryPtr entry = getImage(filename); @@ -705,7 +694,7 @@ } size_t sz = w*h; - size_t smallImageSize = wxConfigBase::Get()->Read(wxT("/ImageCache/SmallImageSize"), 800 * 800l); + size_t smallImageSize = 800 * 800l; int nLevel=0; while(sz > smallImageSize) { @@ -716,19 +705,19 @@ e->origType = entry->origType; e->lastAccess = m_accessCounter; if (entry->imageFloat->width() != 0 ) { - e->imageFloat = ImageCacheRGBFloatPtr(new FRGBImage); + e->imageFloat = ImageCacheRGBFloatPtr(new vigra::FRGBImage); if (entry->mask->width() != 0) { - reduceNTimes(*(entry->imageFloat), *(entry->mask), *(e->imageFloat), *(e->mask), nLevel); + vigra_ext::reduceNTimes(*(entry->imageFloat), *(entry->mask), *(e->imageFloat), *(e->mask), nLevel); } else { - reduceNTimes(*(entry->imageFloat), *(e->imageFloat), nLevel); + vigra_ext::reduceNTimes(*(entry->imageFloat), *(e->imageFloat), nLevel); } } if (entry->image8->width() != 0) { e->image8 = ImageCacheRGB8Ptr(new vigra::BRGBImage); if ((entry->mask->width() != 0) && (e->mask->width() == 0) ) { - reduceNTimes(*(entry->image8), *(entry->mask), *(e->image8), *(e->mask), nLevel); + vigra_ext::reduceNTimes(*(entry->image8), *(entry->mask), *(e->image8), *(e->mask), nLevel); } else { - reduceNTimes(*(entry->image8), *(e->image8), nLevel); + vigra_ext::reduceNTimes(*(entry->image8), *(e->image8), nLevel); } } if (integer && e->image8->width() == 0) { @@ -817,153 +806,4 @@ #endif -SmallRemappedImageCache::~SmallRemappedImageCache() -{ - invalidate(); -} - -SmallRemappedImageCache::MRemappedImage * -SmallRemappedImageCache::getRemapped(const PT::Panorama & pano, - const PT::PanoramaOptions & popts, - unsigned int imgNr, - utils::MultiProgressDisplay & progress) -{ - // always map to HDR mode. curve and exposure is applied in preview window, for speed - PanoramaOptions opts = popts; - opts.outputMode = PanoramaOptions::OUTPUT_HDR; - opts.outputExposureValue = 0.0; - - // return old image, if already in cache and if it has changed since the last rendering - if (set_contains(m_images, imgNr)) { - // return cached image if the parameters of the image have not changed - SrcPanoImage oldParam = m_imagesParam[imgNr]; - if (oldParam == pano.getSrcImage(imgNr) - && m_panoOpts[imgNr].getHFOV() == opts.getHFOV() - && m_panoOpts[imgNr].getWidth() == opts.getWidth() - && m_panoOpts[imgNr].getHeight() == opts.getHeight() - && m_panoOpts[imgNr].getProjection() == opts.getProjection() - && m_panoOpts[imgNr].getProjectionParameters() == opts.getProjectionParameters() - ) - { - DEBUG_DEBUG("using cached remapped image " << imgNr); - return m_images[imgNr]; - } - } - - // WARNING: this might invalidate images that are stored somewhere.. - ImageCache::getInstance().softFlush(); - - typedef BasicImageView<RGBValue<unsigned char> > BRGBImageView; - -// typedef vigra::NumericTraits<PixelType>::RealPromote RPixelType; - - // remap image - DEBUG_DEBUG("remapping image " << imgNr); - - // load image - const PanoImage & img = pano.getImage(imgNr); - const PT::ImageOptions & iopts = img.getOptions(); - - ImageCache::EntryPtr e = ImageCache::getInstance().getSmallImage(img.getFilename().c_str()); - if ( (e->image8->width() == 0) && (e->imageFloat->width() == 0) ) { - throw std::runtime_error("could not retrieve small source image for preview generation"); - } - Size2D srcImgSize; - if (e->image8->width() > 0) - srcImgSize = e->image8->size(); - else - srcImgSize = e->imageFloat->size(); - - MRemappedImage *remapped = new MRemappedImage; - SrcPanoImage srcPanoImg = pano.getSrcImage(imgNr); - // adjust distortion parameters for small preview image - srcPanoImg.resize(srcImgSize); - - FImage srcFlat; - // use complete image, by supplying an empty mask image - BImage srcMask; - - if (iopts.m_vigCorrMode & ImageOptions::VIGCORR_FLATFIELD) { - ImageCache::EntryPtr e = ImageCache::getInstance().getSmallImage(iopts.m_flatfield.c_str()); - if (!e) { - throw std::runtime_error("could not retrieve flatfield image for preview generation"); - } - if (e->image8->width()) { - srcFlat.resize(e->image8->size()); - vigra::copyImage(srcImageRange(*(e->image8), - RGBToGrayAccessor<RGBValue<vigra::UInt8> >()), - destImage(srcFlat)); - } else { - srcFlat.resize(e->imageFloat->size()); - vigra::copyImage(srcImageRange(*(e->imageFloat), - RGBToGrayAccessor<RGBValue<float> >()), - destImage(srcFlat)); - } - } - progress.pushTask(ProgressTask("remapping", "", 0)); - - if (e->imageFloat->width()) { - // remap image - remapImage(*(e->imageFloat), - srcMask, - srcFlat, - srcPanoImg, - opts, - *remapped, - progress); - } else { - remapImage(*(e->image8), - srcMask, - srcFlat, - srcPanoImg, - opts, - *remapped, - progress); - } - - progress.popTask(); - - m_images[imgNr] = remapped; - m_imagesParam[imgNr] = pano.getSrcImage(imgNr); - m_panoOpts[imgNr] = opts; - return remapped; -} - - -void SmallRemappedImageCache::invalidate() -{ - DEBUG_DEBUG("Clear remapped cache"); - for(std::map<unsigned int, MRemappedImage*>::iterator it = m_images.begin(); - it != m_images.end(); ++it) - { - delete (*it).second; - } - // remove all images - m_images.clear(); - m_imagesParam.clear(); -} - -void SmallRemappedImageCache::invalidate(unsigned int imgNr) -{ - DEBUG_DEBUG("Remove " << imgNr << " from remapped cache"); - if (set_contains(m_images, imgNr)) { - delete (m_images[imgNr]); - m_images.erase(imgNr); - m_imagesParam.erase(imgNr); - } -} - -wxImage imageCacheEntry2wxImage(ImageCache::EntryPtr e) -{ - if (e->image8->width() > 0) { - return wxImage(e->image8->width(), - e->image8->height(), - (unsigned char *)e->image8->data(), - true); - } else { - // invalid wxImage - return wxImage(); - } - -} - +} //namespace \ No newline at end of file Modified: hugin/branches/ippei/src/hugin_base/huginapp/ImageCache.h =================================================================== --- hugin/branches/ippei/src/hugin_base/huginapp/ImageCache.h 2007-07-06 22:39:13 UTC (rev 2233) +++ hugin/branches/ippei/src/hugin_base/huginapp/ImageCache.h 2007-07-07 15:17:43 UTC (rev 2234) @@ -25,37 +25,20 @@ #define _IMAGECACHE_H #include <map> - -#include <common/utils.h> -//#include <vigra/stdimage.hxx> -#include <PT/RemappedPanoImage.h> -//#include <PT/PanoImage.h> #include <boost/shared_ptr.hpp> +#include <vigra/stdimage.hxx> +#include <vigra/imageinfo.hxx> +#include <hugin_utils/utils.h> +#include <appbase/ProgressDisplayOld.h> -// use reference counted pointers -typedef boost::shared_ptr<vigra::BRGBImage> ImageCacheRGB8Ptr; -typedef boost::shared_ptr<vigra::FRGBImage> ImageCacheRGBFloatPtr; -typedef boost::shared_ptr<vigra::BImage> ImageCache8Ptr; +#define HUGIN_IMGCACHE_MAPPING_INTEGER 0l +#define HUGIN_IMGCACHE_MAPPING_FLOAT 1l +//using namespace vigra; -/** key for an image. used to find images, and to store access information. - * - * Key is misnamed, because its more than just a key. - */ -struct ImageKey -{ - /// name of the image - std::string name; - /// producer (for special images) - std::string producer; - /// number of accesses - int accesses; - bool operator==(const ImageKey& o) const - { return name == o.name && producer == o.producer; } -}; - - +namespace HuginBase { + /** This is a cache for all the images we use. * * is a singleton for easy access from everywhere. @@ -69,181 +52,197 @@ */ class ImageCache { -public: - - /** information about an image inside the cache */ - class Entry - { - public: + + public: + /// use reference counted pointers + typedef boost::shared_ptr<vigra::BRGBImage> ImageCacheRGB8Ptr; + typedef boost::shared_ptr<vigra::FRGBImage> ImageCacheRGBFloatPtr; + typedef boost::shared_ptr<vigra::BImage> ImageCache8Ptr; + + /** information about an image inside the cache */ + struct Entry + { ImageCacheRGB8Ptr image8; ImageCacheRGBFloatPtr imageFloat; ImageCache8Ptr mask; std::string origType; int lastAccess; + + public: + /// + Entry() + : image8(ImageCacheRGB8Ptr(new vigra::BRGBImage)), + imageFloat(ImageCacheRGBFloatPtr(new vigra::FRGBImage)), + mask(ImageCache8Ptr(new vigra::BImage)) + {}; - Entry() - : image8(ImageCacheRGB8Ptr(new vigra::BRGBImage)), - imageFloat(ImageCacheRGBFloatPtr(new vigra::FRGBImage)), - mask(ImageCache8Ptr(new vigra::BImage)) - { }; + /// + Entry(ImageCacheRGB8Ptr & img, + ImageCacheRGBFloatPtr & imgFloat, + ImageCache8Ptr & imgMask, + const std::string & typ) + : image8(img), imageFloat(imgFloat), mask(imgMask), origType(typ), lastAccess(0) + {}; + }; - Entry(ImageCacheRGB8Ptr & img, ImageCacheRGBFloatPtr & imgFloat, - ImageCache8Ptr & imgMask, const std::string & typ) - : image8(img), imageFloat(imgFloat), mask(imgMask), origType(typ), lastAccess(0) - { }; + /** a shared pointer to the entry */ + typedef boost::shared_ptr<Entry> EntryPtr; - ~Entry() - { - } - }; - - /** a shared pointer to the entry */ - typedef boost::shared_ptr<Entry> EntryPtr; - - /** dtor. - */ - virtual ~ImageCache(); - - /** get the global ImageCache object */ - static ImageCache & getInstance(); - - /** get a image. - * - * it will be loaded if its not already in the cache - * - * Hold the EntryPtr as long as the image data is needed! - */ - EntryPtr getImage(const std::string & filename, bool forceInteger=false); - - /** get an small image. - * - * This image is 512x512 pixel maximum and can be used for icons - * and different previews. It is directly derived from the original. - */ - EntryPtr getSmallImage(const std::string & filename, - bool forceInteger=false); - - - /** remove a specific image (and dependant images) - * from the cache - */ - void removeImage(const std::string & filename); - - /** release all images in the cache. - * - * useful on project load, or maybe before stitching really - * big pictures - */ - void flush(); - - /** a soft version of flush. - * - * Releases some images if they go over a certain threshold - */ - void softFlush(); - - void setProgressDisplay(utils::MultiProgressDisplay * disp) + + private: + // ctor. private, nobody execpt us can create an instance. + ImageCache() + : m_progress(NULL), m_accessCounter(0) + {}; + + public: + /** dtor. + */ + virtual ~ImageCache() { - m_progress = disp; + images.clear(); + //instance = NULL; } - /** get a pyramid image. - * - * A image pyramid is a image in multiple resolutions. - * Usually it is used to accelerate image processing, by using - * lower resolutions first. they are properly low pass filtered, - * so no undersampling occurs (it would if one just takes - * every 2^level pixel instead). - * - * @param filename of source image - * @param level of pyramid. height and width are calculated as - * follows: height/(level^2), width/(level^1) - * - */ -// const vigra::BImage & getPyramidImage(const std::string & filename, -// int level); + /** get the global ImageCache object */ + static ImageCache & getInstance(); + + private: + static ImageCache* instance; -private: - /** ctor. private, nobody execpt us can create an instance. - */ - ImageCache(); + + public: + /** get a image. + * + * it will be loaded if its not already in the cache + * + * Hold the EntryPtr as long as the image data is needed! + */ + EntryPtr getImage(const std::string & filename, bool forceInteger=false); - static ImageCache * instance; + /** get an small image. + * + * This image is 512x512 pixel ... [truncated message content] |
From: <ip...@us...> - 2007-07-09 17:21:17
|
Revision: 2248 http://hugin.svn.sourceforge.net/hugin/?rev=2248&view=rev Author: ippei Date: 2007-07-09 10:21:15 -0700 (Mon, 09 Jul 2007) Log Message: ----------- start testing; Panorama class now links okay Modified Paths: -------------- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj hugin/branches/ippei/src/hugin_base/appbase/DocumentData.h hugin/branches/ippei/src/hugin_base/hugin_utils/utils.cpp hugin/branches/ippei/src/hugin_base/hugin_utils/utils.h hugin/branches/ippei/src/hugin_base/panodata/Lens.cpp hugin/branches/ippei/src/hugin_base/panodata/PTScriptParsing.cpp hugin/branches/ippei/src/hugin_base/panodata/PanoImage.cpp hugin/branches/ippei/src/hugin_base/panodata/PanoImage.h hugin/branches/ippei/src/hugin_base/panodata/Panorama.cpp hugin/branches/ippei/src/hugin_base/panodata/Panorama.h hugin/branches/ippei/src/hugin_base/panodata/PanoramaData.h hugin/branches/ippei/src/hugin_base/panodata/PanoramaOptions.cpp hugin/branches/ippei/src/hugin_base/panodata/PanoramaOptions.h hugin/branches/ippei/src/hugin_base/panodata/PanoramaVariable.cpp hugin/branches/ippei/src/hugin_base/panodata/SrcPanoImage.cpp hugin/branches/ippei/src/hugin_base/panotools/PanoToolsInterface.cpp hugin/branches/ippei/src/hugin_base/panotools/PanoToolsInterface.h hugin/branches/ippei/src/hugin_base/panotools/PanoToolsOptimizerWrapper.cpp Added Paths: ----------- hugin/branches/ippei/src/hugin_base/test/ hugin/branches/ippei/src/hugin_base/test/open_file.cpp Modified: hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-07-08 22:11:59 UTC (rev 2247) +++ hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-07-09 17:21:15 UTC (rev 2248) @@ -7,6 +7,31 @@ objects = { /* Begin PBXAggregateTarget section */ + 57A60E920C400269007B5462 /* All */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 57A60EB20C4002B0007B5462 /* Build configuration list for PBXAggregateTarget "All" */; + buildPhases = ( + ); + dependencies = ( + 57A60E940C400272007B5462 /* PBXTargetDependency */, + 57A60E960C400272007B5462 /* PBXTargetDependency */, + 57A60E980C400272007B5462 /* PBXTargetDependency */, + 57A60E9A0C400272007B5462 /* PBXTargetDependency */, + 57A60E9C0C400272007B5462 /* PBXTargetDependency */, + 57A60E9E0C400272007B5462 /* PBXTargetDependency */, + 57A60EA00C400272007B5462 /* PBXTargetDependency */, + 57A60EA20C400272007B5462 /* PBXTargetDependency */, + 57A60EA40C400272007B5462 /* PBXTargetDependency */, + 57A60EA60C400272007B5462 /* PBXTargetDependency */, + 57A60EA80C400272007B5462 /* PBXTargetDependency */, + 57A60EAA0C400272007B5462 /* PBXTargetDependency */, + 57A60EAC0C400272007B5462 /* PBXTargetDependency */, + 57A60EAE0C400272007B5462 /* PBXTargetDependency */, + 57A60EB00C400272007B5462 /* PBXTargetDependency */, + ); + name = All; + productName = All; + }; 57C486290C3121E8002D79F1 /* copy hugin_config.h */ = { isa = PBXAggregateTarget; buildConfigurationList = 57C4862A0C312226002D79F1 /* Build configuration list for PBXAggregateTarget "copy hugin_config.h" */; @@ -21,6 +46,53 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 5702273C0C4260CC008A44D6 /* open_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 570227180C425C6A008A44D6 /* open_file.cpp */; }; + 57023B300C427838008A44D6 /* libhugin_panodata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; }; + 57023B470C4279A2008A44D6 /* auto_file.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 57114F0206BC2301004F4FA7 /* auto_file.hxx */; }; + 57023B480C4279A2008A44D6 /* bmp.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 57114F0406BC2301004F4FA7 /* bmp.hxx */; }; + 57023B490C4279A2008A44D6 /* byteorder.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 57114F0606BC2301004F4FA7 /* byteorder.hxx */; }; + 57023B4A0C4279A2008A44D6 /* codecmanager.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 57114F0806BC2301004F4FA7 /* codecmanager.hxx */; }; + 57023B4B0C4279A2008A44D6 /* error.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 57114F0906BC2301004F4FA7 /* error.hxx */; }; + 57023B4C0C4279A2008A44D6 /* exr.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 577785FC0BF3439D0041F8FF /* exr.hxx */; }; + 57023B4D0C4279A2008A44D6 /* gif.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 57114F0B06BC2301004F4FA7 /* gif.hxx */; }; + 57023B4E0C4279A2008A44D6 /* hdr.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 578ECFFD0A8D0C160028A7FB /* hdr.hxx */; }; + 57023B4F0C4279A2008A44D6 /* iccjpeg.h in Headers */ = {isa = PBXBuildFile; fileRef = 573F330609F79BB20088B333 /* iccjpeg.h */; }; + 57023B500C4279A2008A44D6 /* jpeg.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 57114F0E06BC2301004F4FA7 /* jpeg.hxx */; }; + 57023B510C4279A2008A44D6 /* png.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 57114F1106BC2301004F4FA7 /* png.hxx */; }; + 57023B520C4279A2008A44D6 /* pnm.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 57114F1306BC2301004F4FA7 /* pnm.hxx */; }; + 57023B540C4279A2008A44D6 /* rgbe.h in Headers */ = {isa = PBXBuildFile; fileRef = 578ECFFF0A8D0C160028A7FB /* rgbe.h */; }; + 57023B550C4279A2008A44D6 /* sun.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 57114F1506BC2301004F4FA7 /* sun.hxx */; }; + 57023B560C4279A2008A44D6 /* tiff.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 57023B460C427981008A44D6 /* tiff.hxx */; }; + 57023B570C4279A2008A44D6 /* viff.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 57114F1906BC2301004F4FA7 /* viff.hxx */; }; + 57023B580C4279A2008A44D6 /* void_vector.hxx in Headers */ = {isa = PBXBuildFile; fileRef = 57114F1B06BC2301004F4FA7 /* void_vector.hxx */; }; + 57023B620C427AB4008A44D6 /* libhugin_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F5D70C3006E900736343 /* libhugin_utils.a */; }; + 57023B910C428147008A44D6 /* platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F5EB0C3007F300736343 /* platform.h */; }; + 57023B920C428147008A44D6 /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F5ED0C3007F300736343 /* utils.h */; }; + 57023B930C428147008A44D6 /* stl_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F6170C30106A00736343 /* stl_utils.h */; }; + 57023B9A0C42816A008A44D6 /* ControlPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EF260C32B1740043F754 /* ControlPoint.h */; }; + 57023B9B0C42816A008A44D6 /* DestPanoImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5797B9EC0C33EB4D00F3DEE6 /* DestPanoImage.h */; }; + 57023B9C0C42816A008A44D6 /* Lens.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EF780C32B69F0043F754 /* Lens.h */; }; + 57023B9D0C42816A008A44D6 /* PanoImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759DA600C327DC90043F754 /* PanoImage.h */; }; + 57023B9E0C42816A008A44D6 /* Panorama.h in Headers */ = {isa = PBXBuildFile; fileRef = 57B88E5E0C36CD7E00EC6519 /* Panorama.h */; }; + 57023B9F0C42816A008A44D6 /* PanoramaData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5713010A0C33E3DD00252FE3 /* PanoramaData.h */; }; + 57023BA00C42816A008A44D6 /* PanoramaOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 571300820C33D49200252FE3 /* PanoramaOptions.h */; }; + 57023BA10C42816A008A44D6 /* PanoramaVariable.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EE7D0C32AA050043F754 /* PanoramaVariable.h */; }; + 57023BA20C42816A008A44D6 /* PTScriptParsing.h in Headers */ = {isa = PBXBuildFile; fileRef = 57B8A1A40C36E53A00EC6519 /* PTScriptParsing.h */; }; + 57023BA30C42816A008A44D6 /* SrcPanoImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EEE10C32AE100043F754 /* SrcPanoImage.h */; }; + 57023D980C428BF6008A44D6 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; + 57023D9A0C428C26008A44D6 /* libboost_thread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F7450C30202B00736343 /* libboost_thread.a */; }; + 57023D9D0C428C4B008A44D6 /* libpano12.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano12.a */; }; + 57023D9E0C428C4B008A44D6 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; + 57023D9F0C428C4B008A44D6 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; + 57023DA00C428C4B008A44D6 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; + 57023DA10C428C63008A44D6 /* libhugin_panotools.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 571300650C33D41F00252FE3 /* libhugin_panotools.a */; }; + 57023DB10C428C83008A44D6 /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; + 57023DB40C428CB2008A44D6 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; + 57023DB60C428CDE008A44D6 /* libIlmImf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.a */; }; + 57023DB70C428CDE008A44D6 /* libHalf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.a */; }; + 57023DB90C428CF0008A44D6 /* libIex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.a */; }; + 57023DBA0C428D17008A44D6 /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.a */; }; + 57023DBC0C428D30008A44D6 /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; 571152F806BC6E4C004F4FA7 /* bmp.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0306BC2301004F4FA7 /* bmp.cxx */; }; 571152F906BC6E58004F4FA7 /* byteorder.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0506BC2301004F4FA7 /* byteorder.cxx */; }; 571152FE06BC6E8E004F4FA7 /* codecmanager.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0706BC2301004F4FA7 /* codecmanager.cxx */; }; @@ -29,8 +101,6 @@ 5713007B0C33D44400252FE3 /* PanoToolsOptimizerWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 571300710C33D43B00252FE3 /* PanoToolsOptimizerWrapper.cpp */; }; 5713007C0C33D44400252FE3 /* PanoToolsOptimizerWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 571300720C33D43B00252FE3 /* PanoToolsOptimizerWrapper.h */; }; 571300830C33D49200252FE3 /* PanoramaOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 571300810C33D49200252FE3 /* PanoramaOptions.cpp */; }; - 571300840C33D49200252FE3 /* PanoramaOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 571300820C33D49200252FE3 /* PanoramaOptions.h */; }; - 5713010B0C33E3DD00252FE3 /* PanoramaData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5713010A0C33E3DD00252FE3 /* PanoramaData.h */; }; 571DD7E10C3E935F0027A85E /* PTStitcherStitcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 571DD7DF0C3E935F0027A85E /* PTStitcherStitcher.cpp */; }; 571DD82D0C3E97CD0027A85E /* PTmenderStitcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 571DD82B0C3E97CD0027A85E /* PTmenderStitcher.h */; }; 571DD82E0C3E97CD0027A85E /* PTmenderStitcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 571DD82C0C3E97CD0027A85E /* PTmenderStitcher.cpp */; }; @@ -65,15 +135,10 @@ 5759D9CC0C3271640043F754 /* ProgressDisplayOld.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9BF0C3271640043F754 /* ProgressDisplayOld.h */; }; 5759D9CD0C3271640043F754 /* ProgressReporterOld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759D9C00C3271640043F754 /* ProgressReporterOld.cpp */; }; 5759D9CE0C3271640043F754 /* ProgressReporterOld.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9C10C3271640043F754 /* ProgressReporterOld.h */; }; - 5759DAA40C32807A0043F754 /* PanoImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759DA600C327DC90043F754 /* PanoImage.h */; }; 5759EE810C32AA270043F754 /* PanoramaVariable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759EE7B0C32A9FA0043F754 /* PanoramaVariable.cpp */; }; - 5759EE820C32AA270043F754 /* PanoramaVariable.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EE7D0C32AA050043F754 /* PanoramaVariable.h */; }; 5759EEE20C32AE100043F754 /* SrcPanoImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759EEE00C32AE100043F754 /* SrcPanoImage.cpp */; }; - 5759EEE30C32AE100043F754 /* SrcPanoImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EEE10C32AE100043F754 /* SrcPanoImage.h */; }; 5759EF270C32B1740043F754 /* ControlPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759EF250C32B1740043F754 /* ControlPoint.cpp */; }; - 5759EF280C32B1740043F754 /* ControlPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EF260C32B1740043F754 /* ControlPoint.h */; }; 5759EF790C32B69F0043F754 /* Lens.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759EF770C32B69F0043F754 /* Lens.cpp */; }; - 5759EF7A0C32B69F0043F754 /* Lens.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759EF780C32B69F0043F754 /* Lens.h */; }; 576DA17B0C3CF8A5006E8D90 /* NonaImageStitcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576DA1790C3CF8A5006E8D90 /* NonaImageStitcher.cpp */; }; 576DA17C0C3CF8A5006E8D90 /* NonaImageStitcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 576DA17A0C3CF8A5006E8D90 /* NonaImageStitcher.h */; }; 576DA2200C3D04F4006E8D90 /* NonaFileStitcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576DA21E0C3D04F4006E8D90 /* NonaFileStitcher.cpp */; }; @@ -91,10 +156,7 @@ 576EDDAE0C3FFF820076A417 /* PhotometricOptimizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 576EDDA80C3FFF820076A417 /* PhotometricOptimizer.h */; }; 5771F4DD0C2FEE0900736343 /* exif.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F4DA0C2FEE0900736343 /* exif.cpp */; }; 5771F4DE0C2FEE0900736343 /* jpgfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F4DC0C2FEE0900736343 /* jpgfile.cpp */; }; - 5771F5EE0C3007F300736343 /* platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F5EB0C3007F300736343 /* platform.h */; }; 5771F5EF0C3007F300736343 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5771F5EC0C3007F300736343 /* utils.cpp */; }; - 5771F5F00C3007F300736343 /* utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F5ED0C3007F300736343 /* utils.h */; }; - 5771F6190C30107200736343 /* stl_utils.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F6170C30106A00736343 /* stl_utils.h */; }; 5771F6430C3011FD00736343 /* jhead.h in Headers */ = {isa = PBXBuildFile; fileRef = 5771F4DB0C2FEE0900736343 /* jhead.h */; }; 5771F6E10C301B7200736343 /* lm.h in Headers */ = {isa = PBXBuildFile; fileRef = 5720E4860BD4575000E63404 /* lm.h */; }; 5771F6E20C301B7200736343 /* misc.h in Headers */ = {isa = PBXBuildFile; fileRef = 5720E48E0BD4575000E63404 /* misc.h */; }; @@ -162,10 +224,7 @@ 5785A3A20C3BED7F00DD8BD8 /* FitPanorama.h in Headers */ = {isa = PBXBuildFile; fileRef = 5785A3A00C3BED7F00DD8BD8 /* FitPanorama.h */; }; 578ED0000A8D0C160028A7FB /* hdr.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 578ECFFC0A8D0C150028A7FB /* hdr.cxx */; }; 578ED0010A8D0C160028A7FB /* rgbe.c in Sources */ = {isa = PBXBuildFile; fileRef = 578ECFFE0A8D0C160028A7FB /* rgbe.c */; }; - 5797B9ED0C33EB4D00F3DEE6 /* DestPanoImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 5797B9EC0C33EB4D00F3DEE6 /* DestPanoImage.h */; }; 57B88E5F0C36CD7E00EC6519 /* Panorama.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57B88E5D0C36CD7E00EC6519 /* Panorama.cpp */; }; - 57B88E600C36CD7E00EC6519 /* Panorama.h in Headers */ = {isa = PBXBuildFile; fileRef = 57B88E5E0C36CD7E00EC6519 /* Panorama.h */; }; - 57B8A1A50C36E53C00EC6519 /* PTScriptParsing.h in Headers */ = {isa = PBXBuildFile; fileRef = 57B8A1A40C36E53A00EC6519 /* PTScriptParsing.h */; }; 57C313C00C37E04500E00EDC /* PTScriptParsing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C313BF0C37E04500E00EDC /* PTScriptParsing.cpp */; }; 57C4868E0C31299E002D79F1 /* hugin_math.h in Headers */ = {isa = PBXBuildFile; fileRef = 57C4868D0C31299E002D79F1 /* hugin_math.h */; }; 57C486C60C312BA8002D79F1 /* Vector3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C486C50C312BA8002D79F1 /* Vector3.cpp */; }; @@ -190,6 +249,41 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 570227880C426363008A44D6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5759DA4E0C327D680043F754 /* panodata */; + remoteInfo = panodata; + }; + 57023B6D0C427B8E008A44D6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5771F5D60C3006E900736343 /* hugin_utils */; + remoteInfo = hugin_utils; + }; + 57023DC80C428DE6008A44D6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 571300640C33D41F00252FE3 /* panotools */; + remoteInfo = panotools; + }; + 57023DCE0C428DE7008A44D6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4 /* jhead */; + remoteInfo = jhead; + }; + 57023DD00C428DE7008A44D6 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5711524906BC6709004F4FA7 /* vigra_impex */; + remoteInfo = vigra_impex; + }; 5771F63E0C3011D700736343 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -204,16 +298,117 @@ remoteGlobalIDString = 5771F7440C30202B00736343; remoteInfo = boost_thread; }; - 57C4864A0C31240A002D79F1 /* PBXContainerItemProxy */ = { + 57A60E930C400272007B5462 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; + 57A60E950C400272007B5462 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5720E4720BD456CD00E63404; + remoteInfo = levmar; + }; + 57A60E970C400272007B5462 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5771F8140C30268F00736343; + remoteInfo = PTLensDB; + }; + 57A60E990C400272007B5462 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5711524906BC6709004F4FA7; + remoteInfo = vigra_impex; + }; + 57A60E9B0C400272007B5462 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4; + remoteInfo = jhead; + }; + 57A60E9D0C400272007B5462 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5771F7440C30202B00736343; + remoteInfo = boost_thread; + }; + 57A60E9F0C400272007B5462 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57C1705809A125DE00FAF325; + remoteInfo = vigra_ext; + }; + 57A60EA10C400272007B5462 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5771F5D60C3006E900736343; + remoteInfo = hugin_utils; + }; + 57A60EA30C400272007B5462 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5771F7790C30216F00736343; + remoteInfo = hugin_math; + }; + 57A60EA50C400272007B5462 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5759D9AB0C32713F0043F754; + remoteInfo = appbase; + }; + 57A60EA70C400272007B5462 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5759DA4E0C327D680043F754; + remoteInfo = panodata; + }; + 57A60EA90C400272007B5462 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 571300640C33D41F00252FE3; + remoteInfo = panotools; + }; + 57A60EAB0C400272007B5462 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 574092290C393E6600D16607; + remoteInfo = nona; + }; + 57A60EAD0C400272007B5462 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57EA83850C3A798A00E4965E; + remoteInfo = algorithms; + }; + 57A60EAF0C400272007B5462 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 576EC4980C3FC9300076A417; + remoteInfo = huginapp; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 570227180C425C6A008A44D6 /* open_file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = open_file.cpp; sourceTree = "<group>"; }; + 5702272F0C42605C008A44D6 /* open_file */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = open_file; sourceTree = BUILT_PRODUCTS_DIR; }; + 57023B460C427981008A44D6 /* tiff.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tiff.hxx; sourceTree = "<group>"; }; 5702996D07F967CB00F1FF15 /* HuginFiles.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = HuginFiles.icns; sourceTree = "<group>"; }; 570D581A082A9ED50030E768 /* enblend */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = enblend; path = bin/enblend; sourceTree = "<group>"; }; 57114E9F06BC2301004F4FA7 /* Hugin-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "Hugin-Info.plist"; sourceTree = "<group>"; }; @@ -282,7 +477,7 @@ 57237F490C391053005818A4 /* Stitcher2.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Stitcher2.cpp; sourceTree = "<group>"; }; 57237F4A0C391053005818A4 /* Stitcher3.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Stitcher3.cpp; sourceTree = "<group>"; }; 57237F4B0C391053005818A4 /* Stitcher4.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Stitcher4.cpp; sourceTree = "<group>"; }; - 573B8F85067BAAB900B7B355 /* libpano13.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpano13.a; path = lib/libpano13.a; sourceTree = "<group>"; }; + 573B8F85067BAAB900B7B355 /* libpano12.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libpano12.a; path = "/Users/ippei/dev/hugin/ExternalPrograms/Repository-universal/lib/libpano12.a"; sourceTree = "<absolute>"; }; 573C3861067C789F00A5DBE0 /* System.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = System.framework; path = System/Library/Frameworks/System.framework; sourceTree = "<group>"; }; 573C3862067C789F00A5DBE0 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = "<group>"; }; 573E2E470B76AC8900E86281 /* howto.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = howto.txt; sourceTree = "<group>"; }; @@ -376,7 +571,7 @@ 573F330309F79B740088B333 /* windows.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = windows.h; sourceTree = "<group>"; }; 573F330409F79BAA0088B333 /* iccjpeg.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = iccjpeg.c; sourceTree = "<group>"; }; 573F330609F79BB20088B333 /* iccjpeg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = iccjpeg.h; sourceTree = "<group>"; }; - 5740922A0C393E6600D16607 /* libnona.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libnona.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 5740922A0C393E6600D16607 /* libhugin_nona.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_nona.a; sourceTree = BUILT_PRODUCTS_DIR; }; 574092350C393E9000D16607 /* ImageRemapper.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageRemapper.h; sourceTree = "<group>"; }; 57453AEF094E4F9C00E6B672 /* jconfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = jconfig.h; sourceTree = "<group>"; }; 57453AF0094E4F9C00E6B672 /* jerror.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = jerror.h; sourceTree = "<group>"; }; @@ -424,7 +619,7 @@ 576DA17A0C3CF8A5006E8D90 /* NonaImageStitcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NonaImageStitcher.h; path = algorithms/nona/NonaImageStitcher.h; sourceTree = "<group>"; }; 576DA21E0C3D04F4006E8D90 /* NonaFileStitcher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = NonaFileStitcher.cpp; path = algorithms/nona/NonaFileStitcher.cpp; sourceTree = "<group>"; }; 576DA21F0C3D04F4006E8D90 /* NonaFileStitcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NonaFileStitcher.h; path = algorithms/nona/NonaFileStitcher.h; sourceTree = "<group>"; }; - 576EC4990C3FC9300076A417 /* libhuginapp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhuginapp.a; sourceTree = BUILT_PRODUCTS_DIR; }; + 576EC4990C3FC9300076A417 /* libhuginapp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhuginapp.a; sourceTree = "<group>"; }; 576EC4A60C3FC9750076A417 /* CachedImageRemapper.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CachedImageRemapper.cpp; sourceTree = "<group>"; }; 576EC4A70C3FC9750076A417 /* CachedImageRemapper.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedImageRemapper.h; sourceTree = "<group>"; }; 576EC4A80C3FC9750076A417 /* ImageCache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ImageCache.cpp; sourceTree = "<group>"; }; @@ -544,7 +739,6 @@ 57C4868D0C31299E002D79F1 /* hugin_math.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = hugin_math.h; sourceTree = "<group>"; }; 57C486C50C312BA8002D79F1 /* Vector3.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Vector3.cpp; sourceTree = "<group>"; }; 57C487350C313A2C002D79F1 /* Matrix3.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Matrix3.cpp; sourceTree = "<group>"; }; - 57CBEE5306BC717A00C43FF5 /* tiff.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; name = tiff.hxx; path = ../src/foreign/vigra_impex/tiff.hxx; sourceTree = SOURCE_ROOT; }; 57CCCC29086C957E000EBC4A /* AUTHORS */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = AUTHORS; sourceTree = "<group>"; }; 57CCCC2B086C957E000EBC4A /* BUGS */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = BUGS; sourceTree = "<group>"; }; 57CCCC2C086C957E000EBC4A /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ChangeLog; sourceTree = "<group>"; }; @@ -559,7 +753,7 @@ 57CF926B06BD7AD100780AC5 /* nona_gui-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "nona_gui-Info.plist"; sourceTree = "<group>"; }; 57D14A4506B8A3D100D8A03D /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = lib/libjpeg.a; sourceTree = "<group>"; }; 57D55913067BDB84005E4CCD /* libmx.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmx.dylib; path = usr/lib/libmx.dylib; sourceTree = "<group>"; }; - 57D5DCD6073FD86D0027E52F /* hugin_config_mac.h */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.corefile"; fileEncoding = 30; path = hugin_config_mac.h; sourceTree = "<group>"; }; + 57D5DCD6073FD86D0027E52F /* hugin_config_mac.h */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.corefile"; fileEncoding = 30; languageSpecificationIdentifier = c.cpp; path = hugin_config_mac.h; sourceTree = "<group>"; }; 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_algorithms.a; sourceTree = BUILT_PRODUCTS_DIR; }; 57EA83A00C3A7AA900E4965E /* PanoramaAlgorithm.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PanoramaAlgorithm.h; path = algorithm/PanoramaAlgorithm.h; sourceTree = "<group>"; }; 57EA83A10C3A7AA900E4965E /* StitcherAlgorithm.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = StitcherAlgorithm.h; path = algorithm/StitcherAlgorithm.h; sourceTree = "<group>"; }; @@ -573,16 +767,47 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 5771F5D50C3006E900736343 /* Frameworks */ = { + 5702272D0C42605C008A44D6 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 57023D980C428BF6008A44D6 /* libz.dylib in Frameworks */, + 57023D9E0C428C4B008A44D6 /* libpng.a in Frameworks */, + 57023D9F0C428C4B008A44D6 /* libtiff.a in Frameworks */, + 57023DA00C428C4B008A44D6 /* libjpeg.a in Frameworks */, + 57023DB90C428CF0008A44D6 /* libIex.a in Frameworks */, + 57023DBA0C428D17008A44D6 /* libIlmThread.a in Frameworks */, + 57023DB60C428CDE008A44D6 /* libIlmImf.a in Frameworks */, + 57023DBC0C428D30008A44D6 /* libImath.a in Frameworks */, + 57023DB70C428CDE008A44D6 /* libHalf.a in Frameworks */, + 57023D9D0C428C4B008A44D6 /* libpano12.a in Frameworks */, + 57023DB40C428CB2008A44D6 /* libjhead.a in Frameworks */, + 57023DB10C428C83008A44D6 /* libvigra_impex.a in Frameworks */, + 57023B620C427AB4008A44D6 /* libhugin_utils.a in Frameworks */, + 57023DA10C428C63008A44D6 /* libhugin_panotools.a in Frameworks */, + 57023B300C427838008A44D6 /* libhugin_panodata.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; + 57023D9B0C428C2B008A44D6 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 57023D9A0C428C26008A44D6 /* libboost_thread.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 570227170C425C44008A44D6 /* test */ = { + isa = PBXGroup; + children = ( + 570227180C425C6A008A44D6 /* open_file.cpp */, + ); + path = test; + sourceTree = "<group>"; + }; 57114E9E06BC2301004F4FA7 /* mac */ = { isa = PBXGroup; children = ( @@ -735,7 +960,7 @@ 57114F1406BC2301004F4FA7 /* sun.cxx */, 57114F1506BC2301004F4FA7 /* sun.hxx */, 57114F1606BC2301004F4FA7 /* tiff.cxx */, - 57CBEE5306BC717A00C43FF5 /* tiff.hxx */, + 57023B460C427981008A44D6 /* tiff.hxx */, 57114F1806BC2301004F4FA7 /* viff.cxx */, 57114F1906BC2301004F4FA7 /* viff.hxx */, 57114F1A06BC2301004F4FA7 /* void_vector.cxx */, @@ -821,24 +1046,26 @@ 57BB2817068114B2006EDB38 /* Mac OS X */, ); name = Product; - sourceTree = BUILT_PRODUCTS_DIR; + path = build/Development; + sourceTree = "<group>"; }; 573B8F3F067BA2F900B7B355 /* lib */ = { isa = PBXGroup; children = ( + 5771F7450C30202B00736343 /* libboost_thread.a */, + 5771F8150C30268F00736343 /* libPTLensDB.a */, + 5720E47A0BD456CD00E63404 /* liblevmar.a */, + 5749F8A3067B60CA00A6EDD4 /* libjhead.a */, + 5711524A06BC6709004F4FA7 /* libvigra_impex.a */, + 57C1706C09A125DE00FAF325 /* libvigra_ext.a */, 5771F5D70C3006E900736343 /* libhugin_utils.a */, 5771F77A0C30216F00736343 /* libhugin_math.a */, 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */, 5759DA4F0C327D680043F754 /* libhugin_panodata.a */, 571300650C33D41F00252FE3 /* libhugin_panotools.a */, + 5740922A0C393E6600D16607 /* libhugin_nona.a */, 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */, - 5740922A0C393E6600D16607 /* libnona.a */, - 5771F7450C30202B00736343 /* libboost_thread.a */, - 5720E47A0BD456CD00E63404 /* liblevmar.a */, - 5749F8A3067B60CA00A6EDD4 /* libjhead.a */, - 57C1706C09A125DE00FAF325 /* libvigra_ext.a */, - 5711524A06BC6709004F4FA7 /* libvigra_impex.a */, - 5771F8150C30268F00736343 /* libPTLensDB.a */, + 576EC4990C3FC9300076A417 /* libhuginapp.a */, ); name = lib; sourceTree = "<group>"; @@ -894,7 +1121,7 @@ isa = PBXGroup; children = ( 570D581A082A9ED50030E768 /* enblend */, - 573B8F85067BAAB900B7B355 /* libpano13.a */, + 573B8F85067BAAB900B7B355 /* libpano12.a */, 577092FA06BD7388004058A1 /* libpng.a */, 577092FB06BD7388004058A1 /* libtiff.a */, 57D14A4506B8A3D100D8A03D /* libjpeg.a */, @@ -1043,6 +1270,7 @@ 57B88E610C36CD8F00EC6519 /* photometric */, 5713006E0C33D43B00252FE3 /* panotools */, 5771F7200C301FC100736343 /* vigra_ext */, + 570227170C425C44008A44D6 /* test */, ); path = hugin_base; sourceTree = "<group>"; @@ -1300,15 +1528,66 @@ 57114E9E06BC2301004F4FA7 /* mac */, 57C1708E09A12D7500FAF325 /* boost */, 5745FC05094E1D5400E6B672 /* External */, + 57CCCC23086C9530000EBC4A /* attached */, 573B8F3E067BA2EB00B7B355 /* Product */, - 57CCCC23086C9530000EBC4A /* attached */, - 576EC4990C3FC9300076A417 /* libhuginapp.a */, + 5702272F0C42605C008A44D6 /* open_file */, ); sourceTree = "<group>"; }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ + 57023B440C427950008A44D6 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 57023B470C4279A2008A44D6 /* auto_file.hxx in Headers */, + 57023B480C4279A2008A44D6 /* bmp.hxx in Headers */, + 57023B490C4279A2008A44D6 /* byteorder.hxx in Headers */, + 57023B4A0C4279A2008A44D6 /* codecmanager.hxx in Headers */, + 57023B4B0C4279A2008A44D6 /* error.hxx in Headers */, + 57023B4C0C4279A2008A44D6 /* exr.hxx in Headers */, + 57023B4D0C4279A2008A44D6 /* gif.hxx in Headers */, + 57023B4E0C4279A2008A44D6 /* hdr.hxx in Headers */, + 57023B4F0C4279A2008A44D6 /* iccjpeg.h in Headers */, + 57023B500C4279A2008A44D6 /* jpeg.hxx in Headers */, + 57023B510C4279A2008A44D6 /* png.hxx in Headers */, + 57023B520C4279A2008A44D6 /* pnm.hxx in Headers */, + 57023B540C4279A2008A44D6 /* rgbe.h in Headers */, + 57023B550C4279A2008A44D6 /* sun.hxx in Headers */, + 57023B560C4279A2008A44D6 /* tiff.hxx in Headers */, + 57023B570C4279A2008A44D6 /* viff.hxx in Headers */, + 57023B580C4279A2008A44D6 /* void_vector.hxx in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 57023B8F0C42813D008A44D6 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 57023B910C428147008A44D6 /* platform.h in Headers */, + 57023B920C428147008A44D6 /* utils.h in Headers */, + 57023B930C428147008A44D6 /* stl_utils.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 57023B940C428159008A44D6 /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 57023B9A0C42816A008A44D6 /* ControlPoint.h in Headers */, + 57023B9B0C42816A008A44D6 /* DestPanoImage.h in Headers */, + 57023B9C0C42816A008A44D6 /* Lens.h in Headers */, + 57023B9D0C42816A008A44D6 /* PanoImage.h in Headers */, + 57023B9E0C42816A008A44D6 /* Panorama.h in Headers */, + 57023B9F0C42816A008A44D6 /* PanoramaData.h in Headers */, + 57023BA00C42816A008A44D6 /* PanoramaOptions.h in Headers */, + 57023BA10C42816A008A44D6 /* PanoramaVariable.h in Headers */, + 57023BA20C42816A008A44D6 /* PTScriptParsing.h in Headers */, + 57023BA30C42816A008A44D6 /* SrcPanoImage.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 571300610C33D41F00252FE3 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -1344,23 +1623,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 5759DA4B0C327D680043F754 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 5759DAA40C32807A0043F754 /* PanoImage.h in Headers */, - 5759EE820C32AA270043F754 /* PanoramaVariable.h in Headers */, - 5759EEE30C32AE100043F754 /* SrcPanoImage.h in Headers */, - 5759EF280C32B1740043F754 /* ControlPoint.h in Headers */, - 5759EF7A0C32B69F0043F754 /* Lens.h in Headers */, - 571300840C33D49200252FE3 /* PanoramaOptions.h in Headers */, - 5713010B0C33E3DD00252FE3 /* PanoramaData.h in Headers */, - 5797B9ED0C33EB4D00F3DEE6 /* DestPanoImage.h in Headers */, - 57B88E600C36CD7E00EC6519 /* Panorama.h in Headers */, - 57B8A1A50C36E53C00EC6519 /* PTScriptParsing.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 576EC4950C3FC9300076A417 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -1371,16 +1633,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 5771F5D30C3006E900736343 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 5771F5EE0C3007F300736343 /* platform.h in Headers */, - 5771F5F00C3007F300736343 /* utils.h in Headers */, - 5771F6190C30107200736343 /* stl_utils.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 5771F6440C30120500736343 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -1484,11 +1736,33 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ + 5702272E0C42605C008A44D6 /* test open_file */ = { + isa = PBXNativeTarget; + buildConfigurationList = 570227310C426099008A44D6 /* Build configuration list for PBXNativeTarget "test open_file" */; + buildPhases = ( + 5702272C0C42605C008A44D6 /* Sources */, + 5702272D0C42605C008A44D6 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 57023DCF0C428DE7008A44D6 /* PBXTargetDependency */, + 57023DD10C428DE7008A44D6 /* PBXTargetDependency */, + 57023B6E0C427B8E008A44D6 /* PBXTargetDependency */, + 57023DC90C428DE6008A44D6 /* PBXTargetDependency */, + 570227890C426363008A44D6 /* PBXTargetDependency */, + ); + name = "test open_file"; + productName = "sample open_close"; + productReference = 5702272F0C42605C008A44D6 /* open_file */; + productType = "com.apple.product-type.tool"; + }; 5711524906BC6709004F4FA7 /* vigra_impex */ = { isa = PBXNativeTarget; buildConfigurationList = 571DA7B7088E59C20058F246 /* Build configuration list for PBXNativeTarget "vigra_impex" */; buildPhases = ( 5711524806BC6709004F4FA7 /* Sources */, + 57023B440C427950008A44D6 /* Headers */, ); buildRules = ( ); @@ -1544,7 +1818,7 @@ ); name = nona; productName = nona; - productReference = 5740922A0C393E6600D16607 /* libnona.a */; + productReference = 5740922A0C393E6600D16607 /* libhugin_nona.a */; productType = "com.apple.product-type.library.static"; }; 5749F8A2067B60CA00A6EDD4 /* jhead */ = { @@ -1584,7 +1858,7 @@ isa = PBXNativeTarget; buildConfigurationList = 5759DA540C327D940043F754 /* Build configuration list for PBXNativeTarget "panodata" */; buildPhases = ( - 5759DA4B0C327D680043F754 /* Headers */, + 57023B940C428159008A44D6 /* Headers */, 5759DA4C0C327D680043F754 /* Sources */, ); buildRules = ( @@ -1616,9 +1890,8 @@ isa = PBXNativeTarget; buildConfigurationList = 5771F5DA0C30076C00736343 /* Build configuration list for PBXNativeTarget "hugin_utils" */; buildPhases = ( - 5771F5D30C3006E900736343 /* Headers */, + 57023B8F0C42813D008A44D6 /* Headers */, 5771F5D40C3006E900736343 /* Sources */, - 5771F5D50C3006E900736343 /* Frameworks */, ); buildRules = ( ); @@ -1683,11 +1956,11 @@ buildPhases = ( 5771F7460C30204A00736343 /* Headers */, 57C1705909A125DE00FAF325 /* Sources */, + 57023D9B0C428C2B008A44D6 /* Frameworks */, ); buildRules = ( ); dependencies = ( - 57C4864B0C31240A002D79F1 /* PBXTargetDependency */, 5771F76C0C30206E00736343 /* PBXTargetDependency */, ); name = vigra_ext; @@ -1734,10 +2007,11 @@ productRefGroup = 57FC3ABD0675E43600C3E0AC; projectDirPath = ""; targets = ( + 57A60E920C400269007B5462 /* All */, 57C486290C3121E8002D79F1 /* copy hugin_config.h */, + 5711524906BC6709004F4FA7 /* vigra_impex */, 5720E4720BD456CD00E63404 /* levmar */, 5771F8140C30268F00736343 /* PTLensDB */, - 5711524906BC6709004F4FA7 /* vigra_impex */, 5749F8A2067B60CA00A6EDD4 /* jhead */, 5771F7440C30202B00736343 /* boost_thread */, 57C1705809A125DE00FAF325 /* vigra_ext */, @@ -1749,6 +2023,7 @@ 574092290C393E6600D16607 /* nona */, 57EA83850C3A798A00E4965E /* algorithms */, 576EC4980C3FC9300076A417 /* huginapp */, + 5702272E0C42605C008A44D6 /* test open_file */, ); }; /* End PBXProject section */ @@ -1772,6 +2047,14 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 5702272C0C42605C008A44D6 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 5702273C0C4260CC008A44D6 /* open_file.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 5711524806BC6709004F4FA7 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1958,6 +2241,31 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ + 570227890C426363008A44D6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5759DA4E0C327D680043F754 /* panodata */; + targetProxy = 570227880C426363008A44D6 /* PBXContainerItemProxy */; + }; + 57023B6E0C427B8E008A44D6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5771F5D60C3006E900736343 /* hugin_utils */; + targetProxy = 57023B6D0C427B8E008A44D6 /* PBXContainerItemProxy */; + }; + 57023DC90C428DE6008A44D6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 571300640C33D41F00252FE3 /* panotools */; + targetProxy = 57023DC80C428DE6008A44D6 /* PBXContainerItemProxy */; + }; + 57023DCF0C428DE7008A44D6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5749F8A2067B60CA00A6EDD4 /* jhead */; + targetProxy = 57023DCE0C428DE7008A44D6 /* PBXContainerItemProxy */; + }; + 57023DD10C428DE7008A44D6 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5711524906BC6709004F4FA7 /* vigra_impex */; + targetProxy = 57023DD00C428DE7008A44D6 /* PBXContainerItemProxy */; + }; 5771F63F0C3011D700736343 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 5771F5D60C3006E900736343 /* hugin_utils */; @@ -1968,14 +2276,136 @@ target = 5771F7440C30202B00736343 /* boost_thread */; targetProxy = 5771F76B0C30206E00736343 /* PBXContainerItemProxy */; }; - 57C4864B0C31240A002D79F1 /* PBXTargetDependency */ = { + 57A60E940C400272007B5462 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; - targetProxy = 57C4864A0C31240A002D79F1 /* PBXContainerItemProxy */; + targetProxy = 57A60E930C400272007B5462 /* PBXContainerItemProxy */; }; + 57A60E960C400272007B5462 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5720E4720BD456CD00E63404 /* levmar */; + targetProxy = 57A60E950C400272007B5462 /* PBXContainerItemProxy */; + }; + 57A60E980C400272007B5462 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5771F8140C30268F00736343 /* PTLensDB */; + targetProxy = 57A60E970C400272007B5462 /* PBXContainerItemProxy */; + }; + 57A60E9A0C400272007B5462 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5711524906BC6709004F4FA7 /* vigra_impex */; + targetProxy = 57A60E990C400272007B5462 /* PBXContainerItemProxy */; + }; + 57A60E9C0C400272007B5462 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5749F8A2067B60CA00A6EDD4 /* jhead */; + targetProxy = 57A60E9B0C400272007B5462 /* PBXContainerItemProxy */; + }; + 57A60E9E0C400272007B5462 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5771F7440C30202B00736343 /* boost_thread */; + targetProxy = 57A60E9D0C400272007B5462 /* PBXContainerItemProxy */; + }; + 57A60EA00C400272007B5462 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57C1705809A125DE00FAF325 /* vigra_ext */; + targetProxy = 57A60E9F0C400272007B5462 /* PBXContainerItemProxy */; + }; + 57A60EA20C400272007B5462 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5771F5D60C3006E900736343 /* hugin_utils */; + targetProxy = 57A60EA10C400272007B5462 /* PBXContainerItemProxy */; + }; + 57A60EA40C400272007B5462 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5771F7790C30216F00736343 /* hugin_math */; + targetProxy = 57A60EA30C400272007B5462 /* PBXContainerItemProxy */; + }; + 57A60EA60C400272007B5462 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5759D9AB0C32713F0043F754 /* appbase */; + targetProxy = 57A60EA50C400272007B5462 /* PBXContainerItemProxy */; + }; + 57A60EA80C400272007B5462 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5759DA4E0C327D680043F754 /* panodata */; + targetProxy = 57A60EA70C400272007B5462 /* PBXContainerItemProxy */; + }; + 57A60EAA0C400272007B5462 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 571300640C33D41F00252FE3 /* panotools */; + targetProxy = 57A60EA90C400272007B5462 /* PBXContainerItemProxy */; + }; + 57A60EAC0C400272007B5462 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 574092290C393E6600D16607 /* nona */; + targetProxy = 57A60EAB0C400272007B5462 /* PBXContainerItemProxy */; + }; + 57A60EAE0C400272007B5462 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57EA83850C3A798A00E4965E /* algorithms */; + targetProxy = 57A60EAD0C400272007B5462 /* PBXContainerItemProxy */; + }; + 57A60EB00C400272007B5462 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 576EC4980C3FC9300076A417 /* huginapp */; + targetProxy = 57A60EAF0C400272007B5462 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ + 570227320C426099008A44D6 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = open_file; + }; + name = Debug; + }; + 570227330C426099008A44D6 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = open_file; + }; + name = Development; + }; + 570227340C426099008A44D6 /* Development ZeroLink */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = open_file; + }; + name = "Development ZeroLink"; + }; + 570227350C426099008A44D6 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = open_file; + }; + name = Release; + }; 5713006A0C33D43600252FE3 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1984,6 +2414,11 @@ ../src/hugin_base, "$(inherited)", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"/Users/ippei/dev/hugin/ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = hugin_panotools; }; name = Debug; @@ -1996,6 +2431,11 @@ ../src/hugin_base, "$(inherited)", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"/Users/ippei/dev/hugin/ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = hugin_panotools; }; name = Development; @@ -2008,6 +2448,11 @@ ../src/hugin_base, "$(inherited)", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"/Users/ippei/dev/hugin/ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = hugin_panotools; }; name = "Development ZeroLink"; @@ -2020,6 +2465,11 @@ ../src/hugin_base, "$(inherited)", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"/Users/ippei/dev/hugin/ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = hugin_panotools; }; name = Release; @@ -2056,7 +2506,7 @@ ../src/foreign/vigra, "$(inherited)", ); - PRODUCT_NAME = nona; + PRODUCT_NAME = hugin_nona; }; name = Debug; }; @@ -2068,7 +2518,7 @@ ../src/foreign/vigra, "$(inherited)", ); - PRODUCT_NAME = nona; + PRODUCT_NAME = hugin_nona; }; name = Development; }; @@ -2080,7 +2530,7 @@ ../src/foreign/vigra, "$(inherited)", ); - PRODUCT_NAME = nona; + PRODUCT_NAME = hugin_nona; }; name = "Development ZeroLink"; }; @@ -2092,7 +2542,7 @@ ../src/foreign/vigra, "$(inherited)", ); - PRODUCT_NAME = nona; + PRODUCT_NAME = hugin_nona; }; name = Release; }; @@ -2163,7 +2613,11 @@ ./ExternalPrograms/repository/include/OpenEXR, ../src, ); - LIBRARY_SEARCH_PATHS = ./ExternalPrograms/repository/lib; + INSTALL_PATH = /Applications; + LIBRARY_SEARCH_PATHS = ( + "$(value)", + ./ExternalPrograms/repository/lib, + ); MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; PER_ARCH_CFLAGS_i386 = "-ftree-vectorize"; @@ -2208,7 +2662,11 @@ ./ExternalPrograms/repository/include/OpenEXR, ../src, ); - LIBRARY_SEARCH_PATHS = ./ExternalPrograms/repository/lib; + INSTALL_PATH = /Applications; + LIBRARY_SEARCH_PATHS = ( + "$(value)", + ./ExternalPrograms/repository/lib, + ); MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; PER_ARCH_CFLAGS_i386 = "-ftree-vectorize"; @@ -2220,6 +2678,7 @@ SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = YES; STRIP_STYLE = all; + VERSIONING_SYSTEM = "apple-generic"; WARNING_CFLAGS = "-Wstrict-aliasing"; WX_INCLUDE_DIR = "./ExternalPrograms/repository/include/wx-$(WX_MAJOR_VERSOIN)"; WX_INCLUDE_DIR_LIB = "./ExternalPrograms/repository/lib/wx/include/mac-unicode-release-static-$(WX_MAJOR_VERSOIN)"; @@ -2281,6 +2740,13 @@ ../src/foreign, "$(inherited)", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"/Users/ippei/dev/hugin/ExternalPrograms/Repository-universal/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = hugin_panodata; }; name = Debug; @@ -2289,12 +2755,20 @@ isa = XCBuildConfiguration; buildSettings = { HEADER_SEARCH_PATHS = ( + "$(inherited)", ../src/hugin_base, ../src/foreign/vigra, ../src/foreign, + ); + LIBRARY_SEARCH_PATHS = ( "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"/Users/ippei/dev/hugin/ExternalPrograms/Repository-universal/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = hugin_panodata; + USER_HEADER_SEARCH_PATHS = "$(inherited) ../src/hugin_base/panodata"; }; name = Development; }; @@ -2307,6 +2781,13 @@ ../src/foreign, "$(inherited)", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"/Users/ippei/dev/hugin/ExternalPrograms/Repository-universal/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = hugin_panodata; }; name = "Development ZeroLink"; @@ -2320,6 +2801,13 @@ ../src/foreign, "$(inherited)", ); + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", + "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", + ); + LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"/Users/ippei/dev/hugin/ExternalPrograms/Repository-universal/lib\""; + LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = hugin_panodata; }; name = Release; @@ -2368,7 +2856,11 @@ ./ExternalPrograms/repository/include/OpenEXR, ../src, ); - LIBRARY_SEARCH_PATHS = ./ExternalPrograms/repository/lib; + INSTALL_PATH = /Applications; + LIBRARY_SEARCH_PATHS = ( + "$(value)", + ./ExternalPrograms/repository/lib, + ); MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; PER_ARCH_CFLAGS_i386 = "-ftree-vectorize"; @@ -2380,6 +2872,7 @@ SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = NO; STRIP_STYLE = all; + VERSIONING_SYSTEM = ""; WARNING_CFLAGS = "-Wstrict-aliasing"; WX_INCLUDE_DIR = "./ExternalPrograms/repository/include/wx-$(WX_MAJOR_VERSOIN)"; WX_INCLUDE_DIR_LIB = "./ExternalPrograms/repository/lib/wx/include/mac-unicode-release-static-$(WX_MAJOR_VERSOIN)"; @@ -2528,7 +3021,11 @@ ./ExternalPrograms/repository/include/OpenEXR, ../src, ); - LIBRARY_SEARCH_PATHS = ./ExternalPrograms/repository/lib; + INSTALL_PATH = /Applications; + LIBRARY_SEARCH_PATHS = ( + "$(value)", + ./ExternalPrograms/repository/lib, + ); MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; PER_ARCH_CFLAGS_i386 = "-ftree-vectorize"; @@ -2540,6 +3037,7 @@ SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = NO; STRIP_STYLE = all; + VERSIONING_SYSTEM = ""; WARNING_CFLAGS = "-Wstrict-aliasing"; WX_INCLUDE_DIR = "./ExternalPrograms/repository/include/wx-$(WX_MAJOR_VERSOIN)"; WX_INCLUDE_DIR_LIB = "./ExternalPrograms/repository/lib/wx/include/mac-unicode-release-static-$(WX_MAJOR_VERSOIN)"; @@ -2656,6 +3154,46 @@ }; name = Release; }; + 57A60EB30C4002B0007B5462 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + PRODUCT_NAME = All; + }; + name = Debug; + }; + 57A60EB40C4002B0007B5462 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + PRODUCT_NAME = All; + }; + name = Development; + }; + 57A60EB50C4002B0007B5462 /* Development ZeroLink */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = All; + }; + name = "Development ZeroLink"; + }; + 57A60EB60C4002B0007B5462 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + PRODUCT_NAME = All; + ZERO_LINK = NO; + }; + name = Release; + }; 57C1706809A125DE00FAF325 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2787,6 +3325,17 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 570227310C426099008A44D6 /* Build configuration list for PBXNativeTarget "test open_file" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 570227320C426099008A44D6 /* Debug */, + 570227330C426099008A44D6 /* Development */, + 570227340C426099008A44D6 /* Development ZeroLink */, + 570227350C426099008A44D6 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; 571300690C33D43600252FE3 /* Build configuration list for PBXNativeTarget "panotools" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -2930,6 +3479,17 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + 57A60EB20C4002B0007B5462 /* Build configuration list for PBXAggregateTarget "All" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 57A60EB30C4002B0007B5462 /* Debug */, + 57A60EB40C4002B0007B5462 /* Development */, + 57A60EB50C4002B0007B5462 /* Development ZeroLink */, + 57A60EB60C4002B0007B5462 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; 57C1706609A125DE00FAF325 /* Build configuration list for PBXNativeTarget "vigra_ext" */ = { isa = XCConfigurationList; buildConfigurations = ( Modified: hugin/branches/ippei/src/hugin_base/appbase/DocumentData.h =================================================================== --- hugin/branches/ippei/src/hugin_base/appbase/DocumentData.h 2007-07-08 22:11:59 UTC (rev 2247) +++ hugin/branches/ippei/src/hugin_base/appbase/DocumentData.h 2007-07-09 17:21:15 UTC (rev 2248) @@ -44,14 +44,14 @@ public: /// - virtual ~Do... [truncated message content] |
From: <ip...@us...> - 2007-07-11 22:58:58
|
Revision: 2256 http://hugin.svn.sourceforge.net/hugin/?rev=2256&view=rev Author: ippei Date: 2007-07-11 15:58:50 -0700 (Wed, 11 Jul 2007) Log Message: ----------- update what I did earlier today; more debug and sample tools Modified Paths: -------------- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj hugin/branches/ippei/src/hugin_base/algorithms/basic/RotatePanorama.h hugin/branches/ippei/src/hugin_base/algorithms/basic/StraightenPanorama.h hugin/branches/ippei/src/hugin_base/algorithms/nona/CalculateFOV.h hugin/branches/ippei/src/hugin_base/algorithms/nona/FitPanorama.h hugin/branches/ippei/src/hugin_base/algorithms/nona/NonaFileStitcher.cpp hugin/branches/ippei/src/hugin_base/algorithms/optimizer/PTOptimizer.cpp hugin/branches/ippei/src/hugin_base/algorithms/optimizer/PTOptimizer.h hugin/branches/ippei/src/hugin_base/appbase/ProgressDisplay.cpp hugin/branches/ippei/src/hugin_base/appbase/ProgressDisplay.h hugin/branches/ippei/src/hugin_base/appbase/ProgressDisplayOld.cpp hugin/branches/ippei/src/hugin_base/appbase/ProgressDisplayOld.h hugin/branches/ippei/src/hugin_base/hugin_math/Matrix3.cpp hugin/branches/ippei/src/hugin_base/hugin_math/Matrix3.h hugin/branches/ippei/src/hugin_base/nona/Stitcher.h hugin/branches/ippei/src/hugin_base/panodata/SrcPanoImage.cpp hugin/branches/ippei/src/hugin_base/test/open_file.cpp hugin/branches/ippei/src/hugin_base/vigra_ext/ImageTransforms.h Added Paths: ----------- hugin/branches/ippei/src/hugin_base/panoinc.h hugin/branches/ippei/src/hugin_base/test/autooptimiser.cpp Modified: hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-07-11 22:10:07 UTC (rev 2255) +++ hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-07-11 22:58:50 UTC (rev 2256) @@ -93,6 +93,22 @@ 57023DB90C428CF0008A44D6 /* libIex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.a */; }; 57023DBA0C428D17008A44D6 /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.a */; }; 57023DBC0C428D30008A44D6 /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; + 5709A0750C4543E100BD1C53 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; + 5709A0760C4543E100BD1C53 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; + 5709A0770C4543E100BD1C53 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; + 5709A0780C4543E100BD1C53 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; + 5709A0790C4543E100BD1C53 /* libIex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.a */; }; + 5709A07A0C4543E100BD1C53 /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.a */; }; + 5709A07B0C4543E100BD1C53 /* libIlmImf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.a */; }; + 5709A07C0C4543E100BD1C53 /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; + 5709A07D0C4543E100BD1C53 /* libHalf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.a */; }; + 5709A07E0C4543E100BD1C53 /* libpano12.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano12.a */; }; + 5709A07F0C4543E100BD1C53 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; + 5709A0800C4543E100BD1C53 /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; + 5709A0810C4543E100BD1C53 /* libhugin_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F5D70C3006E900736343 /* libhugin_utils.a */; }; + 5709A0820C4543E100BD1C53 /* libhugin_panotools.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 571300650C33D41F00252FE3 /* libhugin_panotools.a */; }; + 5709A0830C4543E100BD1C53 /* libhugin_panodata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; }; + 5709A08D0C45440200BD1C53 /* autooptimiser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5709A0650C4543D700BD1C53 /* autooptimiser.cpp */; }; 571152F806BC6E4C004F4FA7 /* bmp.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0306BC2301004F4FA7 /* bmp.cxx */; }; 571152F906BC6E58004F4FA7 /* byteorder.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0506BC2301004F4FA7 /* byteorder.cxx */; }; 571152FE06BC6E8E004F4FA7 /* codecmanager.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F0706BC2301004F4FA7 /* codecmanager.cxx */; }; @@ -224,6 +240,26 @@ 5785A3A20C3BED7F00DD8BD8 /* FitPanorama.h in Headers */ = {isa = PBXBuildFile; fileRef = 5785A3A00C3BED7F00DD8BD8 /* FitPanorama.h */; }; 578ED0000A8D0C160028A7FB /* hdr.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 578ECFFC0A8D0C150028A7FB /* hdr.cxx */; }; 578ED0010A8D0C160028A7FB /* rgbe.c in Sources */ = {isa = PBXBuildFile; fileRef = 578ECFFE0A8D0C160028A7FB /* rgbe.c */; }; + 579610D20C43C541006B7C6E /* libhugin_algorithms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */; }; + 5796FA810C4395CC006B7C6E /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; + 5796FA820C4395CC006B7C6E /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; + 5796FA830C4395CC006B7C6E /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; + 5796FA840C4395CC006B7C6E /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; + 5796FA850C4395CC006B7C6E /* libIex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.a */; }; + 5796FA860C4395CC006B7C6E /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.a */; }; + 5796FA870C4395CC006B7C6E /* libIlmImf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.a */; }; + 5796FA880C4395CC006B7C6E /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; + 5796FA890C4395CC006B7C6E /* libHalf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.a */; }; + 5796FA8A0C4395CC006B7C6E /* libpano12.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano12.a */; }; + 5796FA8B0C4395CC006B7C6E /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; + 5796FA8C0C4395CC006B7C6E /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; + 5796FA8D0C4395CC006B7C6E /* libhugin_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F5D70C3006E900736343 /* libhugin_utils.a */; }; + 5796FA8E0C4395CC006B7C6E /* libhugin_panotools.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 571300650C33D41F00252FE3 /* libhugin_panotools.a */; }; + 5796FA8F0C4395CC006B7C6E /* libhugin_panodata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; }; + 5796FA980C4395F4006B7C6E /* nona.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5796FA970C4395F4006B7C6E /* nona.cpp */; }; + 5796FD9D0C43AC50006B7C6E /* libvigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libvigra_ext.a */; }; + 5796FD9E0C43AC50006B7C6E /* libhugin_appbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */; }; + 5796FD9F0C43AC50006B7C6E /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; }; 57B88E5F0C36CD7E00EC6519 /* Panorama.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57B88E5D0C36CD7E00EC6519 /* Panorama.cpp */; }; 57C313C00C37E04500E00EDC /* PTScriptParsing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C313BF0C37E04500E00EDC /* PTScriptParsing.cpp */; }; 57C4868E0C31299E002D79F1 /* hugin_math.h in Headers */ = {isa = PBXBuildFile; fileRef = 57C4868D0C31299E002D79F1 /* hugin_math.h */; }; @@ -238,6 +274,10 @@ 57CBEE3206BC715C00C43FF5 /* tiff.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F1606BC2301004F4FA7 /* tiff.cxx */; }; 57CBEE3306BC716200C43FF5 /* viff.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F1806BC2301004F4FA7 /* viff.cxx */; }; 57CBEE3406BC716600C43FF5 /* void_vector.cxx in Sources */ = {isa = PBXBuildFile; fileRef = 57114F1A06BC2301004F4FA7 /* void_vector.cxx */; }; + 57DB9BC10C454BA2004957C2 /* libhugin_algorithms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */; }; + 57DB9BC20C454BA5004957C2 /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; }; + 57DB9BC70C454BE5004957C2 /* libhugin_appbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */; }; + 57DB9BC90C454C07004957C2 /* libhugin_math.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F77A0C30216F00736343 /* libhugin_math.a */; }; 57EA83A20C3A7AA900E4965E /* PanoramaAlgorithm.h in Headers */ = {isa = PBXBuildFile; fileRef = 57EA83A00C3A7AA900E4965E /* PanoramaAlgorithm.h */; }; 57EA83A30C3A7AA900E4965E /* StitcherAlgorithm.h in Headers */ = {isa = PBXBuildFile; fileRef = 57EA83A10C3A7AA900E4965E /* StitcherAlgorithm.h */; }; 57EA83CA0C3A800100E4965E /* CalculateCPStatistics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EA83C80C3A800100E4965E /* CalculateCPStatistics.cpp */; }; @@ -253,37 +293,79 @@ isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5759DA4E0C327D680043F754 /* panodata */; + remoteGlobalIDString = 5759DA4E0C327D680043F754; remoteInfo = panodata; }; 57023B6D0C427B8E008A44D6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5771F5D60C3006E900736343 /* hugin_utils */; + remoteGlobalIDString = 5771F5D60C3006E900736343; remoteInfo = hugin_utils; }; 57023DC80C428DE6008A44D6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 571300640C33D41F00252FE3 /* panotools */; + remoteGlobalIDString = 571300640C33D41F00252FE3; remoteInfo = panotools; }; 57023DCE0C428DE7008A44D6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4 /* jhead */; + remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4; remoteInfo = jhead; }; 57023DD00C428DE7008A44D6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5711524906BC6709004F4FA7 /* vigra_impex */; + remoteGlobalIDString = 5711524906BC6709004F4FA7; remoteInfo = vigra_impex; }; + 5709A0690C4543E100BD1C53 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4; + remoteInfo = jhead; + }; + 5709A06B0C4543E100BD1C53 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5711524906BC6709004F4FA7; + remoteInfo = vigra_impex; + }; + 5709A06D0C4543E100BD1C53 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5771F5D60C3006E900736343; + remoteInfo = hugin_utils; + }; + 5709A06F0C4543E100BD1C53 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 571300640C33D41F00252FE3; + remoteInfo = panotools; + }; + 5709A0710C4543E100BD1C53 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5759DA4E0C327D680043F754; + remoteInfo = panodata; + }; + 5709A0D30C45481500BD1C53 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5759D9AB0C32713F0043F754; + remoteInfo = appbase; + }; 5771F63E0C3011D700736343 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -298,6 +380,69 @@ remoteGlobalIDString = 5771F7440C30202B00736343; remoteInfo = boost_thread; }; + 579610B30C43C066006B7C6E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57EA83850C3A798A00E4965E; + remoteInfo = algorithms; + }; + 5796FA750C4395CC006B7C6E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4; + remoteInfo = jhead; + }; + 5796FA770C4395CC006B7C6E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5711524906BC6709004F4FA7; + remoteInfo = vigra_impex; + }; + 5796FA790C4395CC006B7C6E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5771F5D60C3006E900736343; + remoteInfo = hugin_utils; + }; + 5796FA7B0C4395CC006B7C6E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 571300640C33D41F00252FE3; + remoteInfo = panotools; + }; + 5796FA7D0C4395CC006B7C6E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5759DA4E0C327D680043F754; + remoteInfo = panodata; + }; + 5796FDA00C43AC62006B7C6E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 574092290C393E6600D16607; + remoteInfo = nona; + }; + 5796FDA20C43AC62006B7C6E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5759D9AB0C32713F0043F754; + remoteInfo = appbase; + }; + 5796FDA40C43AC62006B7C6E /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57C1705809A125DE00FAF325; + remoteInfo = vigra_ext; + }; 57A60E930C400272007B5462 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -403,6 +548,20 @@ remoteGlobalIDString = 576EC4980C3FC9300076A417; remoteInfo = huginapp; }; + 57DB9BBF0C454B96004957C2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57EA83850C3A798A00E4965E; + remoteInfo = algorithms; + }; + 57DB9BCA0C454C10004957C2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5771F7790C30216F00736343; + remoteInfo = hugin_math; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -410,6 +569,13 @@ 5702272F0C42605C008A44D6 /* open_file */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = open_file; sourceTree = BUILT_PRODUCTS_DIR; }; 57023B460C427981008A44D6 /* tiff.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tiff.hxx; sourceTree = "<group>"; }; 5702996D07F967CB00F1FF15 /* HuginFiles.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = HuginFiles.icns; sourceTree = "<group>"; }; + 57098D730C453E5F00BD1C53 /* panoinc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = panoinc.h; sourceTree = "<group>"; }; + 57098D740C453E6600BD1C53 /* algorithm.pch */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = algorithm.pch; sourceTree = "<group>"; }; + 57098D750C453E6600BD1C53 /* hugin_base.pch */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = hugin_base.pch; sourceTree = "<group>"; }; + 57098D760C453E6600BD1C53 /* nona.pch */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = nona.pch; sourceTree = "<group>"; }; + 57098D770C453E6600BD1C53 /* panodata.pch */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = panodata.pch; sourceTree = "<group>"; }; + 5709A0650C4543D700BD1C53 /* autooptimiser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = autooptimiser.cpp; sourceTree = "<group>"; }; + 5709A0890C4543E100BD1C53 /* autooptimiser */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = autooptimiser; sourceTree = BUILT_PRODUCTS_DIR; }; 570D581A082A9ED50030E768 /* enblend */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = enblend; path = bin/enblend; sourceTree = "<group>"; }; 57114E9F06BC2301004F4FA7 /* Hugin-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "Hugin-Info.plist"; sourceTree = "<group>"; }; 57114EA006BC2301004F4FA7 /* Hugin.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Hugin.icns; sourceTree = "<group>"; }; @@ -619,7 +785,7 @@ 576DA17A0C3CF8A5006E8D90 /* NonaImageStitcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NonaImageStitcher.h; path = algorithms/nona/NonaImageStitcher.h; sourceTree = "<group>"; }; 576DA21E0C3D04F4006E8D90 /* NonaFileStitcher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = NonaFileStitcher.cpp; path = algorithms/nona/NonaFileStitcher.cpp; sourceTree = "<group>"; }; 576DA21F0C3D04F4006E8D90 /* NonaFileStitcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NonaFileStitcher.h; path = algorithms/nona/NonaFileStitcher.h; sourceTree = "<group>"; }; - 576EC4990C3FC9300076A417 /* libhuginapp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhuginapp.a; sourceTree = "<group>"; }; + 576EC4990C3FC9300076A417 /* libhuginapp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhuginapp.a; sourceTree = BUILT_PRODUCTS_DIR; }; 576EC4A60C3FC9750076A417 /* CachedImageRemapper.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CachedImageRemapper.cpp; sourceTree = "<group>"; }; 576EC4A70C3FC9750076A417 /* CachedImageRemapper.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CachedImageRemapper.h; sourceTree = "<group>"; }; 576EC4A80C3FC9750076A417 /* ImageCache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ImageCache.cpp; sourceTree = "<group>"; }; @@ -708,6 +874,8 @@ 578ECFFE0A8D0C160028A7FB /* rgbe.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = rgbe.c; sourceTree = "<group>"; }; 578ECFFF0A8D0C160028A7FB /* rgbe.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = rgbe.h; sourceTree = "<group>"; }; 57906E890C105F7B00A6C3FE /* hugin_base */ = {isa = PBXFileReference; lastKnownFileType = folder; name = hugin_base; path = ../src/hugin_base; sourceTree = "<group>"; }; + 5796FA950C4395CC006B7C6E /* nona */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = nona; sourceTree = BUILT_PRODUCTS_DIR; }; + 5796FA970C4395F4006B7C6E /* nona.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = nona.cpp; sourceTree = "<group>"; }; 5797B9EC0C33EB4D00F3DEE6 /* DestPanoImage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DestPanoImage.h; sourceTree = "<group>"; }; 57989544068E2F22009F90BF /* libwx_macu-2.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libwx_macu-2.7.a"; path = "lib/libwx_macu-2.7.a"; sourceTree = "<group>"; }; 57989545068E2F22009F90BF /* libwxexpat-2.7.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libwxexpat-2.7.a"; path = "lib/libwxexpat-2.7.a"; sourceTree = "<group>"; }; @@ -797,12 +965,66 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 5709A0740C4543E100BD1C53 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 5709A0750C4543E100BD1C53 /* libz.dylib in Frameworks */, + 5709A0760C4543E100BD1C53 /* libpng.a in Frameworks */, + 5709A0770C4543E100BD1C53 /* libtiff.a in Frameworks */, + 5709A0780C4543E100BD1C53 /* libjpeg.a in Frameworks */, + 5709A0790C4543E100BD1C53 /* libIex.a in Frameworks */, + 5709A07A0C4543E100BD1C53 /* libIlmThread.a in Frameworks */, + 5709A07B0C4543E100BD1C53 /* libIlmImf.a in Frameworks */, + 5709A07C0C4543E100BD1C53 /* libImath.a in Frameworks */, + 5709A07D0C4543E100BD1C53 /* libHalf.a in Frameworks */, + 5709A07E0C4543E100BD1C53 /* libpano12.a in Frameworks */, + 5709A07F0C4543E100BD1C53 /* libjhead.a in Frameworks */, + 5709A0800C4543E100BD1C53 /* libvigra_impex.a in Frameworks */, + 5709A0810C4543E100BD1C53 /* libhugin_utils.a in Frameworks */, + 5709A0820C4543E100BD1C53 /* libhugin_panotools.a in Frameworks */, + 5709A0830C4543E100BD1C53 /* libhugin_panodata.a in Frameworks */, + 57DB9BC70C454BE5004957C2 /* libhugin_appbase.a in Frameworks */, + 57DB9BC20C454BA5004957C2 /* libhugin_nona.a in Frameworks */, + 57DB9BC10C454BA2004957C2 /* libhugin_algorithms.a in Frameworks */, + 57DB9BC90C454C07004957C2 /* libhugin_math.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 5796FA800C4395CC006B7C6E /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 5796FA810C4395CC006B7C6E /* libz.dylib in Frameworks */, + 5796FA820C4395CC006B7C6E /* libpng.a in Frameworks */, + 5796FA830C4395CC006B7C6E /* libtiff.a in Frameworks */, + 5796FA840C4395CC006B7C6E /* libjpeg.a in Frameworks */, + 5796FA850C4395CC006B7C6E /* libIex.a in Frameworks */, + 5796FA860C4395CC006B7C6E /* libIlmThread.a in Frameworks */, + 5796FA870C4395CC006B7C6E /* libIlmImf.a in Frameworks */, + 5796FA880C4395CC006B7C6E /* libImath.a in Frameworks */, + 5796FA890C4395CC006B7C6E /* libHalf.a in Frameworks */, + 5796FA8A0C4395CC006B7C6E /* libpano12.a in Frameworks */, + 5796FA8B0C4395CC006B7C6E /* libjhead.a in Frameworks */, + 5796FA8C0C4395CC006B7C6E /* libvigra_impex.a in Frameworks */, + 5796FA8D0C4395CC006B7C6E /* libhugin_utils.a in Frameworks */, + 5796FA8E0C4395CC006B7C6E /* libhugin_panotools.a in Frameworks */, + 5796FA8F0C4395CC006B7C6E /* libhugin_panodata.a in Frameworks */, + 5796FD9D0C43AC50006B7C6E /* libvigra_ext.a in Frameworks */, + 5796FD9E0C43AC50006B7C6E /* libhugin_appbase.a in Frameworks */, + 5796FD9F0C43AC50006B7C6E /* libhugin_nona.a in Frameworks */, + 579610D20C43C541006B7C6E /* libhugin_algorithms.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ 570227170C425C44008A44D6 /* test */ = { isa = PBXGroup; children = ( + 5709A0650C4543D700BD1C53 /* autooptimiser.cpp */, + 5796FA970C4395F4006B7C6E /* nona.cpp */, 570227180C425C6A008A44D6 /* open_file.cpp */, ); path = test; @@ -1259,6 +1481,11 @@ 5771F5E60C3007B300736343 /* hugin_base */ = { isa = PBXGroup; children = ( + 57098D730C453E5F00BD1C53 /* panoinc.h */, + 57098D750C453E6600BD1C53 /* hugin_base.pch */, + 57098D740C453E6600BD1C53 /* algorithm.pch */, + 57098D760C453E6600BD1C53 /* nona.pch */, + 57098D770C453E6600BD1C53 /* panodata.pch */, 5759D9B40C3271640043F754 /* appbase */, 57EA83940C3A7A0C00E4965E /* algorithm */, 57EA83A40C3A7CD700E4965E /* algorithms */, @@ -1377,9 +1604,9 @@ 5785A3080C3BE6AF00DD8BD8 /* nona */ = { isa = PBXGroup; children = ( + 5785A30D0C3BE6DD00DD8BD8 /* CalculateFOV.cpp */, + 5785A30C0C3BE6DD00DD8BD8 /* CalculateFOV.h */, 5785A30B0C3BE6DD00DD8BD8 /* CenterHorizontally.cpp */, - 5785A30C0C3BE6DD00DD8BD8 /* CalculateFOV.h */, - 5785A30D0C3BE6DD00DD8BD8 /* CalculateFOV.cpp */, 5785A30E0C3BE6DD00DD8BD8 /* CenterHorizontally.h */, 5785A39F0C3BED7F00DD8BD8 /* FitPanorama.cpp */, 5785A3A00C3BED7F00DD8BD8 /* FitPanorama.h */, @@ -1531,6 +1758,8 @@ 57CCCC23086C9530000EBC4A /* attached */, 573B8F3E067BA2EB00B7B355 /* Product */, 5702272F0C42605C008A44D6 /* open_file */, + 5796FA950C4395CC006B7C6E /* nona */, + 5709A0890C4543E100BD1C53 /* autooptimiser */, ); sourceTree = "<group>"; }; @@ -1757,6 +1986,30 @@ productReference = 5702272F0C42605C008A44D6 /* open_file */; productType = "com.apple.product-type.tool"; }; + 5709A0670C4543E100BD1C53 /* test autooptimiser */ = { + isa = PBXNativeTarget; + buildConfigurationList = 5709A0840C4543E100BD1C53 /* Build configuration list for PBXNativeTarget "test autooptimiser" */; + buildPhases = ( + 5709A0720C4543E100BD1C53 /* Sources */, + 5709A0740C4543E100BD1C53 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 5709A0680C4543E100BD1C53 /* PBXTargetDependency */, + 5709A06A0C4543E100BD1C53 /* PBXTargetDependency */, + 5709A06C0C4543E100BD1C53 /* PBXTargetDependency */, + 5709A0D40C45481500BD1C53 /* PBXTargetDependency */, + 5709A06E0C4543E100BD1C53 /* PBXTargetDependency */, + 5709A0700C4543E100BD1C53 /* PBXTargetDependency */, + 57DB9BC00C454B96004957C2 /* PBXTargetDependency */, + 57DB9BCB0C454C10004957C2 /* PBXTargetDependency */, + ); + name = "test autooptimiser"; + productName = "sample open_close"; + productReference = 5709A0890C4543E100BD1C53 /* autooptimiser */; + productType = "com.apple.product-type.tool"; + }; 5711524906BC6709004F4FA7 /* vigra_impex */ = { isa = PBXNativeTarget; buildConfigurationList = 571DA7B7088E59C20058F246 /* Build configuration list for PBXNativeTarget "vigra_impex" */; @@ -1950,6 +2203,31 @@ productReference = 5771F8150C30268F00736343 /* libPTLensDB.a */; productType = "com.apple.product-type.library.static"; }; + 5796FA730C4395CC006B7C6E /* test nona */ = { + isa = PBXNativeTarget; + buildConfigurationList = 5796FA900C4395CC006B7C6E /* Build configuration list for PBXNativeTarget "test nona" */; + buildPhases = ( + 5796FA7E0C4395CC006B7C6E /* Sources */, + 5796FA800C4395CC006B7C6E /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 5796FA740C4395CC006B7C6E /* PBXTargetDependency */, + 5796FA760C4395CC006B7C6E /* PBXTargetDependency */, + 5796FA780C4395CC006B7C6E /* PBXTargetDependency */, + 5796FA7A0C4395CC006B7C6E /* PBXTargetDependency */, + 5796FA7C0C4395CC006B7C6E /* PBXTargetDependency */, + 5796FDA50C43AC62006B7C6E /* PBXTargetDependency */, + 5796FDA30C43AC62006B7C6E /* PBXTargetDependency */, + 5796FDA10C43AC62006B7C6E /* PBXTargetDependency */, + 579610B40C43C066006B7C6E /* PBXTargetDependency */, + ); + name = "test nona"; + productName = "sample open_close"; + productReference = 5796FA950C4395CC006B7C6E /* nona */; + productType = "com.apple.product-type.tool"; + }; 57C1705809A125DE00FAF325 /* vigra_ext */ = { isa = PBXNativeTarget; buildConfigurationList = 57C1706609A125DE00FAF325 /* Build configuration list for PBXNativeTarget "vigra_ext" */; @@ -2024,6 +2302,8 @@ 57EA83850C3A798A00E4965E /* algorithms */, 576EC4980C3FC9300076A417 /* huginapp */, 5702272E0C42605C008A44D6 /* test open_file */, + 5796FA730C4395CC006B7C6E /* test nona */, + 5709A0670C4543E100BD1C53 /* test autooptimiser */, ); }; /* End PBXProject section */ @@ -2055,6 +2335,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 5709A0720C4543E100BD1C53 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 5709A08D0C45440200BD1C53 /* autooptimiser.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 5711524806BC6709004F4FA7 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -2205,6 +2493,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 5796FA7E0C4395CC006B7C6E /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 5796FA980C4395F4006B7C6E /* nona.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 57C1705909A125DE00FAF325 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -2266,6 +2562,36 @@ target = 5711524906BC6709004F4FA7 /* vigra_impex */; targetProxy = 57023DD00C428DE7008A44D6 /* PBXContainerItemProxy */; }; + 5709A0680C4543E100BD1C53 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5749F8A2067B60CA00A6EDD4 /* jhead */; + targetProxy = 5709A0690C4543E100BD1C53 /* PBXContainerItemProxy */; + }; + 5709A06A0C4543E100BD1C53 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5711524906BC6709004F4FA7 /* vigra_impex */; + targetProxy = 5709A06B0C4543E100BD1C53 /* PBXContainerItemProxy */; + }; + 5709A06C0C4543E100BD1C53 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5771F5D60C3006E900736343 /* hugin_utils */; + targetProxy = 5709A06D0C4543E100BD1C53 /* PBXContainerItemProxy */; + }; + 5709A06E0C4543E100BD1C53 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 571300640C33D41F00252FE3 /* panotools */; + targetProxy = 5709A06F0C4543E100BD1C53 /* PBXContainerItemProxy */; + }; + 5709A0700C4543E100BD1C53 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5759DA4E0C327D680043F754 /* panodata */; + targetProxy = 5709A0710C4543E100BD1C53 /* PBXContainerItemProxy */; + }; + 5709A0D40C45481500BD1C53 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5759D9AB0C32713F0043F754 /* appbase */; + targetProxy = 5709A0D30C45481500BD1C53 /* PBXContainerItemProxy */; + }; 5771F63F0C3011D700736343 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 5771F5D60C3006E900736343 /* hugin_utils */; @@ -2276,6 +2602,51 @@ target = 5771F7440C30202B00736343 /* boost_thread */; targetProxy = 5771F76B0C30206E00736343 /* PBXContainerItemProxy */; }; + 579610B40C43C066006B7C6E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57EA83850C3A798A00E4965E /* algorithms */; + targetProxy = 579610B30C43C066006B7C6E /* PBXContainerItemProxy */; + }; + 5796FA740C4395CC006B7C6E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5749F8A2067B60CA00A6EDD4 /* jhead */; + targetProxy = 5796FA750C4395CC006B7C6E /* PBXContainerItemProxy */; + }; + 5796FA760C4395CC006B7C6E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5711524906BC6709004F4FA7 /* vigra_impex */; + targetProxy = 5796FA770C4395CC006B7C6E /* PBXContainerItemProxy */; + }; + 5796FA780C4395CC006B7C6E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5771F5D60C3006E900736343 /* hugin_utils */; + targetProxy = 5796FA790C4395CC006B7C6E /* PBXContainerItemProxy */; + }; + 5796FA7A0C4395CC006B7C6E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 571300640C33D41F00252FE3 /* panotools */; + targetProxy = 5796FA7B0C4395CC006B7C6E /* PBXContainerItemProxy */; + }; + 5796FA7C0C4395CC006B7C6E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5759DA4E0C327D680043F754 /* panodata */; + targetProxy = 5796FA7D0C4395CC006B7C6E /* PBXContainerItemProxy */; + }; + 5796FDA10C43AC62006B7C6E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 574092290C393E6600D16607 /* nona */; + targetProxy = 5796FDA00C43AC62006B7C6E /* PBXContainerItemProxy */; + }; + 5796FDA30C43AC62006B7C6E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5759D9AB0C32713F0043F754 /* appbase */; + targetProxy = 5796FDA20C43AC62006B7C6E /* PBXContainerItemProxy */; + }; + 5796FDA50C43AC62006B7C6E /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57C1705809A125DE00FAF325 /* vigra_ext */; + targetProxy = 5796FDA40C43AC62006B7C6E /* PBXContainerItemProxy */; + }; 57A60E940C400272007B5462 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; @@ -2351,6 +2722,16 @@ target = 576EC4980C3FC9300076A417 /* huginapp */; targetProxy = 57A60EAF0C400272007B5462 /* PBXContainerItemProxy */; }; + 57DB9BC00C454B96004957C2 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57EA83850C3A798A00E4965E /* algorithms */; + targetProxy = 57DB9BBF0C454B96004957C2 /* PBXContainerItemProxy */; + }; + 57DB9BCB0C454C10004957C2 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5771F7790C30216F00736343 /* hugin_math */; + targetProxy = 57DB9BCA0C454C10004957C2 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -2375,7 +2756,6 @@ ../src/hugin_base, "$(inherited)", ); - LIBRARY_SEARCH_PATHS = "$(inherited)"; PRODUCT_NAME = open_file; }; name = Development; @@ -2406,6 +2786,57 @@ }; name = Release; }; + 5709A0850C4543E100BD1C53 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = autooptimiser; + }; + name = Debug; + }; + 5709A0860C4543E100BD1C53 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + PRODUCT_NAME = autooptimiser; + }; + name = Development; + }; + 5709A0870C4543E100BD1C53 /* Development ZeroLink */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = autooptimiser; + }; + name = "Development ZeroLink"; + }; + 5709A0880C4543E100BD1C53 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = autooptimiser; + }; + name = Release; + }; 5713006A0C33D43600252FE3 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2431,11 +2862,6 @@ ../src/hugin_base, "$(inherited)", ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", - ); - LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"/Users/ippei/dev/hugin/ExternalPrograms/Repository-universal/lib\""; PRODUCT_NAME = hugin_panotools; }; name = Development; @@ -2513,6 +2939,7 @@ 574092320C393E8500D16607 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_PREFIX_HEADER = ../src/hugin_base/nona.pch; HEADER_SEARCH_PATHS = ( ../src/hugin_base, ../src/foreign/vigra, @@ -2622,7 +3049,6 @@ MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; PER_ARCH_CFLAGS_i386 = "-ftree-vectorize"; PER_ARCH_CFLAGS_ppc = "-mcpu=G3 -mtune=G4"; - PREBINDING = YES; SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk; SEPARATE_STRIP = YES; @@ -2671,7 +3097,6 @@ MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; PER_ARCH_CFLAGS_i386 = "-ftree-vectorize"; PER_ARCH_CFLAGS_ppc = "-mcpu=G3 -mtune=G4"; - PREBINDING = YES; SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk; SEPARATE_STRIP = YES; @@ -2760,13 +3185,6 @@ ../src/foreign/vigra, ../src/foreign, ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", - ); - LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"/Users/ippei/dev/hugin/ExternalPrograms/Repository-universal/lib\""; - LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = hugin_panodata; USER_HEADER_SEARCH_PATHS = "$(inherited) ../src/hugin_base/panodata"; }; @@ -2865,7 +3283,6 @@ MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; PER_ARCH_CFLAGS_i386 = "-ftree-vectorize"; PER_ARCH_CFLAGS_ppc = "-mcpu=G3 -mtune=G4"; - PREBINDING = YES; SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk; SEPARATE_STRIP = YES; @@ -3030,7 +3447,6 @@ MACOSX_DEPLOYMENT_TARGET_ppc = 10.3; PER_ARCH_CFLAGS_i386 = "-ftree-vectorize"; PER_ARCH_CFLAGS_ppc = "-mcpu=G3 -mtune=G4"; - PREBINDING = YES; SDKROOT_i386 = /Developer/SDKs/MacOSX10.4u.sdk; SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk; SEPARATE_STRIP = YES; @@ -3154,6 +3570,58 @@ }; name = Release; }; + 5796FA910C4395CC006B7C6E /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = open_file; + }; + name = Debug; + }; + 5796FA920C4395CC006B7C6E /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + GCC_PREFIX_HEADER = ../src/hugin_base/hugin_base.pch; + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + PRODUCT_NAME = nona; + }; + name = Development; + }; + 5796FA930C4395CC006B7C6E /* Development ZeroLink */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = open_file; + }; + name = "Development ZeroLink"; + }; + 5796FA940C4395CC006B7C6E /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = open_file; + }; + name = Release; + }; 57A60EB30C4002B0007B5462 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -3286,6 +3754,7 @@ 57EA838C0C3A79B300E4965E /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_PREFIX_HEADER = ../src/hugin_base/algorithm.pch; HEADER_SEARCH_PATHS = ( ../src/foreign, ../src/foreign/vigra, @@ -3336,6 +3805,17 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + 5709A0840C4543E100BD1C53 /* Build configuration list for PBXNativeTarget "test autooptimiser" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 5709A0850C4543E100BD1C53 /* Debug */, + 5709A0860C4543E100BD1C53 /* Development */, + 5709A0870C4543E100BD1C53 /* Development ZeroLink */, + 5709A0880C4543E100BD1C53 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; 571300690C33D43600252FE3 /* Build configuration list for PBXNativeTarget "panotools" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -3479,6 +3959,17 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + 5796FA900C4395CC006B7C6E /* Build configuration list for PBXNativeTarget "test nona" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 5796FA910C4395CC006B7C6E /* Debug */, + 5796FA920C4395CC006B7C6E /* Development */, + 5796FA930C4395CC006B7C6E /* Development ZeroLink */, + 5796FA940C4395CC006B7C6E /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; 57A60EB20C4002B0007B5462 /* Build configuration list for PBXAggregateTarget "All" */ = { isa = XCConfigurationList; buildConfigurations = ( Modified: hugin/branches/ippei/src/hugin_base/algorithms/basic/RotatePanorama.h =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithms/basic/RotatePanorama.h 2007-07-11 22:10:07 UTC (rev 2255) +++ hugin/branches/ippei/src/hugin_base/algorithms/basic/RotatePanorama.h 2007-07-11 22:58:50 UTC (rev 2256) @@ -47,7 +47,7 @@ RotatePanorama(PanoramaData& panorama, double yaw, double pitch, double roll); /// - virtual ~RotatePanorama(); + virtual ~RotatePanorama() {}; public: @@ -57,7 +57,7 @@ public: /// - virtual bool modifiesPanoramaData() + virtual bool modifiesPanoramaData() const { return true; } /// Modified: hugin/branches/ippei/src/hugin_base/algorithms/basic/StraightenPanorama.h =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithms/basic/StraightenPanorama.h 2007-07-11 22:10:07 UTC (rev 2255) +++ hugin/branches/ippei/src/hugin_base/algorithms/basic/StraightenPanorama.h 2007-07-11 22:58:50 UTC (rev 2256) @@ -42,7 +42,7 @@ {}; /// - virtual ~StraightenPanorama(); + virtual ~StraightenPanorama() {}; public: Modified: hugin/branches/ippei/src/hugin_base/algorithms/nona/CalculateFOV.h =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithms/nona/CalculateFOV.h 2007-07-11 22:10:07 UTC (rev 2255) +++ hugin/branches/ippei/src/hugin_base/algorithms/nona/CalculateFOV.h 2007-07-11 22:58:50 UTC (rev 2256) @@ -44,7 +44,7 @@ {}; /// - virtual ~CalculateFOV(); + virtual ~CalculateFOV() {}; public: Modified: hugin/branches/ippei/src/hugin_base/algorithms/nona/FitPanorama.h =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithms/nona/FitPanorama.h 2007-07-11 22:10:07 UTC (rev 2255) +++ hugin/branches/ippei/src/hugin_base/algorithms/nona/FitPanorama.h 2007-07-11 22:58:50 UTC (rev 2256) @@ -43,12 +43,12 @@ {}; /// - virtual ~CalculateFitPanorama(); + virtual ~CalculateFitPanorama() {}; public: /// - virtual bool modifiesPanoramaData() + virtual bool modifiesPanoramaData() const { return false; } /// @@ -95,12 +95,12 @@ {}; /// - virtual ~FitPanorama(); + virtual ~FitPanorama() {}; public: /// - virtual bool modifiesPanoramaData() + virtual bool modifiesPanoramaData() const { return true; } /// Modified: hugin/branches/ippei/src/hugin_base/algorithms/nona/NonaFileStitcher.cpp =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithms/nona/NonaFileStitcher.cpp 2007-07-11 22:10:07 UTC (rev 2255) +++ hugin/branches/ippei/src/hugin_base/algorithms/nona/NonaFileStitcher.cpp 2007-07-11 22:58:50 UTC (rev 2256) @@ -48,8 +48,9 @@ *progDisp, o_filename, o_usedImages); - + delete progDisp; + return true; } Modified: hugin/branches/ippei/src/hugin_base/algorithms/optimizer/PTOptimizer.cpp =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithms/optimizer/PTOptimizer.cpp 2007-07-11 22:10:07 UTC (rev 2255) +++ hugin/branches/ippei/src/hugin_base/algorithms/optimizer/PTOptimizer.cpp 2007-07-11 22:58:50 UTC (rev 2256) @@ -39,6 +39,14 @@ #endif namespace HuginBase { + + +bool PTOptimizer::runAlgorithm() +{ + PTools::optimize(o_panorama); + return true; // let's hope so. +} + void AutoOptimise::autoOptimise(PanoramaData& pano) @@ -97,7 +105,7 @@ } -void SmartOptimise::smartOptimise(PanoramaData& optPano) +void SmartOptimise::smartOptimize(PanoramaData& optPano) { // use m-estimator with sigma 2 PanoramaOptions opts = optPano.getOptions(); Modified: hugin/branches/ippei/src/hugin_base/algorithms/optimizer/PTOptimizer.h =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithms/optimizer/PTOptimizer.h 2007-07-11 22:10:07 UTC (rev 2255) +++ hugin/branches/ippei/src/hugin_base/algorithms/optimizer/PTOptimizer.h 2007-07-11 22:58:50 UTC (rev 2256) @@ -37,7 +37,7 @@ namespace HuginBase { - /// conceptual + /// class PTOptimizer : public PanoramaAlgorithm { @@ -56,6 +56,9 @@ /// virtual bool modifiesPanoramaData() { return true; } + + /// calls PTools::optimize() + virtual bool runAlgorithm(); }; @@ -118,7 +121,7 @@ /// class SmartOptimizerStub { - public: + protected: /// enum OptMode { OPT_POS=1, @@ -153,14 +156,14 @@ public: /// - static void smartOptimise(PanoramaData& pano); + static void smartOptimize(PanoramaData& pano); public: /// virtual bool runAlgorithm() { - smartOptimise(o_panorama); + smartOptimize(o_panorama); return true; // let's hope so. } Modified: hugin/branches/ippei/src/hugin_base/appbase/ProgressDisplay.cpp =================================================================== --- hugin/branches/ippei/src/hugin_base/appbase/ProgressDisplay.cpp 2007-07-11 22:10:07 UTC (rev 2255) +++ hugin/branches/ippei/src/hugin_base/appbase/ProgressDisplay.cpp 2007-07-11 22:58:50 UTC (rev 2256) @@ -110,17 +110,18 @@ { if(noSubtasksAvailable()) { - //[TODO] debug + DEBUG_INFO("No subtask available"); return; } if(getCurrentSubtask().progress > newValue) { - //[TODO] debug + DEBUG_INFO("Progress has already reached its max."); return; } - getCurrentSubtask().progress = std::max(newValue, getSubtaskMaxProgress()); + propagateProgress(newValue); + //getCurrentSubtask().progress = std::min(newValue, getSubtaskMaxProgress()); updateProgressDisplay(); } @@ -168,16 +169,20 @@ do { + DEBUG_INFO("Propagating progress:+" << diffFromPrev*100 << "%"); + itr->progress += diffFromPrev; if(!itr->propagatesProgress) + { + DEBUG_INFO("Propagation stopped."); return; + } // scale previous change for higher level diffFromPrev *= itr->progressForParentTask / itr->maxProgress; + ++itr; - itr++; - } while(itr != o_subtasks.rend()); } @@ -193,14 +198,15 @@ void StreamProgressDisplay::updateProgressDisplay() { - DEBUG_TRACE("\n" << std::string(80,'=')); - // [TODO] check for Ctrl-C then cancelTask() int lines = m_printedLines; // step back the line printed before. - if (lines !=0) { + if (lines !=0) + { +#ifndef DEBUG m_stream << "\033[" << m_printedLines << "A" << "\r"; +#endif } m_printedLines = 0; // build the message: @@ -209,28 +215,30 @@ { m_printedLines++; char tmp[81]; - tmp[80]=0; if (it->measuresProgress()) { - snprintf(tmp,80,"%-72s : %3.0f %%", + snprintf(tmp,81,"%-72s : %3.0f %%", it->message.c_str(), - 100 * it->progress / it->maxProgress); + 100.0 * it->progress / it->maxProgress); } else if (it+1 == o_subtasks.end()) { m_whizzCount = (++m_whizzCount) % (int)m_whizz.size(); - snprintf(tmp,80,"%-72s : %c ", + snprintf(tmp,81,"%-72s : %c ", it->message.c_str(), m_whizz[m_whizzCount]); } else { - snprintf(tmp,80,"%-72s : - ", + snprintf(tmp,81,"%-72s : - ", it->message.c_str()); } - m_stream << tmp << std::endl; + m_stream << std::string(tmp,80) << std::endl; } // print empty lines.. - while (m_printedLines < lines) { + while (m_printedLines < lines) + { m_stream << std::string(80,' ') << std::endl; m_printedLines++; } + + DEBUG_TRACE("\n" << std::string(80,'=')); } Modified: hugin/branches/ippei/src/hugin_base/appbase/ProgressDisplay.h =================================================================== --- hugin/branches/ippei/src/hugin_base/appbase/ProgressDisplay.h 2007-07-11 22:10:07 UTC (rev 2255) +++ hugin/branches/ippei/src/hugin_base/appbase/ProgressDisplay.h 2007-07-11 22:58:50 UTC (rev 2256) @@ -87,7 +87,7 @@ protected: /// ProgressDisplay() - : o_newSubtaskProgress(0), o_canceled(false) + : o_newSubtaskProgress(0), o_canceled(false), o_newSubtaskPropagates(true) {}; public: Modified: hugin/branches/ippei/src/hugin_base/appbase/ProgressDisplayOld.cpp =================================================================== --- hugin/branches/ippei/src/hugin_base/appbase/ProgressDisplayOld.cpp 2007-07-11 22:10:07 UTC (rev 2255) +++ hugin/branches/ippei/src/hugin_base/appbase/ProgressDisplayOld.cpp 2007-07-11 22:58:50 UTC (rev 2256) @@ -144,8 +144,8 @@ /// void MultiProgressDisplayAdaptor::taskAdded() { - o_progressDisplay.setParentProgressOfNewSubtasks(tasks.back().subStepProgress, true); - o_progressDisplay.startSubtask(1.0); + o_progressDisplay.setParentProgressOfNewSubtasks(( ++(tasks.rbegin()) )->subStepProgress, true); + o_progressDisplay.startSubtask(tasks.back().getMessage(), 1.0); }; /// @@ -157,6 +157,12 @@ /// void MultiProgressDisplayAdaptor::updateProgressDisplay() { + if(tasks.empty()) + { + DEBUG_INFO("There are no tasks."); + return; + } + if(tasks.back().getMessage().length() == 0) o_progressDisplay.setSubtaskMessage(tasks.back().getShortMessage()); else if(tasks.back().getShortMessage().length() == 0) Modified: hugin/branches/ippei/src/hugin_base/appbase/ProgressDisplayOld.h =================================================================== --- hugin/branches/ippei/src/hugin_base/appbase/ProgressDisplayOld.h 2007-07-11 22:10:07 UTC (rev 2255) +++ hugin/branches/ippei/src/hugin_base/appbase/ProgressDisplayOld.h 2007-07-11 22:58:50 UTC (rev 2256) @@ -128,7 +128,7 @@ * * should be provided by subclasses. */ - virtual void updateProgressDisplay() { } + virtual void updateProgressDisplay() =0; /** template method, called when a task is added */ virtual void taskAdded() {}; @@ -154,16 +154,17 @@ */ class DummyMultiProgressDispaly : public MultiProgressDisplay { - void pushTask(const ProgressTask & task) {}; - void popTask() {}; - void setShortMessage(const std::string & msg) {}; - void setMessage(const std::string & msg) {}; - void setProgress(double progress) {}; - void increase() {}; - - virtual void updateProgressDisplay() {}; - virtual void taskAdded() {}; - virtual void taskRemove() {}; + public: + void pushTask(const ProgressTask & task) {}; + void popTask() {}; + void setShortMessage(const std::string & msg) {}; + void setMessage(const std::string & msg) {}; + void setProgress(double progress) {}; + void increase() {}; + + virtual void updateProgressDisplay() {}; + virtual void taskAdded() {}; + virtual void taskRemove() {}; }; @@ -217,8 +218,9 @@ protected: /** update the display */ virtual void updateProgressDisplay(); + virtual void taskAdded() {}; + virtual void taskRemove() {}; - protected: std::ostream & m_stream; int m_printedLines; Modified: hugin/branches/ippei/src/hugin_base/hugin_math/Matrix3.cpp =================================================================== --- hugin/branches/ippei/src/hugin_base/hugin_math/Matrix3.cpp 2007-07-11 22:10:07 UTC (rev 2255) +++ hugin/branches/ippei/src/hugin_base/hugin_math/Matrix3.cpp 2007-07-11 22:58:50 UTC (rev 2256) @@ -23,6 +23,15 @@ #include "Matrix3.h" +inline Matrix3 getIdentity() +{ + Matrix3 tmp; + tmp.SetIdentity(); + return tmp; +} +Matrix3 Matrix3::Identity = getIdentity(); + + /** default constructor : initialise to zero */ Matrix3::Matrix3() { for (int i=0; i<3; i++) Modified: hugin/branches/ippei/src/hugin_base/hugin_math/Matrix3.h =================================================================== --- hugin/branches/ippei/src/hugin_base/hugin_math/Matrix3.h 2007-07-11 22:10:07 UTC (rev 2255) +++ hugin/branches/ippei/src/hugin_base/hugin_math/Matrix3.h 2007-07-11 22:58:50 UTC (rev 2256) @@ -39,7 +39,7 @@ /** we define the Matrix3 as 3 colums of 3 rows */ double m[3][3]; - static Matrix3 Identity; + static Matrix3 Identity; public: /** default constructor : initialise to zero */ Modified: hugin/branches/ippei/src/hugin_base/nona/Stitcher.h =================================================================== --- hugin/branches/ippei/src/hugin_base/nona/Stitcher.h 2007-07-11 22:10:07 UTC (rev 2255) +++ hugin/branches/ippei/src/hugin_base/nona/Stitcher.h 2007-07-11 22:58:50 UTC (rev 2256) @@ -538,26 +538,26 @@ std::pair<AlphaIter, AlphaAccessor> alpha, SingleImageRemapper<ImageType, AlphaType> & remapper) { - std::vector<unsigned int> images; - // calculate stitching order - estimateBlendingOrder(Base::m_pano, imgSet, images); + std::vector<unsigned int> images; + // calculate stitching order + estimateBlendingOrder(Base::m_pano, imgSet, images); - unsigned int nImg = images.size(); + unsigned int nImg = images.size(); - Base::m_progress.pushTask(AppBase::ProgressTask("Stitching", "", 1.0/(nImg))); - // empty ROI - vigra::Rect2D panoROI; + Base::m_progress.pushTask(AppBase::ProgressTask("Stitching", "", 1.0/(nImg))); + // empty ROI + vigra::Rect2D panoROI; - // remap each image and blend into main pano image - for (UIntVector::const_iterator it = images.begin(); - it != images.end(); ++it) - { + // remap each image and blend into main pano image + for (UIntVector::const_iterator it = images.begin(); + it != images.end(); ++it) + { // get a remapped image. DEBUG_DEBUG("remapping image: " << *it); RemappedPanoImage<ImageType, AlphaType> * remapped = remapper.getRemapped(Base::m_pano, opts, *it, Base::m_progress); - Base::m_progress.setMessage("blending"); - // add image to pano and panoalpha, adjusts panoROI as well. + Base::m_progress.setMessage("blending"); + // add image to pano and panoalpha, adjusts panoROI as well. try { vigra_ext::blend(*remapped, pano, alpha, panoROI, Base::m_progress); @@ -569,8 +569,8 @@ // is completely out of the pano } // free remapped image - remapper.release(remapped); - } + remapper.release(remapped); + } } void stitch(const PanoramaOptions & opts, UIntSet & imgSet, Modified: hugin/branches/ippei/src/hugin_base/panodata/SrcPanoImage.cpp =================================================================== --- hugin/branches/ippei/src/hugin_base/panodata/SrcPanoImage.cpp 2007-07-11 22:10:07 UTC (rev 2255) +++ hugin/branches/ippei/src/hugin_base/panodata/SrcPanoImage.cpp 2007-07-11 22:58:50 UTC (rev 2256) @@ -31,7 +31,9 @@ #include <iostream> #include <vector> #include <vigra/diff2d.hxx> +#include <vigra/imageinfo.hxx> #include <hugin_utils/utils.h> +#include <jhead/jhead.h> namespace HuginBase { @@ -307,5 +309,200 @@ + +bool SrcPanoImage::initImageFromFile(SrcPanoImage & img, double & focalLength, double & cropFactor) +{ + std::string filename = img.getFilename(); + std::string ext = hugin_utils::getExtension(filename); + std::transform(ext.begin(), ext.end(), ext.begin(), (int(*)(int)) toupper); + double roll = 0; + int width; + int height; + try { + vigra::ImageImportInfo info(filename.c_str()); + width = info.width(); + height = info.height(); + } catch(vigra::PreconditionViolation & ) { + return false; + } + img.setSize(vigra::Size2D(width, height)); + + if (ext == "JPG" || ext == "JPEG") { + + ImageInfo_t exif; + ResetJpgfile(); + // Start with an empty image information structure. + + memset(&exif, 0, sizeof(exif)); + exif.FlashUsed = -1; + exif.MeteringMode = -1; + if (ReadJpegFile(exif,filename.c_str(), READ_EXIF)){ +#ifdef DEBUG + ShowImageInfo(exif); +#endif + std::cout << "exp time: " << exif.ExposureTime << " f-stop: " << exif.ApertureFNumber << std::endl; + //... [truncated message content] |
From: <ip...@us...> - 2007-07-13 13:40:23
|
Revision: 2260 http://hugin.svn.sourceforge.net/hugin/?rev=2260&view=rev Author: ippei Date: 2007-07-13 06:40:21 -0700 (Fri, 13 Jul 2007) Log Message: ----------- testing with vig_optimize; more bug fixes Modified Paths: -------------- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj hugin/branches/ippei/src/hugin_base/algorithms/optimizer/PhotometricOptimizer.cpp hugin/branches/ippei/src/hugin_base/algorithms/optimizer/PhotometricOptimizer.h hugin/branches/ippei/src/hugin_base/algorithms/point_sampler/PointSampler.cpp hugin/branches/ippei/src/hugin_base/algorithms/point_sampler/PointSampler.h hugin/branches/ippei/src/hugin_base/appbase/ProgressDisplay.cpp hugin/branches/ippei/src/hugin_base/appbase/ProgressReporterOld.cpp hugin/branches/ippei/src/hugin_base/appbase/ProgressReporterOld.h hugin/branches/ippei/src/hugin_base/vigra_ext/VigQuotientEstimator.h Added Paths: ----------- hugin/branches/ippei/src/hugin_base/test/fulla.cpp hugin/branches/ippei/src/hugin_base/test/vig_optimize.cpp Modified: hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-07-13 13:31:08 UTC (rev 2259) +++ hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-07-13 13:40:21 UTC (rev 2260) @@ -155,6 +155,47 @@ 5759EEE20C32AE100043F754 /* SrcPanoImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759EEE00C32AE100043F754 /* SrcPanoImage.cpp */; }; 5759EF270C32B1740043F754 /* ControlPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759EF250C32B1740043F754 /* ControlPoint.cpp */; }; 5759EF790C32B69F0043F754 /* Lens.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5759EF770C32B69F0043F754 /* Lens.cpp */; }; + 576482AA0C469052003AFC2F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; + 576482AB0C469052003AFC2F /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; + 576482AC0C469052003AFC2F /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; + 576482AD0C469052003AFC2F /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; + 576482AE0C469052003AFC2F /* libIex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.a */; }; + 576482AF0C469052003AFC2F /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.a */; }; + 576482B00C469052003AFC2F /* libIlmImf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.a */; }; + 576482B10C469052003AFC2F /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; + 576482B20C469052003AFC2F /* libHalf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.a */; }; + 576482B30C469052003AFC2F /* libpano12.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano12.a */; }; + 576482B40C469052003AFC2F /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; + 576482B50C469052003AFC2F /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; + 576482B60C469052003AFC2F /* libhugin_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F5D70C3006E900736343 /* libhugin_utils.a */; }; + 576482B70C469052003AFC2F /* libhugin_panotools.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 571300650C33D41F00252FE3 /* libhugin_panotools.a */; }; + 576482B80C469052003AFC2F /* libhugin_panodata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; }; + 576482CE0C469056003AFC2F /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; + 576482CF0C469056003AFC2F /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; + 576482D00C469056003AFC2F /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; + 576482D10C469056003AFC2F /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; + 576482D20C469056003AFC2F /* libIex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.a */; }; + 576482D30C469056003AFC2F /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.a */; }; + 576482D40C469056003AFC2F /* libIlmImf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.a */; }; + 576482D50C469056003AFC2F /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; + 576482D60C469056003AFC2F /* libHalf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.a */; }; + 576482D70C469056003AFC2F /* libpano12.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano12.a */; }; + 576482D80C469056003AFC2F /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; + 576482D90C469056003AFC2F /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; + 576482DA0C469056003AFC2F /* libhugin_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F5D70C3006E900736343 /* libhugin_utils.a */; }; + 576482DB0C469056003AFC2F /* libhugin_panotools.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 571300650C33D41F00252FE3 /* libhugin_panotools.a */; }; + 576482DC0C469056003AFC2F /* libhugin_panodata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; }; + 576482EA0C469093003AFC2F /* fulla.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576482E80C469093003AFC2F /* fulla.cpp */; }; + 576482ED0C469093003AFC2F /* vig_optimize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576482E90C469093003AFC2F /* vig_optimize.cpp */; }; + 576483530C46957A003AFC2F /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; }; + 576483540C46957D003AFC2F /* libhugin_appbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */; }; + 576483550C4695CE003AFC2F /* libvigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libvigra_ext.a */; }; + 576483570C4695EA003AFC2F /* libPTLensDB.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F8150C30268F00736343 /* libPTLensDB.a */; }; + 576483580C4695EA003AFC2F /* libhugin_math.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F77A0C30216F00736343 /* libhugin_math.a */; }; + 576483E60C46AD9C003AFC2F /* libhugin_appbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */; }; + 576483E80C46ADA9003AFC2F /* libhugin_algorithms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */; }; + 576483F10C46AE05003AFC2F /* libvigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libvigra_ext.a */; }; + 576484130C46AF3D003AFC2F /* liblevmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* liblevmar.a */; }; 576DA17B0C3CF8A5006E8D90 /* NonaImageStitcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576DA1790C3CF8A5006E8D90 /* NonaImageStitcher.cpp */; }; 576DA17C0C3CF8A5006E8D90 /* NonaImageStitcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 576DA17A0C3CF8A5006E8D90 /* NonaImageStitcher.h */; }; 576DA2200C3D04F4006E8D90 /* NonaFileStitcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 576DA21E0C3D04F4006E8D90 /* NonaFileStitcher.cpp */; }; @@ -366,6 +407,132 @@ remoteGlobalIDString = 5759D9AB0C32713F0043F754; remoteInfo = appbase; }; + 5764829E0C469052003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4; + remoteInfo = jhead; + }; + 576482A00C469052003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5711524906BC6709004F4FA7; + remoteInfo = vigra_impex; + }; + 576482A20C469052003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5771F5D60C3006E900736343; + remoteInfo = hugin_utils; + }; + 576482A40C469052003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 571300640C33D41F00252FE3; + remoteInfo = panotools; + }; + 576482A60C469052003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5759DA4E0C327D680043F754; + remoteInfo = panodata; + }; + 576482C20C469056003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4; + remoteInfo = jhead; + }; + 576482C40C469056003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5711524906BC6709004F4FA7; + remoteInfo = vigra_impex; + }; + 576482C60C469056003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5771F5D60C3006E900736343; + remoteInfo = hugin_utils; + }; + 576482C80C469056003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 571300640C33D41F00252FE3; + remoteInfo = panotools; + }; + 576482CA0C469056003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5759DA4E0C327D680043F754; + remoteInfo = panodata; + }; + 576483590C469615003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 574092290C393E6600D16607; + remoteInfo = nona; + }; + 5764835B0C46961B003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5759D9AB0C32713F0043F754; + remoteInfo = appbase; + }; + 5764835D0C46961B003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5771F7790C30216F00736343; + remoteInfo = hugin_math; + }; + 5764835F0C46961F003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5771F8140C30268F00736343; + remoteInfo = PTLensDB; + }; + 576483610C469627003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57C1705809A125DE00FAF325; + remoteInfo = vigra_ext; + }; + 576483EA0C46ADBA003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57EA83850C3A798A00E4965E; + remoteInfo = algorithms; + }; + 576484000C46AF0A003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5759D9AB0C32713F0043F754; + remoteInfo = appbase; + }; + 576484140C46AF49003AFC2F /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5720E4720BD456CD00E63404; + remoteInfo = levmar; + }; 5771F63E0C3011D700736343 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -781,6 +948,10 @@ 5759EF260C32B1740043F754 /* ControlPoint.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ControlPoint.h; sourceTree = "<group>"; }; 5759EF770C32B69F0043F754 /* Lens.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Lens.cpp; sourceTree = "<group>"; }; 5759EF780C32B69F0043F754 /* Lens.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Lens.h; sourceTree = "<group>"; }; + 576482BE0C469052003AFC2F /* fulla */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = fulla; sourceTree = BUILT_PRODUCTS_DIR; }; + 576482E20C469056003AFC2F /* vig_optimize */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = vig_optimize; sourceTree = BUILT_PRODUCTS_DIR; }; + 576482E80C469093003AFC2F /* fulla.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = fulla.cpp; sourceTree = "<group>"; }; + 576482E90C469093003AFC2F /* vig_optimize.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = vig_optimize.cpp; sourceTree = "<group>"; }; 576DA1790C3CF8A5006E8D90 /* NonaImageStitcher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = NonaImageStitcher.cpp; path = algorithms/nona/NonaImageStitcher.cpp; sourceTree = "<group>"; }; 576DA17A0C3CF8A5006E8D90 /* NonaImageStitcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NonaImageStitcher.h; path = algorithms/nona/NonaImageStitcher.h; sourceTree = "<group>"; }; 576DA21E0C3D04F4006E8D90 /* NonaFileStitcher.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = NonaFileStitcher.cpp; path = algorithms/nona/NonaFileStitcher.cpp; sourceTree = "<group>"; }; @@ -984,13 +1155,66 @@ 5709A0810C4543E100BD1C53 /* libhugin_utils.a in Frameworks */, 5709A0820C4543E100BD1C53 /* libhugin_panotools.a in Frameworks */, 5709A0830C4543E100BD1C53 /* libhugin_panodata.a in Frameworks */, - 57DB9BC70C454BE5004957C2 /* libhugin_appbase.a in Frameworks */, 57DB9BC20C454BA5004957C2 /* libhugin_nona.a in Frameworks */, 57DB9BC10C454BA2004957C2 /* libhugin_algorithms.a in Frameworks */, 57DB9BC90C454C07004957C2 /* libhugin_math.a in Frameworks */, + 57DB9BC70C454BE5004957C2 /* libhugin_appbase.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; + 576482A90C469052003AFC2F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 576482AA0C469052003AFC2F /* libz.dylib in Frameworks */, + 576482AB0C469052003AFC2F /* libpng.a in Frameworks */, + 576482AC0C469052003AFC2F /* libtiff.a in Frameworks */, + 576482AD0C469052003AFC2F /* libjpeg.a in Frameworks */, + 576482AE0C469052003AFC2F /* libIex.a in Frameworks */, + 576482AF0C469052003AFC2F /* libIlmThread.a in Frameworks */, + 576482B00C469052003AFC2F /* libIlmImf.a in Frameworks */, + 576482B10C469052003AFC2F /* libImath.a in Frameworks */, + 576482B20C469052003AFC2F /* libHalf.a in Frameworks */, + 576482B30C469052003AFC2F /* libpano12.a in Frameworks */, + 576482B40C469052003AFC2F /* libjhead.a in Frameworks */, + 576482B50C469052003AFC2F /* libvigra_impex.a in Frameworks */, + 576482B60C469052003AFC2F /* libhugin_utils.a in Frameworks */, + 576482B70C469052003AFC2F /* libhugin_panotools.a in Frameworks */, + 576482B80C469052003AFC2F /* libhugin_panodata.a in Frameworks */, + 576483550C4695CE003AFC2F /* libvigra_ext.a in Frameworks */, + 576483570C4695EA003AFC2F /* libPTLensDB.a in Frameworks */, + 576483540C46957D003AFC2F /* libhugin_appbase.a in Frameworks */, + 576483530C46957A003AFC2F /* libhugin_nona.a in Frameworks */, + 576483580C4695EA003AFC2F /* libhugin_math.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 576482CD0C469056003AFC2F /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 576482CE0C469056003AFC2F /* libz.dylib in Frameworks */, + 576482CF0C469056003AFC2F /* libpng.a in Frameworks */, + 576482D00C469056003AFC2F /* libtiff.a in Frameworks */, + 576482D10C469056003AFC2F /* libjpeg.a in Frameworks */, + 576482D20C469056003AFC2F /* libIex.a in Frameworks */, + 576482D30C469056003AFC2F /* libIlmThread.a in Frameworks */, + 576482D40C469056003AFC2F /* libIlmImf.a in Frameworks */, + 576482D50C469056003AFC2F /* libImath.a in Frameworks */, + 576482D60C469056003AFC2F /* libHalf.a in Frameworks */, + 576482D70C469056003AFC2F /* libpano12.a in Frameworks */, + 576482D80C469056003AFC2F /* libjhead.a in Frameworks */, + 576482D90C469056003AFC2F /* libvigra_impex.a in Frameworks */, + 576482DA0C469056003AFC2F /* libhugin_utils.a in Frameworks */, + 576483F10C46AE05003AFC2F /* libvigra_ext.a in Frameworks */, + 576482DB0C469056003AFC2F /* libhugin_panotools.a in Frameworks */, + 576482DC0C469056003AFC2F /* libhugin_panodata.a in Frameworks */, + 576483E60C46AD9C003AFC2F /* libhugin_appbase.a in Frameworks */, + 576483E80C46ADA9003AFC2F /* libhugin_algorithms.a in Frameworks */, + 576484130C46AF3D003AFC2F /* liblevmar.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 5796FA800C4395CC006B7C6E /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -1024,8 +1248,10 @@ isa = PBXGroup; children = ( 5709A0650C4543D700BD1C53 /* autooptimiser.cpp */, + 576482E80C469093003AFC2F /* fulla.cpp */, 5796FA970C4395F4006B7C6E /* nona.cpp */, 570227180C425C6A008A44D6 /* open_file.cpp */, + 576482E90C469093003AFC2F /* vig_optimize.cpp */, ); path = test; sourceTree = "<group>"; @@ -1760,6 +1986,8 @@ 5702272F0C42605C008A44D6 /* open_file */, 5796FA950C4395CC006B7C6E /* nona */, 5709A0890C4543E100BD1C53 /* autooptimiser */, + 576482BE0C469052003AFC2F /* fulla */, + 576482E20C469056003AFC2F /* vig_optimize */, ); sourceTree = "<group>"; }; @@ -2123,6 +2351,56 @@ productReference = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; productType = "com.apple.product-type.library.static"; }; + 5764829C0C469052003AFC2F /* test fulla */ = { + isa = PBXNativeTarget; + buildConfigurationList = 576482B90C469052003AFC2F /* Build configuration list for PBXNativeTarget "test fulla" */; + buildPhases = ( + 576482A70C469052003AFC2F /* Sources */, + 576482A90C469052003AFC2F /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 5764829D0C469052003AFC2F /* PBXTargetDependency */, + 5764829F0C469052003AFC2F /* PBXTargetDependency */, + 576482A10C469052003AFC2F /* PBXTargetDependency */, + 576482A30C469052003AFC2F /* PBXTargetDependency */, + 576482A50C469052003AFC2F /* PBXTargetDependency */, + 5764835A0C469615003AFC2F /* PBXTargetDependency */, + 576483620C469627003AFC2F /* PBXTargetDependency */, + 5764835E0C46961B003AFC2F /* PBXTargetDependency */, + 5764835C0C46961B003AFC2F /* PBXTargetDependency */, + 576483600C46961F003AFC2F /* PBXTargetDependency */, + ); + name = "test fulla"; + productName = "sample open_close"; + productReference = 576482BE0C469052003AFC2F /* fulla */; + productType = "com.apple.product-type.tool"; + }; + 576482C00C469056003AFC2F /* test vig_optimize */ = { + isa = PBXNativeTarget; + buildConfigurationList = 576482DD0C469056003AFC2F /* Build configuration list for PBXNativeTarget "test vig_optimize" */; + buildPhases = ( + 576482CB0C469056003AFC2F /* Sources */, + 576482CD0C469056003AFC2F /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 576484150C46AF49003AFC2F /* PBXTargetDependency */, + 576483EB0C46ADBA003AFC2F /* PBXTargetDependency */, + 576482C10C469056003AFC2F /* PBXTargetDependency */, + 576482C30C469056003AFC2F /* PBXTargetDependency */, + 576482C50C469056003AFC2F /* PBXTargetDependency */, + 576482C70C469056003AFC2F /* PBXTargetDependency */, + 576482C90C469056003AFC2F /* PBXTargetDependency */, + 576484010C46AF0A003AFC2F /* PBXTargetDependency */, + ); + name = "test vig_optimize"; + productName = "sample open_close"; + productReference = 576482E20C469056003AFC2F /* vig_optimize */; + productType = "com.apple.product-type.tool"; + }; 576EC4980C3FC9300076A417 /* huginapp */ = { isa = PBXNativeTarget; buildConfigurationList = 576EC49F0C3FC9500076A417 /* Build configuration list for PBXNativeTarget "huginapp" */; @@ -2304,6 +2582,8 @@ 5702272E0C42605C008A44D6 /* test open_file */, 5796FA730C4395CC006B7C6E /* test nona */, 5709A0670C4543E100BD1C53 /* test autooptimiser */, + 5764829C0C469052003AFC2F /* test fulla */, + 576482C00C469056003AFC2F /* test vig_optimize */, ); }; /* End PBXProject section */ @@ -2436,6 +2716,22 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 576482A70C469052003AFC2F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 576482EA0C469093003AFC2F /* fulla.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 576482CB0C469056003AFC2F /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 576482ED0C469093003AFC2F /* vig_optimize.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 576EC4960C3FC9300076A417 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -2592,6 +2888,96 @@ target = 5759D9AB0C32713F0043F754 /* appbase */; targetProxy = 5709A0D30C45481500BD1C53 /* PBXContainerItemProxy */; }; + 5764829D0C469052003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5749F8A2067B60CA00A6EDD4 /* jhead */; + targetProxy = 5764829E0C469052003AFC2F /* PBXContainerItemProxy */; + }; + 5764829F0C469052003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5711524906BC6709004F4FA7 /* vigra_impex */; + targetProxy = 576482A00C469052003AFC2F /* PBXContainerItemProxy */; + }; + 576482A10C469052003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5771F5D60C3006E900736343 /* hugin_utils */; + targetProxy = 576482A20C469052003AFC2F /* PBXContainerItemProxy */; + }; + 576482A30C469052003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 571300640C33D41F00252FE3 /* panotools */; + targetProxy = 576482A40C469052003AFC2F /* PBXContainerItemProxy */; + }; + 576482A50C469052003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5759DA4E0C327D680043F754 /* panodata */; + targetProxy = 576482A60C469052003AFC2F /* PBXContainerItemProxy */; + }; + 576482C10C469056003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5749F8A2067B60CA00A6EDD4 /* jhead */; + targetProxy = 576482C20C469056003AFC2F /* PBXContainerItemProxy */; + }; + 576482C30C469056003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5711524906BC6709004F4FA7 /* vigra_impex */; + targetProxy = 576482C40C469056003AFC2F /* PBXContainerItemProxy */; + }; + 576482C50C469056003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5771F5D60C3006E900736343 /* hugin_utils */; + targetProxy = 576482C60C469056003AFC2F /* PBXContainerItemProxy */; + }; + 576482C70C469056003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 571300640C33D41F00252FE3 /* panotools */; + targetProxy = 576482C80C469056003AFC2F /* PBXContainerItemProxy */; + }; + 576482C90C469056003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5759DA4E0C327D680043F754 /* panodata */; + targetProxy = 576482CA0C469056003AFC2F /* PBXContainerItemProxy */; + }; + 5764835A0C469615003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 574092290C393E6600D16607 /* nona */; + targetProxy = 576483590C469615003AFC2F /* PBXContainerItemProxy */; + }; + 5764835C0C46961B003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5759D9AB0C32713F0043F754 /* appbase */; + targetProxy = 5764835B0C46961B003AFC2F /* PBXContainerItemProxy */; + }; + 5764835E0C46961B003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5771F7790C30216F00736343 /* hugin_math */; + targetProxy = 5764835D0C46961B003AFC2F /* PBXContainerItemProxy */; + }; + 576483600C46961F003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5771F8140C30268F00736343 /* PTLensDB */; + targetProxy = 5764835F0C46961F003AFC2F /* PBXContainerItemProxy */; + }; + 576483620C469627003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57C1705809A125DE00FAF325 /* vigra_ext */; + targetProxy = 576483610C469627003AFC2F /* PBXContainerItemProxy */; + }; + 576483EB0C46ADBA003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57EA83850C3A798A00E4965E /* algorithms */; + targetProxy = 576483EA0C46ADBA003AFC2F /* PBXContainerItemProxy */; + }; + 576484010C46AF0A003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5759D9AB0C32713F0043F754 /* appbase */; + targetProxy = 576484000C46AF0A003AFC2F /* PBXContainerItemProxy */; + }; + 576484150C46AF49003AFC2F /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 5720E4720BD456CD00E63404 /* levmar */; + targetProxy = 576484140C46AF49003AFC2F /* PBXContainerItemProxy */; + }; 5771F63F0C3011D700736343 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 5771F5D60C3006E900736343 /* hugin_utils */; @@ -3000,7 +3386,6 @@ 5745FC16094E1E6400E6B672 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = ""; PRODUCT_NAME = vigra_impex; USER_HEADER_SEARCH_PATHS = "../src/foreign/vigra $(inherited)"; }; @@ -3009,7 +3394,6 @@ 5745FC17094E1E6400E6B672 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = ""; PRODUCT_NAME = vigra_impex; USER_HEADER_SEARCH_PATHS = "../src/foreign/vigra $(inherited)"; }; @@ -3230,6 +3614,112 @@ }; name = Release; }; + 576482BA0C469052003AFC2F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign, + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = fulla; + }; + name = Debug; + }; + 576482BB0C469052003AFC2F /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign, + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + PRODUCT_NAME = fulla; + }; + name = Development; + }; + 576482BC0C469052003AFC2F /* Development ZeroLink */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign, + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = fulla; + }; + name = "Development ZeroLink"; + }; + 576482BD0C469052003AFC2F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign, + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = fulla; + }; + name = Release; + }; + 576482DE0C469056003AFC2F /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = vig_optimize; + }; + name = Debug; + }; + 576482DF0C469056003AFC2F /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + PRODUCT_NAME = vig_optimize; + }; + name = Development; + }; + 576482E00C469056003AFC2F /* Development ZeroLink */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = vig_optimize; + }; + name = "Development ZeroLink"; + }; + 576482E10C469056003AFC2F /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + HEADER_SEARCH_PATHS = ( + ../src/foreign/vigra, + ../src/hugin_base, + "$(inherited)", + ); + LIBRARY_SEARCH_PATHS = "$(inherited)"; + PRODUCT_NAME = vig_optimize; + }; + name = Release; + }; 576D276E093B3D4300FC5596 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { @@ -3245,7 +3735,6 @@ 576D2770093B3D4300FC5596 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = ""; PRODUCT_NAME = vigra_impex; USER_HEADER_SEARCH_PATHS = "../src/foreign/vigra $(inherited)"; }; @@ -3389,7 +3878,6 @@ 5771F6320C30115A00736343 /* Development ZeroLink */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREPROCESSOR_DEFINITIONS = ""; PRODUCT_NAME = vigra_impex; USER_HEADER_SEARCH_PATHS = "../src/foreign/vigra $(inherited)"; }; @@ -3904,6 +4392,28 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + 576482B90C469052003AFC2F /* Build configuration list for PBXNativeTarget "test fulla" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 576482BA0C469052003AFC2F /* Debug */, + 576482BB0C469052003AFC2F /* Development */, + 576482BC0C469052003AFC2F /* Development ZeroLink */, + 576482BD0C469052003AFC2F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; + 576482DD0C469056003AFC2F /* Build configuration list for PBXNativeTarget "test vig_optimize" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 576482DE0C469056003AFC2F /* Debug */, + 576482DF0C469056003AFC2F /* Development */, + 576482E00C469056003AFC2F /* Development ZeroLink */, + 576482E10C469056003AFC2F /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; 576EC49F0C3FC9500076A417 /* Build configuration list for PBXNativeTarget "huginapp" */ = { isa = XCConfigurationList; buildConfigurations = ( Modified: hugin/branches/ippei/src/hugin_base/algorithms/optimizer/PhotometricOptimizer.cpp =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithms/optimizer/PhotometricOptimizer.cpp 2007-07-13 13:31:08 UTC (rev 2259) +++ hugin/branches/ippei/src/hugin_base/algorithms/optimizer/PhotometricOptimizer.cpp 2007-07-13 13:40:21 UTC (rev 2260) @@ -251,7 +251,7 @@ tmp[199] = 0; double error = sqrt(sqerror/n)*255; snprintf(tmp,199, "Iteration: %d, error: %f", iter, error); - return dat->m_progress.increaseProgress(1.0/dat->m_maxIter, tmp) ? 1 : 0 ; + return dat->m_progress.increaseProgress(0.0, tmp) ? 1 : 0 ; } void PhorometricOptimizer::optimizePhotometric(PanoramaData & pano, const OptimizeVector & vars, @@ -392,7 +392,7 @@ { // is this correct? how much progress requierd? AppBase::ProgressReporter* progRep = - AppBase::ProgressReporterAdaptor::newProgressReporter(getProgressDisplay(), 1.0); + AppBase::ProgressReporterAdaptor::newProgressReporter(getProgressDisplay(), 0.0); optimizePhotometric(o_panorama, o_vars, o_correspondences, @@ -416,7 +416,7 @@ if(hasProgressDisplay()) { // is this correct? how much progress requierd? - progRep = new AppBase::ProgressReporterAdaptor(*getProgressDisplay(), 1.0); + progRep = new AppBase::ProgressReporterAdaptor(*getProgressDisplay(), 0.0); } else { progRep = new AppBase::DummyProgressReporter(); } Modified: hugin/branches/ippei/src/hugin_base/algorithms/optimizer/PhotometricOptimizer.h =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithms/optimizer/PhotometricOptimizer.h 2007-07-13 13:31:08 UTC (rev 2259) +++ hugin/branches/ippei/src/hugin_base/algorithms/optimizer/PhotometricOptimizer.h 2007-07-13 13:40:21 UTC (rev 2260) @@ -47,19 +47,19 @@ const OptimizeVector& vars, const PointPairs& correspondences) : TimeConsumingPanoramaAlgorithm(panorama, progressDisplay), - o_vars(vars), o_correspondences(correspondences) + o_vars(vars), o_correspondences(correspondences), o_resultError(0.0) {}; /// - virtual ~PhorometricOptimizer(); + virtual ~PhorometricOptimizer() {}; public: /// - void optimizePhotometric(PanoramaData& pano, const OptimizeVector& vars, - const PointPairs& correspondences, - AppBase::ProgressReporter& progress, - double& error); + static void optimizePhotometric(PanoramaData& pano, const OptimizeVector& vars, + const PointPairs& correspondences, + AppBase::ProgressReporter& progress, + double& error); protected: /// @@ -106,7 +106,7 @@ public: /// - virtual bool modifiesPanoramaData() + virtual bool modifiesPanoramaData() const { return true; } /// Modified: hugin/branches/ippei/src/hugin_base/algorithms/point_sampler/PointSampler.cpp =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithms/point_sampler/PointSampler.cpp 2007-07-13 13:31:08 UTC (rev 2259) +++ hugin/branches/ippei/src/hugin_base/algorithms/point_sampler/PointSampler.cpp 2007-07-13 13:40:21 UTC (rev 2260) @@ -51,7 +51,7 @@ { // is this correct? how much progress requierd? AppBase::ProgressReporter* progRep = - AppBase::ProgressReporterAdaptor::newProgressReporter(getProgressDisplay(), 1.0); + AppBase::ProgressReporterAdaptor::newProgressReporter(getProgressDisplay(), 2.0); sampleAndExtractPoints(*progRep); @@ -155,83 +155,5 @@ -#if 0 - -template<class ImageType> -std::vector<ImageType *> loadImagesPyr(std::vector<std::string> files, int pyrLevel, int verbose=0) -{ - typedef typename ImageType::value_type PixelType; - std::vector<ImageType *> srcImgs; - for (size_t i=0; i < files.size(); i++) { - ImageType * tImg = new ImageType(); - ImageType * tImg2 = new ImageType(); - vigra::ImageImportInfo info(files[i].c_str()); - tImg->resize(info.size()); - if (verbose) - std::cout << "loading: " << files[i] << std::endl; - - if (info.numExtraBands() == 1) { - // dummy mask - vigra::BImage mask(info.size()); - vigra::importImageAlpha(info, vigra::destImage(*tImg), vigra::destImage(mask)); - } else { - vigra::importImage(info, vigra::destImage(*tImg)); - } - float div = 1; - if (strcmp(info.getPixelType(), "UINT8") == 0) { - div = 255; - } else if (strcmp(info.getPixelType(), "UINT16") == 0) { - div = (1<<16)-1; - } - - if (pyrLevel) { - ImageType * swap; - // create downscaled image - if (verbose > 0) { - std::cout << "downscaling: "; - } - for (int l=pyrLevel; l > 0; l--) { - if (verbose > 0) { - std::cout << tImg->size().x << "x" << tImg->size().y << " " << std::flush; - } - reduceToNextLevel(*tImg, *tImg2); - swap = tImg; - tImg = tImg2; - tImg2 = swap; - } - if (verbose > 0) - std::cout << std::endl; - } - if (div > 1) { - div = 1/div; - transformImage(vigra::srcImageRange(*tImg), vigra::destImage(*tImg), - vigra::functor::Arg1()*vigra::functor::Param(div)); - } - srcImgs.push_back(tImg); - delete tImg2; - } - return srcImgs; -} - - -// needs 2.0 progress steps -void loadImgsAndExtractPoints(Panorama pano, int nPoints, int pyrLevel, bool randomPoints, AppBase::ProgressReporter & progress, std::vector<vigra_ext::PointPairRGB> & points ) -{ - // extract file names - std::vector<std::string> files; - for (size_t i=0; i < pano.getNrOfImages(); i++) - files.push_back(pano.getImage(i).getFilename()); - - std::vector<vigra::FRGBImage*> images; - - // try to load the images. - images = loadImagesPyr<vigra::FRGBImage>(files, pyrLevel, 1); - - extractPoints(pano, images, nPoints, randomPoints, progress, points); -} - -#endif //0 - - }; // namespace Modified: hugin/branches/ippei/src/hugin_base/algorithms/point_sampler/PointSampler.h =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithms/point_sampler/PointSampler.h 2007-07-13 13:31:08 UTC (rev 2259) +++ hugin/branches/ippei/src/hugin_base/algorithms/point_sampler/PointSampler.h 2007-07-13 13:40:21 UTC (rev 2260) @@ -49,7 +49,7 @@ public: /// - virtual ~PointSampler(); + virtual ~PointSampler() {}; protected: @@ -85,7 +85,7 @@ public: /// - virtual bool modifiesPanoramaData() + virtual bool modifiesPanoramaData() const { return false; } /// @@ -126,7 +126,7 @@ {}; /// - virtual ~AllPointSampler(); + virtual ~AllPointSampler() {}; public: @@ -189,7 +189,7 @@ {}; /// - virtual ~RandomPointSampler(); + virtual ~RandomPointSampler() {}; public: @@ -211,7 +211,6 @@ const std::vector<vigra::FImage*>& voteImgs, const std::vector<SrcPanoImage>& src, const PanoramaOptions& dest, - int nPoints, float minI, float maxI, std::vector<std::multimap<double,vigra_ext::PointPairRGB> >& radiusHist, @@ -479,6 +478,8 @@ boost::variate_generator<boost::mt19937&, boost::uniform_int<> > randY(rng, distriby); // glues randomness with mapping + double percentReported = 0.0; + for (unsigned maxTry = nPoints*5; nPoints > 0 && maxTry > 0; maxTry--) { unsigned x = randX(); unsigned y = randY(); @@ -580,13 +581,18 @@ } } double pc = (allPoints - nPoints); - if (((int)pc)%(allPoints/10) == 0) { - progress.increaseProgress(1.0/10); + double percentNow = (pc / allPoints) * 100.0; + if (percentNow - percentReported >= 10) { + percentReported = percentNow; + progress.increaseProgress(0.1); } } for(unsigned i=0; i < imgs.size(); i++) { delete transf[i]; } + + DEBUG_INFO("Point sampled: " << allPoints-nPoints) + progress.increaseProgress(1.0 - percentReported/100.0); } Modified: hugin/branches/ippei/src/hugin_base/appbase/ProgressDisplay.cpp =================================================================== --- hugin/branches/ippei/src/hugin_base/appbase/ProgressDisplay.cpp 2007-07-13 13:31:08 UTC (rev 2259) +++ hugin/branches/ippei/src/hugin_base/appbase/ProgressDisplay.cpp 2007-07-13 13:40:21 UTC (rev 2260) @@ -35,11 +35,6 @@ void ProgressDisplay::startSubtaskWithTask(const ProgressSubtask& newSubtask) { - DEBUG_INFO("New subtask: " - << "message[" << newSubtask.message << "] " - << "maxProgress[" << newSubtask.maxProgress << "] " - << "progForParent[" << newSubtask.progressForParentTask << "]"); - o_subtasks.push_back(newSubtask); subtaskStarted(); updateProgressDisplay(); @@ -56,9 +51,9 @@ void ProgressDisplay::startSubtask(const std::string& message, - const double& maxProgress, - const double& progressForParentTask, - const bool& propagatesProgress) + const double& maxProgress, + const double& progressForParentTask, + const bool& propagatesProgress) { ProgressSubtask newSubtask = ProgressSubtask(message, maxProgress, progressForParentTask, propagatesProgress); Modified: hugin/branches/ippei/src/hugin_base/appbase/ProgressReporterOld.cpp =================================================================== --- hugin/branches/ippei/src/hugin_base/appbase/ProgressReporterOld.cpp 2007-07-13 13:31:08 UTC (rev 2259) +++ hugin/branches/ippei/src/hugin_base/appbase/ProgressReporterOld.cpp 2007-07-13 13:40:21 UTC (rev 2260) @@ -29,11 +29,20 @@ namespace AppBase { +ProgressReporter::ProgressReporter(double maxProgress) + : m_progress(0), m_maxProgress(maxProgress) +{ +} + + + + /// ProgressReporterAdaptor::ProgressReporterAdaptor(ProgressDisplay& myProgressDisplay, const double& maxProgress) : ProgressReporter(maxProgress), o_progressDisplay(myProgressDisplay) { - o_progressDisplay.startSubtask(maxProgress); + o_progressDisplay.startSubtask(maxProgress); + o_progressDisplay.startSubtask("", 0.0, 0.0, false); }; @@ -41,13 +50,18 @@ ProgressReporterAdaptor::~ProgressReporterAdaptor() { o_progressDisplay.finishSubtask(); + o_progressDisplay.finishSubtask(); }; /// bool ProgressReporterAdaptor::increaseProgress(double delta) { + std::string msg = o_progressDisplay.getSubtaskMessage(); + o_progressDisplay.finishSubtask(); o_progressDisplay.increaseSubtaskProgressBy(delta); + o_progressDisplay.startSubtask(msg, 0.0, 0.0, false); + return !o_progressDisplay.wasCancelled(); } @@ -68,8 +82,11 @@ } + + + StreamProgressReporter::StreamProgressReporter(double maxProgress, std::ostream & out) -: m_progress(0), m_maxProgress(maxProgress), m_stream(out) +: ProgressReporter(maxProgress), m_stream(out) { } Modified: hugin/branches/ippei/src/hugin_base/appbase/ProgressReporterOld.h =================================================================== --- hugin/branches/ippei/src/hugin_base/appbase/ProgressReporterOld.h 2007-07-13 13:31:08 UTC (rev 2259) +++ hugin/branches/ippei/src/hugin_base/appbase/ProgressReporterOld.h 2007-07-13 13:40:21 UTC (rev 2260) @@ -52,6 +52,10 @@ setMessage(msg); return increaseProgress(delta); } + + protected: + double m_progress; + double m_maxProgress; }; @@ -125,8 +129,6 @@ void print(); private: - double m_progress; - double m_maxProgress; std::string m_message; std::ostream & m_stream; }; Added: hugin/branches/ippei/src/hugin_base/test/fulla.cpp =================================================================== --- hugin/branches/ippei/src/hugin_base/test/fulla.cpp (rev 0) +++ hugin/branches/ippei/src/hugin_base/test/fulla.cpp 2007-07-13 13:40:21 UTC (rev 2260) @@ -0,0 +1,604 @@ +// -*- c-basic-offset: 4 -*- + +/** @file fulla.cpp + * + * @brief a tool to perform distortion, vignetting and chromatic abberation correction. + * + * @author Pablo d'Angelo <pab...@we...> + * + * $Id: fulla.cpp 1953 2007-04-15 20:58:37Z dangelo $ + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this software; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <hugin_config.h> +#include <fstream> +#include <sstream> + +#include <vigra/error.hxx> +#include <vigra/impex.hxx> +#include <jhead/jhead.h> +#ifdef WIN32 + #include <getopt.h> +#else + #include <unistd.h> +#endif + +#include <appbase/ProgressDisplayOld.h> +#include <nona/SpaceTransform.h> +#include <photometric/ResponseTransform.h> + +#include <panoinc.h> + +#include <lensdb/PTLensDB.h> + +#include <tiffio.h> +#include <vigra_ext/MultiThreadOperations.h> +#include <vigra_ext/ImageTransforms.h> + + +using namespace std; +using namespace vigra; +//using namespace vigra_ext; +using namespace hugin_utils; +using namespace HuginBase; + + +template <class SrcImgType, class FlatImgType, class DestImgType> +void correctImage(SrcImgType & srcImg, + const FlatImgType & srcFlat, + SrcPanoImage src, + vigra_ext::Interpolator interpolator, + DestImgType & destImg, + bool doCrop, + AppBase::MultiProgressDisplay & progress); + +template <class PIXELTYPE> +void correctRGB(SrcPanoImage & src, ImageImportInfo & info, const char * outfile, + bool crop, AppBase::MultiProgressDisplay & progress); + +bool getPTLensCoef(const char * fn, string cameraMaker, string cameraName, + string lensName, float focalLength, vector<double> & coeff); + + + + +static void usage(const char * name) +{ + cerr << name << ": correct lens distortion, vignetting and chromatic abberation" << std::endl + << "version " << PACKAGE_VERSION << endl + << std::endl + << "Usage: " << name << " [options] inputfile(s) " << std::endl + << " option are: " << std::endl + << " -g a:b:c:d Radial distortion coefficient for all channels, (a, b, c, d)" << std::endl + << " -b a:b:c:d Radial distortion coefficents for blue channel, (a, b, c, d)" << std::endl + << " this is applied on top of the -g distortion coefficients," << endl + << " use for TCA corr" << std::endl + << " -r a:b:c:d Radial distortion coefficents for red channel, (a, b, c, d)" << std::endl + << " this is applied on top of the -g distortion coefficients," << endl + << " use for TCA corr" << std::endl + << " -p Try to read radial distortion coefficients for green" << endl + << " channel from PTLens database" << std::endl + << " -m Canon Camera manufacturer, for PTLens database query" << std::endl + << " -n Camera Camera name, for PTLens database query" << std::endl + << " -l Lens Lens name, for PTLens database query" << std::endl + << " if not specified, a list of possible lenses is displayed" << std::endl + << " -d 50 specify focal length in mm, for PTLens database query" << std::endl + << " -s do not rescale the image to avoid black borders." << std::endl + << endl + << " -f filename Vignetting correction by flatfield division" << std::endl + << " I = I / c, c = flatfield / mean(flatfield)" << std::endl + << " -c a:b:c:d radial vignetting correction by division:" << std::endl + << " I = I / c, c = a + b*r^2 + c*r^4 + d*r^6" << std::endl + << " -a Correct vignetting by addition, rather than by division" << std::endl + << " I = I + c" << std::endl + << " -i value gamma of input data. used for gamma correction" << std::endl + << " before and after flatfield correction" << std::endl + << " -t n Number of threads that should be used during processing" << std::endl + << " -h Display help (this text)" << std::endl + << " -o name set output filename. If more than one image is given," << std::endl + << " the name will be uses as suffix (default suffix: _corr)" << std::endl + << " -v Verbose" << std::endl; +} + + +int main(int argc, char *argv[]) +{ + // parse arguments + const char * optstring = "g:b:r:pm:n:l:d:sf:c:ai:t:ho:v"; + int o; + //bool verbose_flag = true; + + opterr = 0; + + vector<double> vec4(4); + bool doFlatfield = false; + bool doVigRadial = false; + bool doVigAddition = false; + bool doCropBorders = true; + unsigned nThreads=1; + unsigned verbose = 0; + + std::string batchPostfix("_corr"); + std::string outputFile; + bool doPTLens = false; + std::string cameraMaker; + std::string cameraName; + std::string lensName; + float focalLength=0; + double gamma = 1.0; + SrcPanoImage c; + while ((o = getopt (argc, argv, optstring)) != -1) + switch (o) { + case 'r': + if (sscanf(optarg, "%lf:%lf:%lf:%lf", &vec4[0], &vec4[1], &vec4[2], &vec4[3]) != 4) + { + std::cerr << std::endl << "Error: invalid -r argument" << std::endl <<std::endl; + usage(argv[0]); + return 1; + } + c.setRadialDistortionRed(vec4); +// c.radDistRed[3] = 1 - c.radDistRed[0] - c.radDistRed[1] - c.radDistRed[2]; + break; + case 'g': + if (sscanf(optarg, "%lf:%lf:%lf:%lf", &vec4[0], &vec4[1], &vec4[2], &vec4[3]) != 4) + { + std::cerr << std::endl << "Error: invalid -g argument" << std::endl <<std::endl; + usage(argv[0]); + return 1; + } + c.setRadialDistortion(vec4); + // c.radDistBlue[3] = 1 - c.radDistBlue[0] - c.radDistBlue[1] - c.radDistBlue[2]; + break; + case 'b': + if (sscanf(optarg, "%lf:%lf:%lf:%lf", &vec4[0], &vec4[1], &vec4[2], &vec4[3]) != 4) + { + std::cerr << std::endl << "Error: invalid -b argument" << std::endl <<std::endl; + usage(argv[0]); + return 1; + } + c.setRadialDistortionBlue(vec4); + // c.radDistBlue[3] = 1 - c.radDistBlue[0] - c.radDistBlue[1] - c.radDistBlue[2]; + break; + case 's': + doCropBorders = false; + break; + case 'f': + c.setFlatfieldFilename(optarg); + doFlatfield = true; + break; + case 'a': + doVigAddition = true; + break; + case 'i': + gamma = atof(optarg); + c.setGamma(gamma); + break; + case 'p': + doPTLens = true; + break; + case 'm': + cameraMaker = optarg; + doPTLens = true; + break; + case 'n': + cameraName = optarg; + doPTLens = true; + break; + case 'l': + lensName = optarg; + doPTLens = true; + break; + case 'd': + focalLength = atof(optarg); + doPTLens = true; + break; + case 'c': + if (sscanf(optarg, "%lf:%lf:%lf:%lf", &vec4[0], &vec4[1], &vec4[2], &vec4[3]) !=4) + { + std::cerr << std::endl << "Error: invalid -c argument" << std::endl <<std::endl; + usage(argv[0]); + return 1; + } + c.setRadialVigCorrCoeff(vec4); + doVigRadial=true; + break; + case '?': + case 'h': + usage(argv[0]); + return 1; + case 't': + nThreads = atoi(optarg); + break; + case 'o': + outputFile = optarg; + break; + case 'v': + verbose++; + break; + default: + abort (); + } + + if (doVigRadial && doFlatfield) { + std::cerr << std::endl << "Error: cannot use -f and -c at the same time" << std::endl <<std::endl; + usage(argv[0]); + return 1; + } + + SrcPanoImage::VignettingCorrMode vm=SrcPanoImage::VIGCORR_NONE; + + if (doVigRadial) + vm = SrcPanoImage::VIGCORR_RADIAL; + if (doFlatfield) + vm = SrcPanoImage::VIGCORR_FLATFIELD; + if (! doVigAddition) + vm = (SrcPanoImage::VignettingCorrMode) (vm | SrcPanoImage::VIGCORR_DIV); + c.setVigCorrMode(vm); + + unsigned nFiles = argc - optind; + if (nFiles == 0) { + std::cerr << std::endl << "Error: No input file(s) specified" << std::endl <<std::endl; + usage(argv[0]); + return 1; + } + + // get input images. + vector<string> inFiles; + vector<string> outFiles; + if (nFiles == 1) { + if (outputFile.length() !=0) { + inFiles.push_back(string(argv[optind])); + outFiles.push_back(outputFile); + } else { + string name = string(argv[optind]); + inFiles.push_back(name); + string basen = stripExtension(name); + outFiles.push_back(basen.append(batchPostfix.append(".").append(getExtension(name)))); + } + } else { + // multiple files + if (outputFile.length() != 0) { + batchPostfix = outputFile; + } + for (int i = optind; i < argc; i++) { + string name = string(argv[i]); + inFiles.push_back(name); + outFiles.push_back(stripExtension(name) + batchPostfix + "." + getExtension(name)); + } + } + + + // suppress tiff warnings + TIFFSetWarningHandler(0); + + AppBase::StreamMultiProgressDisplay pdisp(cout); + + if (nThreads == 0) nThreads = 1; + vigra_ext::ThreadManager::get().setNThreads(nThreads); + + try { + vector<string>::iterator outIt = outFiles.begin(); + for (vector<string>::iterator inIt = inFiles.begin(); inIt != inFiles.end() ; ++inIt, ++outIt) + { + if (verbose > 0) { + cerr << "Correcting " << *inIt << " -> " << *outIt << endl; + } + c.setFilename(*inIt); + + // load the input image + vigra::ImageImportInfo info(inIt->c_str()); + const char * pixelType = info.getPixelType(); + int bands = info.numBands(); + int extraBands = info.numExtraBands(); + + // if ptlens support required, load database + if (doPTLens) { + if (getPTLensCoef(inIt->c_str(), cameraMaker.c_str(), cameraName.c_str(), + lensName.c_str(), focalLength, vec4)) + { + c.setRadialDistortion(vec4); + } else { + cerr << "Error: could not extract correction parameters from PTLens database" << endl; + return 1; + } + } + c.setSize(info.size()); + // stitch the pano with a suitable image type + if (bands == 3 || bands == 4 && extraBands == 1) { + // TODO: add more cases + if (strcmp(pixelType, "UINT8") == 0) { + correctRGB<RGBValue<UInt8> >(c, info, outIt->c_str(), doCropBorders, pdisp); + } + else if (strcmp(pixelType, "UINT16") == 0) { + correctRGB<RGBValue<UInt16> >(c, info, outIt->c_str(), doCropBorders, pdisp); + } else if (strcmp(pixelType, "INT16") == 0) { + correctRGB<RGBValue<Int16> >(c, info, outIt->c_str(), doCropBorders, pdisp); + } else if (strcmp(pixelType, "UINT32") == 0) { + correctRGB<RGBValue<UInt32> >(c, info, outIt->c_str(), doCropBorders, pdisp); + } else if (strcmp(pixelType, "FLOAT") == 0) { + correctRGB<RGBValue<float> >(c, info, outIt->c_str(), doCropBorders, pdisp); + } else if (strcmp(pixelType, "DOUBLE") == 0) { + correctRGB<RGBValue<double> >(c, info, outIt->c_str(), doCropBorders, pdisp); + } + } else { + DEBUG_ERROR("unsupported depth, only 3 channel images are supported"); + throw std::runtime_error("unsupported depth, only 3 channels images are supported"); + return 1; + } + } + } catch (std::exception & e) { + cerr << "caught exception: " << e.what() << std::endl; + return 1; + } + return 0; +} + + + + +/** remap a single image + * + * Be careful, might modify srcImg (vignetting and brightness correction) + * + */ +template <class SrcImgType, class FlatImgType, class DestImgType> +void correctImage(SrcImgType & srcImg, + const FlatImgType & srcFlat, + SrcPanoImage src, + vigra_ext::Interpolator interpolator, + DestImgType & destImg, + bool doCrop, + AppBase::MultiProgressDisplay & progress) +{ + typedef typename SrcImgType::value_type SrcPixelType; + typedef typename DestImgType::value_type DestPixelType; + + typedef typename vigra::NumericTraits<SrcPixelType>::RealPromote RSrcPixelType; + + // prepare some information required by multiple types of vignetting correction + progress.pushTask(AppBase::ProgressTask("correcting image", "")); + + if( (src.getVigCorrMode() & SrcPanoImage::... [truncated message content] |
From: <ip...@us...> - 2007-07-16 11:57:15
|
Revision: 2266 http://hugin.svn.sourceforge.net/hugin/?rev=2266&view=rev Author: ippei Date: 2007-07-16 04:57:13 -0700 (Mon, 16 Jul 2007) Log Message: ----------- the old GUI compiles Modified Paths: -------------- hugin/branches/ippei/mac/Hugin-Info.plist hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj hugin/branches/ippei/mac/localised.sh hugin/branches/ippei/src/hugin1/PT/PTOptimise.h hugin/branches/ippei/src/hugin1/PT/PanoCommand.h hugin/branches/ippei/src/hugin1/PT/Panorama.h hugin/branches/ippei/src/hugin1/PT/PanoramaMemento.h hugin/branches/ippei/src/hugin1/PT/PhotometricOptimizer.h hugin/branches/ippei/src/hugin1/PT/RandomPointSampler.h hugin/branches/ippei/src/hugin1/PT/RemappedPanoImage.h hugin/branches/ippei/src/hugin1/common/Command.h hugin/branches/ippei/src/hugin1/hugin/CommandHistory.h hugin/branches/ippei/src/hugin1/hugin/ImageCache.cpp hugin/branches/ippei/src/hugin1/hugin/ImageCache.h hugin/branches/ippei/src/hugin1/hugin/wxPanoCommand.cpp hugin/branches/ippei/src/hugin1/panoinc.h hugin/branches/ippei/src/hugin_base/algorithms/basic/CalculateCPStatistics.h hugin/branches/ippei/src/hugin_base/algorithms/basic/CalculateMeanExposure.h hugin/branches/ippei/src/hugin_base/algorithms/optimizer/PTOptimizer.h hugin/branches/ippei/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.h hugin/branches/ippei/src/hugin_base/appbase/Command.h hugin/branches/ippei/src/hugin_base/appbase/ProgressDisplayOld.h hugin/branches/ippei/src/hugin_base/appbase/ProgressReporterOld.h hugin/branches/ippei/src/hugin_base/huginapp/PanoCommand.h Added Paths: ----------- hugin/branches/ippei/src/hugin1/config.h Modified: hugin/branches/ippei/mac/Hugin-Info.plist =================================================================== --- hugin/branches/ippei/mac/Hugin-Info.plist 2007-07-15 14:26:53 UTC (rev 2265) +++ hugin/branches/ippei/mac/Hugin-Info.plist 2007-07-16 11:57:13 UTC (rev 2266) @@ -26,17 +26,17 @@ </dict> </array> <key>CFBundleExecutable</key> - <string>HuginOSX</string> + <string>Hugin</string> <key>CFBundleGetInfoString</key> - <string>HuginOSX 0.7beta5</string> + <string>Hugin 0.7beta5</string> <key>CFBundleIconFile</key> - <string>HuginOSX.icns</string> + <string>Hugin.icns</string> <key>CFBundleIdentifier</key> - <string>net.sourceforge.hugin.HuginOSX</string> + <string>net.sourceforge.hugin.Hugin</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> <key>CFBundleName</key> - <string>HuginOSX</string> + <string>Hugin</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> Modified: hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-07-15 14:26:53 UTC (rev 2265) +++ hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-07-16 11:57:13 UTC (rev 2266) @@ -7,29 +7,18 @@ objects = { /* Begin PBXAggregateTarget section */ - 57A60E920C400269007B5462 /* All */ = { + 57A60E920C400269007B5462 /* all */ = { isa = PBXAggregateTarget; - buildConfigurationList = 57A60EB20C4002B0007B5462 /* Build configuration list for PBXAggregateTarget "All" */; + buildConfigurationList = 57A60EB20C4002B0007B5462 /* Build configuration list for PBXAggregateTarget "all" */; buildPhases = ( ); dependencies = ( 57A60E940C400272007B5462 /* PBXTargetDependency */, - 57A60E960C400272007B5462 /* PBXTargetDependency */, - 57A60E980C400272007B5462 /* PBXTargetDependency */, - 57A60E9A0C400272007B5462 /* PBXTargetDependency */, - 57A60E9C0C400272007B5462 /* PBXTargetDependency */, - 57A60E9E0C400272007B5462 /* PBXTargetDependency */, - 57A60EA00C400272007B5462 /* PBXTargetDependency */, - 57A60EA20C400272007B5462 /* PBXTargetDependency */, - 57A60EA40C400272007B5462 /* PBXTargetDependency */, - 57A60EA60C400272007B5462 /* PBXTargetDependency */, - 57A60EA80C400272007B5462 /* PBXTargetDependency */, - 57A60EAA0C400272007B5462 /* PBXTargetDependency */, - 57A60EAC0C400272007B5462 /* PBXTargetDependency */, - 57A60EAE0C400272007B5462 /* PBXTargetDependency */, - 57A60EB00C400272007B5462 /* PBXTargetDependency */, + 57E3472F0C4A8EC6006AA781 /* PBXTargetDependency */, + 57E3474B0C4A8F06006AA781 /* PBXTargetDependency */, + 57E347490C4A8F06006AA781 /* PBXTargetDependency */, ); - name = All; + name = all; productName = All; }; 57C486290C3121E8002D79F1 /* copy hugin_config.h */ = { @@ -43,6 +32,56 @@ name = "copy hugin_config.h"; productName = "copy hugin_config.h"; }; + 57E3470D0C4A8E95006AA781 /* lib static */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 57E3474C0C4A8F24006AA781 /* Build configuration list for PBXAggregateTarget "lib static" */; + buildPhases = ( + ); + dependencies = ( + 57E3472D0C4A8EB6006AA781 /* PBXTargetDependency */, + 57E3472B0C4A8EB6006AA781 /* PBXTargetDependency */, + 57E347290C4A8EB6006AA781 /* PBXTargetDependency */, + 57E347270C4A8EB6006AA781 /* PBXTargetDependency */, + 57E347250C4A8EB6006AA781 /* PBXTargetDependency */, + 57E347230C4A8EB6006AA781 /* PBXTargetDependency */, + 57E347210C4A8EB6006AA781 /* PBXTargetDependency */, + 57E3471F0C4A8EB6006AA781 /* PBXTargetDependency */, + 57E3471D0C4A8EB6006AA781 /* PBXTargetDependency */, + 57E3471B0C4A8EB6006AA781 /* PBXTargetDependency */, + 57E347190C4A8EB6006AA781 /* PBXTargetDependency */, + 57E347170C4A8EB6006AA781 /* PBXTargetDependency */, + 57E347150C4A8EB6006AA781 /* PBXTargetDependency */, + 57E347130C4A8EB6006AA781 /* PBXTargetDependency */, + ); + name = "lib static"; + productName = lib; + }; + 57E347300C4A8EDF006AA781 /* app */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 57E347510C4A8F24006AA781 /* Build configuration list for PBXAggregateTarget "app" */; + buildPhases = ( + ); + dependencies = ( + 57E347470C4A8EF8006AA781 /* PBXTargetDependency */, + ); + name = app; + productName = app; + }; + 57E347330C4A8EED006AA781 /* tools */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 57E347560C4A8F24006AA781 /* Build configuration list for PBXAggregateTarget "tools" */; + buildPhases = ( + ); + dependencies = ( + 57E3473D0C4A8EF4006AA781 /* PBXTargetDependency */, + 57E3473B0C4A8EF4006AA781 /* PBXTargetDependency */, + 57E347390C4A8EF4006AA781 /* PBXTargetDependency */, + 57E347370C4A8EF4006AA781 /* PBXTargetDependency */, + 57E347350C4A8EF4006AA781 /* PBXTargetDependency */, + ); + name = tools; + productName = tools; + }; /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ @@ -319,6 +358,81 @@ 57DB9BC20C454BA5004957C2 /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; }; 57DB9BC70C454BE5004957C2 /* libhugin_appbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */; }; 57DB9BC90C454C07004957C2 /* libhugin_math.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F77A0C30216F00736343 /* libhugin_math.a */; }; + 57E346880C4A89E6006AA781 /* AssistantPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331010C4A8859006AA781 /* AssistantPanel.cpp */; }; + 57E3468A0C4A89E6006AA781 /* AutoCtrlPointCreator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331030C4A8859006AA781 /* AutoCtrlPointCreator.cpp */; }; + 57E3468C0C4A89E6006AA781 /* CPEditorPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331060C4A8859006AA781 /* CPEditorPanel.cpp */; }; + 57E346920C4A89E6006AA781 /* CPImageCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3310C0C4A8859006AA781 /* CPImageCtrl.cpp */; }; + 57E346940C4A89E6006AA781 /* CPListFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3310E0C4A8859006AA781 /* CPListFrame.cpp */; }; + 57E3469A0C4A89E6006AA781 /* CropPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331140C4A8859006AA781 /* CropPanel.cpp */; }; + 57E3469C0C4A89E6006AA781 /* HFOVDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331160C4A8859006AA781 /* HFOVDialog.cpp */; }; + 57E3469E0C4A89E6006AA781 /* huginApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3314F0C4A8859006AA781 /* huginApp.cpp */; }; + 57E346A30C4A89E6006AA781 /* ImagesList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3311B0C4A8859006AA781 /* ImagesList.cpp */; }; + 57E346A50C4A89E6006AA781 /* ImagesPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3311D0C4A8859006AA781 /* ImagesPanel.cpp */; }; + 57E346A70C4A89E6006AA781 /* LensPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3311F0C4A8859006AA781 /* LensPanel.cpp */; }; + 57E346A90C4A89E6006AA781 /* LocalizedFileTipProvider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331210C4A8859006AA781 /* LocalizedFileTipProvider.cpp */; }; + 57E346AB0C4A89E6006AA781 /* MainFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331230C4A8859006AA781 /* MainFrame.cpp */; }; + 57E346AD0C4A89E6006AA781 /* MyExternalCmdExecDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331260C4A8859006AA781 /* MyExternalCmdExecDialog.cpp */; }; + 57E346B10C4A89E6006AA781 /* NonaStitcherPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3312A0C4A8859006AA781 /* NonaStitcherPanel.cpp */; }; + 57E346B30C4A89E6006AA781 /* OptimizePanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3312C0C4A8859006AA781 /* OptimizePanel.cpp */; }; + 57E346B50C4A89E6006AA781 /* OptimizePhotometricPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3312E0C4A8859006AA781 /* OptimizePhotometricPanel.cpp */; }; + 57E346B70C4A89E6006AA781 /* PTStitcherPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331300C4A8859006AA781 /* PTStitcherPanel.cpp */; }; + 57E346BB0C4A89E6006AA781 /* PanoDruid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331340C4A8859006AA781 /* PanoDruid.cpp */; }; + 57E346BD0C4A89E6006AA781 /* PanoPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331360C4A8859006AA781 /* PanoPanel.cpp */; }; + 57E346C10C4A89E6006AA781 /* PreferencesDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3313A0C4A8859006AA781 /* PreferencesDialog.cpp */; }; + 57E346C30C4A89E6006AA781 /* PreviewFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3313C0C4A8859006AA781 /* PreviewFrame.cpp */; }; + 57E346C50C4A89E6006AA781 /* PreviewPanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3313E0C4A8859006AA781 /* PreviewPanel.cpp */; }; + 57E346C70C4A89E6006AA781 /* RunStitcherFrame.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331400C4A8859006AA781 /* RunStitcherFrame.cpp */; }; + 57E346CA0C4A89E6006AA781 /* TextKillFocusHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331430C4A8859006AA781 /* TextKillFocusHandler.cpp */; }; + 57E346CE0C4A89E6006AA781 /* VigCorrDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331470C4A8859006AA781 /* VigCorrDialog.cpp */; }; + 57E346D00C4A89E6006AA781 /* wxPanoCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E3316A0C4A8859006AA781 /* wxPanoCommand.cpp */; }; + 57E346D90C4A8AB3006AA781 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 574F3EBC081FF2350086E561 /* QuickTime.framework */; }; + 57E346DA0C4A8AB3006AA781 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 574F3F2E082005980086E561 /* IOKit.framework */; }; + 57E346DB0C4A8AB3006AA781 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9B067B80F000A6EDD4 /* Carbon.framework */; }; + 57E346DC0C4A8AB3006AA781 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9C067B80F000A6EDD4 /* Cocoa.framework */; }; + 57E346DD0C4A8AB3006AA781 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 573C3861067C789F00A5DBE0 /* System.framework */; }; + 57E346DE0C4A8AB3006AA781 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 573C3862067C789F00A5DBE0 /* WebKit.framework */; }; + 57E346DF0C4A8AB3006AA781 /* libpthread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989595068E2FEC009F90BF /* libpthread.dylib */; }; + 57E346E00C4A8AB3006AA781 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; + 57E346E10C4A8AB3006AA781 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; + 57E346E20C4A8AB3006AA781 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; + 57E346E30C4A8AC2006AA781 /* libpano12.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano12.a */; }; + 57E346E40C4A8AC2006AA781 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; + 57E346E50C4A8AC2006AA781 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; + 57E346E60C4A8AC2006AA781 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; + 57E346E70C4A8AC2006AA781 /* libwx_macu-2.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.7.a */; }; + 57E346E80C4A8AC2006AA781 /* libwxexpat-2.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989545068E2F22009F90BF /* libwxexpat-2.7.a */; }; + 57E346E90C4A8AC2006AA781 /* libwxregexu-2.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989565068E2FA3009F90BF /* libwxregexu-2.7.a */; }; + 57E346EA0C4A8AC2006AA781 /* libIex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.a */; }; + 57E346EB0C4A8AC2006AA781 /* libIlmImf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.a */; }; + 57E346EC0C4A8AC2006AA781 /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.a */; }; + 57E346ED0C4A8AC2006AA781 /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; + 57E346EE0C4A8AC2006AA781 /* libHalf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.a */; }; + 57E346EF0C4A8AE2006AA781 /* libboost_thread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F7450C30202B00736343 /* libboost_thread.a */; }; + 57E346F00C4A8AE2006AA781 /* liblevmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* liblevmar.a */; }; + 57E346F10C4A8AE2006AA781 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; + 57E346F20C4A8AE2006AA781 /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; + 57E346F30C4A8AE2006AA781 /* libvigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libvigra_ext.a */; }; + 57E346F40C4A8AE2006AA781 /* libhugin_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F5D70C3006E900736343 /* libhugin_utils.a */; }; + 57E346F50C4A8AE2006AA781 /* libhugin_math.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F77A0C30216F00736343 /* libhugin_math.a */; }; + 57E346F60C4A8AE2006AA781 /* libhugin_appbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */; }; + 57E346F70C4A8AE2006AA781 /* libhugin_panodata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; }; + 57E346F80C4A8AE2006AA781 /* libhugin_panotools.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 571300650C33D41F00252FE3 /* libhugin_panotools.a */; }; + 57E346F90C4A8AE2006AA781 /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; }; + 57E346FA0C4A8AE2006AA781 /* libhugin_algorithms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */; }; + 57E347760C4A8FED006AA781 /* enblend in CopyFiles */ = {isa = PBXBuildFile; fileRef = 570D581A082A9ED50030E768 /* enblend */; }; + 57E347770C4A9005006AA781 /* autopano-complete-mac.sh in Resources */ = {isa = PBXBuildFile; fileRef = 57A91BD707FD85E30013AE47 /* autopano-complete-mac.sh */; }; + 57E347780C4A9005006AA781 /* Hugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 57114EA006BC2301004F4FA7 /* Hugin.icns */; }; + 57E347790C4A9005006AA781 /* HuginFiles.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5702996D07F967CB00F1FF15 /* HuginFiles.icns */; }; + 57E34A680C4ACB0F006AA781 /* Plot2D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E34A660C4ACB0F006AA781 /* Plot2D.cpp */; }; + 57E34A690C4ACB0F006AA781 /* Plot2D.h in Headers */ = {isa = PBXBuildFile; fileRef = 57E34A670C4ACB0F006AA781 /* Plot2D.h */; }; + 57E34A6C0C4ACB24006AA781 /* PTWXDlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E34A6A0C4ACB24006AA781 /* PTWXDlg.cpp */; }; + 57E34A6D0C4ACB24006AA781 /* PTWXDlg.h in Headers */ = {isa = PBXBuildFile; fileRef = 57E34A6B0C4ACB24006AA781 /* PTWXDlg.h */; }; + 57E34A720C4ACB39006AA781 /* ImageCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331180C4A8859006AA781 /* ImageCache.cpp */; }; + 57E34A730C4ACB39006AA781 /* ImageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 57E331190C4A8859006AA781 /* ImageCache.h */; }; + 57E34A780C4ACB43006AA781 /* MyProgressDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331280C4A8859006AA781 /* MyProgressDialog.cpp */; }; + 57E34A790C4ACB43006AA781 /* MyProgressDialog.h in Headers */ = {isa = PBXBuildFile; fileRef = 57E331290C4A8859006AA781 /* MyProgressDialog.h */; }; + 57E34AAA0C4ACBD6006AA781 /* CommandHistory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E331120C4A8859006AA781 /* CommandHistory.cpp */; }; + 57E34AD90C4ACF51006AA781 /* libhuginwxutils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57E34A5C0C4ACAA1006AA781 /* libhuginwxutils.a */; }; 57EA83A20C3A7AA900E4965E /* PanoramaAlgorithm.h in Headers */ = {isa = PBXBuildFile; fileRef = 57EA83A00C3A7AA900E4965E /* PanoramaAlgorithm.h */; }; 57EA83A30C3A7AA900E4965E /* StitcherAlgorithm.h in Headers */ = {isa = PBXBuildFile; fileRef = 57EA83A10C3A7AA900E4965E /* StitcherAlgorithm.h */; }; 57EA83CA0C3A800100E4965E /* CalculateCPStatistics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57EA83C80C3A800100E4965E /* CalculateCPStatistics.cpp */; }; @@ -617,126 +731,216 @@ remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; - 57A60E950C400272007B5462 /* PBXContainerItemProxy */ = { + 57DB9BBF0C454B96004957C2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5720E4720BD456CD00E63404; - remoteInfo = levmar; + remoteGlobalIDString = 57EA83850C3A798A00E4965E; + remoteInfo = algorithms; }; - 57A60E970C400272007B5462 /* PBXContainerItemProxy */ = { + 57DB9BCA0C454C10004957C2 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5771F8140C30268F00736343; - remoteInfo = PTLensDB; + remoteGlobalIDString = 5771F7790C30216F00736343; + remoteInfo = hugin_math; }; - 57A60E990C400272007B5462 /* PBXContainerItemProxy */ = { + 57E347120C4A8EB6006AA781 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5711524906BC6709004F4FA7; - remoteInfo = vigra_impex; + remoteGlobalIDString = 576EC4980C3FC9300076A417 /* huginapp */; + remoteInfo = huginapp; }; - 57A60E9B0C400272007B5462 /* PBXContainerItemProxy */ = { + 57E347140C4A8EB6006AA781 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4; - remoteInfo = jhead; + remoteGlobalIDString = 57EA83850C3A798A00E4965E /* algorithms */; + remoteInfo = algorithms; }; - 57A60E9D0C400272007B5462 /* PBXContainerItemProxy */ = { + 57E347160C4A8EB6006AA781 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5771F7440C30202B00736343; - remoteInfo = boost_thread; + remoteGlobalIDString = 574092290C393E6600D16607 /* nona */; + remoteInfo = nona; }; - 57A60E9F0C400272007B5462 /* PBXContainerItemProxy */ = { + 57E347180C4A8EB6006AA781 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57C1705809A125DE00FAF325; - remoteInfo = vigra_ext; + remoteGlobalIDString = 571300640C33D41F00252FE3 /* panotools */; + remoteInfo = panotools; }; - 57A60EA10C400272007B5462 /* PBXContainerItemProxy */ = { + 57E3471A0C4A8EB6006AA781 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5771F5D60C3006E900736343; - remoteInfo = hugin_utils; + remoteGlobalIDString = 5759DA4E0C327D680043F754 /* panodata */; + remoteInfo = panodata; }; - 57A60EA30C400272007B5462 /* PBXContainerItemProxy */ = { + 57E3471C0C4A8EB6006AA781 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5771F7790C30216F00736343; + remoteGlobalIDString = 5759D9AB0C32713F0043F754 /* appbase */; + remoteInfo = appbase; + }; + 57E3471E0C4A8EB6006AA781 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5771F7790C30216F00736343 /* hugin_math */; remoteInfo = hugin_math; }; - 57A60EA50C400272007B5462 /* PBXContainerItemProxy */ = { + 57E347200C4A8EB6006AA781 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5759D9AB0C32713F0043F754; - remoteInfo = appbase; + remoteGlobalIDString = 5771F5D60C3006E900736343 /* hugin_utils */; + remoteInfo = hugin_utils; }; - 57A60EA70C400272007B5462 /* PBXContainerItemProxy */ = { + 57E347220C4A8EB6006AA781 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5759DA4E0C327D680043F754; - remoteInfo = panodata; + remoteGlobalIDString = 57C1705809A125DE00FAF325 /* vigra_ext */; + remoteInfo = vigra_ext; }; - 57A60EA90C400272007B5462 /* PBXContainerItemProxy */ = { + 57E347240C4A8EB6006AA781 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 571300640C33D41F00252FE3; - remoteInfo = panotools; + remoteGlobalIDString = 5771F7440C30202B00736343 /* boost_thread */; + remoteInfo = boost_thread; }; - 57A60EAB0C400272007B5462 /* PBXContainerItemProxy */ = { + 57E347260C4A8EB6006AA781 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 574092290C393E6600D16607; - remoteInfo = nona; + remoteGlobalIDString = 5749F8A2067B60CA00A6EDD4 /* jhead */; + remoteInfo = jhead; }; - 57A60EAD0C400272007B5462 /* PBXContainerItemProxy */ = { + 57E347280C4A8EB6006AA781 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57EA83850C3A798A00E4965E; - remoteInfo = algorithms; + remoteGlobalIDString = 5771F8140C30268F00736343 /* PTLensDB */; + remoteInfo = PTLensDB; }; - 57A60EAF0C400272007B5462 /* PBXContainerItemProxy */ = { + 57E3472A0C4A8EB6006AA781 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 576EC4980C3FC9300076A417; - remoteInfo = huginapp; + remoteGlobalIDString = 5720E4720BD456CD00E63404 /* levmar */; + remoteInfo = levmar; }; - 57DB9BBF0C454B96004957C2 /* PBXContainerItemProxy */ = { + 57E3472C0C4A8EB6006AA781 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57EA83850C3A798A00E4965E; - remoteInfo = algorithms; + remoteGlobalIDString = 5711524906BC6709004F4FA7 /* vigra_impex */; + remoteInfo = vigra_impex; }; - 57DB9BCA0C454C10004957C2 /* PBXContainerItemProxy */ = { + 57E3472E0C4A8EC6006AA781 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 5771F7790C30216F00736343; - remoteInfo = hugin_math; + remoteGlobalIDString = 57E3470D0C4A8E95006AA781 /* lib static */; + remoteInfo = "lib static"; }; + 57E347340C4A8EF4006AA781 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 576482C00C469056003AFC2F /* test vig_optimize */; + remoteInfo = "test vig_optimize"; + }; + 57E347360C4A8EF4006AA781 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5764829C0C469052003AFC2F /* test fulla */; + remoteInfo = "test fulla"; + }; + 57E347380C4A8EF4006AA781 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5709A0670C4543E100BD1C53 /* test autooptimiser */; + remoteInfo = "test autooptimiser"; + }; + 57E3473A0C4A8EF4006AA781 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5796FA730C4395CC006B7C6E /* test nona */; + remoteInfo = "test nona"; + }; + 57E3473C0C4A8EF4006AA781 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 5702272E0C42605C008A44D6 /* test open_file */; + remoteInfo = "test open_file"; + }; + 57E347460C4A8EF8006AA781 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E3467D0C4A89B0006AA781 /* Hugin */; + remoteInfo = Hugin; + }; + 57E347480C4A8F06006AA781 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E347330C4A8EED006AA781 /* tools */; + remoteInfo = tools; + }; + 57E3474A0C4A8F06006AA781 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E347300C4A8EDF006AA781 /* app */; + remoteInfo = app; + }; + 57E34A5D0C4ACAB1006AA781 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E34A5B0C4ACAA1006AA781 /* huginwxutils */; + remoteInfo = huginwxutils; + }; + 57E34A5F0C4ACAB8006AA781 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E3470D0C4A8E95006AA781 /* lib static */; + remoteInfo = "lib static"; + }; /* End PBXContainerItemProxy section */ +/* Begin PBXCopyFilesBuildPhase section */ + 57E347620C4A8F97006AA781 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 6; + files = ( + 57E347760C4A8FED006AA781 /* enblend in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 570227180C425C6A008A44D6 /* open_file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = open_file.cpp; sourceTree = "<group>"; }; 5702272F0C42605C008A44D6 /* open_file */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = open_file; sourceTree = BUILT_PRODUCTS_DIR; }; 57023B460C427981008A44D6 /* tiff.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = tiff.hxx; sourceTree = "<group>"; }; 5702996D07F967CB00F1FF15 /* HuginFiles.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = HuginFiles.icns; sourceTree = "<group>"; }; - 57098D730C453E5F00BD1C53 /* panoinc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = panoinc.h; sourceTree = "<group>"; }; + 57098D730C453E5F00BD1C53 /* hugin_basic.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = hugin_basic.h; sourceTree = "<group>"; }; 57098D740C453E6600BD1C53 /* algorithm.pch */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = algorithm.pch; sourceTree = "<group>"; }; 57098D750C453E6600BD1C53 /* hugin_base.pch */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = hugin_base.pch; sourceTree = "<group>"; }; 57098D760C453E6600BD1C53 /* nona.pch */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = nona.pch; sourceTree = "<group>"; }; @@ -1044,7 +1248,6 @@ 578ECFFD0A8D0C160028A7FB /* hdr.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = hdr.hxx; sourceTree = "<group>"; }; 578ECFFE0A8D0C160028A7FB /* rgbe.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = rgbe.c; sourceTree = "<group>"; }; 578ECFFF0A8D0C160028A7FB /* rgbe.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = rgbe.h; sourceTree = "<group>"; }; - 57906E890C105F7B00A6C3FE /* hugin_base */ = {isa = PBXFileReference; lastKnownFileType = folder; name = hugin_base; path = ../src/hugin_base; sourceTree = "<group>"; }; 5796FA950C4395CC006B7C6E /* nona */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = nona; sourceTree = BUILT_PRODUCTS_DIR; }; 5796FA970C4395F4006B7C6E /* nona.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = nona.cpp; sourceTree = "<group>"; }; 5797B9EC0C33EB4D00F3DEE6 /* DestPanoImage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DestPanoImage.h; sourceTree = "<group>"; }; @@ -1059,7 +1262,7 @@ 57B88E5E0C36CD7E00EC6519 /* Panorama.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Panorama.h; sourceTree = "<group>"; }; 57B88E620C36CD8F00EC6519 /* ResponseTransform.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ResponseTransform.h; sourceTree = "<group>"; }; 57B8A1A40C36E53A00EC6519 /* PTScriptParsing.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PTScriptParsing.h; sourceTree = "<group>"; }; - 57B8C693083AB7F400283C06 /* localised.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = localised.sh; sourceTree = "<group>"; }; + 57B8C693083AB7F400283C06 /* localised.sh */ = {isa = PBXFileReference; fileEncoding = 30; languageSpecificationIdentifier = shell.sh; lastKnownFileType = text.script.sh; path = localised.sh; sourceTree = "<group>"; }; 57C1706C09A125DE00FAF325 /* libvigra_ext.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libvigra_ext.a; sourceTree = BUILT_PRODUCTS_DIR; }; 57C1709209A12DE400FAF325 /* barrier.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = barrier.cpp; sourceTree = "<group>"; }; 57C1709309A12DE400FAF325 /* condition.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = condition.cpp; sourceTree = "<group>"; }; @@ -1093,6 +1296,151 @@ 57D14A4506B8A3D100D8A03D /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = lib/libjpeg.a; sourceTree = "<group>"; }; 57D55913067BDB84005E4CCD /* libmx.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmx.dylib; path = usr/lib/libmx.dylib; sourceTree = "<group>"; }; 57D5DCD6073FD86D0027E52F /* hugin_config_mac.h */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.corefile"; fileEncoding = 30; languageSpecificationIdentifier = c.cpp; path = hugin_config_mac.h; sourceTree = "<group>"; }; + 57E32FAF0C4A87F1006AA781 /* ImageGraph.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageGraph.h; sourceTree = "<group>"; }; + 57E32FB00C4A87F1006AA781 /* PTOptimise.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PTOptimise.h; sourceTree = "<group>"; }; + 57E32FB10C4A87F1006AA781 /* PanoCommand.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PanoCommand.h; sourceTree = "<group>"; }; + 57E32FB20C4A87F1006AA781 /* PanoImage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PanoImage.h; sourceTree = "<group>"; }; + 57E32FB30C4A87F1006AA781 /* PanoToolsInterface.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PanoToolsInterface.h; sourceTree = "<group>"; }; + 57E32FB40C4A87F1006AA781 /* Panorama.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Panorama.h; sourceTree = "<group>"; }; + 57E32FB50C4A87F1006AA781 /* PanoramaMemento.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PanoramaMemento.h; sourceTree = "<group>"; }; + 57E32FB60C4A87F1006AA781 /* PhotometricOptimizer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PhotometricOptimizer.h; sourceTree = "<group>"; }; + 57E32FB70C4A87F1006AA781 /* RandomPointSampler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RandomPointSampler.h; sourceTree = "<group>"; }; + 57E32FB80C4A87F1006AA781 /* RemappedPanoImage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RemappedPanoImage.h; sourceTree = "<group>"; }; + 57E32FB90C4A87F1006AA781 /* SpaceTransform.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SpaceTransform.h; sourceTree = "<group>"; }; + 57E32FBA0C4A87F1006AA781 /* Stitcher.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Stitcher.h; sourceTree = "<group>"; }; + 57E32FBB0C4A87F1006AA781 /* Transforms.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Transforms.h; sourceTree = "<group>"; }; + 57E32FBC0C4A87F1006AA781 /* utils.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; }; + 57E32FBE0C4A87F1006AA781 /* Command.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Command.h; sourceTree = "<group>"; }; + 57E32FBF0C4A87F1006AA781 /* Matrix3.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Matrix3.h; sourceTree = "<group>"; }; + 57E32FC00C4A87F1006AA781 /* PTLensDB.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PTLensDB.h; sourceTree = "<group>"; }; + 57E32FC10C4A87F1006AA781 /* Vector3.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Vector3.h; sourceTree = "<group>"; }; + 57E32FC20C4A87F1006AA781 /* eig_jacobi.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = eig_jacobi.h; sourceTree = "<group>"; }; + 57E32FC30C4A87F1006AA781 /* graph.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = graph.h; sourceTree = "<group>"; }; + 57E32FC40C4A87F1006AA781 /* lu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = lu.h; sourceTree = "<group>"; }; + 57E32FC50C4A87F1006AA781 /* math.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = math.h; sourceTree = "<group>"; }; + 57E32FC60C4A87F1006AA781 /* platform.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = platform.h; sourceTree = "<group>"; }; + 57E32FC70C4A87F1006AA781 /* stl_utils.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = stl_utils.h; sourceTree = "<group>"; }; + 57E32FC80C4A87F1006AA781 /* utils.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; }; + 57E32FC90C4A87F1006AA781 /* wxPlatform.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = wxPlatform.h; sourceTree = "<group>"; }; + 57E330BF0C4A87F2006AA781 /* nona_gui.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = nona_gui.cpp; sourceTree = "<group>"; }; + 57E330C40C4A87F2006AA781 /* LINGUAS */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = LINGUAS; sourceTree = "<group>"; }; + 57E330C70C4A87F2006AA781 /* cs_CZ.po */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = cs_CZ.po; sourceTree = "<group>"; }; + 57E330C80C4A87F2006AA781 /* de.po */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = de.po; sourceTree = "<group>"; }; + 57E330C90C4A87F2006AA781 /* fr.po */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = fr.po; sourceTree = "<group>"; }; + 57E330CA0C4A87F2006AA781 /* hu.po */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = hu.po; sourceTree = "<group>"; }; + 57E330CB0C4A87F2006AA781 /* nl.po */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = nl.po; sourceTree = "<group>"; }; + 57E330CC0C4A87F2006AA781 /* nona_gui.pot */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = nona_gui.pot; sourceTree = "<group>"; }; + 57E330CD0C4A87F2006AA781 /* pl.po */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = pl.po; sourceTree = "<group>"; }; + 57E330CE0C4A87F2006AA781 /* pt_BR.po */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = pt_BR.po; sourceTree = "<group>"; }; + 57E330CF0C4A87F2006AA781 /* ru.po */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ru.po; sourceTree = "<group>"; }; + 57E330D00C4A87F2006AA781 /* sk.po */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = sk.po; sourceTree = "<group>"; }; + 57E330D10C4A87F2006AA781 /* zh_CN.po */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = zh_CN.po; sourceTree = "<group>"; }; + 57E330D20C4A87F2006AA781 /* panoinc.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = panoinc.h; sourceTree = "<group>"; }; + 57E330D30C4A87F2006AA781 /* panoinc_WX.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = panoinc_WX.h; sourceTree = "<group>"; }; + 57E330D90C4A87F2006AA781 /* common.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = common.cpp; sourceTree = "<group>"; }; + 57E330DA0C4A87F2006AA781 /* imageproc.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = imageproc.cpp; sourceTree = "<group>"; }; + 57E330DB0C4A87F2006AA781 /* interpolator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = interpolator.cpp; sourceTree = "<group>"; }; + 57E330DC0C4A87F2006AA781 /* panorama.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = panorama.cpp; sourceTree = "<group>"; }; + 57E330DD0C4A87F2006AA781 /* panotools.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = panotools.cpp; sourceTree = "<group>"; }; + 57E330DE0C4A87F2006AA781 /* phasecorrelation.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = phasecorrelation.cpp; sourceTree = "<group>"; }; + 57E330DF0C4A87F2006AA781 /* real_template.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = real_template.png; sourceTree = "<group>"; }; + 57E330E00C4A87F2006AA781 /* result_corr.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = result_corr.png; sourceTree = "<group>"; }; + 57E330E10C4A87F2006AA781 /* result_corr_2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = result_corr_2.png; sourceTree = "<group>"; }; + 57E330E20C4A87F2006AA781 /* subject.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = subject.png; sourceTree = "<group>"; }; + 57E330E30C4A87F2006AA781 /* template.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = template.png; sourceTree = "<group>"; }; + 57E330E40C4A87F2006AA781 /* transforms.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = transforms.cpp; sourceTree = "<group>"; }; + 57E330E50C4A87F2006AA781 /* vigra_ext.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = vigra_ext.cpp; sourceTree = "<group>"; }; + 57E330E60C4A87F2006AA781 /* test_projections.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = test_projections.cpp; sourceTree = "<group>"; }; + 57E330EB0C4A87F2006AA781 /* align_image_stack.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = align_image_stack.cpp; sourceTree = "<group>"; }; + 57E330ED0C4A87F2006AA781 /* automatch.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = automatch.cpp; sourceTree = "<group>"; }; + 57E330EE0C4A87F2006AA781 /* autooptimiser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = autooptimiser.cpp; sourceTree = "<group>"; }; + 57E330F00C4A87F2006AA781 /* color_correct_tiff.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = color_correct_tiff.cpp; sourceTree = "<group>"; }; + 57E330F10C4A87F2006AA781 /* fulla.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = fulla.cpp; sourceTree = "<group>"; }; + 57E330F30C4A87F2006AA781 /* img2vips.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = img2vips.cpp; sourceTree = "<group>"; }; + 57E330F40C4A87F2006AA781 /* nona.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = nona.cpp; sourceTree = "<group>"; }; + 57E330F60C4A87F2006AA781 /* vig_optimize.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = vig_optimize.cpp; sourceTree = "<group>"; }; + 57E330F80C4A87F2006AA781 /* zhang_undistort.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = zhang_undistort.cpp; sourceTree = "<group>"; }; + 57E330FB0C4A87F2006AA781 /* hdrmerge_vips.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hdrmerge_vips.cpp; sourceTree = "<group>"; }; + 57E330FC0C4A87F2006AA781 /* img2vips.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = img2vips.cpp; sourceTree = "<group>"; }; + 57E331000C4A8859006AA781 /* AnchorPositionCtrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AnchorPositionCtrl.h; sourceTree = "<group>"; }; + 57E331010C4A8859006AA781 /* AssistantPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = AssistantPanel.cpp; sourceTree = "<group>"; }; + 57E331020C4A8859006AA781 /* AssistantPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AssistantPanel.h; sourceTree = "<group>"; }; + 57E331030C4A8859006AA781 /* AutoCtrlPointCreator.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = AutoCtrlPointCreator.cpp; sourceTree = "<group>"; }; + 57E331040C4A8859006AA781 /* AutoCtrlPointCreator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AutoCtrlPointCreator.h; sourceTree = "<group>"; }; + 57E331060C4A8859006AA781 /* CPEditorPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CPEditorPanel.cpp; sourceTree = "<group>"; }; + 57E331070C4A8859006AA781 /* CPEditorPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CPEditorPanel.h; sourceTree = "<group>"; }; + 57E331080C4A8859006AA781 /* CPEditorPanelHandler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CPEditorPanelHandler.h; sourceTree = "<group>"; }; + 57E331090C4A8859006AA781 /* CPEditorTest.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CPEditorTest.h; sourceTree = "<group>"; }; + 57E3310C0C4A8859006AA781 /* CPImageCtrl.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CPImageCtrl.cpp; sourceTree = "<group>"; }; + 57E3310D0C4A8859006AA781 /* CPImageCtrl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CPImageCtrl.h; sourceTree = "<group>"; }; + 57E3310E0C4A8859006AA781 /* CPListFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CPListFrame.cpp; sourceTree = "<group>"; }; + 57E3310F0C4A8859006AA781 /* CPListFrame.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CPListFrame.h; sourceTree = "<group>"; }; + 57E331120C4A8859006AA781 /* CommandHistory.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CommandHistory.cpp; sourceTree = "<group>"; }; + 57E331130C4A8859006AA781 /* CommandHistory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CommandHistory.h; sourceTree = "<group>"; }; + 57E331140C4A8859006AA781 /* CropPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CropPanel.cpp; sourceTree = "<group>"; }; + 57E331150C4A8859006AA781 /* CropPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CropPanel.h; sourceTree = "<group>"; }; + 57E331160C4A8859006AA781 /* HFOVDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = HFOVDialog.cpp; sourceTree = "<group>"; }; + 57E331170C4A8859006AA781 /* HFOVDialog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HFOVDialog.h; sourceTree = "<group>"; }; + 57E331180C4A8859006AA781 /* ImageCache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ImageCache.cpp; sourceTree = "<group>"; }; + 57E331190C4A8859006AA781 /* ImageCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageCache.h; sourceTree = "<group>"; }; + 57E3311A0C4A8859006AA781 /* ImageProcessing.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImageProcessing.h; sourceTree = "<group>"; }; + 57E3311B0C4A8859006AA781 /* ImagesList.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ImagesList.cpp; sourceTree = "<group>"; }; + 57E3311C0C4A8859006AA781 /* ImagesList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImagesList.h; sourceTree = "<group>"; }; + 57E3311D0C4A8859006AA781 /* ImagesPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ImagesPanel.cpp; sourceTree = "<group>"; }; + 57E3311E0C4A8859006AA781 /* ImagesPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ImagesPanel.h; sourceTree = "<group>"; }; + 57E3311F0C4A8859006AA781 /* LensPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = LensPanel.cpp; sourceTree = "<group>"; }; + 57E331200C4A8859006AA781 /* LensPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LensPanel.h; sourceTree = "<group>"; }; + 57E331210C4A8859006AA781 /* LocalizedFileTipProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = LocalizedFileTipProvider.cpp; sourceTree = "<group>"; }; + 57E331220C4A8859006AA781 /* LocalizedFileTipProvider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = LocalizedFileTipProvider.h; sourceTree = "<group>"; }; + 57E331230C4A8859006AA781 /* MainFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MainFrame.cpp; sourceTree = "<group>"; }; + 57E331240C4A8859006AA781 /* MainFrame.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MainFrame.h; sourceTree = "<group>"; }; + 57E331260C4A8859006AA781 /* MyExternalCmdExecDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MyExternalCmdExecDialog.cpp; sourceTree = "<group>"; }; + 57E331270C4A8859006AA781 /* MyExternalCmdExecDialog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MyExternalCmdExecDialog.h; sourceTree = "<group>"; }; + 57E331280C4A8859006AA781 /* MyProgressDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MyProgressDialog.cpp; sourceTree = "<group>"; }; + 57E331290C4A8859006AA781 /* MyProgressDialog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MyProgressDialog.h; sourceTree = "<group>"; }; + 57E3312A0C4A8859006AA781 /* NonaStitcherPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = NonaStitcherPanel.cpp; sourceTree = "<group>"; }; + 57E3312B0C4A8859006AA781 /* NonaStitcherPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = NonaStitcherPanel.h; sourceTree = "<group>"; }; + 57E3312C0C4A8859006AA781 /* OptimizePanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = OptimizePanel.cpp; sourceTree = "<group>"; }; + 57E3312D0C4A8859006AA781 /* OptimizePanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = OptimizePanel.h; sourceTree = "<group>"; }; + 57E3312E0C4A8859006AA781 /* OptimizePhotometricPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = OptimizePhotometricPanel.cpp; sourceTree = "<group>"; }; + 57E3312F0C4A8859006AA781 /* OptimizePhotometricPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = OptimizePhotometricPanel.h; sourceTree = "<group>"; }; + 57E331300C4A8859006AA781 /* PTStitcherPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PTStitcherPanel.cpp; sourceTree = "<group>"; }; + 57E331310C4A8859006AA781 /* PTStitcherPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PTStitcherPanel.h; sourceTree = "<group>"; }; + 57E331340C4A8859006AA781 /* PanoDruid.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PanoDruid.cpp; sourceTree = "<group>"; }; + 57E331350C4A8859006AA781 /* PanoDruid.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PanoDruid.h; sourceTree = "<group>"; }; + 57E331360C4A8859006AA781 /* PanoPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PanoPanel.cpp; sourceTree = "<group>"; }; + 57E331370C4A8859006AA781 /* PanoPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PanoPanel.h; sourceTree = "<group>"; }; + 57E3313A0C4A8859006AA781 /* PreferencesDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PreferencesDialog.cpp; sourceTree = "<group>"; }; + 57E3313B0C4A8859006AA781 /* PreferencesDialog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PreferencesDialog.h; sourceTree = "<group>"; }; + 57E3313C0C4A8859006AA781 /* PreviewFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PreviewFrame.cpp; sourceTree = "<group>"; }; + 57E3313D0C4A8859006AA781 /* PreviewFrame.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PreviewFrame.h; sourceTree = "<group>"; }; + 57E3313E0C4A8859006AA781 /* PreviewPanel.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PreviewPanel.cpp; sourceTree = "<group>"; }; + 57E3313F0C4A8859006AA781 /* PreviewPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PreviewPanel.h; sourceTree = "<group>"; }; + 57E331400C4A8859006AA781 /* RunStitcherFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = RunStitcherFrame.cpp; sourceTree = "<group>"; }; + 57E331410C4A8859006AA781 /* RunStitcherFrame.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RunStitcherFrame.h; sourceTree = "<group>"; }; + 57E331420C4A8859006AA781 /* StitcherPanel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = StitcherPanel.h; sourceTree = "<group>"; }; + 57E331430C4A8859006AA781 /* TextKillFocusHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TextKillFocusHandler.cpp; sourceTree = "<group>"; }; + 57E331440C4A8859006AA781 /* TextKillFocusHandler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TextKillFocusHandler.h; sourceTree = "<group>"; }; + 57E331470C4A8859006AA781 /* VigCorrDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = VigCorrDialog.cpp; sourceTree = "<group>"; }; + 57E331480C4A8859006AA781 /* VigCorrDialog.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = VigCorrDialog.h; sourceTree = "<group>"; }; + 57E331490C4A8859006AA781 /* config.h.tmpl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = config.h.tmpl; sourceTree = "<group>"; }; + 57E3314A0C4A8859006AA781 /* config_defaults.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config_defaults.h; sourceTree = "<group>"; }; + 57E3314F0C4A8859006AA781 /* huginApp.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = huginApp.cpp; sourceTree = "<group>"; }; + 57E331500C4A8859006AA781 /* huginApp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = huginApp.h; sourceTree = "<group>"; }; + 57E3316A0C4A8859006AA781 /* wxPanoCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = wxPanoCommand.cpp; sourceTree = "<group>"; }; + 57E3316B0C4A8859006AA781 /* wxPanoCommand.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = wxPanoCommand.h; sourceTree = "<group>"; }; + 57E345D50C4A88C7006AA781 /* po */ = {isa = PBXFileReference; lastKnownFileType = folder; path = po; sourceTree = "<group>"; }; + 57E345ED0C4A88C7006AA781 /* xrc */ = {isa = PBXFileReference; lastKnownFileType = folder; path = xrc; sourceTree = "<group>"; }; + 57E3467E0C4A89B0006AA781 /* Hugin.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Hugin.app; sourceTree = "<group>"; }; + 57E347610C4A8F7D006AA781 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; }; + 57E34A5C0C4ACAA1006AA781 /* libhuginwxutils.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhuginwxutils.a; sourceTree = "<group>"; }; + 57E34A660C4ACB0F006AA781 /* Plot2D.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Plot2D.cpp; sourceTree = "<group>"; }; + 57E34A670C4ACB0F006AA781 /* Plot2D.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Plot2D.h; sourceTree = "<group>"; }; + 57E34A6A0C4ACB24006AA781 /* PTWXDlg.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PTWXDlg.cpp; sourceTree = "<group>"; }; + 57E34A6B0C4ACB24006AA781 /* PTWXDlg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PTWXDlg.h; sourceTree = "<group>"; }; + 57E34AB20C4ACC04006AA781 /* CPFineTuneFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = CPFineTuneFrame.cpp; sourceTree = "<group>"; }; + 57E34AB30C4ACC04006AA781 /* CPFineTuneFrame.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CPFineTuneFrame.h; sourceTree = "<group>"; }; + 57E34ACC0C4ACE46006AA781 /* math.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = math.h; sourceTree = "<group>"; }; 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_algorithms.a; sourceTree = BUILT_PRODUCTS_DIR; }; 57EA83A00C3A7AA900E4965E /* PanoramaAlgorithm.h */ ... [truncated message content] |
From: <da...@us...> - 2007-07-17 11:28:20
|
Revision: 2276 http://hugin.svn.sourceforge.net/hugin/?rev=2276&view=rev Author: dangelo Date: 2007-07-17 04:27:45 -0700 (Tue, 17 Jul 2007) Log Message: ----------- cmake build system and fixes for compilation with pano13 Modified Paths: -------------- hugin/branches/ippei/CMakeLists.txt hugin/branches/ippei/CMakeModules/FindPANO13.cmake hugin/branches/ippei/src/foreign/CMakeLists.txt hugin/branches/ippei/src/foreign/vigra/vigra_impex/CMakeLists.txt hugin/branches/ippei/src/hugin_base/panotools/PanoToolsInterface.cpp hugin/branches/ippei/src/hugin_base/panotools/PanoToolsOptimizerWrapper.cpp Modified: hugin/branches/ippei/CMakeLists.txt =================================================================== --- hugin/branches/ippei/CMakeLists.txt 2007-07-17 11:24:36 UTC (rev 2275) +++ hugin/branches/ippei/CMakeLists.txt 2007-07-17 11:27:45 UTC (rev 2276) @@ -1,5 +1,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules ) +include(HuginMacros) include(CheckIncludeFiles) ## global setup @@ -20,6 +21,11 @@ FIND_PACKAGE(PANO13 REQUIRED) FIND_PACKAGE(PNG REQUIRED) FIND_PACKAGE(OpenEXR) + +IF (OPENEXR_FOUND) +include_directories(${OPENEXR_INCLUDE_DIR}) +ENDIF (OPENEXR_FOUND) + FIND_PACKAGE(Boost REQUIRED) SET(wxWidgets_USE_LIBS base core xrc) @@ -33,20 +39,17 @@ MESSAGE(STATUS "Program msgfmt found (${MSGFMT_EXECUTABLE})") ENDIF(MSGFMT_FOUND) -# check for VIPSvipsCC-7.12 -#PKGCONFIG(vipsCC-7.12 VIPS_INCLUDE_DIR VIPS_LINK_DIR VIPS_LINK_FLAGS VIPS_CFLAGS) +pkg_check_modules(VIPS vips-7.12) +LIST2STRING(VIPS_CFLAGS_OTHER VIPS_CFLAGS_OTHER_STRING) +LIST2STRING(VIPS_LDFLAGS_OTHER VIPS_LDFLAGS_OTHER_STRING) pkg_check_modules(VIPSCC vipsCC-7.12) +LIST2STRING(VIPSCC_CFLAGS_OTHER VIPSCC_CFLAGS_OTHER_STRING) +LIST2STRING(VIPSCC_LDFLAGS_OTHER VIPSCC_LDFLAGS_OTHER_STRING) -MESSAGE("Vips include dir: ${VIPSCC_INCLUDE_DIR}") -MESSAGE("Vips link dir: ${VIPSCC_LINK_DIR}") -MESSAGE("Vips link flags: ${VIPSCC_LINK_FLAGS}") -MESSAGE("Vips cflags: ${VIPSCC_CFLAGS}") - MESSAGE("tiff libraries: ${TIFF_LIBRARIES}") MESSAGE("tiff include dir: ${TIFF_INCLUDE_DIR}") - #BUILD SETUP IF(NOT CMAKE_BUILD_TYPE) SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING @@ -97,13 +100,14 @@ MESSAGE("WARNING: installation for OSX not yet supported") ENDIF(UNIX) -set(AAAA "bbbbb") - # create config.h file -configure_file(src/include/config.h.in.cmake ${CMAKE_BINARY_DIR}/src/include/config.h) +configure_file(src/hugin_config.h.in.cmake ${CMAKE_BINARY_DIR}/src/hugin_config.h) # setup some common compilation flags INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) +LINK_DIRECTORIES( ${VIPSCC_LIBRARY_DIRS} ) +INCLUDE_DIRECTORIES( ${VIPSCC_INCLUDE_DIRS} ) + add_subdirectory(src) Modified: hugin/branches/ippei/CMakeModules/FindPANO13.cmake =================================================================== --- hugin/branches/ippei/CMakeModules/FindPANO13.cmake 2007-07-17 11:24:36 UTC (rev 2275) +++ hugin/branches/ippei/CMakeModules/FindPANO13.cmake 2007-07-17 11:27:45 UTC (rev 2276) @@ -7,7 +7,7 @@ # also defined, but not for general use are # PANO13_LIBRARY, where to find the PANO13 library. -FIND_PATH(PANO13_INCLUDE_DIR tiff.h +FIND_PATH(PANO13_INCLUDE_DIR pano13/panorama.h /usr/local/include /usr/include ) Modified: hugin/branches/ippei/src/foreign/CMakeLists.txt =================================================================== --- hugin/branches/ippei/src/foreign/CMakeLists.txt 2007-07-17 11:24:36 UTC (rev 2275) +++ hugin/branches/ippei/src/foreign/CMakeLists.txt 2007-07-17 11:27:45 UTC (rev 2276) @@ -1,3 +1,5 @@ -add_subdirectory(vigra_impex) +add_subdirectory(vigra) add_subdirectory(levmar) +add_subdirectory(jhead) +add_subdirectory(lensdb) Modified: hugin/branches/ippei/src/foreign/vigra/vigra_impex/CMakeLists.txt =================================================================== --- hugin/branches/ippei/src/foreign/vigra/vigra_impex/CMakeLists.txt 2007-07-17 11:24:36 UTC (rev 2275) +++ hugin/branches/ippei/src/foreign/vigra/vigra_impex/CMakeLists.txt 2007-07-17 11:27:45 UTC (rev 2276) @@ -2,4 +2,4 @@ #build a shared library add_library(huginvigraimpex STATIC bmp.cxx byteorder.cxx codecmanager.cxx gif.cxx imageinfo.cxx jpeg.cxx png.cxx pnm.cxx sun.cxx tiff.cxx viff.cxx void_vector.cxx iccjpeg.c rgbe.c hdr.cxx exr.cxx) -#install(TARGETS huginjhead DESTINATION lib) \ No newline at end of file +#install(TARGETS huginvigraimpex DESTINATION lib) \ No newline at end of file Modified: hugin/branches/ippei/src/hugin_base/panotools/PanoToolsInterface.cpp =================================================================== --- hugin/branches/ippei/src/hugin_base/panotools/PanoToolsInterface.cpp 2007-07-17 11:24:36 UTC (rev 2275) +++ hugin/branches/ippei/src/hugin_base/panotools/PanoToolsInterface.cpp 2007-07-17 11:27:45 UTC (rev 2276) @@ -24,6 +24,10 @@ * */ +#include <hugin_config.h> + +#include <stdlib.h> + #include "PanoToolsInterface.h" #include <vector> @@ -992,4 +996,4 @@ } -}} // namespace \ No newline at end of file +}} // namespace Modified: hugin/branches/ippei/src/hugin_base/panotools/PanoToolsOptimizerWrapper.cpp =================================================================== --- hugin/branches/ippei/src/hugin_base/panotools/PanoToolsOptimizerWrapper.cpp 2007-07-17 11:24:36 UTC (rev 2275) +++ hugin/branches/ippei/src/hugin_base/panotools/PanoToolsOptimizerWrapper.cpp 2007-07-17 11:27:45 UTC (rev 2276) @@ -29,6 +29,9 @@ #include <hugin_config.h> // libpano includes ------------------------------------------------------------ + +#include <stdlib.h> + extern "C" { #ifdef __INTEL__ #define __INTELMEMO__ @@ -250,4 +253,4 @@ #endif -}} //namespace \ No newline at end of file +}} //namespace This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2007-07-17 14:01:03
|
Revision: 2277 http://hugin.svn.sourceforge.net/hugin/?rev=2277&view=rev Author: ippei Date: 2007-07-17 07:01:00 -0700 (Tue, 17 Jul 2007) Log Message: ----------- bug fixes Modified Paths: -------------- hugin/branches/ippei/mac/Hugin.icns hugin/branches/ippei/mac/HuginFiles.icns hugin/branches/ippei/src/hugin_base/panodata/PanoramaOptions.h hugin/branches/ippei/src/hugin_config_mac.h Modified: hugin/branches/ippei/mac/Hugin.icns =================================================================== (Binary files differ) Modified: hugin/branches/ippei/mac/HuginFiles.icns =================================================================== (Binary files differ) Modified: hugin/branches/ippei/src/hugin_base/panodata/PanoramaOptions.h =================================================================== --- hugin/branches/ippei/src/hugin_base/panodata/PanoramaOptions.h 2007-07-17 11:27:45 UTC (rev 2276) +++ hugin/branches/ippei/src/hugin_base/panodata/PanoramaOptions.h 2007-07-17 14:01:00 UTC (rev 2277) @@ -24,6 +24,7 @@ #ifndef _PANODATA_PANORAMAMEMENTO_H #define _PANODATA_PANORAMAMEMENTO_H +#include <hugin_config.h> #include <string> #include <vector> Modified: hugin/branches/ippei/src/hugin_config_mac.h =================================================================== --- hugin/branches/ippei/src/hugin_config_mac.h 2007-07-17 11:27:45 UTC (rev 2276) +++ hugin/branches/ippei/src/hugin_config_mac.h 2007-07-17 14:01:00 UTC (rev 2277) @@ -120,13 +120,13 @@ #define PACKAGE_NAME "hugin" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "hugin 0.5" +#define PACKAGE_STRING "hugin 0.7" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "hugin" /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.5" +#define PACKAGE_VERSION "0.7" /* Define to 1 if you have the ANSI C header files. */ #define STDC_HEADERS 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2007-07-20 21:23:22
|
Revision: 2296 http://hugin.svn.sourceforge.net/hugin/?rev=2296&view=rev Author: ippei Date: 2007-07-20 14:23:12 -0700 (Fri, 20 Jul 2007) Log Message: ----------- guess work on CMake files Modified Paths: -------------- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj hugin/branches/ippei/src/CMakeLists.txt hugin/branches/ippei/src/hugin1/CMakeLists.txt hugin/branches/ippei/src/hugin1/hugin/ImageCache.h hugin/branches/ippei/src/hugin_base/CMakeLists.txt Modified: hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-07-20 17:17:53 UTC (rev 2295) +++ hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-07-20 21:23:12 UTC (rev 2296) @@ -526,105 +526,105 @@ isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; 5737BC3A0C4CF7CE00A61778 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; 5737BC3C0C4CF7D500A61778 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; 5737BC3E0C4CF7D800A61778 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; 5737BC400C4CF7E500A61778 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; 5737BC420C4CF7EA00A61778 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; 5737BC440C4CF7ED00A61778 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; 5737BC460C4CF7F000A61778 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; 5737BC480C4CF7F400A61778 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; 5737BC4A0C4CF80300A61778 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; 5737BC4C0C4CF80700A61778 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; 5737BC4E0C4CF80A00A61778 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; 5737BC500C4CF80D00A61778 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; 5737BC520C4CF81400A61778 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; 5737BC540C4CF81800A61778 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; proxyType = 1; - remoteGlobalIDString = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; 5764829E0C469052003AFC2F /* PBXContainerItemProxy */ = { @@ -1737,11 +1737,7 @@ 570227170C425C44008A44D6 /* test */ = { isa = PBXGroup; children = ( - 5709A0650C4543D700BD1C53 /* autooptimiser.cpp */, - 576482E80C469093003AFC2F /* fulla.cpp */, - 5796FA970C4395F4006B7C6E /* nona.cpp */, 570227180C425C6A008A44D6 /* open_file.cpp */, - 576482E90C469093003AFC2F /* vig_optimize.cpp */, ); path = test; sourceTree = "<group>"; @@ -2086,6 +2082,17 @@ name = External; sourceTree = "<group>"; }; + 57460AB30C4E7BD5004507F7 /* tools */ = { + isa = PBXGroup; + children = ( + 5709A0650C4543D700BD1C53 /* autooptimiser.cpp */, + 576482E80C469093003AFC2F /* fulla.cpp */, + 5796FA970C4395F4006B7C6E /* nona.cpp */, + 576482E90C469093003AFC2F /* vig_optimize.cpp */, + ); + path = tools; + sourceTree = "<group>"; + }; 5749F84D067B601A00A6EDD4 /* MacOSX SDK */ = { isa = PBXGroup; children = ( @@ -2340,6 +2347,7 @@ 57D5DCD6073FD86D0027E52F /* hugin_config_mac.h */, 5771F5E60C3007B300736343 /* hugin_base */, 57114EC106BC2301004F4FA7 /* foreign */, + 57460AB30C4E7BD5004507F7 /* tools */, 57E32FAB0C4A87F1006AA781 /* hugin1 */, ); name = src; @@ -2948,9 +2956,9 @@ productReference = 5702272F0C42605C008A44D6 /* open_file */; productType = "com.apple.product-type.tool"; }; - 5709A0670C4543E100BD1C53 /* test autooptimiser */ = { + 5709A0670C4543E100BD1C53 /* tools autooptimiser */ = { isa = PBXNativeTarget; - buildConfigurationList = 5709A0840C4543E100BD1C53 /* Build configuration list for PBXNativeTarget "test autooptimiser" */; + buildConfigurationList = 5709A0840C4543E100BD1C53 /* Build configuration list for PBXNativeTarget "tools autooptimiser" */; buildPhases = ( 5709A0720C4543E100BD1C53 /* Sources */, 5709A0740C4543E100BD1C53 /* Frameworks */, @@ -2967,7 +2975,7 @@ 57DB9BC00C454B96004957C2 /* PBXTargetDependency */, 57DB9BCB0C454C10004957C2 /* PBXTargetDependency */, ); - name = "test autooptimiser"; + name = "tools autooptimiser"; productName = "sample open_close"; productReference = 5709A0890C4543E100BD1C53 /* autooptimiser */; productType = "com.apple.product-type.tool"; @@ -3091,9 +3099,9 @@ productReference = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; productType = "com.apple.product-type.library.static"; }; - 5764829C0C469052003AFC2F /* test fulla */ = { + 5764829C0C469052003AFC2F /* tools fulla */ = { isa = PBXNativeTarget; - buildConfigurationList = 576482B90C469052003AFC2F /* Build configuration list for PBXNativeTarget "test fulla" */; + buildConfigurationList = 576482B90C469052003AFC2F /* Build configuration list for PBXNativeTarget "tools fulla" */; buildPhases = ( 576482A70C469052003AFC2F /* Sources */, 576482A90C469052003AFC2F /* Frameworks */, @@ -3112,14 +3120,14 @@ 5764835C0C46961B003AFC2F /* PBXTargetDependency */, 576483600C46961F003AFC2F /* PBXTargetDependency */, ); - name = "test fulla"; + name = "tools fulla"; productName = "sample open_close"; productReference = 576482BE0C469052003AFC2F /* fulla */; productType = "com.apple.product-type.tool"; }; - 576482C00C469056003AFC2F /* test vig_optimize */ = { + 576482C00C469056003AFC2F /* tools vig_optimize */ = { isa = PBXNativeTarget; - buildConfigurationList = 576482DD0C469056003AFC2F /* Build configuration list for PBXNativeTarget "test vig_optimize" */; + buildConfigurationList = 576482DD0C469056003AFC2F /* Build configuration list for PBXNativeTarget "tools vig_optimize" */; buildPhases = ( 576482CB0C469056003AFC2F /* Sources */, 576482CD0C469056003AFC2F /* Frameworks */, @@ -3136,7 +3144,7 @@ 576482C90C469056003AFC2F /* PBXTargetDependency */, 576484010C46AF0A003AFC2F /* PBXTargetDependency */, ); - name = "test vig_optimize"; + name = "tools vig_optimize"; productName = "sample open_close"; productReference = 576482E20C469056003AFC2F /* vig_optimize */; productType = "com.apple.product-type.tool"; @@ -3225,9 +3233,9 @@ productReference = 5771F8150C30268F00736343 /* libPTLensDB.a */; productType = "com.apple.product-type.library.static"; }; - 5796FA730C4395CC006B7C6E /* test nona */ = { + 5796FA730C4395CC006B7C6E /* tools nona */ = { isa = PBXNativeTarget; - buildConfigurationList = 5796FA900C4395CC006B7C6E /* Build configuration list for PBXNativeTarget "test nona" */; + buildConfigurationList = 5796FA900C4395CC006B7C6E /* Build configuration list for PBXNativeTarget "tools nona" */; buildPhases = ( 5796FA7E0C4395CC006B7C6E /* Sources */, 5796FA800C4395CC006B7C6E /* Frameworks */, @@ -3245,7 +3253,7 @@ 5796FDA10C43AC62006B7C6E /* PBXTargetDependency */, 579610B40C43C066006B7C6E /* PBXTargetDependency */, ); - name = "test nona"; + name = "tools nona"; productName = "sample open_close"; productReference = 5796FA950C4395CC006B7C6E /* nona */; productType = "com.apple.product-type.tool"; @@ -3370,10 +3378,10 @@ 57E3467D0C4A89B0006AA781 /* Hugin */, 57E347330C4A8EED006AA781 /* tools */, 5702272E0C42605C008A44D6 /* test open_file */, - 5796FA730C4395CC006B7C6E /* test nona */, - 5709A0670C4543E100BD1C53 /* test autooptimiser */, - 5764829C0C469052003AFC2F /* test fulla */, - 576482C00C469056003AFC2F /* test vig_optimize */, + 5796FA730C4395CC006B7C6E /* tools nona */, + 5709A0670C4543E100BD1C53 /* tools autooptimiser */, + 5764829C0C469052003AFC2F /* tools fulla */, + 576482C00C469056003AFC2F /* tools vig_optimize */, ); }; /* End PBXProject section */ @@ -4058,22 +4066,22 @@ }; 57E347350C4A8EF4006AA781 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 576482C00C469056003AFC2F /* test vig_optimize */; + target = 576482C00C469056003AFC2F /* tools vig_optimize */; targetProxy = 57E347340C4A8EF4006AA781 /* PBXContainerItemProxy */; }; 57E347370C4A8EF4006AA781 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 5764829C0C469052003AFC2F /* test fulla */; + target = 5764829C0C469052003AFC2F /* tools fulla */; targetProxy = 57E347360C4A8EF4006AA781 /* PBXContainerItemProxy */; }; 57E347390C4A8EF4006AA781 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 5709A0670C4543E100BD1C53 /* test autooptimiser */; + target = 5709A0670C4543E100BD1C53 /* tools autooptimiser */; targetProxy = 57E347380C4A8EF4006AA781 /* PBXContainerItemProxy */; }; 57E3473B0C4A8EF4006AA781 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 5796FA730C4395CC006B7C6E /* test nona */; + target = 5796FA730C4395CC006B7C6E /* tools nona */; targetProxy = 57E3473A0C4A8EF4006AA781 /* PBXContainerItemProxy */; }; 57E3473D0C4A8EF4006AA781 /* PBXTargetDependency */ = { @@ -5638,7 +5646,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 5709A0840C4543E100BD1C53 /* Build configuration list for PBXNativeTarget "test autooptimiser" */ = { + 5709A0840C4543E100BD1C53 /* Build configuration list for PBXNativeTarget "tools autooptimiser" */ = { isa = XCConfigurationList; buildConfigurations = ( 5709A0850C4543E100BD1C53 /* Debug */, @@ -5737,7 +5745,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 576482B90C469052003AFC2F /* Build configuration list for PBXNativeTarget "test fulla" */ = { + 576482B90C469052003AFC2F /* Build configuration list for PBXNativeTarget "tools fulla" */ = { isa = XCConfigurationList; buildConfigurations = ( 576482BA0C469052003AFC2F /* Debug */, @@ -5748,7 +5756,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 576482DD0C469056003AFC2F /* Build configuration list for PBXNativeTarget "test vig_optimize" */ = { + 576482DD0C469056003AFC2F /* Build configuration list for PBXNativeTarget "tools vig_optimize" */ = { isa = XCConfigurationList; buildConfigurations = ( 576482DE0C469056003AFC2F /* Debug */, @@ -5814,7 +5822,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 5796FA900C4395CC006B7C6E /* Build configuration list for PBXNativeTarget "test nona" */ = { + 5796FA900C4395CC006B7C6E /* Build configuration list for PBXNativeTarget "tools nona" */ = { isa = XCConfigurationList; buildConfigurations = ( 5796FA910C4395CC006B7C6E /* Debug */, Modified: hugin/branches/ippei/src/CMakeLists.txt =================================================================== --- hugin/branches/ippei/src/CMakeLists.txt 2007-07-20 17:17:53 UTC (rev 2295) +++ hugin/branches/ippei/src/CMakeLists.txt 2007-07-20 21:23:12 UTC (rev 2296) @@ -12,6 +12,7 @@ add_subdirectory(foreign) add_subdirectory(hugin_base) +add_subdirectory(tools) # build vips stuff, only if vips was found # not ready for the general public yet @@ -22,8 +23,8 @@ # build gui only if wxWidgets was found IF(wxWidgets_FOUND) INCLUDE(${wxWidgets_USE_FILE}) -# add_subdirectory(hugin1) +# add_subdirectory(hugin) # add_subdirectory(nona_gui) ENDIF(wxWidgets_FOUND) -#add_subdirectory(tests) +add_subdirectory(hugin1) Modified: hugin/branches/ippei/src/hugin1/CMakeLists.txt =================================================================== --- hugin/branches/ippei/src/hugin1/CMakeLists.txt 2007-07-20 17:17:53 UTC (rev 2295) +++ hugin/branches/ippei/src/hugin1/CMakeLists.txt 2007-07-20 21:23:12 UTC (rev 2296) @@ -1,32 +1,16 @@ -include_directories( ${CMAKE_BINARY_DIR}/src/include ) -include_directories( ${CMAKE_SOURCE_DIR}/src/include ) -include_directories( ${CMAKE_SOURCE_DIR}/src/foreign ) +include_directories( ${CMAKE_BINARY_DIR}/src/hugin1 ) -# define common sets of libraries, used by different subdirectories -set(common_libs huginjhead hugincommon huginpanorama - huginvigra_ext boost_thread ${PANO13_LIBRARIES} huginlevmar) -set(image_libs huginvigraimpex ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} - ${PNG_LIBRARIES} ${OPENEXR_LIBRARIES}) - -add_subdirectory(jhead) -add_subdirectory(common) -add_subdirectory(foreign) -add_subdirectory(vigra_ext) -add_subdirectory(Panorama) -add_subdirectory(tools) - -# build vips stuff, only if vips was found -# not ready for the general public yet -#IF(VIPSCC_FOUND) -# add_subdirectory(tools_vips) -#ENDIF(VIPSCC_FOUND) - # build gui only if wxWidgets was found IF(wxWidgets_FOUND) - INCLUDE(${wxWidgets_USE_FILE}) +# INCLUDE(${wxWidgets_USE_FILE}) add_subdirectory(hugin) add_subdirectory(nona_gui) ENDIF(wxWidgets_FOUND) +IF(VIPS_FOUND) +# add_subdirectory(tools_vips) +ENDIF(VIPS_FOUND) + +add_subdirectory(tools) #add_subdirectory(tests) Modified: hugin/branches/ippei/src/hugin1/hugin/ImageCache.h =================================================================== --- hugin/branches/ippei/src/hugin1/hugin/ImageCache.h 2007-07-20 17:17:53 UTC (rev 2295) +++ hugin/branches/ippei/src/hugin1/hugin/ImageCache.h 2007-07-20 21:23:12 UTC (rev 2296) @@ -25,6 +25,7 @@ #define _IMAGECACHE_H #include <map> +#include <panoinc_WX.h> #include <PT/RemappedPanoImage.h> #include <common/utils.h> Modified: hugin/branches/ippei/src/hugin_base/CMakeLists.txt =================================================================== --- hugin/branches/ippei/src/hugin_base/CMakeLists.txt 2007-07-20 17:17:53 UTC (rev 2295) +++ hugin/branches/ippei/src/hugin_base/CMakeLists.txt 2007-07-20 21:23:12 UTC (rev 2296) @@ -54,18 +54,4 @@ add_library(huginbase SHARED ${HUGIN_BASE_SRC}) install(TARGETS huginbase DESTINATION lib) -add_executable(fulla test/fulla.cpp) -target_link_libraries(fulla ${common_libs} huginlensdb ${image_libs}) - -add_executable(nona test/nona.cpp) -target_link_libraries(nona ${common_libs} ${image_libs}) - -add_executable(autooptimiser test/autooptimiser.cpp) -target_link_libraries(autooptimiser ${common_libs} ${image_libs}) - -add_executable(vig_optimize test/vig_optimize.cpp) -target_link_libraries(vig_optimize ${common_libs} ${image_libs}) - -add_executable(open_file test/open_file.cpp) -target_link_libraries(open_file ${common_libs} ${image_libs}) - +add_subdirectory(test) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2007-07-20 22:22:27
|
Revision: 2297 http://hugin.svn.sourceforge.net/hugin/?rev=2297&view=rev Author: ippei Date: 2007-07-20 15:22:25 -0700 (Fri, 20 Jul 2007) Log Message: ----------- another newline thingy and old fulla fixed Modified Paths: -------------- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj hugin/branches/ippei/src/hugin1/PT/SpaceTransform.h hugin/branches/ippei/src/hugin1/tools/fulla.cpp Modified: hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-07-20 21:23:12 UTC (rev 2296) +++ hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-07-20 22:22:25 UTC (rev 2297) @@ -5265,7 +5265,7 @@ 57E346D40C4A8A2E006AA781 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; + GCC_PREFIX_HEADER = ../src/hugin1/panoinc_WX.h; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", WX_PRECOMP, @@ -5507,7 +5507,7 @@ 57E34A630C4ACADD006AA781 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; + GCC_PREFIX_HEADER = ../src/hugin1/panoinc_WX.h; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", WX_PRECOMP, Modified: hugin/branches/ippei/src/hugin1/PT/SpaceTransform.h =================================================================== --- hugin/branches/ippei/src/hugin1/PT/SpaceTransform.h 2007-07-20 21:23:12 UTC (rev 2296) +++ hugin/branches/ippei/src/hugin1/PT/SpaceTransform.h 2007-07-20 22:22:25 UTC (rev 2297) @@ -45,4 +45,5 @@ using HuginBase::Nona::estRadialScaleCrop; } -#endif \ No newline at end of file + +#endif Modified: hugin/branches/ippei/src/hugin1/tools/fulla.cpp =================================================================== --- hugin/branches/ippei/src/hugin1/tools/fulla.cpp 2007-07-20 21:23:12 UTC (rev 2296) +++ hugin/branches/ippei/src/hugin1/tools/fulla.cpp 2007-07-20 22:22:25 UTC (rev 2297) @@ -41,6 +41,7 @@ #include "panoinc.h" #include <vigra_ext/lut.h> +#include <vigra_ext/ResponseTransform.h> #include "PT/Panorama.h" #include "PT/Stitcher.h" #include "PT/SpaceTransform.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2007-07-21 11:15:07
|
Revision: 2307 http://hugin.svn.sourceforge.net/hugin/?rev=2307&view=rev Author: ippei Date: 2007-07-21 04:15:05 -0700 (Sat, 21 Jul 2007) Log Message: ----------- precomp on Mac Modified Paths: -------------- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj hugin/branches/ippei/src/hugin_base/hugin_base.pch hugin/branches/ippei/src/hugin_base/nona.pch hugin/branches/ippei/src/hugin_base/panodata.pch Added Paths: ----------- hugin/branches/ippei/src/hugin1/hugin1.pch Modified: hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-07-21 11:12:21 UTC (rev 2306) +++ hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-07-21 11:15:05 UTC (rev 2307) @@ -1549,6 +1549,7 @@ 57EA84700C3A8AB400E4965E /* CalculateMeanExposure.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CalculateMeanExposure.h; path = algorithms/basic/CalculateMeanExposure.h; sourceTree = "<group>"; }; 57EA97D70C3A940500E4965E /* RotatePanorama.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = RotatePanorama.cpp; path = algorithms/basic/RotatePanorama.cpp; sourceTree = "<group>"; }; 57EA97D80C3A940500E4965E /* RotatePanorama.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = RotatePanorama.h; path = algorithms/basic/RotatePanorama.h; sourceTree = "<group>"; }; + 57F7B2150C521B7C00E0C537 /* hugin1.pch */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = hugin1.pch; sourceTree = "<group>"; }; 57FD3E5E06E98ED50070426B /* pano13 */ = {isa = PBXFileReference; lastKnownFileType = folder; path = pano13; sourceTree = "<group>"; }; /* End PBXFileReference section */ @@ -2448,6 +2449,7 @@ 57E330E70C4A87F2006AA781 /* tools */, 57E330F90C4A87F2006AA781 /* tools_vips */, 57E330D40C4A87F2006AA781 /* tests */, + 57F7B2150C521B7C00E0C537 /* hugin1.pch */, ); path = hugin1; sourceTree = "<group>"; @@ -4405,6 +4407,7 @@ ); COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = YES; + DEBUG_MACRO = "DEBUG=1"; GCC_CW_ASM_SYNTAX = NO; GCC_DEBUGGING_SYMBOLS = full; GCC_ENABLE_PASCAL_STRINGS = YES; @@ -4412,7 +4415,10 @@ GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = s; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(DEBUG_MACRO)", + HUGIN_PRECOMP, + ); HEADER_SEARCH_PATHS = ( /usr/include, /Developer/Headers/FlatCarbon, @@ -4455,6 +4461,7 @@ ); COPY_PHASE_STRIP = YES; DEAD_CODE_STRIPPING = YES; + DEBUG_MACRO = "DEBUG=1"; GCC_CW_ASM_SYNTAX = NO; GCC_DEBUGGING_SYMBOLS = full; GCC_ENABLE_PASCAL_STRINGS = YES; @@ -4462,6 +4469,10 @@ GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = s; GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(DEBUG_MACRO)", + HUGIN_PRECOMP, + ); HEADER_SEARCH_PATHS = ( /usr/include, /Developer/Headers/FlatCarbon, @@ -4745,6 +4756,7 @@ ARCHS = "$(NATIVE_ARCH)"; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = NO; + DEBUG_MACRO = "DEBUG=1"; GCC_CW_ASM_SYNTAX = NO; GCC_DEBUGGING_SYMBOLS = full; GCC_ENABLE_FIX_AND_CONTINUE = YES; @@ -4753,7 +4765,7 @@ GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; + GCC_PREPROCESSOR_DEFINITIONS = "$(DEBUG_MACRO)"; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; @@ -4912,6 +4924,7 @@ ARCHS = "$(NATIVE_ARCH)"; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = NO; + DEBUG_MACRO = "DEBUG=1"; GCC_CW_ASM_SYNTAX = NO; GCC_DEBUGGING_SYMBOLS = full; GCC_ENABLE_FIX_AND_CONTINUE = YES; @@ -4920,7 +4933,10 @@ GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; + GCC_PREPROCESSOR_DEFINITIONS = "$(DEBUG_MACRO)"; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; HEADER_SEARCH_PATHS = ( /usr/include, /Developer/Headers/FlatCarbon, @@ -5233,7 +5249,7 @@ isa = XCBuildConfiguration; buildSettings = { DEPLOYMENT_POSTPROCESSING = YES; - GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; + GCC_PREFIX_HEADER = ../src/hugin1/hugin1.pch; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", WX_PRECOMP, @@ -5265,7 +5281,7 @@ 57E346D40C4A8A2E006AA781 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREFIX_HEADER = ../src/hugin1/panoinc_WX.h; + GCC_PREFIX_HEADER = ../src/hugin1/hugin1.pch; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", WX_PRECOMP, @@ -5297,7 +5313,7 @@ 57E346D50C4A8A2E006AA781 /* Development ZeroLink */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; + GCC_PREFIX_HEADER = ../src/hugin1/hugin1.pch; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", WX_PRECOMP, @@ -5330,7 +5346,7 @@ isa = XCBuildConfiguration; buildSettings = { DEPLOYMENT_POSTPROCESSING = YES; - GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; + GCC_PREFIX_HEADER = ../src/hugin1/hugin1.pch; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", WX_PRECOMP, @@ -5482,7 +5498,7 @@ 57E34A620C4ACADD006AA781 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; + GCC_PREFIX_HEADER = ../src/hugin1/hugin1.pch; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", WX_PRECOMP, @@ -5507,7 +5523,7 @@ 57E34A630C4ACADD006AA781 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREFIX_HEADER = ../src/hugin1/panoinc_WX.h; + GCC_PREFIX_HEADER = ../src/hugin1/hugin1.pch; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", WX_PRECOMP, @@ -5532,7 +5548,7 @@ 57E34A640C4ACADD006AA781 /* Development ZeroLink */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; + GCC_PREFIX_HEADER = ../src/hugin1/hugin1.pch; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", WX_PRECOMP, @@ -5557,7 +5573,7 @@ 57E34A650C4ACADD006AA781 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_PREFIX_HEADER = "$(WX_INCLUDE_DIR)/wx/wxprec.h"; + GCC_PREFIX_HEADER = ../src/hugin1/hugin1.pch; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", WX_PRECOMP, Added: hugin/branches/ippei/src/hugin1/hugin1.pch =================================================================== --- hugin/branches/ippei/src/hugin1/hugin1.pch (rev 0) +++ hugin/branches/ippei/src/hugin1/hugin1.pch 2007-07-21 11:15:05 UTC (rev 2307) @@ -0,0 +1,43 @@ +// -*- c-basic-offset: 4 -*- +/** @file +* +* @author Ippei UKAI <ipp...@ma...> +* +* $Id: $ +* +* This is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public +* License as published by the Free Software Foundation; either +* version 2 of the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this software; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA. +* +* Hereby the author, Ippei UKAI, grant the license of this particular file to +* be relaxed to the GNU Lesser General Public License as published by the Free +* Software Foundation; either version 2 of the License, or (at your option) +* any later version. Please note however that when the file is linked to or +* compiled with other files in this library, the GNU General Public License as +* mentioned above is likely to restrict the terms of use further. +* +*/ + +#ifndef _HUGIN1_PCH +#define _HUGIN1_PCH +#ifdef HUGIN_PRECOMP + + +//#include "config.h" +//#include "panoinc.h" + +#include "panoinc_WX.h" + + +#endif //_PRECOMP +#endif //_PCH Modified: hugin/branches/ippei/src/hugin_base/hugin_base.pch =================================================================== --- hugin/branches/ippei/src/hugin_base/hugin_base.pch 2007-07-21 11:12:21 UTC (rev 2306) +++ hugin/branches/ippei/src/hugin_base/hugin_base.pch 2007-07-21 11:15:05 UTC (rev 2307) @@ -43,4 +43,4 @@ #endif //_PRECOMP -#endif //_PCH \ No newline at end of file +#endif //_PCH Modified: hugin/branches/ippei/src/hugin_base/nona.pch =================================================================== --- hugin/branches/ippei/src/hugin_base/nona.pch 2007-07-21 11:12:21 UTC (rev 2306) +++ hugin/branches/ippei/src/hugin_base/nona.pch 2007-07-21 11:15:05 UTC (rev 2307) @@ -35,7 +35,7 @@ #include <hugin_config.h> -#include "panodata/panodata.pch" +#include "panodata.pch" #include <vigra/stdimage.hxx> #include <appbase/ProgressDisplayOld.h> Modified: hugin/branches/ippei/src/hugin_base/panodata.pch =================================================================== --- hugin/branches/ippei/src/hugin_base/panodata.pch 2007-07-21 11:12:21 UTC (rev 2306) +++ hugin/branches/ippei/src/hugin_base/panodata.pch 2007-07-21 11:15:05 UTC (rev 2307) @@ -55,4 +55,4 @@ #endif //_PRECOMP -#endif //_PCH \ No newline at end of file +#endif //_PCH This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2007-07-23 22:08:46
|
Revision: 2319 http://hugin.svn.sourceforge.net/hugin/?rev=2319&view=rev Author: ippei Date: 2007-07-23 15:08:40 -0700 (Mon, 23 Jul 2007) Log Message: ----------- update from the trunk Modified Paths: -------------- hugin/branches/ippei/mac/Hugin-Info.plist hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj hugin/branches/ippei/mac/nona_gui-Info.plist hugin/branches/ippei/src/hugin1/hugin/OptimizePhotometricPanel.cpp hugin/branches/ippei/src/hugin1/hugin/huginApp.cpp Modified: hugin/branches/ippei/mac/Hugin-Info.plist =================================================================== --- hugin/branches/ippei/mac/Hugin-Info.plist 2007-07-23 17:30:27 UTC (rev 2318) +++ hugin/branches/ippei/mac/Hugin-Info.plist 2007-07-23 22:08:40 UTC (rev 2319) @@ -2,6 +2,10 @@ <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> + <key>CFBundleName</key> + <string>Hugin</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>CFBundleDocumentTypes</key> @@ -27,23 +31,19 @@ </array> <key>CFBundleExecutable</key> <string>Hugin</string> - <key>CFBundleGetInfoString</key> - <string>Hugin 0.7beta5</string> <key>CFBundleIconFile</key> <string>Hugin.icns</string> <key>CFBundleIdentifier</key> <string>net.sourceforge.hugin.Hugin</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundleName</key> - <string>Hugin</string> <key>CFBundlePackageType</key> <string>APPL</string> - <key>CFBundleShortVersionString</key> - <string>0.7b5</string> <key>CFBundleSignature</key> <string>Hgin</string> + <key>CFBundleGetInfoString</key> + <string>Hugin 0.7-beta5</string> <key>CFBundleVersion</key> <string>0.7b5</string> + <key>CFBundleShortVersionString</key> + <string>0.7b5</string> </dict> </plist> Modified: hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-07-23 17:30:27 UTC (rev 2318) +++ hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-07-23 22:08:40 UTC (rev 2319) @@ -38,10 +38,10 @@ buildPhases = ( ); dependencies = ( - 57E3472D0C4A8EB6006AA781 /* PBXTargetDependency */, + 57E347290C4A8EB6006AA781 /* PBXTargetDependency */, 57E3472B0C4A8EB6006AA781 /* PBXTargetDependency */, - 57E347290C4A8EB6006AA781 /* PBXTargetDependency */, 57E347270C4A8EB6006AA781 /* PBXTargetDependency */, + 57E3472D0C4A8EB6006AA781 /* PBXTargetDependency */, 57E347250C4A8EB6006AA781 /* PBXTargetDependency */, 57E347230C4A8EB6006AA781 /* PBXTargetDependency */, 57E347210C4A8EB6006AA781 /* PBXTargetDependency */, @@ -63,6 +63,7 @@ ); dependencies = ( 57E347470C4A8EF8006AA781 /* PBXTargetDependency */, + 57525A2E0C54BC8400BF8096 /* PBXTargetDependency */, ); name = app; productName = app; @@ -177,6 +178,43 @@ 574092C00C3943D000D16607 /* Stitcher2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F490C391053005818A4 /* Stitcher2.cpp */; }; 574092C10C3943D000D16607 /* Stitcher3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F4A0C391053005818A4 /* Stitcher3.cpp */; }; 574092C20C3943D000D16607 /* Stitcher4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57237F4B0C391053005818A4 /* Stitcher4.cpp */; }; + 57525A390C54BCCB00BF8096 /* nona_gui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57E330BF0C4A87F2006AA781 /* nona_gui.cpp */; }; + 57525A3A0C54BCEA00BF8096 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 574F3EBC081FF2350086E561 /* QuickTime.framework */; }; + 57525A3B0C54BCEA00BF8096 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 574F3F2E082005980086E561 /* IOKit.framework */; }; + 57525A3C0C54BCEA00BF8096 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9B067B80F000A6EDD4 /* Carbon.framework */; }; + 57525A3D0C54BCEA00BF8096 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749FA9C067B80F000A6EDD4 /* Cocoa.framework */; }; + 57525A3E0C54BCEA00BF8096 /* System.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 573C3861067C789F00A5DBE0 /* System.framework */; }; + 57525A3F0C54BCEA00BF8096 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 573C3862067C789F00A5DBE0 /* WebKit.framework */; }; + 57525A400C54BCEA00BF8096 /* libpthread.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989595068E2FEC009F90BF /* libpthread.dylib */; }; + 57525A410C54BCEA00BF8096 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989581068E2FD7009F90BF /* libiconv.dylib */; }; + 57525A420C54BCEA00BF8096 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 579895AB068E3002009F90BF /* libz.dylib */; }; + 57525A430C54BCEA00BF8096 /* libmx.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D55913067BDB84005E4CCD /* libmx.dylib */; }; + 57525A440C54BCEA00BF8096 /* libpano13.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 573B8F85067BAAB900B7B355 /* libpano13.a */; }; + 57525A450C54BCEA00BF8096 /* libpng.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FA06BD7388004058A1 /* libpng.a */; }; + 57525A460C54BCEA00BF8096 /* libtiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577092FB06BD7388004058A1 /* libtiff.a */; }; + 57525A470C54BCEA00BF8096 /* libjpeg.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57D14A4506B8A3D100D8A03D /* libjpeg.a */; }; + 57525A480C54BCEA00BF8096 /* libwx_macu-2.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989544068E2F22009F90BF /* libwx_macu-2.7.a */; }; + 57525A490C54BCEA00BF8096 /* libwxexpat-2.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989545068E2F22009F90BF /* libwxexpat-2.7.a */; }; + 57525A4A0C54BCEA00BF8096 /* libwxregexu-2.7.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57989565068E2FA3009F90BF /* libwxregexu-2.7.a */; }; + 57525A4B0C54BCEA00BF8096 /* libIex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786100BF347B80041F8FF /* libIex.a */; }; + 57525A4C0C54BCEA00BF8096 /* libIlmImf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786090BF347780041F8FF /* libIlmImf.a */; }; + 57525A4D0C54BCEA00BF8096 /* libIlmThread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786110BF347B80041F8FF /* libIlmThread.a */; }; + 57525A4E0C54BCEA00BF8096 /* libImath.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5777860A0BF3477A0041F8FF /* libImath.a */; }; + 57525A4F0C54BCEA00BF8096 /* libHalf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 577786180BF348E90041F8FF /* libHalf.a */; }; + 57525A500C54BCEA00BF8096 /* libboost_thread.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F7450C30202B00736343 /* libboost_thread.a */; }; + 57525A510C54BCEA00BF8096 /* liblevmar.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5720E47A0BD456CD00E63404 /* liblevmar.a */; }; + 57525A520C54BCEA00BF8096 /* libjhead.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; }; + 57525A530C54BCEA00BF8096 /* libvigra_impex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5711524A06BC6709004F4FA7 /* libvigra_impex.a */; }; + 57525A540C54BCEA00BF8096 /* libvigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libvigra_ext.a */; }; + 57525A550C54BCEA00BF8096 /* libhugin_utils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F5D70C3006E900736343 /* libhugin_utils.a */; }; + 57525A560C54BCEA00BF8096 /* libhugin_math.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5771F77A0C30216F00736343 /* libhugin_math.a */; }; + 57525A570C54BCEA00BF8096 /* libhugin_appbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */; }; + 57525A580C54BCEA00BF8096 /* libhugin_panodata.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759DA4F0C327D680043F754 /* libhugin_panodata.a */; }; + 57525A590C54BCEA00BF8096 /* libhugin_panotools.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 571300650C33D41F00252FE3 /* libhugin_panotools.a */; }; + 57525A5A0C54BCEA00BF8096 /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; }; + 57525A5B0C54BCEA00BF8096 /* libhugin_algorithms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57EA83860C3A798A00E4965E /* libhugin_algorithms.a */; }; + 57525A5C0C54BCEA00BF8096 /* libhuginapp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 576EC4990C3FC9300076A417 /* libhuginapp.a */; }; + 57525A5D0C54BCEA00BF8096 /* libhuginwxutils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57E34A5C0C4ACAA1006AA781 /* libhuginwxutils.a */; }; 5759D9C20C3271640043F754 /* Command.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9B50C3271640043F754 /* Command.h */; }; 5759D9C30C3271640043F754 /* CommandHistory.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9B60C3271640043F754 /* CommandHistory.h */; }; 5759D9C40C3271640043F754 /* DocumentData.h in Headers */ = {isa = PBXBuildFile; fileRef = 5759D9B70C3271640043F754 /* DocumentData.h */; }; @@ -340,6 +378,7 @@ 5796FD9D0C43AC50006B7C6E /* libvigra_ext.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57C1706C09A125DE00FAF325 /* libvigra_ext.a */; }; 5796FD9E0C43AC50006B7C6E /* libhugin_appbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */; }; 5796FD9F0C43AC50006B7C6E /* libhugin_nona.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5740922A0C393E6600D16607 /* libhugin_nona.a */; }; + 579DFCCC0C54EC9E0047E745 /* PanoToolsInclude.h in Headers */ = {isa = PBXBuildFile; fileRef = 579DFCCB0C54EC9E0047E745 /* PanoToolsInclude.h */; }; 57B88E5F0C36CD7E00EC6519 /* Panorama.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57B88E5D0C36CD7E00EC6519 /* Panorama.cpp */; }; 57C313C00C37E04500E00EDC /* PTScriptParsing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57C313BF0C37E04500E00EDC /* PTScriptParsing.cpp */; }; 57C4868E0C31299E002D79F1 /* hugin_math.h in Headers */ = {isa = PBXBuildFile; fileRef = 57C4868D0C31299E002D79F1 /* hugin_math.h */; }; @@ -627,6 +666,34 @@ remoteGlobalIDString = 57C486290C3121E8002D79F1; remoteInfo = "copy hugin_config.h"; }; + 57525A2D0C54BC8400BF8096 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57525A240C54BC4400BF8096; + remoteInfo = Nona; + }; + 57525A310C54BCA400BF8096 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57C486290C3121E8002D79F1; + remoteInfo = "copy hugin_config.h"; + }; + 57525A330C54BCA400BF8096 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E3470D0C4A8E95006AA781; + remoteInfo = "lib static"; + }; + 57525A350C54BCA500BF8096 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; + proxyType = 1; + remoteGlobalIDString = 57E34A5B0C4ACAA1006AA781; + remoteInfo = huginwxutils; + }; 5764829E0C469052003AFC2F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 57FC3AC10675E43600C3E0AC /* Project object */; @@ -1227,6 +1294,7 @@ 5749FA9C067B80F000A6EDD4 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = "<group>"; }; 574F3EBC081FF2350086E561 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = System/Library/Frameworks/QuickTime.framework; sourceTree = "<group>"; }; 574F3F2E082005980086E561 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = "<group>"; }; + 57525A250C54BC4400BF8096 /* Nona.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Nona.app; sourceTree = BUILT_PRODUCTS_DIR; }; 5759D9AC0C32713F0043F754 /* libhugin_appbase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhugin_appbase.a; sourceTree = BUILT_PRODUCTS_DIR; }; 5759D9B50C3271640043F754 /* Command.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = Command.h; sourceTree = "<group>"; }; 5759D9B60C3271640043F754 /* CommandHistory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = CommandHistory.h; sourceTree = "<group>"; }; @@ -1356,6 +1424,7 @@ 57989581068E2FD7009F90BF /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = "<group>"; }; 57989595068E2FEC009F90BF /* libpthread.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpthread.dylib; path = usr/lib/libpthread.dylib; sourceTree = "<group>"; }; 579895AB068E3002009F90BF /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.1.dylib; sourceTree = "<group>"; }; + 579DFCCB0C54EC9E0047E745 /* PanoToolsInclude.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PanoToolsInclude.h; sourceTree = "<group>"; }; 57A91BD707FD85E30013AE47 /* autopano-complete-mac.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = "autopano-complete-mac.sh"; sourceTree = "<group>"; }; 57B88E5D0C36CD7E00EC6519 /* Panorama.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Panorama.cpp; sourceTree = "<group>"; }; 57B88E5E0C36CD7E00EC6519 /* Panorama.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Panorama.h; sourceTree = "<group>"; }; @@ -1381,15 +1450,10 @@ 57C486C50C312BA8002D79F1 /* Vector3.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Vector3.cpp; sourceTree = "<group>"; }; 57C487350C313A2C002D79F1 /* Matrix3.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Matrix3.cpp; sourceTree = "<group>"; }; 57CCCC29086C957E000EBC4A /* AUTHORS */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = AUTHORS; sourceTree = "<group>"; }; - 57CCCC2B086C957E000EBC4A /* BUGS */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = BUGS; sourceTree = "<group>"; }; - 57CCCC2C086C957E000EBC4A /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = ChangeLog; sourceTree = "<group>"; }; 57CCCC39086C957E000EBC4A /* COPYING */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = COPYING; sourceTree = "<group>"; }; - 57CCCC3A086C957E000EBC4A /* HACKING */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = HACKING; sourceTree = "<group>"; }; 57CCCC3B086C957E000EBC4A /* INSTALL */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = INSTALL; sourceTree = "<group>"; }; 57CCCC3C086C957E000EBC4A /* LICENCE */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = LICENCE; sourceTree = "<group>"; }; - 57CCCC4D086C957E000EBC4A /* NEWS */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = NEWS; sourceTree = "<group>"; }; 57CCCC4E086C957E000EBC4A /* README */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = README; sourceTree = "<group>"; }; - 57CCCC50086C957E000EBC4A /* TODO */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = TODO; sourceTree = "<group>"; }; 57CCCC5C086C9651000EBC4A /* utils */ = {isa = PBXFileReference; lastKnownFileType = folder; path = utils; sourceTree = "<group>"; }; 57CF926B06BD7AD100780AC5 /* nona_gui-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "nona_gui-Info.plist"; sourceTree = "<group>"; }; 57D14A4506B8A3D100D8A03D /* libjpeg.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjpeg.a; path = lib/libjpeg.a; sourceTree = "<group>"; }; @@ -1610,6 +1674,49 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 57525A230C54BC4400BF8096 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 57525A3A0C54BCEA00BF8096 /* QuickTime.framework in Frameworks */, + 57525A3B0C54BCEA00BF8096 /* IOKit.framework in Frameworks */, + 57525A3C0C54BCEA00BF8096 /* Carbon.framework in Frameworks */, + 57525A3D0C54BCEA00BF8096 /* Cocoa.framework in Frameworks */, + 57525A3E0C54BCEA00BF8096 /* System.framework in Frameworks */, + 57525A3F0C54BCEA00BF8096 /* WebKit.framework in Frameworks */, + 57525A400C54BCEA00BF8096 /* libpthread.dylib in Frameworks */, + 57525A410C54BCEA00BF8096 /* libiconv.dylib in Frameworks */, + 57525A420C54BCEA00BF8096 /* libz.dylib in Frameworks */, + 57525A430C54BCEA00BF8096 /* libmx.dylib in Frameworks */, + 57525A440C54BCEA00BF8096 /* libpano13.a in Frameworks */, + 57525A450C54BCEA00BF8096 /* libpng.a in Frameworks */, + 57525A460C54BCEA00BF8096 /* libtiff.a in Frameworks */, + 57525A470C54BCEA00BF8096 /* libjpeg.a in Frameworks */, + 57525A480C54BCEA00BF8096 /* libwx_macu-2.7.a in Frameworks */, + 57525A490C54BCEA00BF8096 /* libwxexpat-2.7.a in Frameworks */, + 57525A4A0C54BCEA00BF8096 /* libwxregexu-2.7.a in Frameworks */, + 57525A4B0C54BCEA00BF8096 /* libIex.a in Frameworks */, + 57525A4C0C54BCEA00BF8096 /* libIlmImf.a in Frameworks */, + 57525A4D0C54BCEA00BF8096 /* libIlmThread.a in Frameworks */, + 57525A4E0C54BCEA00BF8096 /* libImath.a in Frameworks */, + 57525A4F0C54BCEA00BF8096 /* libHalf.a in Frameworks */, + 57525A500C54BCEA00BF8096 /* libboost_thread.a in Frameworks */, + 57525A510C54BCEA00BF8096 /* liblevmar.a in Frameworks */, + 57525A520C54BCEA00BF8096 /* libjhead.a in Frameworks */, + 57525A530C54BCEA00BF8096 /* libvigra_impex.a in Frameworks */, + 57525A540C54BCEA00BF8096 /* libvigra_ext.a in Frameworks */, + 57525A550C54BCEA00BF8096 /* libhugin_utils.a in Frameworks */, + 57525A560C54BCEA00BF8096 /* libhugin_math.a in Frameworks */, + 57525A570C54BCEA00BF8096 /* libhugin_appbase.a in Frameworks */, + 57525A580C54BCEA00BF8096 /* libhugin_panodata.a in Frameworks */, + 57525A590C54BCEA00BF8096 /* libhugin_panotools.a in Frameworks */, + 57525A5A0C54BCEA00BF8096 /* libhugin_nona.a in Frameworks */, + 57525A5B0C54BCEA00BF8096 /* libhugin_algorithms.a in Frameworks */, + 57525A5C0C54BCEA00BF8096 /* libhuginapp.a in Frameworks */, + 57525A5D0C54BCEA00BF8096 /* libhuginwxutils.a in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 576482A90C469052003AFC2F /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -1916,6 +2023,7 @@ 5713006E0C33D43B00252FE3 /* panotools */ = { isa = PBXGroup; children = ( + 579DFCCB0C54EC9E0047E745 /* PanoToolsInclude.h */, 5713006F0C33D43B00252FE3 /* PanoToolsInterface.cpp */, 571300700C33D43B00252FE3 /* PanoToolsInterface.h */, 571300710C33D43B00252FE3 /* PanoToolsOptimizerWrapper.cpp */, @@ -1979,6 +2087,7 @@ 573B8F3F067BA2F900B7B355 /* lib */, 573B9041067BAEA700B7B355 /* tools */, 57BB2817068114B2006EDB38 /* Mac OS X */, + 57525A1E0C54BBF600BF8096 /* test */, ); name = Product; path = build/Development; @@ -2008,6 +2117,10 @@ 573B9041067BAEA700B7B355 /* tools */ = { isa = PBXGroup; children = ( + 5796FA950C4395CC006B7C6E /* nona */, + 5709A0890C4543E100BD1C53 /* autooptimiser */, + 576482BE0C469052003AFC2F /* fulla */, + 576482E20C469056003AFC2F /* vig_optimize */, ); name = tools; sourceTree = "<group>"; @@ -2120,6 +2233,14 @@ name = Hugin.xcodeproj; sourceTree = "<group>"; }; + 57525A1E0C54BBF600BF8096 /* test */ = { + isa = PBXGroup; + children = ( + 5702272F0C42605C008A44D6 /* open_file */, + ); + name = test; + sourceTree = "<group>"; + }; 5759D9B40C3271640043F754 /* appbase */ = { isa = PBXGroup; children = ( @@ -2368,6 +2489,7 @@ children = ( 57E34A5C0C4ACAA1006AA781 /* libhuginwxutils.a */, 57E3467E0C4A89B0006AA781 /* Hugin.app */, + 57525A250C54BC4400BF8096 /* Nona.app */, ); name = "Mac OS X"; sourceTree = "<group>"; @@ -2422,15 +2544,10 @@ children = ( 57CCCC5C086C9651000EBC4A /* utils */, 57CCCC29086C957E000EBC4A /* AUTHORS */, - 57CCCC2B086C957E000EBC4A /* BUGS */, - 57CCCC2C086C957E000EBC4A /* ChangeLog */, 57CCCC39086C957E000EBC4A /* COPYING */, - 57CCCC3A086C957E000EBC4A /* HACKING */, 57CCCC3B086C957E000EBC4A /* INSTALL */, 57CCCC3C086C957E000EBC4A /* LICENCE */, - 57CCCC4D086C957E000EBC4A /* NEWS */, 57CCCC4E086C957E000EBC4A /* README */, - 57CCCC50086C957E000EBC4A /* TODO */, ); name = attached; path = ..; @@ -2716,11 +2833,6 @@ 5745FC05094E1D5400E6B672 /* External */, 57CCCC23086C9530000EBC4A /* attached */, 573B8F3E067BA2EB00B7B355 /* Product */, - 5702272F0C42605C008A44D6 /* open_file */, - 5796FA950C4395CC006B7C6E /* nona */, - 5709A0890C4543E100BD1C53 /* autooptimiser */, - 576482BE0C469052003AFC2F /* fulla */, - 576482E20C469056003AFC2F /* vig_optimize */, ); sourceTree = "<group>"; }; @@ -2784,6 +2896,7 @@ files = ( 5713007A0C33D44400252FE3 /* PanoToolsInterface.h in Headers */, 5713007C0C33D44400252FE3 /* PanoToolsOptimizerWrapper.h in Headers */, + 579DFCCC0C54EC9E0047E745 /* PanoToolsInclude.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3067,6 +3180,25 @@ productReference = 5749F8A3067B60CA00A6EDD4 /* libjhead.a */; productType = "com.apple.product-type.library.static"; }; + 57525A240C54BC4400BF8096 /* Nona */ = { + isa = PBXNativeTarget; + buildConfigurationList = 57525A280C54BC4700BF8096 /* Build configuration list for PBXNativeTarget "Nona" */; + buildPhases = ( + 57525A220C54BC4400BF8096 /* Sources */, + 57525A230C54BC4400BF8096 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 57525A320C54BCA400BF8096 /* PBXTargetDependency */, + 57525A340C54BCA400BF8096 /* PBXTargetDependency */, + 57525A360C54BCA500BF8096 /* PBXTargetDependency */, + ); + name = Nona; + productName = Nona; + productReference = 57525A250C54BC4400BF8096 /* Nona.app */; + productType = "com.apple.product-type.application"; + }; 5759D9AB0C32713F0043F754 /* appbase */ = { isa = PBXNativeTarget; buildConfigurationList = 5759D9AF0C3271570043F754 /* Build configuration list for PBXNativeTarget "appbase" */; @@ -3378,6 +3510,7 @@ 57E347300C4A8EDF006AA781 /* app */, 57E34A5B0C4ACAA1006AA781 /* huginwxutils */, 57E3467D0C4A89B0006AA781 /* Hugin */, + 57525A240C54BC4400BF8096 /* Nona */, 57E347330C4A8EED006AA781 /* tools */, 5702272E0C42605C008A44D6 /* test open_file */, 5796FA730C4395CC006B7C6E /* tools nona */, @@ -3516,6 +3649,14 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 57525A220C54BC4400BF8096 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 57525A390C54BCCB00BF8096 /* nona_gui.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 5759D9A90C32713F0043F754 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -3836,6 +3977,26 @@ target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; targetProxy = 5737BC540C4CF81800A61778 /* PBXContainerItemProxy */; }; + 57525A2E0C54BC8400BF8096 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57525A240C54BC4400BF8096 /* Nona */; + targetProxy = 57525A2D0C54BC8400BF8096 /* PBXContainerItemProxy */; + }; + 57525A320C54BCA400BF8096 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57C486290C3121E8002D79F1 /* copy hugin_config.h */; + targetProxy = 57525A310C54BCA400BF8096 /* PBXContainerItemProxy */; + }; + 57525A340C54BCA400BF8096 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57E3470D0C4A8E95006AA781 /* lib static */; + targetProxy = 57525A330C54BCA400BF8096 /* PBXContainerItemProxy */; + }; + 57525A360C54BCA500BF8096 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 57E34A5B0C4ACAA1006AA781 /* huginwxutils */; + targetProxy = 57525A350C54BCA500BF8096 /* PBXContainerItemProxy */; + }; 5764829D0C469052003AFC2F /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 5749F8A2067B60CA00A6EDD4 /* jhead */; @@ -4311,6 +4472,7 @@ 574092310C393E8500D16607 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_PREFIX_HEADER = ../src/hugin_base/nona.pch; HEADER_SEARCH_PATHS = ( ../src/hugin_base, ../src/foreign/vigra, @@ -4336,6 +4498,7 @@ 574092330C393E8500D16607 /* Development ZeroLink */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_PREFIX_HEADER = ../src/hugin_base/nona.pch; HEADER_SEARCH_PATHS = ( ../src/hugin_base, ../src/foreign/vigra, @@ -4348,6 +4511,7 @@ 574092340C393E8500D16607 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_PREFIX_HEADER = ../src/hugin_base/nona.pch; HEADER_SEARCH_PATHS = ( ../src/hugin_base, ../src/foreign/vigra, @@ -4442,7 +4606,6 @@ SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = NO; STRIP_STYLE = all; - VERSIONING_SYSTEM = "apple-generic"; WARNING_CFLAGS = "-Wall"; WX_INCLUDE_DIR = "$(REPOSITORY_DIR)/include/wx-$(WX_MAJOR_VERSOIN)"; WX_INCLUDE_DIR_LIB = "$(REPOSITORY_DIR)/lib/wx/include/mac-unicode-release-static-$(WX_MAJOR_VERSOIN)"; @@ -4496,7 +4659,6 @@ SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = YES; STRIP_STYLE = all; - VERSIONING_SYSTEM = "apple-generic"; WARNING_CFLAGS = "-Wstrict-aliasing"; WX_INCLUDE_DIR = "$(REPOSITORY_DIR)/include/wx-$(WX_MAJOR_VERSOIN)"; WX_INCLUDE_DIR_LIB = "$(REPOSITORY_DIR)/lib/wx/include/mac-unicode-release-static-$(WX_MAJOR_VERSOIN)"; @@ -4505,6 +4667,118 @@ }; name = Release; }; + 57525A290C54BC4700BF8096 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEPLOYMENT_POSTPROCESSING = "<Multiple values>"; + GCC_PREFIX_HEADER = ../src/hugin1/hugin1.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + WX_PRECOMP, + __WXMAC__, + "_FILE_OFFSET_BITS=64", + _LARGE_FILES, + NO_GCC_PRAGMA, + ); + HEADER_SEARCH_PATHS = ( + ../src/hugin_base, + ../src/foreign/vigra, + ../src/foreign, + ../src/hugin1, + "$(WX_INCLUDE_DIR)", + "$(WX_INCLUDE_DIR_LIB)", + "$(inherited)", + ); + INFOPLIST_FILE = "nona_gui-Info.plist"; + INSTALL_PATH = /Applications; + PRODUCT_NAME = Nona; + }; + name = Debug; + }; + 57525A2A0C54BC4700BF8096 /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEPLOYMENT_POSTPROCESSING = "<Multiple values>"; + GCC_PREFIX_HEADER = ../src/hugin1/hugin1.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + WX_PRECOMP, + __WXMAC__, + "_FILE_OFFSET_BITS=64", + _LARGE_FILES, + NO_GCC_PRAGMA, + ); + HEADER_SEARCH_PATHS = ( + ../src/hugin_base, + ../src/foreign/vigra, + ../src/foreign, + ../src/hugin1, + "$(WX_INCLUDE_DIR)", + "$(WX_INCLUDE_DIR_LIB)", + "$(inherited)", + ); + INFOPLIST_FILE = "nona_gui-Info.plist"; + INSTALL_PATH = /Applications; + PRODUCT_NAME = Nona; + }; + name = Development; + }; + 57525A2B0C54BC4700BF8096 /* Development ZeroLink */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEPLOYMENT_POSTPROCESSING = "<Multiple values>"; + GCC_PREFIX_HEADER = ../src/hugin1/hugin1.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + WX_PRECOMP, + __WXMAC__, + "_FILE_OFFSET_BITS=64", + _LARGE_FILES, + NO_GCC_PRAGMA, + ); + HEADER_SEARCH_PATHS = ( + ../src/hugin_base, + ../src/foreign/vigra, + ../src/foreign, + ../src/hugin1, + "$(WX_INCLUDE_DIR)", + "$(WX_INCLUDE_DIR_LIB)", + "$(inherited)", + ); + INFOPLIST_FILE = "nona_gui-Info.plist"; + INSTALL_PATH = /Applications; + PRODUCT_NAME = Nona; + }; + name = "Development ZeroLink"; + }; + 57525A2C0C54BC4700BF8096 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + DEPLOYMENT_POSTPROCESSING = "<Multiple values>"; + GCC_PREFIX_HEADER = ../src/hugin1/hugin1.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + WX_PRECOMP, + __WXMAC__, + "_FILE_OFFSET_BITS=64", + _LARGE_FILES, + NO_GCC_PRAGMA, + ); + HEADER_SEARCH_PATHS = ( + ../src/hugin_base, + ../src/foreign/vigra, + ../src/foreign, + ../src/hugin1, + "$(WX_INCLUDE_DIR)", + "$(WX_INCLUDE_DIR_LIB)", + "$(inherited)", + ); + INFOPLIST_FILE = "nona_gui-Info.plist"; + INSTALL_PATH = /Applications; + PRODUCT_NAME = Nona; + }; + name = Release; + }; 5759D9B00C3271570043F754 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -4558,13 +4832,6 @@ ../src/foreign, "$(inherited)", ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", - ); - LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"/Users/ippei/dev/hugin/ExternalPrograms/Repository-universal/lib\""; - LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = hugin_panodata; }; name = Debug; @@ -4579,7 +4846,6 @@ ../src/foreign, ); PRODUCT_NAME = hugin_panodata; - USER_HEADER_SEARCH_PATHS = "$(inherited) ../src/hugin_base/panodata"; }; name = Development; }; @@ -4592,13 +4858,6 @@ ../src/foreign, "$(inherited)", ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", - ); - LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"/Users/ippei/dev/hugin/ExternalPrograms/Repository-universal/lib\""; - LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = hugin_panodata; }; name = "Development ZeroLink"; @@ -4612,13 +4871,6 @@ ../src/foreign, "$(inherited)", ); - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_2)", - ); - LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"/Users/ippei/dev/hugin/ExternalPrograms/Repository-universal/lib\""; - LIBRARY_SEARCH_PATHS_QUOTED_2 = "\"$(SRCROOT)/ExternalPrograms/repository/lib\""; PRODUCT_NAME = hugin_panodata; }; name = Release; @@ -4792,7 +5044,6 @@ SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = NO; STRIP_STYLE = all; - VERSIONING_SYSTEM = ""; WARNING_CFLAGS = "-Wall"; WX_INCLUDE_DIR = "$(REPOSITORY_DIR)/include/wx-$(WX_MAJOR_VERSOIN)"; WX_INCLUDE_DIR_LIB = "$(REPOSITORY_DIR)/lib/wx/include/mac-unicode-release-static-$(WX_MAJOR_VERSOIN)"; @@ -4960,7 +5211,6 @@ SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = NO; STRIP_STYLE = all; - VERSIONING_SYSTEM = ""; WARNING_CFLAGS = "-Wall"; WX_INCLUDE_DIR = "$(REPOSITORY_DIR)/include/wx-$(WX_MAJOR_VERSOIN)"; WX_INCLUDE_DIR_LIB = "$(REPOSITORY_DIR)/lib/wx/include/mac-unicode-release-static-$(WX_MAJOR_VERSOIN)"; @@ -5086,7 +5336,7 @@ "$(inherited)", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - PRODUCT_NAME = open_file; + PRODUCT_NAME = nona; }; name = Debug; }; @@ -5112,7 +5362,7 @@ "$(inherited)", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - PRODUCT_NAME = open_file; + PRODUCT_NAME = nona; }; name = "Development ZeroLink"; }; @@ -5125,7 +5375,7 @@ "$(inherited)", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - PRODUCT_NAME = open_file; + PRODUCT_NAME = nona; }; name = Release; }; @@ -5269,11 +5519,6 @@ ); INFOPLIST_FILE = "Hugin-Info.plist"; INSTALL_PATH = /Applications; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", - ); - LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Development\""; PRODUCT_NAME = Hugin; }; name = Debug; @@ -5301,11 +5546,6 @@ ); INFOPLIST_FILE = "Hugin-Info.plist"; INSTALL_PATH = /Applications; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", - ); - LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Development\""; PRODUCT_NAME = Hugin; }; name = Development; @@ -5333,11 +5573,6 @@ ); INFOPLIST_FILE = "Hugin-Info.plist"; INSTALL_PATH = /Applications; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", - ); - LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Development\""; PRODUCT_NAME = Hugin; }; name = "Development ZeroLink"; @@ -5366,11 +5601,6 @@ ); INFOPLIST_FILE = "Hugin-Info.plist"; INSTALL_PATH = /Applications; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_1)", - ); - LIBRARY_SEARCH_PATHS_QUOTED_1 = "\"$(SRCROOT)/build/Development\""; PRODUCT_NAME = Hugin; }; name = Release; @@ -5598,6 +5828,7 @@ 57EA838B0C3A79B300E4965E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_PREFIX_HEADER = ../src/hugin_base/algorithm.pch; HEADER_SEARCH_PATHS = ( ../src/foreign, ../src/foreign/vigra, @@ -5625,6 +5856,7 @@ 57EA838D0C3A79B300E4965E /* Development ZeroLink */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_PREFIX_HEADER = ../src/hugin_base/algorithm.pch; HEADER_SEARCH_PATHS = ( ../src/foreign, ../src/foreign/vigra, @@ -5638,6 +5870,7 @@ 57EA838E0C3A79B300E4965E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + GCC_PREFIX_HEADER = ../src/hugin_base/algorithm.pch; HEADER_SEARCH_PATHS = ( ../src/foreign, ../src/foreign/vigra, @@ -5739,6 +5972,17 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + 57525A280C54BC4700BF8096 /* Build configuration list for PBXNativeTarget "Nona" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 57525A290C54BC4700BF8096 /* Debug */, + 57525A2A0C54BC4700BF8096 /* Development */, + 57525A2B0C54BC4700BF8096 /* Development ZeroLink */, + 57525A2C0C54BC4700BF8096 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; 5759D9AF0C3271570043F754 /* Build configuration list for PBXNativeTarget "appbase" */ = { isa = XCConfigurationList; buildConfigurations = ( Modified: hugin/branches/ippei/mac/nona_gui-Info.plist =================================================================== --- hugin/branches/ippei/mac/nona_gui-Info.plist 2007-07-23 17:30:27 UTC (rev 2318) +++ hugin/branches/ippei/mac/nona_gui-Info.plist 2007-07-23 22:08:40 UTC (rev 2319) @@ -26,9 +26,7 @@ </dict> </array> <key>CFBundleExecutable</key> - <string>nona_gui</string> - <key>CFBundleGetInfoString</key> - <string></string> + <string>Nona</string> <key>CFBundleIconFile</key> <string></string> <key>CFBundleIdentifier</key> @@ -37,11 +35,13 @@ <string>6.0</string> <key>CFBundlePackageType</key> <string>APPL</string> - <key>CFBundleShortVersionString</key> - <string></string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>0.6.1</string> + <string></string> + <key>CFBundleShortVersionString</key> + <string></string> + <key>CFBundleGetInfoString</key> + <string></string> </dict> </plist> Modified: hugin/branches/ippei/src/hugin1/hugin/OptimizePhotometricPanel.cpp =================================================================== --- hugin/branches/ippei/src/hugin1/hugin/OptimizePhotometricPanel.cpp 2007-07-23 17:30:27 UTC (rev 2318) +++ hugin/branches/ippei/src/hugin1/hugin/OptimizePhotometricPanel.cpp 2007-07-23 22:08:40 UTC (rev 2319) @@ -484,7 +484,7 @@ } double error = 0; - { + try { //wxBusyCursor busyc; if (mode != OPT_CUSTOM) { // run automatic optimisation @@ -511,6 +511,8 @@ optimizePhotometric(optPano, optvars, m_points, progress, error); } + } catch (std::exception & error) { + wxMessageBox(_("Internal error during photometric optimisation:\n") + wxString(error.what(), wxConvLocal), _("Internal error")); } progress.Close(); Modified: hugin/branches/ippei/src/hugin1/hugin/huginApp.cpp =================================================================== --- hugin/branches/ippei/src/hugin1/hugin/huginApp.cpp 2007-07-23 17:30:27 UTC (rev 2318) +++ hugin/branches/ippei/src/hugin1/hugin/huginApp.cpp 2007-07-23 22:08:40 UTC (rev 2319) @@ -182,8 +182,27 @@ wxFileSystem::AddHandler(new wxZipFSHandler); wxString m_huginPath; +#ifdef __WXMSW__ + // special code to find location of hugin.exe under windows + #if wxUSE_UNICODE + WCHAR tpath[MAX_PATH]; + #else //ANSI + char tpath[MAX_PATH]; + #endif + tpath[0] = 0; + GetModuleFileName(0,tpath,sizeof(tpath)-1); + + #ifdef wxUSE_UNICODE + wxString path(tpath); + #else + wxString path(tpath, wxConvLocal); + #endif wxFileName::SplitPath( argv[0], &m_huginPath, NULL, NULL ); +#else + wxFileName::SplitPath( argv[0], &m_huginPath, NULL, NULL ); +#endif + // DEBUG_INFO( GetAppName().c_str() ) DEBUG_INFO( wxFileName::GetCwd().c_str() ) // DEBUG_INFO( wxFileName::GetHomeDir().c_str() ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2007-07-25 14:01:22
|
Revision: 2325 http://hugin.svn.sourceforge.net/hugin/?rev=2325&view=rev Author: dangelo Date: 2007-07-25 07:01:18 -0700 (Wed, 25 Jul 2007) Log Message: ----------- allow compilation of hugin1 using cmake Modified Paths: -------------- hugin/branches/ippei/CMakeLists.txt hugin/branches/ippei/src/CMakeLists.txt hugin/branches/ippei/src/hugin1/CMakeLists.txt Modified: hugin/branches/ippei/CMakeLists.txt =================================================================== --- hugin/branches/ippei/CMakeLists.txt 2007-07-25 14:00:27 UTC (rev 2324) +++ hugin/branches/ippei/CMakeLists.txt 2007-07-25 14:01:18 UTC (rev 2325) @@ -18,7 +18,21 @@ FIND_PACKAGE(PkgConfig) FIND_PACKAGE(TIFF REQUIRED) FIND_PACKAGE(JPEG REQUIRED) -FIND_PACKAGE(PANO13 REQUIRED) +FIND_PACKAGE(PANO13) +FIND_PACKAGE(PANO12) + +IF(PANO13_FOUND) + SET(PANO_INCLUDE_DIR ${PANO13_INCLUDE_DIR}) + SET(PANO_LIBRARIES ${PANO13_LIBRARIES}) +ELSE(PANO13_FOUND) + IF(PANO12_FOUND) + SET(PANO_INCLUDE_DIR ${PANO12_INCLUDE_DIR}) + SET(PANO_LIBRARIES ${PANO12_LIBRARIES}) + ELSE(PANO12_FOUND) + MESSAGE(FATAL_ERROR "libpano13 or libpano12 not found") + ENDIF(PANO12_FOUND) +ENDIF(PANO13_FOUND) + FIND_PACKAGE(PNG REQUIRED) FIND_PACKAGE(OpenEXR) @@ -107,6 +121,8 @@ INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) +INCLUDE_DIRECTORIES(${PANO_INCLUDE_DIRS}) + LINK_DIRECTORIES( ${VIPSCC_LIBRARY_DIRS} ) INCLUDE_DIRECTORIES( ${VIPSCC_INCLUDE_DIRS} ) Modified: hugin/branches/ippei/src/CMakeLists.txt =================================================================== --- hugin/branches/ippei/src/CMakeLists.txt 2007-07-25 14:00:27 UTC (rev 2324) +++ hugin/branches/ippei/src/CMakeLists.txt 2007-07-25 14:01:18 UTC (rev 2325) @@ -6,7 +6,7 @@ # define common sets of libraries, used by different subdirectories set(common_libs huginjhead huginbase - boost_thread ${PANO13_LIBRARIES} huginlevmar) + boost_thread ${PANO_LIBRARIES} huginlevmar) set(image_libs huginvigraimpex ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${PNG_LIBRARIES} ${OPENEXR_LIBRARIES}) @@ -23,8 +23,7 @@ # build gui only if wxWidgets was found IF(wxWidgets_FOUND) INCLUDE(${wxWidgets_USE_FILE}) -# add_subdirectory(hugin) -# add_subdirectory(nona_gui) + add_subdirectory(hugin1) ENDIF(wxWidgets_FOUND) add_subdirectory(hugin1) Modified: hugin/branches/ippei/src/hugin1/CMakeLists.txt =================================================================== --- hugin/branches/ippei/src/hugin1/CMakeLists.txt 2007-07-25 14:00:27 UTC (rev 2324) +++ hugin/branches/ippei/src/hugin1/CMakeLists.txt 2007-07-25 14:01:18 UTC (rev 2325) @@ -1,16 +1,16 @@ -include_directories( ${CMAKE_BINARY_DIR}/src/hugin1 ) +include_directories( ${CMAKE_SOURCE_DIR}/src/hugin1 ) # build gui only if wxWidgets was found IF(wxWidgets_FOUND) # INCLUDE(${wxWidgets_USE_FILE}) add_subdirectory(hugin) - add_subdirectory(nona_gui) +# add_subdirectory(nona_gui) ENDIF(wxWidgets_FOUND) IF(VIPS_FOUND) # add_subdirectory(tools_vips) ENDIF(VIPS_FOUND) -add_subdirectory(tools) +#add_subdirectory(tools) #add_subdirectory(tests) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2007-08-17 19:14:04
|
Revision: 2396 http://hugin.svn.sourceforge.net/hugin/?rev=2396&view=rev Author: ippei Date: 2007-08-17 12:14:01 -0700 (Fri, 17 Aug 2007) Log Message: ----------- more documentation Modified Paths: -------------- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj Added Paths: ----------- hugin/branches/ippei/src/hugin_base/TODO.txt hugin/branches/ippei/src/hugin_qtbase/TODO.txt hugin/branches/ippei/whitepaper/ hugin/branches/ippei/whitepaper/Beyond Hugin printable.pdf hugin/branches/ippei/whitepaper/Beyond Hugin.pdf Removed Paths: ------------- hugin/branches/ippei/src/hugin2/ hugin/branches/ippei/src/munin/ Modified: hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj =================================================================== --- hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-08-17 17:25:05 UTC (rev 2395) +++ hugin/branches/ippei/mac/Hugin.xcodeproj/project.pbxproj 2007-08-17 19:14:01 UTC (rev 2396) @@ -1594,7 +1594,7 @@ 57E3316B0C4A8859006AA781 /* wxPanoCommand.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = wxPanoCommand.h; sourceTree = "<group>"; }; 57E345D50C4A88C7006AA781 /* po */ = {isa = PBXFileReference; lastKnownFileType = folder; path = po; sourceTree = "<group>"; }; 57E345ED0C4A88C7006AA781 /* xrc */ = {isa = PBXFileReference; lastKnownFileType = folder; path = xrc; sourceTree = "<group>"; }; - 57E3467E0C4A89B0006AA781 /* Hugin.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Hugin.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 57E3467E0C4A89B0006AA781 /* Hugin.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = Hugin.app; sourceTree = BUILT_PRODUCTS_DIR; }; 57E347610C4A8F7D006AA781 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; }; 57E34A5C0C4ACAA1006AA781 /* libhuginwxutils.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libhuginwxutils.a; sourceTree = BUILT_PRODUCTS_DIR; }; 57E34A660C4ACB0F006AA781 /* Plot2D.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Plot2D.cpp; sourceTree = "<group>"; }; Added: hugin/branches/ippei/src/hugin_base/TODO.txt =================================================================== --- hugin/branches/ippei/src/hugin_base/TODO.txt (rev 0) +++ hugin/branches/ippei/src/hugin_base/TODO.txt 2007-08-17 19:14:01 UTC (rev 2396) @@ -0,0 +1,10 @@ +hugin_base [TODO] + + +- Nona engine needs clean up; it has its own todo list in its directory. + +- Most algorithms classes have only constructors directly ported from old implementation. Many arguments to those constructors are actually retrievable from the PanoramaData, which is always the first arguments. They should have simpler constructors that automatically use the values in PanoramaData. + +- AppBase::ExternalProgram* classes are not tested. (In fact, no implementation of ExternalProgramExecutor class is written yet.) + +- Consequently externally processed algorithms aren't complete. Only a few implemented, and none are tested. \ No newline at end of file Added: hugin/branches/ippei/src/hugin_qtbase/TODO.txt =================================================================== --- hugin/branches/ippei/src/hugin_qtbase/TODO.txt (rev 0) +++ hugin/branches/ippei/src/hugin_qtbase/TODO.txt 2007-08-17 19:14:01 UTC (rev 2396) @@ -0,0 +1,10 @@ +hugin_qtbase [TODO] + +!!! obviously implementations not at all complete !!! +... in fact, it's just started. + + Please take a look at any of those classes and give it a life. + + + +Aside from implementing classes and finalising the headers, it would be nice to have something like TextEditor domo using qtappbase. Anyway, this is very early stage of development. \ No newline at end of file Added: hugin/branches/ippei/whitepaper/Beyond Hugin printable.pdf =================================================================== (Binary files differ) Property changes on: hugin/branches/ippei/whitepaper/Beyond Hugin printable.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: hugin/branches/ippei/whitepaper/Beyond Hugin.pdf =================================================================== (Binary files differ) Property changes on: hugin/branches/ippei/whitepaper/Beyond Hugin.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2007-08-17 19:25:50
|
Revision: 2397 http://hugin.svn.sourceforge.net/hugin/?rev=2397&view=rev Author: ippei Date: 2007-08-17 12:25:49 -0700 (Fri, 17 Aug 2007) Log Message: ----------- more documentation Added Paths: ----------- hugin/branches/ippei/TODO Removed Paths: ------------- hugin/branches/ippei/src/hugin_base/algorithms/TODO.txt Added: hugin/branches/ippei/TODO =================================================================== --- hugin/branches/ippei/TODO (rev 0) +++ hugin/branches/ippei/TODO 2007-08-17 19:25:49 UTC (rev 2397) @@ -0,0 +1,10 @@ +[TODO] Hugin - Ippei branch + +src/hugin_base and src/hugin_qtbase have their own TODO lists. + +- automake or autoconf based building + +- Mac: command-line build +- Win: VC build + +- More in cmake documentation, especially for switching from ./configure (how each argument would look like in cmake) \ No newline at end of file Deleted: hugin/branches/ippei/src/hugin_base/algorithms/TODO.txt =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithms/TODO.txt 2007-08-17 19:14:01 UTC (rev 2396) +++ hugin/branches/ippei/src/hugin_base/algorithms/TODO.txt 2007-08-17 19:25:49 UTC (rev 2397) @@ -1,11 +0,0 @@ -[TODO] algorithms - - -- naming convention - -Algorithms should be organised by their implementation (as opposed to functionality). The existing algorithms need be named nicely. - - -- namespace - -Have to decide what namespace each algorithms should be in. \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2007-08-20 15:32:14
|
Revision: 2409 http://hugin.svn.sourceforge.net/hugin/?rev=2409&view=rev Author: ippei Date: 2007-08-20 08:32:12 -0700 (Mon, 20 Aug 2007) Log Message: ----------- GSoC 2007 files Added Paths: ----------- hugin/branches/ippei/GSoC 2007/ hugin/branches/ippei/GSoC 2007/Presentation 1/ hugin/branches/ippei/GSoC 2007/Presentation 1/Revising Architecture (recorded).mov hugin/branches/ippei/GSoC 2007/Presentation 1/Revising Architecture printable.pdf hugin/branches/ippei/GSoC 2007/Presentation 1/Revising Architecture.pdf hugin/branches/ippei/GSoC 2007/Presentation 2/ hugin/branches/ippei/GSoC 2007/Presentation 2/Beyond Hugin (recorded).mov hugin/branches/ippei/GSoC 2007/Presentation 2/Beyond Hugin printable.pdf hugin/branches/ippei/GSoC 2007/Presentation 2/Beyond Hugin.pdf hugin/branches/ippei/GSoC 2007/Presentation 2/about Beyond Hugin (recorded).txt Added: hugin/branches/ippei/GSoC 2007/Presentation 1/Revising Architecture (recorded).mov =================================================================== (Binary files differ) Property changes on: hugin/branches/ippei/GSoC 2007/Presentation 1/Revising Architecture (recorded).mov ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: hugin/branches/ippei/GSoC 2007/Presentation 1/Revising Architecture printable.pdf =================================================================== (Binary files differ) Property changes on: hugin/branches/ippei/GSoC 2007/Presentation 1/Revising Architecture printable.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: hugin/branches/ippei/GSoC 2007/Presentation 1/Revising Architecture.pdf =================================================================== (Binary files differ) Property changes on: hugin/branches/ippei/GSoC 2007/Presentation 1/Revising Architecture.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: hugin/branches/ippei/GSoC 2007/Presentation 2/Beyond Hugin (recorded).mov =================================================================== (Binary files differ) Property changes on: hugin/branches/ippei/GSoC 2007/Presentation 2/Beyond Hugin (recorded).mov ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: hugin/branches/ippei/GSoC 2007/Presentation 2/Beyond Hugin printable.pdf =================================================================== (Binary files differ) Property changes on: hugin/branches/ippei/GSoC 2007/Presentation 2/Beyond Hugin printable.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: hugin/branches/ippei/GSoC 2007/Presentation 2/Beyond Hugin.pdf =================================================================== (Binary files differ) Property changes on: hugin/branches/ippei/GSoC 2007/Presentation 2/Beyond Hugin.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: hugin/branches/ippei/GSoC 2007/Presentation 2/about Beyond Hugin (recorded).txt =================================================================== --- hugin/branches/ippei/GSoC 2007/Presentation 2/about Beyond Hugin (recorded).txt (rev 0) +++ hugin/branches/ippei/GSoC 2007/Presentation 2/about Beyond Hugin (recorded).txt 2007-08-20 15:32:12 UTC (rev 2409) @@ -0,0 +1,5 @@ +about "Beyond Hugin.mov" file + +This file is created with Apple's new Keynote 4.0 (iWork '08). It's released less than a month ago, and appears to have a bug in movie exporting function when used in conjunction with the new presentation recording feature. The recorded presentation plays fine in Keynote, but the exported movie shows everything 'one click' ahead of the voice. I have reported the bug to Apple, but have not yet found a workaround. Since I have no desire to record the presentation yet again (I've discarded take 1 for a trouble with microphone), I will leave it as is until Apple fixes the problem. Sorry for the inconvenience, but if you could follow the recorded presentation side by side with the PDF file, I'd appreciate it very much. + +Ippei \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2007-10-14 21:25:17
|
Revision: 2428 http://hugin.svn.sourceforge.net/hugin/?rev=2428&view=rev Author: dangelo Date: 2007-10-14 14:25:11 -0700 (Sun, 14 Oct 2007) Log Message: ----------- added checks for libpano12. Build vigra_impex for static linkage (important for windows binaries) Modified Paths: -------------- hugin/branches/ippei/CMakeLists.txt hugin/branches/ippei/src/CMakeLists.txt hugin/branches/ippei/src/hugin_config.h.in.cmake Modified: hugin/branches/ippei/CMakeLists.txt =================================================================== --- hugin/branches/ippei/CMakeLists.txt 2007-10-02 14:55:28 UTC (rev 2427) +++ hugin/branches/ippei/CMakeLists.txt 2007-10-14 21:25:11 UTC (rev 2428) @@ -18,21 +18,7 @@ FIND_PACKAGE(PkgConfig) FIND_PACKAGE(TIFF REQUIRED) FIND_PACKAGE(JPEG REQUIRED) -FIND_PACKAGE(PANO13) -#FIND_PACKAGE(PANO12) - -IF(PANO13_FOUND) - SET(PANO_INCLUDE_DIR ${PANO13_INCLUDE_DIR}) - SET(PANO_LIBRARIES ${PANO13_LIBRARIES}) -ELSE(PANO13_FOUND) - IF(PANO12_FOUND) - SET(PANO_INCLUDE_DIR ${PANO12_INCLUDE_DIR}) - SET(PANO_LIBRARIES ${PANO12_LIBRARIES}) - ELSE(PANO12_FOUND) - MESSAGE(FATAL_ERROR "libpano13 or libpano12 not found") - ENDIF(PANO12_FOUND) -ENDIF(PANO13_FOUND) - +FIND_PACKAGE(PANO13 REQUIRED) FIND_PACKAGE(PNG REQUIRED) FIND_PACKAGE(OpenEXR) @@ -80,10 +66,13 @@ # SET(CMAKE_BUILD_TYPE Release) #ENDIF(WANT_DEBUG) -IF(CMAKE_BUILD_MODE STREQUAL "Debug") +IF(${CMAKE_BUILD_TYPE} STREQUAL "Debug") MESSAGE("Building in Debug mode, resulting programs will be SLOW") ADD_DEFINITIONS(-DDEBUG) -ENDIF(CMAKE_BUILD_MODE STREQUAL "Debug") + IF(UNIX) + ADD_DEFINITIONS(-Wall) + ENDIF(UNIX) +ENDIF(${CMAKE_BUILD_TYPE} STREQUAL "Debug") #IF(UNIX) # SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -Wall" CACHE) @@ -110,19 +99,34 @@ # backward compatibility SET(INSTALL_XRC_DIR xrc) SET(INSTALL_LOCALE_DIR locale) -ELSEIF(APPLE) - MESSAGE("WARNING: installation for OSX not yet supported") ENDIF(UNIX) + +#This namespace workaround is not needed for CMake >= 2.5.x +IF (APPLE) + ## Add needed Compiler and Linker flags for OSX + IF (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) + SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flat_namespace -undefined suppress" ) + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flat_namespace -undefined suppress" ) + SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flat_namespace -undefined suppress" ) + SET (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -flat_namespace -undefined suppress" ) + SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flat_namespace -undefined suppress" ) + ENDIF (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) +ENDIF (APPLE) + # create config.h file configure_file(src/hugin_config.h.in.cmake ${CMAKE_BINARY_DIR}/src/hugin_config.h) + +IF(SHARED_INTERNAL_LIBS) +ELSE(SHARED_INTERNAL_LIBS) +ADD_DEFINITIONS(-DVIGRA_STATIC_LIB) +ENDIF(SHARED_INTERNAL_LIBS) + # setup some common compilation flags INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) -INCLUDE_DIRECTORIES(${PANO_INCLUDE_DIRS}) - LINK_DIRECTORIES( ${VIPSCC_LIBRARY_DIRS} ) INCLUDE_DIRECTORIES( ${VIPSCC_INCLUDE_DIRS} ) Modified: hugin/branches/ippei/src/CMakeLists.txt =================================================================== --- hugin/branches/ippei/src/CMakeLists.txt 2007-10-02 14:55:28 UTC (rev 2427) +++ hugin/branches/ippei/src/CMakeLists.txt 2007-10-14 21:25:11 UTC (rev 2428) @@ -6,7 +6,7 @@ # define common sets of libraries, used by different subdirectories set(common_libs huginjhead huginbase - boost_thread ${PANO_LIBRARIES} huginlevmar) + boost_thread ${PANO13_LIBRARIES} huginlevmar) set(image_libs huginvigraimpex ${JPEG_LIBRARIES} ${TIFF_LIBRARIES} ${PNG_LIBRARIES} ${OPENEXR_LIBRARIES}) Modified: hugin/branches/ippei/src/hugin_config.h.in.cmake =================================================================== --- hugin/branches/ippei/src/hugin_config.h.in.cmake 2007-10-02 14:55:28 UTC (rev 2427) +++ hugin/branches/ippei/src/hugin_config.h.in.cmake 2007-10-14 21:25:11 UTC (rev 2428) @@ -31,6 +31,12 @@ #define HasTIFF 1 #endif +/* Define if you have OpenEXR library */ +#cmakedefine OPENEXR_FOUND 1 +#ifdef OPENEXR_FOUND +#define HasEXR 1 +#endif + /* Define if you have Panotools library (pano13) */ #cmakedefine TLALLI_FOUND 1 #cmakedefine PANO13_FOUND 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2007-10-14 21:55:30
|
Revision: 2441 http://hugin.svn.sourceforge.net/hugin/?rev=2441&view=rev Author: dangelo Date: 2007-10-14 14:55:28 -0700 (Sun, 14 Oct 2007) Log Message: ----------- added option to render only a subset of the full panorama image. Crop tool in preview window still missing though. Modified Paths: -------------- hugin/branches/ippei/doc/nona.txt hugin/branches/ippei/src/hugin1/hugin/ImageCache.cpp hugin/branches/ippei/src/hugin1/hugin/PanoPanel.cpp hugin/branches/ippei/src/hugin1/hugin/PanoPanel.h hugin/branches/ippei/src/hugin1/hugin/PreviewPanel.cpp hugin/branches/ippei/src/hugin1/hugin/PreviewPanel.h hugin/branches/ippei/src/hugin1/hugin/xrc/pano_panel.xrc hugin/branches/ippei/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp hugin/branches/ippei/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.h hugin/branches/ippei/src/hugin_base/huginapp/CachedImageRemapper.cpp hugin/branches/ippei/src/hugin_base/huginapp/CachedImageRemapper.h hugin/branches/ippei/src/hugin_base/huginapp/ImageCache.h hugin/branches/ippei/src/hugin_base/nona/ImageRemapper.h hugin/branches/ippei/src/hugin_base/nona/RemappedPanoImage.h hugin/branches/ippei/src/hugin_base/nona/Stitcher.cpp hugin/branches/ippei/src/hugin_base/nona/Stitcher.h hugin/branches/ippei/src/hugin_base/panodata/PanoImage.h hugin/branches/ippei/src/hugin_base/panodata/PanoramaOptions.cpp hugin/branches/ippei/src/hugin_base/panodata/PanoramaOptions.h Modified: hugin/branches/ippei/doc/nona.txt =================================================================== --- hugin/branches/ippei/doc/nona.txt 2007-10-14 21:52:50 UTC (rev 2440) +++ hugin/branches/ippei/doc/nona.txt 2007-10-14 21:55:28 UTC (rev 2441) @@ -59,6 +59,10 @@ # FLOAT - 32 bit floating point # By default the bit depth of the input images is use. # +# S100,600,100,800 Selection(left,right,top,bottom), Only pixels inside the rectangle +# will be rendered. Images that do not contain pixels in this area +# are not rendered/created. +# # The 'i' lines describe input images (nona also accepts 'o' line image descriptions) Modified: hugin/branches/ippei/src/hugin1/hugin/ImageCache.cpp =================================================================== --- hugin/branches/ippei/src/hugin1/hugin/ImageCache.cpp 2007-10-14 21:52:50 UTC (rev 2440) +++ hugin/branches/ippei/src/hugin1/hugin/ImageCache.cpp 2007-10-14 21:55:28 UTC (rev 2441) @@ -956,6 +956,9 @@ } progress.pushTask(ProgressTask("remapping", "", 0)); + // compute the bounding output rectangle here! + vigra::Rect2D outROI = estimateOutputROI(pano, opts, imgNr); + if (e->imageFloat->width()) { // remap image remapImage(*(e->imageFloat), @@ -963,6 +966,7 @@ srcFlat, srcPanoImg, opts, + outROI, *remapped, progress); } else if (e->image16->width()) { @@ -972,6 +976,7 @@ srcFlat, srcPanoImg, opts, + outROI, *remapped, progress); } else { @@ -980,6 +985,7 @@ srcFlat, srcPanoImg, opts, + outROI, *remapped, progress); } Modified: hugin/branches/ippei/src/hugin1/hugin/PanoPanel.cpp =================================================================== --- hugin/branches/ippei/src/hugin1/hugin/PanoPanel.cpp 2007-10-14 21:52:50 UTC (rev 2440) +++ hugin/branches/ippei/src/hugin1/hugin/PanoPanel.cpp 2007-10-14 21:55:28 UTC (rev 2441) @@ -75,6 +75,10 @@ EVT_BUTTON ( XRCID("pano_button_calc_fov"), PanoPanel::DoCalcFOV) EVT_TEXT_ENTER ( XRCID("pano_val_width"),PanoPanel::WidthChanged ) EVT_TEXT_ENTER ( XRCID("pano_val_height"),PanoPanel::HeightChanged ) + EVT_TEXT_ENTER ( XRCID("pano_val_roi_top"),PanoPanel::ROIChanged ) + EVT_TEXT_ENTER ( XRCID("pano_val_roi_bottom"),PanoPanel::ROIChanged ) + EVT_TEXT_ENTER ( XRCID("pano_val_roi_left"),PanoPanel::ROIChanged ) + EVT_TEXT_ENTER ( XRCID("pano_val_roi_right"),PanoPanel::ROIChanged ) EVT_BUTTON ( XRCID("pano_button_opt_width"), PanoPanel::DoCalcOptimalWidth) EVT_BUTTON ( XRCID("pano_button_stitch"),PanoPanel::OnDoStitch ) @@ -160,6 +164,22 @@ DEBUG_ASSERT(m_HeightTxt); m_HeightTxt->PushEventHandler(new TextKillFocusHandler(this)); + m_ROILeftTxt = XRCCTRL(*this, "pano_val_roi_left", wxTextCtrl); + DEBUG_ASSERT(m_ROILeftTxt); + m_ROILeftTxt->PushEventHandler(new TextKillFocusHandler(this)); + + m_ROIRightTxt = XRCCTRL(*this, "pano_val_roi_right", wxTextCtrl); + DEBUG_ASSERT(m_ROIRightTxt); + m_ROIRightTxt->PushEventHandler(new TextKillFocusHandler(this)); + + m_ROITopTxt = XRCCTRL(*this, "pano_val_roi_top", wxTextCtrl); + DEBUG_ASSERT(m_ROITopTxt); + m_ROITopTxt->PushEventHandler(new TextKillFocusHandler(this)); + + m_ROIBottomTxt = XRCCTRL(*this, "pano_val_roi_bottom", wxTextCtrl); + DEBUG_ASSERT(m_ROIBottomTxt); + m_ROIBottomTxt->PushEventHandler(new TextKillFocusHandler(this)); + m_RemapperChoice = XRCCTRL(*this, "pano_choice_remapper", wxChoice); DEBUG_ASSERT(m_RemapperChoice); m_BlenderChoice = XRCCTRL(*this, "pano_choice_blender", wxChoice); @@ -211,6 +231,10 @@ m_HFOVText->PopEventHandler(true); m_VFOVText->PopEventHandler(true); m_WidthTxt->PopEventHandler(true); + m_ROILeftTxt->PopEventHandler(true); + m_ROIRightTxt->PopEventHandler(true); + m_ROITopTxt->PopEventHandler(true); + m_ROIBottomTxt->PopEventHandler(true); pano.removeObserver(this); DEBUG_TRACE("dtor end"); } @@ -268,6 +292,11 @@ m_WidthTxt->SetValue(wxString::Format(wxT("%d"), opt.getWidth())); m_HeightTxt->SetValue(wxString::Format(wxT("%d"), opt.getHeight())); + m_ROILeftTxt->SetValue(wxString::Format(wxT("%d"), opt.getROI().left() )); + m_ROIRightTxt->SetValue(wxString::Format(wxT("%d"), opt.getROI().right() )); + m_ROITopTxt->SetValue(wxString::Format(wxT("%d"), opt.getROI().top() )); + m_ROIBottomTxt->SetValue(wxString::Format(wxT("%d"), opt.getROI().bottom() )); + // output types XRCCTRL(*this, "pano_cb_ldr_output_blended", wxCheckBox)->SetValue(opt.outputLDRBlended); XRCCTRL(*this, "pano_cb_ldr_output_layers", wxCheckBox)->SetValue(opt.outputLDRLayers); @@ -414,7 +443,34 @@ } } +void PanoPanel::ROIChanged ( wxCommandEvent & e ) +{ + if (updatesDisabled) return; + PanoramaOptions opt = pano.getOptions(); + long left, right, top, bottom; + if (!m_ROITopTxt->GetValue().ToLong(&top)) { + wxLogError(_("Top needs to be an integer bigger than 0")); + return; + } + if (!m_ROILeftTxt->GetValue().ToLong(&left)) { + wxLogError(_("left needs to be an integer bigger than 0")); + return; + } + if (!m_ROIRightTxt->GetValue().ToLong(&right)) { + wxLogError(_("right needs to be an integer bigger than 0")); + return; + } + if (!m_ROIBottomTxt->GetValue().ToLong(&bottom)) { + wxLogError(_("bottom needs to be an integer bigger than 0")); + return; + } + opt.setROI(vigra::Rect2D(left, top, right, bottom)); + GlobalCmdHist::getInstance().addCommand( + new PT::SetPanoOptionsCmd( pano, opt ) + ); +} + void PanoPanel::EnableControls(bool enable) { // m_HFOVSpin->Enable(enable); @@ -551,7 +607,7 @@ // cd to project directory wxString oldCWD = wxFileName::GetCwd(); wxFileName::SetCwd(wxFileName(filename).GetPath()); - wxString command = terminal + wxString(wxT("make -f ")) + wxQuoteString(filename + wxT(".mk")) + wxString(wxT(" all clean || read dummy")); + wxString command = terminal + wxString(wxT("\"make -f ")) + wxQuoteString(filename + wxT(".mk")) + wxString(wxT(" all clean || read dummy\"")); // execute commands.. cout << "Executing stitching command: " << command.mb_str() << endl; wxExecute(command); Modified: hugin/branches/ippei/src/hugin1/hugin/PanoPanel.h =================================================================== --- hugin/branches/ippei/src/hugin1/hugin/PanoPanel.h 2007-10-14 21:52:50 UTC (rev 2440) +++ hugin/branches/ippei/src/hugin1/hugin/PanoPanel.h 2007-10-14 21:55:28 UTC (rev 2441) @@ -111,6 +111,7 @@ void WidthChanged(wxCommandEvent & e); void HeightChanged(wxCommandEvent & e); + void ROIChanged(wxCommandEvent & e); // TODO remove // void DoPreview(wxCommandEvent & e); @@ -144,6 +145,10 @@ wxTextCtrl * m_WidthTxt; wxTextCtrl * m_HeightTxt; + wxTextCtrl * m_ROILeftTxt; + wxTextCtrl * m_ROIRightTxt; + wxTextCtrl * m_ROITopTxt; + wxTextCtrl * m_ROIBottomTxt; wxChoice * m_RemapperChoice; wxChoice * m_BlenderChoice; wxButton * m_StitchButton; Modified: hugin/branches/ippei/src/hugin1/hugin/PreviewPanel.cpp =================================================================== --- hugin/branches/ippei/src/hugin1/hugin/PreviewPanel.cpp 2007-10-14 21:52:50 UTC (rev 2440) +++ hugin/branches/ippei/src/hugin1/hugin/PreviewPanel.cpp 2007-10-14 21:55:28 UTC (rev 2441) @@ -49,7 +49,7 @@ using namespace std; using namespace vigra; using namespace vigra_ext; -using namespace utils; +using namespace hugin_utils; typedef RGBValue<unsigned char> BRGBValue; @@ -561,6 +561,22 @@ offsetX + w/2, offsetY + h); dc.DrawLine(offsetX, offsetY + h/2, offsetX + w, offsetY+ h/2); + + // draw ROI + Size2D panoSize = pano.getOptions().getSize(); + Rect2D panoROI = pano.getOptions().getROI(); + if (panoROI != vigra::Rect2D(panoSize)) { + // draw roi + double scale = min(w/(float)panoSize.x, h/(float)panoSize.y); + dc.DrawLine(roundi(panoROI.left()*scale),roundi(panoROI.top()*scale), + roundi(panoROI.right()*scale),roundi(panoROI.top()*scale)); + dc.DrawLine(roundi(panoROI.right()*scale),roundi(panoROI.top()*scale), + roundi(panoROI.right()*scale),roundi(panoROI.bottom()*scale)); + dc.DrawLine(roundi(panoROI.right()*scale),roundi(panoROI.bottom()*scale), + roundi(panoROI.left()*scale),roundi(panoROI.bottom()*scale)); + dc.DrawLine(roundi(panoROI.left()*scale),roundi(panoROI.bottom()*scale), + roundi(panoROI.left()*scale),roundi(panoROI.top()*scale)); + } } void PreviewPanel::OnDraw(wxPaintEvent & event) Modified: hugin/branches/ippei/src/hugin1/hugin/PreviewPanel.h =================================================================== --- hugin/branches/ippei/src/hugin1/hugin/PreviewPanel.h 2007-10-14 21:52:50 UTC (rev 2440) +++ hugin/branches/ippei/src/hugin1/hugin/PreviewPanel.h 2007-10-14 21:55:28 UTC (rev 2441) @@ -84,7 +84,7 @@ void mousePressLMBEvent(wxMouseEvent & e); void OnUpdatePreview(wxCommandEvent & e); - void DrawOutline(const std::vector<FDiff2D> & points, wxDC & dc, int offX, int offY); + void DrawOutline(const std::vector<hugin_utils::FDiff2D> & points, wxDC & dc, int offX, int offY); void mouse2erect(int xm, int ym, double &xd, double & yd); Modified: hugin/branches/ippei/src/hugin1/hugin/xrc/pano_panel.xrc =================================================================== --- hugin/branches/ippei/src/hugin1/hugin/xrc/pano_panel.xrc 2007-10-14 21:52:50 UTC (rev 2440) +++ hugin/branches/ippei/src/hugin1/hugin/xrc/pano_panel.xrc 2007-10-14 21:55:28 UTC (rev 2441) @@ -99,7 +99,7 @@ </object> <object class="sizeritem"> <object class="wxStaticText"> - <label>Panorama Image Size</label> + <label>Panorama Canvas Size</label> <font> <style platform="mac">normal</style> <family platform="mac">swiss</family> @@ -155,7 +155,7 @@ <hgap>6</hgap> <object class="sizeritem"> <object class="wxStaticText"> - <label>Output</label> + <label>Crop</label> <font> <style platform="mac">normal</style> <family platform="mac">swiss</family> @@ -164,24 +164,121 @@ </font> </object> <flag>wxTOP</flag> - <border>0</border> + <border>6</border> <cellpos>4,0</cellpos> <cellspan>0,4</cellspan> </object> <object class="sizeritem"> + <object class="wxBoxSizer"> + <orient>wxHORIZONTAL</orient> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>left:</label> + </object> + <flag>wxLEFT|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + <border>6</border> + <cellpos>3,0</cellpos> + </object> + <object class="sizeritem"> + <object class="wxTextCtrl" name="pano_val_roi_left"> + <size>60,-1</size> + <style>wxTE_PROCESS_ENTER</style> + </object> + <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> + <cellpos>3,1</cellpos> + </object> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>top:</label> + <style>wxALIGN_RIGHT</style> + </object> + <flag>wxLEFT|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + <cellpos>3,2</cellpos> + <border>6</border> + </object> + <object class="sizeritem"> + <object class="wxTextCtrl" name="pano_val_roi_top"> + <size>60,-1</size> + <style>wxTE_PROCESS_ENTER</style> + </object> + <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> + <cellpos>3,3</cellpos> + </object> + </object> + <flag>wxLEFT</flag> + <border>6</border> + <cellpos>5,0</cellpos> + <cellspan>0,2</cellspan> + </object> + <object class="sizeritem"> + <object class="wxBoxSizer"> + <orient>wxHORIZONTAL</orient> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>right:</label> + <style>wxALIGN_RIGHT</style> + </object> + <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + <cellpos>3,2</cellpos> + </object> + <object class="sizeritem"> + <object class="wxTextCtrl" name="pano_val_roi_right"> + <size>60,-1</size> + <style>wxTE_PROCESS_ENTER</style> + </object> + <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> + <cellpos>3,3</cellpos> + </object> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>bottom:</label> + <style>wxALIGN_RIGHT</style> + </object> + <flag>wxLEFT|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> + <cellpos>3,2</cellpos> + <border>6</border> + </object> + <object class="sizeritem"> + <object class="wxTextCtrl" name="pano_val_roi_bottom"> + <size>60,-1</size> + <style>wxTE_PROCESS_ENTER</style> + </object> + <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag> + <cellpos>3,3</cellpos> + </object> + </object> + <cellpos>5,2</cellpos> + <cellspan>0,3</cellspan> + </object> + <object class="sizeritem"> + <object class="wxStaticText"> + <label>Output</label> + <font> + <style platform="mac">normal</style> + <family platform="mac">swiss</family> + <weight>bold</weight> + <size platform="mac">12</size> + </font> + </object> + <flag>wxTOP</flag> + <border>6</border> + <cellpos>6,0</cellpos> + <cellspan>0,4</cellspan> + </object> + <object class="sizeritem"> <object class="wxStaticText" name="pano_rb_ldr_enabled"> <label>LDR</label> </object> <flag>wxLEFT</flag> <border>6</border> - <cellpos>5,0</cellpos> + <cellpos>7,0</cellpos> <cellspan>0,2</cellspan> </object> <object class="sizeritem"> <object class="wxStaticText" name="pano_rb_hdr_enabled"> <label>HDR</label> </object> - <cellpos>5,2</cellpos> + <cellpos>7,2</cellpos> <cellspan>0,2</cellspan> </object> <object class="sizeritem"> @@ -205,7 +302,7 @@ </object> <flag>wxLEFT</flag> <border>12</border> - <cellpos>6,0</cellpos> + <cellpos>8,0</cellpos> <cellspan>0,2</cellspan> </object> <object class="sizeritem"> @@ -229,7 +326,7 @@ </object> <flag>wxLEFT</flag> <border>12</border> - <cellpos>6,2</cellpos> + <cellpos>8,2</cellpos> <cellspan>0,3</cellspan> </object> </object> Modified: hugin/branches/ippei/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2007-10-14 21:52:50 UTC (rev 2440) +++ hugin/branches/ippei/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.cpp 2007-10-14 21:55:28 UTC (rev 2441) @@ -1,5 +1,5 @@ // -*- c-basic-offset: 4 -*- -/** @file utils.h +/** @file PanoramaMakefileExport.h * * @author Pablo d'Angelo <pab...@we...> * @@ -28,484 +28,501 @@ #include <iomanip> #include <panodata/PanoramaData.h> #include <hugin_utils/utils.h> +#include <algorithms/nona/ComputeImageROI.h> - namespace HuginBase { - using namespace std; - using namespace hugin_utils; +using namespace std; +using namespace hugin_utils; +using namespace vigra; + + +// should be moved somewhere else (will be after GSOC anyway) +vector<UIntSet> getHDRStacks(const PanoramaData & pano, UIntSet allImgs) +{ + vector<UIntSet> result; + if(pano.getNrOfImages() == 0) return result; + UIntSet stack; + + do { + unsigned srcImg = *(allImgs.begin()); + stack.insert(srcImg); + allImgs.erase(srcImg); + + // find all images that have a suitable overlap. + SrcPanoImage simg = pano.getSrcImage(srcImg); + double maxShift = simg.getHFOV() / 10.0; + for (UIntSet::iterator it = allImgs.begin(); it != allImgs.end(); ) { + unsigned srcImg2 = *it; + it++; + SrcPanoImage simg2 = pano.getSrcImage(srcImg2); + if ( fabs(simg.getYaw() - simg2.getYaw()) < maxShift + && fabs(simg.getPitch() - simg2.getPitch()) < maxShift ) + { + stack.insert(srcImg2); + allImgs.erase(srcImg2); + } + } + result.push_back(stack); + stack.clear(); + } while (allImgs.size() > 0); + return result; +} - // should be moved somewhere else (will be after GSOC anyway) - vector<UIntSet> getHDRStacks(const PanoramaData & pano, UIntSet allImgs) - { - vector<UIntSet> result; - if(pano.getNrOfImages() == 0) return result; - UIntSet stack; - - do { - unsigned srcImg = *(allImgs.begin()); - stack.insert(srcImg); - allImgs.erase(srcImg); - - // find all images that have a suitable overlap. - SrcPanoImage simg = pano.getSrcImage(srcImg); - double maxShift = simg.getHFOV() / 10.0; - for (UIntSet::iterator it = allImgs.begin(); it != allImgs.end(); ) { - unsigned srcImg2 = *it; - it++; - SrcPanoImage simg2 = pano.getSrcImage(srcImg2); - if ( fabs(simg.getYaw() - simg2.getYaw()) < maxShift - && fabs(simg.getPitch() - simg2.getPitch()) < maxShift ) - { - stack.insert(srcImg2); - allImgs.erase(srcImg2); - } +// should be moved somewhere else (will be after GSOC anyway) +vector<UIntSet> getExposureLayers(const PanoramaData & pano, UIntSet allImgs) +{ + vector<UIntSet> result; + if(pano.getNrOfImages() == 0) return result; + UIntSet stack; + + do { + unsigned srcImg = *(allImgs.begin()); + stack.insert(srcImg); + allImgs.erase(srcImg); + + // find all images that have a suitable overlap. + SrcPanoImage simg = pano.getSrcImage(srcImg); + double maxEVDiff = 0.2; + for (UIntSet::iterator it = allImgs.begin(); it != allImgs.end(); ) { + unsigned srcImg2 = *it; + it++; + SrcPanoImage simg2 = pano.getSrcImage(srcImg2); + if ( fabs(simg.getExposureValue() - simg2.getExposureValue()) < maxEVDiff ) + { + stack.insert(srcImg2); + allImgs.erase(srcImg2); } - result.push_back(stack); - stack.clear(); - } while (allImgs.size() > 0); - - return result; + } + result.push_back(stack); + stack.clear(); + } while (allImgs.size() > 0); + + return result; +} + + +void PanoramaMakefileExport::createMakefile(const PanoramaData& pano, + const UIntSet& rimages, + const std::string& ptofile, + const std::string& outputPrefix, + const PTPrograms& progs, + const std::string& includePath, + std::ostream& o) +{ + PanoramaOptions opts = pano.getOptions(); +#ifdef __unix__ + // set numeric locale to C, for correct number output + char * t = setlocale(LC_NUMERIC,NULL); + char * old_locale = (char*) malloc(strlen(t)+1); + strcpy(old_locale, t); + setlocale(LC_NUMERIC,"C"); +#endif + + // output only images in current ROI + UIntSet images; + for (UIntSet::const_iterator it = rimages.begin(); it != rimages.end(); ++it) + { + Rect2D roi = estimateOutputROI(pano, opts, *it); + if (! (roi.isEmpty())) { + images.insert(*it); + } + } + + o << "# makefile for panorama stitching, created by hugin " << endl + << endl; + + o << endl + << endl + << "# Tool configuration" << endl + << "NONA=" << quoteString(progs.nona) << endl + << "PTSTITCHER=" << quoteString(progs.PTStitcher) << endl + << "PTMENDER=" << quoteString(progs.PTmender) << endl + << "PTBLENDER=" << quoteString(progs.PTblender) << endl + << "PTMASKER=" << quoteString(progs.PTmasker) << endl + << "PTROLLER=" << quoteString(progs.PTroller) << endl + << "ENBLEND=" << quoteString(progs.enblend) << endl + << "SMARTBLEND=" << quoteString(progs.smartblend) << endl + << "HDRMERGE=" << "hugin_hdrmerge" << endl + << "RM=rm" << endl + << endl + << "# options for the programs" << endl << endl; + + + o << "ENBLEND_OPTS=" << progs.enblend_opts; + if (opts.getHFOV() == 360.0) { + // blend over the border + o << " -w"; } - - // should be moved somewhere else (will be after GSOC anyway) - vector<UIntSet> getExposureLayers(const PanoramaData & pano, UIntSet allImgs) - { - vector<UIntSet> result; - if(pano.getNrOfImages() == 0) return result; - UIntSet stack; - - do { - unsigned srcImg = *(allImgs.begin()); - stack.insert(srcImg); - allImgs.erase(srcImg); - - // find all images that have a suitable overlap. - SrcPanoImage simg = pano.getSrcImage(srcImg); - double maxEVDiff = 0.2; - for (UIntSet::iterator it = allImgs.begin(); it != allImgs.end(); ) { - unsigned srcImg2 = *it; - it++; - SrcPanoImage simg2 = pano.getSrcImage(srcImg2); - if ( fabs(simg.getExposureValue() - simg2.getExposureValue()) < maxEVDiff ) - { - stack.insert(srcImg2); - allImgs.erase(srcImg2); - } - } - result.push_back(stack); - stack.clear(); - } while (allImgs.size() > 0); - - return result; + if (opts.tiffCompression == "LZW") { + o << " -z"; } - - + vigra::Rect2D roi = opts.getROI(); + if (roi.top() != 0 || roi.left() != 0 ) { + o << " -f" << roi.width() << "x" << roi.height() << "+" << roi.left() << "+" << roi.top(); + } else { + o << " -f" << roi.width() << "x" << roi.height(); + } - void PanoramaMakefileExport::createMakefile(const PanoramaData& pano, - const UIntSet& images, - const std::string& ptofile, - const std::string& outputPrefix, - const PTPrograms& progs, - const std::string& includePath, - std::ostream& o) - { - PanoramaOptions opts = pano.getOptions(); - #ifdef __unix__ - // set numeric locale to C, for correct number output - char * t = setlocale(LC_NUMERIC,NULL); - char * old_locale = (char*) malloc(strlen(t)+1); - strcpy(old_locale, t); - setlocale(LC_NUMERIC,"C"); - #endif - o << "# makefile for panorama stitching, created by hugin " << endl - << endl; + o << endl; - o << endl - << endl - << "# Tool configuration" << endl - << "NONA=" << quoteString(progs.nona) << endl - << "PTSTITCHER=" << quoteString(progs.PTStitcher) << endl - << "PTMENDER=" << quoteString(progs.PTmender) << endl - << "PTBLENDER=" << quoteString(progs.PTblender) << endl - << "PTMASKER=" << quoteString(progs.PTmasker) << endl - << "PTROLLER=" << quoteString(progs.PTroller) << endl - << "ENBLEND=" << quoteString(progs.enblend) << endl - << "SMARTBLEND=" << quoteString(progs.smartblend) << endl - << "HDRMERGE=" << "hugin_hdrmerge" << endl - << "RM=rm" << endl - << endl - << "# options for the programs" << endl << endl; + string hdrExt(".exr"); + string ldrExt(".tif"); + string ldrRemappedExt(".tif"); + string ldrRemappedMode("TIFF_m"); + string hdrRemappedExt = ".exr"; + string hdrRemappedMode = "EXR_m"; + // set a suitable target file. + std::string output = outputPrefix; - o << "ENBLEND_OPTS=" << progs.enblend_opts; - if (opts.getHFOV() == 360.0) { - // blend over the border - o << " -w"; +// bool externalBlender = false; +// bool remapToMultiple = false; + + /* + if (opts.blendMode == PT::PanoramaOptions::NO_BLEND) { + // just remapping or simple blending + if (opts.outputFormat == PT::PanoramaOptions::TIFF_m) { + remapToMultiple = true; } - if (opts.tiffCompression == "LZW") { - o << " -z"; - } - o << " -f" << opts.getWidth() << "x" << opts.getHeight() << endl; - o << endl; + } else { + externalBlender = true; + remapToMultiple = true; + } +*/ + o << "# the output panorama" << endl + << "LDR_REMAPPED_PREFIX=" << quoteString(output) << endl + << "HDR_STACK_REMAPPED_PREFIX=" << quoteString(output + "_hdr_") << endl + << "LDR_EXPOSURE_REMAPPED_PREFIX=" << quoteString(output + "_exposure_layers_") << endl + << "PROJECT_FILE=" << quoteString(ptofile) << endl + << "LDR_BLENDED=" << quoteString(output + ldrExt) << endl + << "HDR_BLENDED=" << quoteString(output + "_hdr" + hdrExt) << endl + << endl + << "# Input images" << endl + << "INPUT_IMAGES="; - string hdrExt(".exr"); - string ldrExt(".tif"); - string ldrRemappedExt(".tif"); - string ldrRemappedMode("TIFF_m"); - string hdrRemappedExt = ".exr"; - string hdrRemappedMode = "EXR_m"; + for (unsigned int i=0; i < pano.getNrOfImages(); i++) { + o << quoteString(pano.getImage(i).getFilename()); + if (i+1 != pano.getNrOfImages()) o << "\\" << endl; + } - // set a suitable target file. - std::string output = outputPrefix; + vector<string> remappedImages; + o << endl + << endl + << "# remapped images" << endl + << "LDR_LAYERS="; + for (UIntSet::iterator it = images.begin(); it != images.end();) { + std::ostringstream fns; + fns << output << std::setfill('0') << std::setw(4) << *it << ldrRemappedExt; + remappedImages.push_back(fns.str()); + o << quoteString(fns.str()); + ++it; + if (it != images.end()) o << "\\" << endl; + } - // bool externalBlender = false; - // bool remapToMultiple = false; + vector<string> remappedHDRImages; + o << endl + << endl + << "# remapped images (hdr)" << endl + << "HDR_LAYERS="; + for (UIntSet::iterator it = images.begin(); it != images.end();) { + std::ostringstream fns; + fns << output << "_hdr_" << std::setfill('0') << std::setw(4) << *it << hdrRemappedExt; + remappedHDRImages.push_back(fns.str()); + o << quoteString(fns.str()); + ++it; + if (it != images.end()) o << "\\" << endl; + } - /* - if (opts.blendMode == PT::PanoramaOptions::NO_BLEND) { - // just remapping or simple blending - if (opts.outputFormat == PT::PanoramaOptions::TIFF_m) { - remapToMultiple = true; - } - } else { - externalBlender = true; - remapToMultiple = true; - } - */ - o << "# the output panorama" << endl - << "LDR_REMAPPED_PREFIX=" << quoteString(output) << endl - << "HDR_STACK_REMAPPED_PREFIX=" << quoteString(output + "_hdr_") << endl - << "LDR_EXPOSURE_REMAPPED_PREFIX=" << quoteString(output + "_exposure_layers_") << endl - << "PROJECT_FILE=" << quoteString(ptofile) << endl - << "LDR_BLENDED=" << quoteString(output + ldrExt) << endl - << "HDR_BLENDED=" << quoteString(output + "_hdr" + hdrExt) << endl - << endl - << "# Input images" << endl - << "INPUT_IMAGES="; + o << endl + << endl + << "# remapped maxval images" << endl + << "HDR_LAYERS_WEIGHTS="; + for (UIntSet::iterator it = images.begin(); it != images.end();) { + std::ostringstream fns; + fns << output << "_hdr_" << std::setfill('0') << std::setw(4) << *it << "_gray.pgm"; + o << quoteString(fns.str()) << " "; + ++it; + if (it != images.end()) o << "\\" << endl; + } + o << endl; - for (unsigned int i=0; i < pano.getNrOfImages(); i++) { - o << quoteString(pano.getImage(i).getFilename()); - if (i+1 != pano.getNrOfImages()) o << "\\" << endl; - } - vector<string> remappedImages; - o << endl - << endl - << "# remapped images" << endl - << "LDR_LAYERS="; - for (UIntSet::iterator it = images.begin(); it != images.end();) { + vector<string> stackedImages; + vector<UIntSet> stacks = getHDRStacks(pano, images); + DEBUG_DEBUG( stacks.size() << " stacks found"); + o << endl + << "# stacked images" << endl + << "HDR_STACKS_NUMBERS = "; + for (unsigned i=0; i < stacks.size(); i++) + o << i << " "; + o << endl; + for (unsigned i=0; i < stacks.size(); i++) { + std::ostringstream fns; + fns << output << "_stack_hdr_" << std::setfill('0') << std::setw(4) << i << hdrRemappedExt; + stackedImages.push_back(fns.str()); + std::ostringstream stackedImgVar; + stackedImgVar << "HDR_STACK_" << i; + o << stackedImgVar.str() << " = " << quoteString(fns.str()) << endl; + o << stackedImgVar.str() << "_INPUT = "; + for (UIntSet::iterator it = stacks[i].begin(); it != stacks[i].end();) { std::ostringstream fns; - fns << output << std::setfill('0') << std::setw(4) << *it << ldrRemappedExt; - remappedImages.push_back(fns.str()); + fns << output << "_hdr_" << std::setfill('0') << std::setw(4) << *it << hdrRemappedExt; o << quoteString(fns.str()); ++it; - if (it != images.end()) o << "\\" << endl; + if (it != stacks[i].end()) o << "\\" << endl; } + o << endl << endl; + } + o << endl; + o << "HDR_STACKS = "; + for (unsigned i=0; i < stacks.size(); i++) + o << "$(HDR_STACK_" << i << ") "; + o << endl; - vector<string> remappedHDRImages; - o << endl - << endl - << "# remapped images (hdr)" << endl - << "HDR_LAYERS="; - for (UIntSet::iterator it = images.begin(); it != images.end();) { + // add support for exposure blending stuff... + vector<string> similarExposureRemappedImages; + vector<string> similarExposureImages; + vector<UIntSet> similarExposures = getExposureLayers(pano, images); + DEBUG_DEBUG( similarExposures.size() << " similar exposures found"); + o << endl + << endl + << "# number of image sets with similar exposure" << endl + << "LDR_EXPOSURE_EXPOSURE_LAYERS_NUMBERS = "; + for (unsigned i=0; i < similarExposures.size(); i++) + o << i << " "; + o << endl; + for (unsigned i=0; i < similarExposures.size(); i++) { + std::ostringstream fns; + fns << output << "_exposure_" << std::setfill('0') << std::setw(2) << i << ldrExt; + similarExposureImages.push_back(fns.str()); + string destImg = quoteString(fns.str()); + std::ostringstream expImgVar; + expImgVar << "LDR_EXPOSURE_LAYER_" << i; + o << expImgVar.str() << " = " << destImg << endl; + o << expImgVar.str() << "_INPUT = "; + double exposure=0; + for (UIntSet::iterator it = similarExposures[i].begin(); it != similarExposures[i].end();) { + exposure += pano.getSrcImage(*it).getExposureValue(); std::ostringstream fns; - fns << output << "_hdr_" << std::setfill('0') << std::setw(4) << *it << hdrRemappedExt; - remappedHDRImages.push_back(fns.str()); + fns << output << "_exposure_layers_" << std::setfill('0') << std::setw(4) << *it << ldrExt; + similarExposureRemappedImages.push_back(fns.str()); o << quoteString(fns.str()); ++it; - if (it != images.end()) o << "\\" << endl; + if (it != similarExposures[i].end()) o << "\\" << endl; } - - o << endl - << endl - << "# remapped maxval images" << endl - << "HDR_LAYERS_WEIGHTS="; - for (UIntSet::iterator it = images.begin(); it != images.end();) { + o << endl << endl; + o << expImgVar.str() << " = " << destImg << endl; + o << expImgVar.str() << "_INPUT_PTMENDER = "; + for (UIntSet::iterator it = similarExposures[i].begin(); it != similarExposures[i].end();) { std::ostringstream fns; - fns << output << "_hdr_" << std::setfill('0') << std::setw(4) << *it << "_gray.pgm"; - o << quoteString(fns.str()) << " "; + fns << output << std::setfill('0') << std::setw(4) << *it << ldrExt; + o << quoteString(fns.str()); ++it; - if (it != images.end()) o << "\\" << endl; + if (it != similarExposures[i].end()) o << "\\" << endl; } - o << endl; - - - vector<string> stackedImages; - vector<UIntSet> stacks = getHDRStacks(pano, images); - DEBUG_DEBUG( stacks.size() << " stacks found"); + // calculate output exposure value for this set. o << endl - << "# stacked images" << endl - << "HDR_STACKS_NUMBERS = "; - for (unsigned i=0; i < stacks.size(); i++) - o << i << " "; - o << endl; - for (unsigned i=0; i < stacks.size(); i++) { - std::ostringstream fns; - fns << output << "_stack_hdr_" << std::setfill('0') << std::setw(4) << i << hdrRemappedExt; - stackedImages.push_back(fns.str()); - std::ostringstream stackedImgVar; - stackedImgVar << "HDR_STACK_" << i; - o << stackedImgVar.str() << " = " << quoteString(fns.str()) << endl; - o << stackedImgVar.str() << "_INPUT = "; - for (UIntSet::iterator it = stacks[i].begin(); it != stacks[i].end();) { - std::ostringstream fns; - fns << output << "_hdr_" << std::setfill('0') << std::setw(4) << *it << hdrRemappedExt; - o << quoteString(fns.str()); - ++it; - if (it != stacks[i].end()) o << "\\" << endl; - } - o << endl << endl; - } - o << endl; - o << "HDR_STACKS = "; - for (unsigned i=0; i < stacks.size(); i++) - o << "$(HDR_STACK_" << i << ") "; - o << endl; + << "LDR_EXPOSURE_LAYER_" << i << "_EXPOSURE = " + << exposure / similarExposures[i].size() << endl; + } + o << endl; + o << "LDR_EXPOSURE_LAYERS = "; + for (unsigned i=0; i < similarExposures.size(); i++) + o << "$(LDR_EXPOSURE_LAYER_" << i << ") "; + o << endl; + o << "LDR_EXPOSURE_LAYERS_REMAPPED = "; + for (unsigned i=0; i < similarExposureRemappedImages.size(); i++) + { + o << quoteString(similarExposureRemappedImages[i]); + if (i+1 != similarExposureRemappedImages.size()) o << "\\" << endl; + } + o << endl << endl; - // add support for exposure blending stuff... - vector<string> similarExposureRemappedImages; - vector<string> similarExposureImages; - vector<UIntSet> similarExposures = getExposureLayers(pano, images); - DEBUG_DEBUG( similarExposures.size() << " similar exposures found"); - o << endl - << endl - << "# number of image sets with similar exposure" << endl - << "LDR_EXPOSURE_EXPOSURE_LAYERS_NUMBERS = "; - for (unsigned i=0; i < similarExposures.size(); i++) - o << i << " "; - o << endl; - for (unsigned i=0; i < similarExposures.size(); i++) { - std::ostringstream fns; - fns << output << "_exposure_" << std::setfill('0') << std::setw(2) << i << ldrExt; - similarExposureImages.push_back(fns.str()); - string destImg = quoteString(fns.str()); - std::ostringstream expImgVar; - expImgVar << "LDR_EXPOSURE_LAYER_" << i; - o << expImgVar.str() << " = " << destImg << endl; - o << expImgVar.str() << "_INPUT = "; - double exposure=0; - for (UIntSet::iterator it = similarExposures[i].begin(); it != similarExposures[i].end();) { - exposure += pano.getSrcImage(*it).getExposureValue(); - std::ostringstream fns; - fns << output << "_exposure_layers_" << std::setfill('0') << std::setw(4) << *it << ldrExt; - similarExposureRemappedImages.push_back(fns.str()); - o << quoteString(fns.str()); - ++it; - if (it != similarExposures[i].end()) o << "\\" << endl; - } - o << endl << endl; - o << expImgVar.str() << " = " << destImg << endl; - o << expImgVar.str() << "_INPUT_PTMENDER = "; - for (UIntSet::iterator it = similarExposures[i].begin(); it != similarExposures[i].end();) { - std::ostringstream fns; - fns << output << std::setfill('0') << std::setw(4) << *it << ldrExt; - o << quoteString(fns.str()); - ++it; - if (it != similarExposures[i].end()) o << "\\" << endl; - } - // calculate output exposure value for this set. - o << endl - << "LDR_EXPOSURE_LAYER_" << i << "_EXPOSURE = " - << exposure / similarExposures[i].size() << endl; - } - o << endl; - o << "LDR_EXPOSURE_LAYERS = "; - for (unsigned i=0; i < similarExposures.size(); i++) - o << "$(LDR_EXPOSURE_LAYER_" << i << ") "; - o << endl; - o << "LDR_EXPOSURE_LAYERS_REMAPPED = "; - for (unsigned i=0; i < similarExposureRemappedImages.size(); i++) - { - o << quoteString(similarExposureRemappedImages[i]); - if (i+1 != similarExposureRemappedImages.size()) o << "\\" << endl; - } - o << endl << endl; + // TODO: include custom makefile here + if (includePath.size() > 0) { + o << "include " << quoteString(includePath) << endl << endl; + } else { + // create rules for all possible targets. - // TODO: include custom makefile here - if (includePath.size() > 0) { - o << "include " << quoteString(includePath) << endl << endl; - } else { - // create rules for all possible targets. + std::string targets; + std::string cleanTargets; - std::string targets; - std::string cleanTargets; + // output all targets + if (opts.outputLDRBlended) + targets += "$(LDR_BLENDED) "; + else + cleanTargets += "$(LDR_BLENDED) "; - // output all targets - if (opts.outputLDRBlended) - targets += "$(LDR_BLENDED) "; - else - cleanTargets += "$(LDR_BLENDED) "; + if (opts.outputLDRLayers) + targets += "$(LDR_LAYERS) $(HDR_LAYERS_WEIGHTS)"; + else + cleanTargets += "$(LDR_LAYERS) $(HDR_LAYERS_WEIGHTS)"; - if (opts.outputLDRLayers) - targets += "$(LDR_LAYERS) $(HDR_LAYERS_WEIGHTS)"; - else - cleanTargets += "$(LDR_LAYERS) $(HDR_LAYERS_WEIGHTS)"; + if (opts.outputLDRExposureLayers) { + targets += "$(LDR_EXPOSURE_LAYERS) "; + cleanTargets += "$(LDR_EXPOSURE_LAYERS_REMAPPED) "; + } else + cleanTargets += "$(LDR_EXPOSURE_LAYERS) "; - if (opts.outputLDRExposureLayers) { - targets += "$(LDR_EXPOSURE_LAYERS) "; - cleanTargets += "$(LDR_EXPOSURE_LAYERS_REMAPPED) "; - } else - cleanTargets += "$(LDR_EXPOSURE_LAYERS) "; + if (opts.outputHDRBlended) + targets += "$(HDR_BLENDED) "; + else + cleanTargets += "$(HDR_BLENDED) "; - if (opts.outputHDRBlended) - targets += "$(HDR_BLENDED) "; - else - cleanTargets += "$(HDR_BLENDED) "; + if (opts.outputHDRLayers) + targets += "$(HDR_LAYERS) "; + else + cleanTargets += "$(HDR_LAYERS) "; - if (opts.outputHDRLayers) - targets += "$(HDR_LAYERS) "; - else - cleanTargets += "$(HDR_LAYERS) "; + if (opts.outputHDRStacks) + targets += "$(HDR_STACKS) "; + else + cleanTargets += "$(HDR_STACKS) "; - if (opts.outputHDRStacks) - targets += "$(HDR_STACKS) "; - else - cleanTargets += "$(HDR_STACKS) "; + // targets and clean rule. - // targets and clean rule. + o << "TEMP_FILES = " << cleanTargets << endl + << endl + << "all: " << targets << endl << endl + << "clean: " << endl + << "\t $(RM) $(TEMP_FILES)" << endl + << endl; - o << "TEMP_FILES = " << cleanTargets << endl - << endl - << "all: " << targets << endl << endl - << "clean: " << endl - << "\t $(RM) $(TEMP_FILES)" << endl - << endl; + // ============================== + // output rules for all targets. + // remapped LDR images for exposure stacks. + switch(opts.remapper) { + case PanoramaOptions::NONA: + // produce rules for remapping with nona: + { + o << "# Rules for ordinary TIFF_m output" << endl; + int i=0; + for (UIntSet::iterator it = images.begin(); + it != images.end(); ++it) + { + string destImg = quoteString(remappedImages[i]); + string srcImg = quoteString(pano.getImage(*it).getFilename()); + o << destImg << ": " << srcImg << " $(PROJECT_FILE)" << endl + << "\t$(NONA) -r ldr -m " << ldrRemappedMode << " -o $(LDR_REMAPPED_PREFIX) -i " << *it << " $(PROJECT_FILE)" << endl << endl; + i++; + } - // ============================== - // output rules for all targets. - // remapped LDR images for exposure stacks. - switch(opts.remapper) { - case PanoramaOptions::NONA: - // produce rules for remapping with nona: + o << "# Rules for merge to hdr output" << endl; + i=0; + for (UIntSet::iterator it = images.begin(); + it != images.end(); ++it) { - o << "# Rules for ordinary TIFF_m output" << endl; - int i=0; - for (UIntSet::iterator it = images.begin(); - it != images.end(); ++it) - { - string destImg = quoteString(remappedImages[i]); - string srcImg = quoteString(pano.getImage(*it).getFilename()); - o << destImg << ": " << srcImg << " $(PROJECT_FILE)" << endl - << "\t$(NONA) -r ldr -m " << ldrRemappedMode << " -o $(LDR_REMAPPED_PREFIX) -i " << *it << " $(PROJECT_FILE)" << endl << endl; - i++; - } + string destImg = quoteString(remappedHDRImages[i]); + string srcImg = quoteString(pano.getImage(*it).getFilename()); + o << destImg << ": " << srcImg << " $(PROJECT_FILE)" << endl + << "\t$(NONA) -r hdr -m " << hdrRemappedMode << " -o $(HDR_STACK_REMAPPED_PREFIX) -i " << *it << " $(PROJECT_FILE)" << endl << endl; + i++; + } - o << "# Rules for merge to hdr output" << endl; - i=0; - for (UIntSet::iterator it = images.begin(); - it != images.end(); ++it) + // rules for exposure sets. + o << "# Rules for exposure layer output" << endl; + int j=0; + for (unsigned i=0; i < similarExposures.size(); i++) { + for (UIntSet::iterator it = similarExposures[i].begin(); + it != similarExposures[i].end(); ++it) { - string destImg = quoteString(remappedHDRImages[i]); + string destImg = quoteString(similarExposureRemappedImages[j]); string srcImg = quoteString(pano.getImage(*it).getFilename()); o << destImg << ": " << srcImg << " $(PROJECT_FILE)" << endl - << "\t$(NONA) -r hdr -m " << hdrRemappedMode << " -o $(HDR_STACK_REMAPPED_PREFIX) -i " << *it << " $(PROJECT_FILE)" << endl << endl; - i++; + << "\t$(NONA) -r ldr -e $(LDR_EXPOSURE_LAYER_" << i << "_EXPOSURE) -m " + << ldrRemappedMode << " -o $(LDR_EXPOSURE_REMAPPED_PREFIX) -i " << *it + << " $(PROJECT_FILE)" << endl << endl; + j++; } - - // rules for exposure sets. - o << "# Rules for exposure layer output" << endl; - int j=0; - for (unsigned i=0; i < similarExposures.size(); i++) { - for (UIntSet::iterator it = similarExposures[i].begin(); - it != similarExposures[i].end(); ++it) - { - string destImg = quoteString(similarExposureRemappedImages[j]); - string srcImg = quoteString(pano.getImage(*it).getFilename()); - o << destImg << ": " << srcImg << " $(PROJECT_FILE)" << endl - << "\t$(NONA) -r ldr -e $(LDR_EXPOSURE_LAYER_" << i << "_EXPOSURE) -m " - << ldrRemappedMode << " -o $(LDR_EXPOSURE_REMAPPED_PREFIX) -i " << *it - << " $(PROJECT_FILE)" << endl << endl; - j++; - } - } } - break; - case PanoramaOptions::PTMENDER: - o << "$(LDR_LAYERS) : $(INPUT_IMAGES) $(PROJECT_FILE)" << endl - << "\t$(PTMENDER) -o $(LDR_REMAPPED_PREFIX) $(PROJECT_FILE)" << endl << endl; - break; - } + } + break; + case PanoramaOptions::PTMENDER: + o << "$(LDR_LAYERS) : $(INPUT_IMAGES) $(PROJECT_FILE)" << endl + << "\t$(PTMENDER) -o $(LDR_REMAPPED_PREFIX) $(PROJECT_FILE)" << endl << endl; + break; + } - // ==================================== - // output rules for HDR merging + // ==================================== + // output rules for HDR merging - // write rules for each HDR stack - // only output pixes that are defined in all input images - for (unsigned i=0; i < stacks.size(); i++) { - o << "$(HDR_STACK_" << i << ") : $(HDR_STACK_" << i << "_INPUT)" << endl - << "\t$(HDRMERGE) -m avg -c -o $(HDR_STACK_" << i << ") $(HDR_STACK_" << i << "_INPUT)" - << endl << endl; - } + // write rules for each HDR stack + // only output pixes that are defined in all input images + for (unsigned i=0; i < stacks.size(); i++) { + o << "$(HDR_STACK_" << i << ") : $(HDR_STACK_" << i << "_INPUT)" << endl + << "\t$(HDRMERGE) -m avg -c -o $(HDR_STACK_" << i << ") $(HDR_STACK_" << i << "_INPUT)" + << endl << endl; + } - switch(opts.blendMode) { - case PanoramaOptions::ENBLEND_BLEND: - // write rules for blending with enblend - o << "$(LDR_BLENDED) : $(LDR_LAYERS)" << endl; - o << "\t$(ENBLEND) $(ENBLEND_OPTS) -o $(LDR_BLENDED) $(LDR_LAYERS) " << endl << endl; + switch(opts.blendMode) { + case PanoramaOptions::ENBLEND_BLEND: + // write rules for blending with enblend + o << "$(LDR_BLENDED) : $(LDR_LAYERS)" << endl; + o << "\t$(ENBLEND) $(ENBLEND_OPTS) -o $(LDR_BLENDED) $(LDR_LAYERS) " << endl << endl; - o << "$(HDR_BLENDED) : $(HDR_STACKS)" << endl; - o << "\t$(ENBLEND) $(ENBLEND_OPTS) -o $(HDR_BLENDED) $(HDR_STACKS) " << endl << endl; + o << "$(HDR_BLENDED) : $(HDR_STACKS)" << endl; + o << "\t$(ENBLEND) $(ENBLEND_OPTS) -o $(HDR_BLENDED) $(HDR_STACKS) " << endl << endl; - // for LDR exposure blend planes - if (opts.remapper == PanoramaOptions::NONA) { - for (unsigned i=0; i < similarExposures.size(); i++) { - o << "$(LDR_EXPOSURE_LAYER_" << i <<") : $(LDR_EXPOSURE_LAYER_" << i << "_INPUT)" << endl - << "\t$(ENBLEND) $(ENBLEND_OPTS) -o $@ $^" << endl << endl; - } - } else { - for (unsigned i=0; i < similarExposures.size(); i++) { - o << "$(LDR_EXPOSURE_LAYER_" << i <<") : $(LDR_EXPOSURE_LAYER_" << i << "_INPUT_PTMENDER)" << endl - << "\t$(ENBLEND) $(ENBLEND_OPTS) -o $@ $^" << endl << endl; - } - } - break; - case PanoramaOptions::NO_BLEND: - // rules for non-blended HDR panoramas - o << "$(HDR_BLENDED) : $(HDR_LAYERS)" << endl; - o << "\t$(HDRMERGE) -m avg -o $@ $^" << endl << endl; - // TODO: output suitable PTroller rules - break; - case PanoramaOptions::PTBLENDER_BLEND: - o << "PTBLENDER_OPTS="; - switch (opts.colorCorrection) { - case PanoramaOptions::NONE: - break; - case PanoramaOptions::BRIGHTNESS_COLOR: - o << " -k " << opts.colorReferenceImage; - break; - case PanoramaOptions::BRIGHTNESS: - o << " -k " << opts.colorReferenceImage; - break; - case PanoramaOptions::COLOR: - o << " -k " << opts.colorReferenceImage; - break; + // for LDR exposure blend planes + if (opts.remapper == PanoramaOptions::NONA) { + for (unsigned i=0; i < similarExposures.size(); i++) { + o << "$(LDR_EXPOSURE_LAYER_" << i <<") : $(LDR_EXPOSURE_LAYER_" << i << "_INPUT)" << endl + << "\t$(ENBLEND) $(ENBLEND_OPTS) -o $@ $^" << endl << endl; } - o << endl; - // TODO: output PTBlender + PTmasker + PTroller rules - break; - case PanoramaOptions::SMARTBLEND_BLEND: - o << "SMARTBLEND_OPTS=" << progs.smartblend_opts; - if (opts.getHFOV() == 360.0) { - // blend over the border - o << " -w"; + } else { + for (unsigned i=0; i < similarExposures.size(); i++) { + o << "$(LDR_EXPOSURE_LAYER_" << i <<") : $(LDR_EXPOSURE_LAYER_" << i << "_INPUT_PTMENDER)" << endl + << "\t$(ENBLEND) $(ENBLEND_OPTS) -o $@ $^" << endl << endl; } - o << endl; - // TODO: build smartblend command line from given images. (requires additional program) - break; - default: - // TODO: - break; - } + } + break; + case PanoramaOptions::NO_BLEND: + // rules for non-blended HDR panoramas + o << "$(HDR_BLENDED) : $(HDR_LAYERS)" << endl; + o << "\t$(HDRMERGE) -m avg -o $@ $^" << endl << endl; + // TODO: output suitable PTroller rules + break; + case PanoramaOptions::PTBLENDER_BLEND: + o << "PTBLENDER_OPTS="; + switch (opts.colorCorrection) { + case PanoramaOptions::NONE: + break; + case PanoramaOptions::BRIGHTNESS_COLOR: + o << " -k " << opts.colorReferenceImage; + break; + case PanoramaOptions::BRIGHTNESS: + o << " -k " << opts.colorReferenceImage; + break; + case PanoramaOptions::COLOR: + o << " -k " << opts.colorReferenceImage; + break; + } + o << endl; + // TODO: output PTBlender + PTmasker + PTroller rules + break; + case PanoramaOptions::SMARTBLEND_BLEND: + o << "SMARTBLEND_OPTS=" << progs.smartblend_opts; + if (opts.getHFOV() == 360.0) { + // blend over the border + o << " -w"; + } + o << endl; + // TODO: build smartblend command line from given images. (requires additional program) + break; + default: + // TODO: + break; } + } - #ifdef __unix__ - // reset locale - setlocale(LC_NUMERIC,old_locale); - free(old_locale); - #endif +#ifdef __unix__ + // reset locale + setlocale(LC_NUMERIC,old_locale); + free(old_locale); +#endif - } +} } //namespace Modified: hugin/branches/ippei/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.h =================================================================== --- hugin/branches/ippei/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.h 2007-10-14 21:52:50 UTC (rev 2440) +++ hugin/branches/ippei/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefileExport.h 2007-10-14 21:55:28 UTC (rev 2441) @@ -26,7 +26,7 @@ #define _BASICALGORITHM_PANORAMAMAKEFILEEXPORT_H #include <algorithm/PanoramaAlgorithm.h> -#include <panodata/PanoramaData.h>> +#include <panodata/PanoramaData.h> #include <iostream> Modified: hugin/branches/ippei/src/hugin_base/huginapp/CachedImageRemapper.cpp =================================================================== --- hugin/branches/ippei/src/hugin_base/huginapp/CachedImageRemapper.cpp 2007-10-14 21:52:50 UTC (rev 2440) +++ hugin/branches/ippei/src/hugin_base/huginapp/CachedImageRemapper.cpp 2007-10-14 21:55:28 UTC (rev 2441) @@ -27,6 +27,7 @@ #include "CachedImageRemapper.h" #include <vigra/basicimageview.hxx> +#include <algorithms/nona/ComputeImageROI.h> namespace HuginBase { @@ -44,6 +45,7 @@ SmallRemappedImageCache::getRemapped(const PanoramaData& pano, ... [truncated message content] |