Menu
▾
▴
[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: merged the default branch into the hug...
|
From: <hug...@li...> - 2011-03-03 19:58:23
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/53eab2c4d76a changeset: 5080:53eab2c4d76a user: Kay F. Jahnke <_k...@ya...> date: Thu Mar 03 17:04:45 2011 +0100 description: merged the default branch into the hugin_scripting branch to get the latter up-to-date and ready for easy merging with the default branch. Hg: Ge?ndert authors.txt diffstat: .hgtags | 43 + CMakeLists.txt | 10 +- CMakeModules/FindBoostPython.cmake | 151 - ChangeLog | 16265 +--------- README | 4 - README_WINDOWS | 4 - admin/release-mgmt/apply.sh | 47 - admin/release-mgmt/build.sh | 102 - admin/release-mgmt/changes.sh | 37 - admin/release-mgmt/fromtrunk.sh | 41 - admin/release-mgmt/init.sh | 33 - admin/release-mgmt/scripts-readme.txt | 65 - admin/release-mgmt/translate.sh | 52 - artwork-src/2010/buttons/preview_white_balance.svg | 157 + artwork-src/2010/splash/hugin-santa-splash.svg | 929 + artwork-src/2010/splash/splash_with_artwork.svg | 1036 + artwork-src/artwork.readme.txt | 9 +- authors.txt | 7 +- doc/CMakeLists.txt | 15 +- doc/Makefile.pod2man | 13 - doc/PTBatcherGUI.1 | 165 - doc/align_image_stack.1 | 200 - doc/align_image_stack.pod | 38 +- doc/autooptimiser.1 | 192 - doc/calibrate_lens.1 | 202 - doc/celeste_standalone.1 | 182 - doc/checkpto.1 | 150 - doc/cpclean.1 | 167 - doc/cpfind.1 | 369 - doc/cpfind.pod | 38 +- doc/deghosting_mask.1 | 211 - doc/fulla.1 | 252 - doc/hugin.1 | 152 - doc/hugin_hdrmerge.1 | 216 - doc/hugin_stitch_project.1 | 160 - doc/icpfind.1 | 163 - doc/nona.1 | 238 - doc/nona.txt | 17 +- doc/nona_gui.1 | 158 - doc/pano_modify.1 | 180 - doc/pano_trafo.1 | 152 - doc/pto2mk.1 | 154 - doc/pto_merge.1 | 150 - doc/releases/hugin-2011.0.0_beta1.txt | 1688 + doc/releases/hugin-2011.0.0_beta2.txt | 237 + doc/releases/hugin-2011.0.0_beta3.txt | 208 + doc/tca_correct.1 | 209 - doc/vig_optimize.1 | 203 - mac/Hugin.xcodeproj/project.pbxproj | 268 +- mac/Version.xcconfig | 4 +- src/Doxyfile | 18 +- src/dox/folder.dox | 89 + src/dox/introduction.dox | 8 +- src/dox/mainpage.dox | 118 +- src/foreign/flann/CMakeLists.txt | 9 +- src/foreign/vigra/vigra/multi_iterator.hxx | 1 + src/hugin1/CMakeLists.txt | 2 - src/hugin1/PT/ImageGraph.h | 2 +- src/hugin1/PT/PanoCommand.h | 42 +- src/hugin1/PT/PanoImage.h | 5 +- src/hugin1/PT/PanoToolsInterface.h | 2 +- src/hugin1/PT/PanoToolsUtils.h | 2 +- src/hugin1/PT/Panorama.h | 2 +- src/hugin1/PT/PhotometricOptimizer.h | 7 +- src/hugin1/PT/RemappedPanoImage.h | 2 +- src/hugin1/PT/SpaceTransform.h | 2 +- src/hugin1/PT/Stitcher.h | 2 +- src/hugin1/PT/Transforms.h | 2 +- src/hugin1/PT/utils.h | 2 +- src/hugin1/base_wx/CMakeLists.txt | 4 +- src/hugin1/base_wx/ImageCache.cpp | 1043 - src/hugin1/base_wx/ImageCache.h | 292 - src/hugin1/base_wx/MyExternalCmdExecDialog.cpp | 4 +- src/hugin1/base_wx/MyProgressDialog.cpp | 2 +- src/hugin1/base_wx/MyProgressDialog.h | 10 +- src/hugin1/base_wx/Plot2D.cpp | 339 - src/hugin1/base_wx/Plot2D.h | 141 - src/hugin1/base_wx/RunStitchPanel.cpp | 17 +- src/hugin1/base_wx/platform.cpp | 2 +- src/hugin1/base_wx/platform.h | 2 +- src/hugin1/base_wx/wxImageCache.cpp | 43 + src/hugin1/base_wx/wxImageCache.h | 47 + src/hugin1/base_wx/wxPlatform.h | 105 + src/hugin1/common/Command.h | 32 - src/hugin1/common/Matrix3.h | 29 - src/hugin1/common/PTLensDB.h | 35 - src/hugin1/common/Vector3.h | 29 - src/hugin1/common/eig_jacobi.h | 57 - src/hugin1/common/graph.h | 71 - src/hugin1/common/lu.h | 66 - src/hugin1/common/math.h | 55 - src/hugin1/common/platform.h | 40 - src/hugin1/common/stl_utils.h | 45 - src/hugin1/common/utils.h | 71 - src/hugin1/common/wxPlatform.h | 105 - src/hugin1/hugin/AboutDialog.cpp | 45 +- src/hugin1/hugin/AboutDialog.h | 9 + src/hugin1/hugin/AssistantPanel.cpp | 4 +- src/hugin1/hugin/CMakeLists.txt | 12 +- src/hugin1/hugin/CPEditorPanel.cpp | 2 +- src/hugin1/hugin/CPEditorTest.h | 56 - src/hugin1/hugin/CPImageCtrl.cpp | 10 +- src/hugin1/hugin/CPImageCtrl.h | 4 +- src/hugin1/hugin/CPListFrame.cpp | 26 +- src/hugin1/hugin/CPListFrame.h | 2 + src/hugin1/hugin/CommandHistory.cpp | 12 +- src/hugin1/hugin/CommandHistory.h | 4 +- src/hugin1/hugin/CropPanel.cpp | 96 +- src/hugin1/hugin/CropPanel.h | 7 +- src/hugin1/hugin/DragTool.cpp | 138 +- src/hugin1/hugin/DragTool.h | 1 + src/hugin1/hugin/GLPreviewFrame.cpp | 538 +- src/hugin1/hugin/GLPreviewFrame.h | 70 +- src/hugin1/hugin/GLRenderer.h | 2 +- src/hugin1/hugin/GLViewer.cpp | 6 +- src/hugin1/hugin/HDRMergeOptionDialog.cpp | 2 +- src/hugin1/hugin/HFOVDialog.cpp | 3 +- src/hugin1/hugin/HFOVDialog.h | 1 - src/hugin1/hugin/HtmlWindow.cpp | 85 + src/hugin1/hugin/HtmlWindow.h | 65 + src/hugin1/hugin/ImagesList.cpp | 65 +- src/hugin1/hugin/ImagesList.h | 24 +- src/hugin1/hugin/ImagesPanel.cpp | 15 +- src/hugin1/hugin/ImagesPanel.h | 2 +- src/hugin1/hugin/LensPanel.cpp | 16 +- src/hugin1/hugin/LensPanel.h | 6 - src/hugin1/hugin/LocalizedFileTipProvider.cpp | 2 +- src/hugin1/hugin/MainFrame.cpp | 60 +- src/hugin1/hugin/MainFrame.h | 6 +- src/hugin1/hugin/MaskImageCtrl.cpp | 2 +- src/hugin1/hugin/MaskImageCtrl.h | 2 +- src/hugin1/hugin/MaskLoadDialog.cpp | 2 +- src/hugin1/hugin/MaskLoadDialog.h | 2 +- src/hugin1/hugin/NonaOptionsDialog.cpp | 4 +- src/hugin1/hugin/NumTransDialog.cpp | 2 +- src/hugin1/hugin/OptimizePanel.cpp | 12 +- src/hugin1/hugin/OptimizePhotometricPanel.cpp | 54 +- src/hugin1/hugin/OptimizePhotometricPanel.h | 6 + src/hugin1/hugin/OverviewCameraTool.cpp | 74 +- src/hugin1/hugin/OverviewCameraTool.h | 5 + src/hugin1/hugin/PanoPanel.cpp | 37 +- src/hugin1/hugin/PanosphereSphereTool.cpp | 72 + src/hugin1/hugin/PanosphereSphereTool.h | 43 + src/hugin1/hugin/PreferencesDialog.cpp | 63 +- src/hugin1/hugin/PreferencesDialog.h | 8 +- src/hugin1/hugin/PreviewColorPickerTool.cpp | 145 + src/hugin1/hugin/PreviewColorPickerTool.h | 53 + src/hugin1/hugin/PreviewFrame.cpp | 8 +- src/hugin1/hugin/PreviewFrame.h | 3 +- src/hugin1/hugin/PreviewIdentifyTool.cpp | 126 +- src/hugin1/hugin/PreviewIdentifyTool.h | 12 + src/hugin1/hugin/PreviewLayoutLinesTool.cpp | 2 +- src/hugin1/hugin/PreviewPanel.cpp | 2 +- src/hugin1/hugin/PreviewPanel.h | 2 +- src/hugin1/hugin/ProjectionGridTool.cpp | 26 +- src/hugin1/hugin/ResetDialog.cpp | 2 +- src/hugin1/hugin/TextureManager.cpp | 9 +- src/hugin1/hugin/ToolHelper.cpp | 67 +- src/hugin1/hugin/ToolHelper.h | 18 +- src/hugin1/hugin/config_defaults.h | 6 + src/hugin1/hugin/huginApp.cpp | 19 +- src/hugin1/hugin/wxPanoCommand.cpp | 76 +- src/hugin1/hugin/wxPanoCommand.h | 17 +- src/hugin1/hugin/xrc/about.xrc | 23 +- src/hugin1/hugin/xrc/data/dedication.htm | 23 + src/hugin1/hugin/xrc/data/preview_white_balance.png | src/hugin1/hugin/xrc/data/preview_white_balance_small.png | src/hugin1/hugin/xrc/images_panel.xrc | 45 +- src/hugin1/hugin/xrc/lens_panel.xrc | 43 +- src/hugin1/hugin/xrc/optimize_panel.xrc | 10 +- src/hugin1/hugin/xrc/optimize_photo_panel.xrc | 68 +- src/hugin1/hugin/xrc/pref_dialog.xrc | 76 + src/hugin1/hugin/xrc/preview_frame.xrc | 51 +- src/hugin1/icpfind/AutoCtrlPointCreator.cpp | 7 +- src/hugin1/icpfind/icpfind.cpp | 27 +- src/hugin1/icpfind/icpfind.h | 2 +- src/hugin1/nona_gui/nona_gui.cpp | 2 +- src/hugin1/panoinc.h | 9 +- src/hugin1/panoinc_WX.h | 2 +- src/hugin1/ptbatcher/FailedProjectsDialog.cpp | 2 +- src/hugin1/ptbatcher/FindPanoDialog.cpp | 13 +- src/hugin1/ptbatcher/FindPanoDialog.h | 5 +- src/hugin1/stitch_project/hugin_stitch_project.cpp | 27 +- src/hugin1/tests/old/Makefile | 150 - src/hugin1/tests/old/common.cpp | 70 - src/hugin1/tests/old/imageproc.cpp | 126 - src/hugin1/tests/old/interpolator.cpp | 204 - src/hugin1/tests/old/panorama.cpp | 380 - src/hugin1/tests/old/panotools.cpp | 176 - src/hugin1/tests/old/phasecorrelation.cpp | 91 - src/hugin1/tests/old/real_template.png | src/hugin1/tests/old/result_corr.png | src/hugin1/tests/old/result_corr_2.png | src/hugin1/tests/old/subject.png | src/hugin1/tests/old/template.png | src/hugin1/tests/old/transforms.cpp | 197 - src/hugin1/tests/old/vigra_ext.cpp | 603 - src/hugin1/tests/test_projections.cpp | 76 - src/hugin1/tools/CMakeLists.txt | 22 - src/hugin1/tools/automatch.cpp | 1213 - src/hugin1/tools/zhang_undistort.cpp | 162 - src/hugin_base/CMakeLists.txt | 20 +- src/hugin_base/algorithm/ControlPointCreatorAlgorithm.h | 1 - src/hugin_base/algorithm/PanoramaAlgorithm.h | 190 - src/hugin_base/algorithm/StitcherAlgorithm.h | 156 - src/hugin_base/algorithms/PanoramaAlgorithm.h | 190 + src/hugin_base/algorithms/StitcherAlgorithm.h | 156 + src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.cpp | 4 +- src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.h | 2 +- src/hugin_base/algorithms/basic/CalculateCPStatistics.cpp | 2 +- src/hugin_base/algorithms/basic/CalculateCPStatistics.h | 4 +- src/hugin_base/algorithms/basic/CalculateMeanExposure.cpp | 2 +- src/hugin_base/algorithms/basic/CalculateMeanExposure.h | 4 +- src/hugin_base/algorithms/basic/CalculateOptimalROI.cpp | 25 +- src/hugin_base/algorithms/basic/CalculateOptimalROI.h | 10 +- src/hugin_base/algorithms/basic/CalculateOptimalScale.cpp | 2 +- src/hugin_base/algorithms/basic/CalculateOptimalScale.h | 4 +- src/hugin_base/algorithms/basic/CalculateOverlap.cpp | 6 +- src/hugin_base/algorithms/basic/RotatePanorama.cpp | 2 +- src/hugin_base/algorithms/basic/RotatePanorama.h | 4 +- src/hugin_base/algorithms/basic/StraightenPanorama.cpp | 2 +- src/hugin_base/algorithms/basic/StraightenPanorama.h | 2 +- src/hugin_base/algorithms/basic/TranslatePanorama.h | 2 +- src/hugin_base/algorithms/control_points/CleanCP.h | 2 +- src/hugin_base/algorithms/nona/CalculateFOV.cpp | 2 +- src/hugin_base/algorithms/nona/CalculateFOV.h | 4 +- src/hugin_base/algorithms/nona/CenterHorizontally.cpp | 2 +- src/hugin_base/algorithms/nona/CenterHorizontally.h | 4 +- src/hugin_base/algorithms/nona/ComputeImageROI.h | 2 +- src/hugin_base/algorithms/nona/FitPanorama.cpp | 2 +- src/hugin_base/algorithms/nona/FitPanorama.h | 4 +- src/hugin_base/algorithms/nona/NonaFileStitcher.h | 2 +- src/hugin_base/algorithms/nona/NonaImageStitcher.cpp | 95 - src/hugin_base/algorithms/nona/NonaImageStitcher.h | 137 - src/hugin_base/algorithms/optimizer/ImageGraph.h | 2 +- src/hugin_base/algorithms/optimizer/PTOptimizer.cpp | 272 +- src/hugin_base/algorithms/optimizer/PTOptimizer.h | 37 +- src/hugin_base/algorithms/optimizer/PhotometricOptimizer.h | 4 +- src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp | 45 +- src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.h | 2 +- src/hugin_base/algorithms/point_sampler/PointSampler.h | 2 +- src/hugin_base/appbase/Command.h | 4 +- src/hugin_base/appbase/CommandHistory.h | 164 - src/hugin_base/appbase/ExternalProgram.cpp | 52 - src/hugin_base/appbase/ExternalProgram.h | 199 - src/hugin_base/appbase/ExternalProgramSetup.cpp | 84 - src/hugin_base/appbase/ExternalProgramSetup.h | 150 - src/hugin_base/hugin_math/Transforms.h | 2 +- src/hugin_base/hugin_math/eig_jacobi.cpp | 2 +- src/hugin_base/hugin_math/eig_jacobi.h | 2 +- src/hugin_base/hugin_math/hugin_math.h | 2 +- src/hugin_base/hugin_utils/alphanum.hpp | 460 + src/hugin_base/hugin_utils/platform.cpp | 2 +- src/hugin_base/hugin_utils/platform.h | 2 +- src/hugin_base/hugin_utils/utils.cpp | 2 +- src/hugin_base/hugin_utils/utils.h | 2 +- src/hugin_base/huginapp/CachedImageRemapper.h | 12 - src/hugin_base/huginapp/ImageCache.cpp | 11 +- src/hugin_base/huginapp/PanoCommand.h | 2 +- src/hugin_base/makefilelib/Doxyfile | 279 - src/hugin_base/makefilelib/Doxyfile_makefile | 279 + src/hugin_base/makefilelib/test_simple.cpp | 2 +- src/hugin_base/nona/ImageRemapper.h | 2 +- src/hugin_base/nona/RemappedPanoImage.h | 2 +- src/hugin_base/nona/SpaceTransform.h | 10 +- src/hugin_base/nona/Stitcher.h | 18 +- src/hugin_base/panodata/DestPanoImage.h | 133 - src/hugin_base/panodata/Lens.cpp | 2 +- src/hugin_base/panodata/Mask.h | 7 +- src/hugin_base/panodata/PTScriptParsing.cpp | 2 +- src/hugin_base/panodata/PTScriptParsing.h | 2 +- src/hugin_base/panodata/PanoImage.cpp | 154 - src/hugin_base/panodata/PanoImage.h | 112 +- src/hugin_base/panodata/Panorama.cpp | 136 +- src/hugin_base/panodata/Panorama.h | 15 +- src/hugin_base/panodata/PanoramaData.h | 4 + src/hugin_base/panodata/PanoramaOptions.cpp | 11 +- src/hugin_base/panodata/PanoramaOptions.h | 6 +- src/hugin_base/panodata/SrcPanoImage.cpp | 17 +- src/hugin_base/panodata/SrcPanoImage.h | 6 +- src/hugin_base/panodata/image_variables.h | 36 +- src/hugin_base/panotools/PanoToolsInterface.cpp | 2 +- src/hugin_base/panotools/PanoToolsInterface.h | 2 +- src/hugin_base/panotools/PanoToolsUtils.cpp | 2 +- src/hugin_base/panotools/PanoToolsUtils.h | 2 +- src/hugin_base/photometric/OptimizePhotometric.cpp | 392 - src/hugin_base/photometric/OptimizePhotometric.h | 100 - src/hugin_base/vigra_ext/FunctorAccessor.h | 2 +- src/hugin_base/vigra_ext/MultiLayerImage.h | 2 +- src/hugin_base/vigra_ext/VigQuotientEstimator.h | 8 +- src/hugin_base/vigra_ext/impexalpha.hxx | 2 +- src/hugin_base/vigra_ext/ransac.h | 71 +- src/hugin_base/vigra_ext/utils.h | 2 +- src/hugin_config.h.in | 128 - src/hugin_config_msvc.h | 100 - src/hugin_cpfind/AUTHORS | 6 + src/hugin_cpfind/cpfind/PanoDetector.cpp | 130 +- src/hugin_cpfind/cpfind/PanoDetector.h | 26 +- src/hugin_cpfind/cpfind/PanoDetectorDefs.h | 1 + src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp | 286 +- src/hugin_cpfind/cpfind/main.cpp | 46 +- src/hugin_cpfind/localfeatures/CMakeLists.txt | 13 +- src/hugin_cpfind/localfeatures/KeyPoint.h | 13 +- src/hugin_cpfind/localfeatures/KeyPointIO.cpp | 10 +- src/hugin_cpfind/localfeatures/KeyPointIO.h | 8 +- src/hugin_cpfind/localfeatures/PointMatch.h | 9 +- src/hugin_cpfind/localfeatures/keypoints.cpp | 2 +- src/hugin_cpfind/localfeatures/python_wrapper.cpp | 98 - src/hugin_qtbase/HuginDocument.h | 51 - src/hugin_qtbase/HuginDocumentViewLayout.h | 81 - src/hugin_qtbase/HuginDocumentViewManager.h | 72 - src/hugin_qtbase/HuginModule.h | 72 - src/hugin_qtbase/HuginModuleManager.h | 54 - src/hugin_qtbase/PanoramaDocument.qt.h | 110 - src/hugin_qtbase/PanoramaModule.h | 65 - src/hugin_qtbase/TODO.txt | 10 - src/hugin_qtbase/qtappbase/QADocument.cpp | 163 - src/hugin_qtbase/qtappbase/QADocument.qt.h | 99 - src/hugin_qtbase/qtappbase/QADocumentController.qt.h | 82 - src/hugin_qtbase/qtappbase/QADocumentTemplate.h | 61 - src/hugin_qtbase/qtappbase/QAExternalProgram.qt.h | 39 - src/hugin_qtbase/qtappbase/QAFiletype.qt.h | 72 - src/hugin_qtbase/qtappbase/QAUndoStack.qt.h | 67 - src/hugin_qtbase/readme.txt | 15 - src/hugin_qtbase/whitepaper/hugin2-architecture.png | src/hugin_qtbase/whitepaper/hugin2-architecture.txt | 33 - src/hugin_script_interface/CMakeLists.txt | 7 +- src/hugin_script_interface/hsi.i | 22 +- src/tools/align_image_stack.cpp | 284 +- src/tools/pano_trafo.cpp | 2 +- src/tools/vig_optimize.cpp | 2 +- src/translations/bg.po | 2258 +- src/translations/ca_ES.po | 2259 +- src/translations/cs_CZ.po | 2260 +- src/translations/de.po | 2370 +- src/translations/en_GB.po | 2389 +- src/translations/es.po | 2261 +- src/translations/fi.po | 2246 +- src/translations/fr.po | 2250 +- src/translations/hu.po | 2260 +- src/translations/hugin.pot | 2234 +- src/translations/it.po | 2246 +- src/translations/ja.po | 2254 +- src/translations/ko.po | 2258 +- src/translations/nl.po | 6030 ++- src/translations/pl.po | 2246 +- src/translations/pt_BR.po | 2583 +- src/translations/ro.po | 6596 ++++ src/translations/ru.po | 2254 +- src/translations/sk.po | 2265 +- src/translations/sl.po | 2250 +- src/translations/sv.po | 2254 +- src/translations/uk.po | 2259 +- src/translations/zh_CN.po | 2258 +- src/translations/zh_TW.po | 2246 +- 355 files changed, 46506 insertions(+), 58033 deletions(-) diffs (truncated from 189473 to 500 lines): diff -r a5a76e643653 -r 53eab2c4d76a .hgtags --- a/.hgtags Fri Feb 25 14:18:49 2011 +0100 +++ b/.hgtags Thu Mar 03 17:04:45 2011 +0100 @@ -21,3 +21,46 @@ 924390a17a74c239c7f015d5dd0cb8c3e1e29200 2010.4beta1 924390a17a74c239c7f015d5dd0cb8c3e1e29200 2009.4beta1 0000000000000000000000000000000000000000 2009.4beta1 +6f536b4ba7fb62877b8d08be9343d5f8a4c75e2d 2010.4beta2 +6f536b4ba7fb62877b8d08be9343d5f8a4c75e2d 2010.4.0beta2 +0000000000000000000000000000000000000000 2010.4.0beta2 +d8ce0ba947cc77951dc3013733173ccaa12f9128 2010.2.0_rc2 +d8ce0ba947cc77951dc3013733173ccaa12f9128 2010.2.0 +d8ce0ba947cc77951dc3013733173ccaa12f9128 hugin-2010.2.0_rc2 +0000000000000000000000000000000000000000 hugin-2010.2.0_rc2 +d8ce0ba947cc77951dc3013733173ccaa12f9128 hugin-2010.2.0 +0000000000000000000000000000000000000000 hugin-2010.2.0 +23e34640f870d43b9502b1eaeedaaf4752e37043 2010.2.0_rc1 +23e34640f870d43b9502b1eaeedaaf4752e37043 hugin-2010.2.0_rc1 +0000000000000000000000000000000000000000 hugin-2010.2.0_rc1 +ba385cc93f29914e7e8fed7436ca819a3aa03e14 2010.0.0_rc1 +ba385cc93f29914e7e8fed7436ca819a3aa03e14 2010.0.0 +ba385cc93f29914e7e8fed7436ca819a3aa03e14 hugin-2010.0.0_rc1 +0000000000000000000000000000000000000000 hugin-2010.0.0_rc1 +4445c8b23e000b710e621367e0ef8d8221afb44a 2009.4.0_rc2 +4445c8b23e000b710e621367e0ef8d8221afb44a hugin-2009.4.0_rc2 +0000000000000000000000000000000000000000 hugin-2009.4.0_rc2 +15134dadca3a85b5d40d102d148af30d190898f7 2009.4.0_rc1 +15134dadca3a85b5d40d102d148af30d190898f7 hugin-2009.4.0_rc1 +0000000000000000000000000000000000000000 hugin-2009.4.0_rc1 +0000000000000000000000000000000000000000 2009.4beta1 +b19a9bb3d81be4ef47fe93348dec191da2913192 2009.4beta1 +b19a9bb3d81be4ef47fe93348dec191da2913192 hugin-2009.4.0_beta1 +0000000000000000000000000000000000000000 hugin-2009.4.0_beta1 +e99528cf5bb85a9f384b3b31b92d0eb9584a3f59 2009.2.0_rc1 +e99528cf5bb85a9f384b3b31b92d0eb9584a3f59 2009.2.0 +e99528cf5bb85a9f384b3b31b92d0eb9584a3f59 hugin-2009.2.0_RC1 +0000000000000000000000000000000000000000 hugin-2009.2.0_RC1 +af5ab8815d4d2a455ac88ec44f14ff416b2126fc 2009.2.0beta4 +af5ab8815d4d2a455ac88ec44f14ff416b2126fc 2009.2beta4 +f4bce89f003e708c38827af6505c0b6aef1b4dd2 2009.2beta3 +0ce97189b8eb694dc183bf3eadd4aee1de06bef9 2009.2beta2 +ce082254cdf6cfe06ae62ab9b654e568722f9838 2009.2beta1 +af5ab8815d4d2a455ac88ec44f14ff416b2126fc hugin-2009.2.0-beta4 +0000000000000000000000000000000000000000 hugin-2009.2.0-beta4 +0ce97189b8eb694dc183bf3eadd4aee1de06bef9 hugin-2009.2.0_beta2 +0000000000000000000000000000000000000000 hugin-2009.2.0_beta2 +f4bce89f003e708c38827af6505c0b6aef1b4dd2 hugin-2009.2.0_beta3 +0000000000000000000000000000000000000000 hugin-2009.2.0_beta3 +af5ab8815d4d2a455ac88ec44f14ff416b2126fc 2009.2.0beta4 +0000000000000000000000000000000000000000 2009.2.0beta4 diff -r a5a76e643653 -r 53eab2c4d76a CMakeLists.txt --- a/CMakeLists.txt Fri Feb 25 14:18:49 2011 +0100 +++ b/CMakeLists.txt Thu Mar 03 17:04:45 2011 +0100 @@ -1,6 +1,6 @@ -# require at least cmake 2.6 -cmake_minimum_required(VERSION 2.6 FATAL_ERROR ) +# require at least cmake 2.8 +cmake_minimum_required(VERSION 2.8 FATAL_ERROR ) if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) @@ -15,8 +15,8 @@ project(hugin) # version -set(V_MAJOR 2010) -set(V_MINOR 5) +set(V_MAJOR 2011) +set(V_MINOR 1) set(V_PATCH 0) # @@ -60,7 +60,7 @@ IF (EXISTS ${PROJECT_SOURCE_DIR}/.hg) IF (UPDATE_CHANGELOG) FIND_PROGRAM(_hg hg) - EXECUTE_PROCESS(COMMAND ${_hg} log --follow --style=changelog + EXECUTE_PROCESS(COMMAND ${_hg} log --follow -b default --style=changelog WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" OUTPUT_FILE ${PROJECT_SOURCE_DIR}/ChangeLog) MESSAGE("-- New ChangeLog generated") diff -r a5a76e643653 -r 53eab2c4d76a CMakeModules/FindBoostPython.cmake --- a/CMakeModules/FindBoostPython.cmake Fri Feb 25 14:18:49 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,151 +0,0 @@ -# - Try to find the a valid boost+python combination -# Once done this will define -# -# BOOST_PYTHON_FOUND - system has a valid boost+python combination -# BOOST_PYTHON_INCLUDES - the include directory for boost+python -# BOOST_PYTHON_LIBS - the needed libs for boost+python - -# Copyright (c) 2006, Pino Toscano, <tos...@ti...> -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) - # Already in cache, be silent - set(BOOST_PYTHON_FIND_QUIETLY TRUE) -endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) - -# some needed includes -include(CheckCXXSourceCompiles) -include(CheckIncludeFileCXX) -include(CheckLibraryExists) - -# reset vars -set(BOOST_PYTHON_INCLUDES) -set(BOOST_PYTHON_LIBS) - -IF(WIN32) - FIND_PACKAGE(PythonLibs) - FIND_PACKAGE(Boost COMPONENTS Python) - - IF(PYTHONLIBS_FOUND) - IF(Boost_PYTHON_FOUND) - set(BOOST_PYTHON_INCLUDES ${PYTHON_INCLUDE_DIRS} ${Boost_INCLUDE_DIR}) - set(BOOST_PYTHON_LIBS ${PYTHON_LIBRARIES} ${Boost_PYTHON_LIBRARY}) - # assuming that boost is build as dynamic lib - STRING(REPLACE ".lib" ".dll" BOOST_PYTHON_DLL ${Boost_PYTHON_LIBRARY}) - ENDIF(Boost_PYTHON_FOUND) - ENDIF(PYTHONLIBS_FOUND) - -ELSE(WIN32) - -# handy arrays -set(PYTHON_VERSIONS "python;python2.6;python2.5;python2.4;python2.3;python2.2") -set(PYTHON_INCLUDE_DIRS "/usr/include/$pyver;/usr/local/include/$pyver;/usr/$pyver/include;/usr/local/$pyver/include;$prefix/include/$pyver;$prefix/$pyver/include") -set(PYTHON_LIBRARY_DIRS "/usr/lib${LIB_SUFFIX};/usr/local/lib${LIB_SUFFIX};/usr/lib${LIB_SUFFIX}/$pyver/config") -set(PYTHON_LIBS "boost_python-gcc-mt;boost_python-mt;boost_python-gcc-mt-1_33;boost_python-gcc-mt-1_33_1;boost_python;boost_python-gcc-mt-1_32;boost_python") - -# 1st: check for boost/shared_ptr.hpp -check_include_file_cxx(boost/shared_ptr.hpp HAVE_BOOST_SHARED_PTR_HPP) - -if(HAVE_BOOST_SHARED_PTR_HPP) - - set(_found FALSE) - - # save the old flags and setting the new ones - set(_save_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}") - - foreach(_pyver ${PYTHON_VERSIONS}) - if(NOT _found) - foreach(_pydir ${PYTHON_INCLUDE_DIRS}) - - if(NOT _found) - string(REPLACE "$pyver" "${_pyver}" _pydir ${_pydir}) - string(REPLACE "$prefix" "${CMAKE_INSTALL_PREFIX}" _pydir ${_pydir}) - - if(EXISTS ${_pydir}) - if(EXISTS ${_pydir}/Python.h) - - foreach(_pylibdir ${PYTHON_LIBRARY_DIRS}) - - if(NOT _found) - string(REPLACE "$pyver" ${_pyver} _pylibdir ${_pylibdir}) - - foreach(_pblib ${PYTHON_LIBS}) - - if(NOT _found) - - set(CMAKE_REQUIRED_FLAGS "-L${_pylibdir}") - set(CMAKE_REQUIRED_INCLUDES ${_pydir}) - set(CMAKE_REQUIRED_LIBRARIES ${_pblib} ${_pyver}) - - check_cxx_source_compiles(" -#include <boost/python.hpp> -const char* greet() { return \"Hello world!\"; } -BOOST_PYTHON_MODULE(hello) { boost::python::def(\"greet\", greet); } - -int main() { return 0; } - -// some vars, in case of the compilation fail... -// python include dir: ${_pydir} -// python lib dir: ${_pylibdir} -// boost python lib: ${_pblib} - -" boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile ) - - set(CMAKE_REQUIRED_FLAGS) - set(CMAKE_REQUIRED_INCLUDES) - set(CMAKE_REQUIRED_LIBRARIES) - - if(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) - - set(_found TRUE) - - set(BOOST_PYTHON_INCLUDES ${_pydir}) - set(BOOST_PYTHON_LIBS "-l${_pyver} -L${_pylibdir} -l${_pblib}") - - endif(boost_python_${_pylibdir}_${_pydir}_${_pblib}_compile) - - endif(NOT _found) - - endforeach(_pblib ${PYTHON_LIBS}) - - endif(NOT _found) - - endforeach(_pylibdir ${PYTHON_LIBRARY_DIRS}) - - endif(EXISTS ${_pydir}/Python.h) - endif(EXISTS ${_pydir}) - - endif(NOT _found) - - endforeach(_pydir ${PYTHON_INCLUDE_DIRS}) - - endif(NOT _found) - - endforeach(_pyver ${PYTHON_VERSIONS}) - - set(CMAKE_CXX_FLAGS ${_save_CMAKE_CXX_FLAGS}) - -endif(HAVE_BOOST_SHARED_PTR_HPP) -ENDIF(WIN32) - -if(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) - set(BOOST_PYTHON_FOUND TRUE) -endif(BOOST_PYTHON_INCLUDES AND BOOST_PYTHON_LIBS) - -if(BOOST_PYTHON_FOUND) - if(NOT BoostPython_FIND_QUIETLY) - message(STATUS "Found Boost+Python: ${BOOST_PYTHON_LIBS}") - endif(NOT BoostPython_FIND_QUIETLY) - set(KIG_ENABLE_PYTHON_SCRIPTING 1) - INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIRS}) -else (BOOST_PYTHON_FOUND) - if (BoostPython_FIND_REQUIRED) - message(FATAL_ERROR "Could NOT find Boost+Python") - endif(BoostPython_FIND_REQUIRED) - set(KIG_ENABLE_PYTHON_SCRIPTING 0) -endif(BOOST_PYTHON_FOUND) - -mark_as_advanced(BOOST_PYTHON_INCLUDES BOOST_PYTHON_LIBS) diff -r a5a76e643653 -r 53eab2c4d76a ChangeLog --- a/ChangeLog Fri Feb 25 14:18:49 2011 +0100 +++ b/ChangeLog Thu Mar 03 17:04:45 2011 +0100 @@ -1,4 +1,1547 @@ -2010-12-27 23:36 -0500 Yuval Levy <yu...@us...> (fddc4fff25f8 [tip]) +2011-02-27 08:50 -0500 Yuval Levy <yu...@us...> (c27d2767632b [tip]) + + * CMakeLists.txt, mac/Version.xcconfig: + Bumped up version number + +2011-02-27 08:46 -0500 Yuval Levy <yu...@us...> (9ae332342087) + + * ChangeLog, src/translations/bg.po, src/translations/ca_ES.po, + src/translations/cs_CZ.po, src/translations/de.po, + src/translations/en_GB.po, src/translations/es.po, + src/translations/fi.po, src/translations/fr.po, + src/translations/hu.po, src/translations/hugin.pot, + src/translations/it.po, src/translations/ja.po, + src/translations/ko.po, src/translations/nl.po, + src/translations/pl.po, src/translations/pt_BR.po, + src/translations/ro.po, src/translations/ru.po, + src/translations/sk.po, src/translations/sl.po, + src/translations/sv.po, src/translations/uk.po, + src/translations/zh_CN.po, src/translations/zh_TW.po: + Updated Translation Strings + +2011-02-27 14:14 +0100 tmodes <tmodes> (bfdae1c16551) + + * Merged + +2011-02-27 14:13 +0100 tmodes <tmodes> (f6d7cbcfbda9) + + * src/hugin1/ptbatcher/FindPanoDialog.cpp: + Fixes missing first image in find pano feature + +2011-02-27 07:47 -0500 Yuval Levy <yu...@us...> (5ac9ff8cbd02) + + * src/translations/pt_BR.po: + updated Brazilian translation (LuÃs Henrique Camargo Quiroz) + +2011-02-27 10:22 +0100 tmodes <tmodes> (a9a7106b33ca) + + * src/hugin_cpfind/localfeatures/CMakeLists.txt: + Don't build keypoints by default Program is not needed for normal + workflow. Only needed for develepment/improvement of keypoint + descriptor. + +2011-02-27 09:49 +0100 tmodes <tmodes> (b34f91a14f69) + + * src/hugin1/hugin/xrc/lens_panel.xrc: + Little layout change to save space + +2011-02-26 23:40 -0500 Yuval Levy <yu...@us...> (41012f62bc6e) + + * CMakeLists.txt, doc/align_image_stack.pod: + * updated align_image_stack man page + * Changelog generation in CMake only shows changes to default branch + +2011-02-26 20:19 -0500 Yuval Levy <yu...@us...> (d2a9145e9a0c) + + * authors.txt, src/hugin_base/algorithms/basic/CalculateOptimalROI.h: + Merged branch align_stack_stereo + +2011-02-26 19:18 -0500 Yuval Levy <yu...@us...> (10a51481d1e3) + + * src/hugin1/hugin/xrc/images_panel.xrc: + save some space in Images tab + +2011-02-26 19:06 -0500 Yuval Levy <yu...@us...> (e2499f0eddc2) + + * src/hugin1/hugin/xrc/images_panel.xrc: + small tweaking of Images tab (entry field sizes and section label) + +2011-02-26 23:10 +0100 dmakreshanski <dma...@us...> (a227c5288366) + + * src/hugin1/hugin/DragTool.cpp: + fixed a bug with dragging images in panosphere jumps after clicking + +2011-02-26 21:28 +0100 dmakreshanski <dma...@us...> (0d9e026e0120) + + * src/hugin1/hugin/GLPreviewFrame.cpp, + src/hugin1/hugin/GLPreviewFrame.h: + added support to zoom in/out in overview with keyboard, however not + really usable at the moment as the tools are handling events from + the gl canvases. + +2011-02-26 21:15 +0100 dmakreshanski <dma...@us...> (f9ed69690aec) + + * src/hugin1/hugin/GLPreviewFrame.cpp, + src/hugin1/hugin/GLPreviewFrame.h, + src/hugin1/hugin/OverviewCameraTool.cpp, + src/hugin1/hugin/OverviewCameraTool.h: + added support for zooming in and out in overview with keyboard, but + not really usable until tools handle keyboard events not only from + the GLCanvas but also globally from the frame as well. + +2011-02-26 18:54 +0100 tmodes <tmodes> (615ef76bece1) + + * src/hugin1/hugin/PreviewColorPickerTool.cpp: + Finetune color picker + +2011-02-26 18:49 +0100 tmodes <tmodes> (f9faac1970d6) + + * src/hugin1/hugin/DragTool.cpp, src/hugin1/hugin/GLPreviewFrame.cpp, + src/hugin1/hugin/GLPreviewFrame.h, + src/hugin1/hugin/xrc/preview_frame.xrc: + Modified layout of drag tools to save space + +2011-02-26 09:30 -0500 Yuval Levy <yu...@us...> (ca93acae60e3) + + * src/hugin1/hugin/CPImageCtrl.cpp: + OSX: try to fix https://bugs.launchpad.net/hugin/+bug/678997 + +2011-02-26 13:20 +0100 tmodes <tmodes> (415abb75a810) + + * src/hugin1/hugin/GLPreviewFrame.cpp: + Correctly switch on photometric correction [720437] (second part to + changeset 83aeb3144849) + +2011-02-26 13:10 +0100 tmodes <tmodes> (b075f18e627c) + + * artwork-src/2010/buttons/preview_white_balance.svg, + src/hugin1/hugin/PreviewColorPickerTool.cpp, + src/hugin1/hugin/PreviewColorPickerTool.h, + src/hugin1/hugin/xrc/data/preview_white_balance.png, + src/hugin1/hugin/xrc/data/preview_white_balance_small.png: new file. + * artwork-src/2010/buttons/preview_white_balance.svg, + src/hugin1/PT/PanoCommand.h, src/hugin1/hugin/CMakeLists.txt, + src/hugin1/hugin/GLPreviewFrame.cpp, + src/hugin1/hugin/GLPreviewFrame.h, + src/hugin1/hugin/PreviewColorPickerTool.cpp, + src/hugin1/hugin/PreviewColorPickerTool.h, + src/hugin1/hugin/xrc/data/preview_white_balance.png, + src/hugin1/hugin/xrc/data/preview_white_balance_small.png, + src/hugin1/hugin/xrc/preview_frame.xrc, + src/hugin_base/panodata/Panorama.cpp, + src/hugin_base/panodata/Panorama.h, + src/hugin_base/panodata/PanoramaData.h: + Added gray picker to fast preview window + +2011-02-25 17:34 +0100 tmodes <tmodes> (877cd412856f) + + * CMakeModules/FindBoostPython.cmake: deleted file. + * CMakeModules/FindBoostPython.cmake, + src/hugin_cpfind/localfeatures/CMakeLists.txt: + Remove some more obsolete files + +2011-02-25 04:32 +0100 Pablo d'Angelo <pab...@we...> (8421a774f387) + + * src/hugin_cpfind/localfeatures/python_wrapper.cpp: deleted file. + * src/hugin_cpfind/localfeatures/python_wrapper.cpp: + removed obselete python wrapper, it never worked anyway. + +2011-02-25 04:31 +0100 Pablo d'Angelo <pab...@we...> (0c1a577c9741) + + * src/hugin_cpfind/AUTHORS, src/hugin_cpfind/cpfind/PanoDetector.cpp, + src/hugin_cpfind/cpfind/PanoDetectorDefs.h: + Added missing licence declarations in panomatic, added Pablo + d'Angelo, Thomas Modes and Antoine Deleforge to the authors + +2011-02-24 20:25 +0100 tmodes <tmodes> (6d6750825284) + + * src/hugin1/hugin/TextureManager.cpp: + Make output emor parameters consistant for fast preview window + +2011-02-24 20:11 +0100 tmodes <tmodes> (f5f9d968033e) + + * src/hugin1/hugin/xrc/preview_frame.xrc: + Don't use UTF-8 encoded character in ISO-8859-1 encoded xrc file + +2011-02-20 22:27 +0000 Bruno Postle <br...@po...> (b5a907b23b85) + + * src/hugin_base/photometric/OptimizePhotometric.cpp, + src/hugin_base/photometric/OptimizePhotometric.h: deleted file. + * src/hugin_base/photometric/OptimizePhotometric.cpp, + src/hugin_base/photometric/OptimizePhotometric.h: + merge + +2011-02-20 22:26 +0000 Bruno Postle <br...@po...> (0d1c52e25ea8) + + * doc/CMakeLists.txt: + Don't create copies of pod source files, fixes Bug #720419 'building + in-tree deletes pod source files' + +2011-02-20 15:00 -0500 Yuval Levy <yu...@us...> (83aeb3144849) + + * src/hugin1/hugin/xrc/preview_frame.xrc: + fast preview: photometric correction on by default + +2011-02-20 18:47 +0100 tmodes <tmodes> (3a32b5ad517b) + + * src/hugin1/hugin/GLPreviewFrame.cpp: + Correctly free event handler on quit [721949] + +2011-02-20 18:35 +0100 tmodes <tmodes> (63bf50608264) + + * src/hugin1/hugin/GLPreviewFrame.cpp: + Fixes crash if starting new project related to individual drag + +2011-02-20 18:31 +0100 tmodes <tmodes> (26ebe3023375) + + * src/hugin1/hugin/MainFrame.cpp: + Only load valid images file with add time series [721022] + +2011-02-20 18:18 +0100 tmodes <tmodes> (1b6afbbc9695) + + * src/hugin_base/photometric/OptimizePhotometric.cpp, + src/hugin_base/photometric/OptimizePhotometric.h: deleted file. + * src/hugin_base/photometric/OptimizePhotometric.cpp, + src/hugin_base/photometric/OptimizePhotometric.h: + Removed unused files + +2011-02-19 21:43 -0500 Yuval Levy <yu...@us...> (0b3bb2a1f7fc) + + * authors.txt: + added Darko Makreshanski (GSoc 2010 Overview) to authors + +2011-02-19 21:20 -0500 Yuval Levy <yu...@us...> (62ed7c959dcb) + + * authors.txt: + added Stephan Hegel to authors http://groups.google.com/group/hugin- + ptx//t/9584ccbea610c81c/ + +2011-02-19 11:37 +0100 tmodes <tmodes> (3d3c19602641) + + * src/hugin1/hugin/GLPreviewFrame.cpp: + [Windows] Added removed border to image selection buttons + +2011-02-19 11:36 +0100 tmodes <tmodes> (7945d59c9f6c) + + * src/hugin1/hugin/GLPreviewFrame.cpp, + src/hugin1/hugin/GLPreviewFrame.h, + src/hugin1/hugin/xrc/preview_frame.xrc: + Show group selection boxes only in drag mode + +2011-02-18 22:10 +0000 Bruno Postle <br...@po...> (d31fd5e4355f) + + * src/dox/folder.dox: new file. + * merge + +2011-02-18 18:15 +0100 dmakreshanski <dma...@us...> (067870ab0d9b) + + * src/hugin1/hugin/DragTool.cpp, src/hugin1/hugin/DragTool.h, + src/hugin1/hugin/GLPreviewFrame.cpp, + src/hugin1/hugin/GLPreviewFrame.h, + src/hugin1/hugin/PreviewIdentifyTool.cpp, + src/hugin1/hugin/PreviewIdentifyTool.h, + src/hugin1/hugin/ToolHelper.cpp, src/hugin1/hugin/ToolHelper.h, + src/hugin1/hugin/xrc/preview_frame.xrc: + implemented dragging of custom groups of images in fast preview + +2011-02-17 19:43 +0100 tmodes <tmodes> (5a0bdb77823c) + + * src/dox/folder.dox: new file. + * src/Doxyfile, src/dox/folder.dox, src/dox/mainpage.dox, + src/hugin_base/panodata/image_variables.h: + More fixes for doc + * Correctly expand image_variable macro in doc + * Some links to directories + +2011-02-16 21:53 +0100 tmodes <tmodes> (15b1b8ef7cf7) + + * src/Doxyfile, src/hugin1/PT/ImageGraph.h, |