SourceForge.net: Hugin: hugin-cvs

Home / Browse / Hugin / Mail / Archive

Email Archive: hugin-cvs (read-only)

2005:	_Jan (84)	_Feb (83)	_Mar (36)	_Apr (15)	_May (250)	_Jun (81)	_Jul (29)	_Aug (62)	_Sep (22)	_Oct (13)	_Nov (62)	_Dec (30)
2006:	_Jan (67)	_Feb (68)	_Mar (149)	_Apr (51)	_May (8)	_Jun (23)	_Jul (87)	_Aug (132)	_Sep (9)	_Oct (1)	_Nov (22)	_Dec (163)
2007:	_Jan (74)	_Feb (71)	_Mar (2)	_Apr (121)	_May (57)	_Jun (168)	_Jul (151)	_Aug (73)	_Sep (4)	_Oct (91)	_Nov (30)	_Dec (38)
2008:	_Jan (178)	_Feb (159)	_Mar (49)	_Apr (65)	_May (43)	_Jun (56)	_Jul (99)	_Aug (132)	_Sep (71)	_Oct (57)	_Nov (42)	_Dec (11)
2009:	_Jan (40)	_Feb (74)	_Mar (80)	_Apr (45)	_May (86)	_Jun (76)	_Jul (160)	_Aug (170)	_Sep (227)	_Oct (161)	_Nov (49)	_Dec (108)
2010:	_Jan (108)	_Feb (82)	_Mar (62)	_Apr (33)	_May (60)	_Jun (38)	_Jul (46)	_Aug (69)	_Sep (157)	_Oct (123)	_Nov (130)	_Dec (154)
2011:	_Jan (138)	_Feb (112)	_Mar (128)	_Apr (4)	_May (86)	_Jun (81)	_Jul (128)	_Aug (98)	_Sep (69)	_Oct (32)	_Nov (50)	_Dec (41)
2012:	_Jan (10)	_Feb (6)	_Mar (17)	_Apr (10)	_May (67)	_Jun (57)	_Jul (41)	_Aug (54)	_Sep (17)	_Oct (15)	_Nov (34)	_Dec (45)
2013:	_Jan (62)	_Feb (47)	_Mar (71)	_Apr (25)	_May (11)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec


S	M	T	W	T	F	S
1	2	3	4	5	6	7
(6)	(7)	(1)		(1)
8	9	10	11	12	13	14
		(3)	(1)
15	16	17	18	19	20	21
(9)		(6)	(7)	(2)	(1)	(3)
22	23	24	25	26	27	28
(6)	(3)	(5)		(3)	(5)	(2)
29	30	31
(5)	(3)	(7)

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin-web: Repaired title

From: <hugin-cvs@li...> - 2011-05-29 22:40

details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin-web/hgrepo/h/hu/hugin/hugin-web/rev/7d40d940a6dc
changeset: 252:7d40d940a6dc
user:      Vaclav Cerny <vatoz@...>
date:       Mon May 30 00:27:47 2011 +0200
description:
Repaired title

diffstat:

 releases/2011.0.0/en.shtml |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r f0cade030971 -r 7d40d940a6dc releases/2011.0.0/en.shtml
--- a/releases/2011.0.0/en.shtml	Sun May 29 15:48:15 2011 -0400
+++ b/releases/2011.0.0/en.shtml	Mon May 30 00:27:47 2011 +0200
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en">
 <head profile="http://gmpg.org/xfn/11">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Hugin-2010.4.0 release notes</title>
+<title>Hugin-2011.0.0 release notes</title>
 <style media="screen" type="text/css" title="Screen style sheet">
 @import url(/css/normal.css);
 </style>

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: 2011.0.0 release notes

From: <hugin-cvs@li...> - 2011-05-29 19:59

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/13dd690b1ce1
changeset:
diffstat:

 doc/releases/hugin-2011.0.0.txt |  180 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 180 insertions(+), 0 deletions(-)

diffs (184 lines):

diff -r 696461b22093 -r 13dd690b1ce1 doc/releases/hugin-2011.0.0.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/releases/hugin-2011.0.0.txt	Sun May 29 15:58:53 2011 -0400
@@ -0,0 +1,180 @@
+Hugin-2011.0.0 RELEASE NOTES
+
+ABOUT
+
+Hugin is more than just a panorama stitcher.  A new version is available.
+
+Hugin can be found at
+* SourceForge:  http://hugin.sourceforge.net/
+* Launchpad:    https://launchpad.net/hugin
+
+
+DOWNLOAD
+
+The 2011.0.0 source tarball can be downloaded
+
+* from SourceForge at
+http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.0/hugin-2011.0.0.tar.bz2/download
+
+* from Launchpad at
+http://launchpad.net/hugin/2011.0/2011.0.0/+download/hugin-2011.0.0.tar.bz2
+
+This is a source code release.  For executables see below.
+
+This tarball is equivalent to rev/changeset 5243:67a96ebdac74 in our Mercurial
+repository, where it is also tagged 2011.0.0
+
+Verify its SHA1SUM
+22e1ad3846291a9bbe58570683e213921a6f0116  hugin-2011.0.0.tar.bz2
+
+
+EXECUTABLES
+
+Users communities produce executables for their respective platforms.
+
+These executables are then added to the download section on SourceForge at
+http://sourceforge.net/projects/hugin/files/hugin/
+
+A number of users have built recent snapshots and executables are likely to be
+announced within a few days of this tarball release.
+
+Watch http://groups.google.com/group/hugin-ptx for the announcements of binary
+releases.  If you don't see a binary for your platform it has most likely not
+been produced yet.  Consider stepping up to the task.  Instructions at
+
+http://wiki.panotools.org/Development_of_Open_Source_tools#Supported_Platforms
+
+Announce your build on http://groups.google.com/group/hugin-ptx
+
+
+SPLASH SCREEN
+
+To promote artists using Hugin the project has adopted a user-contributed
+artwork to enrich the splash screen of this release.
+
+Read more about the Seattle Sunset panorama and author/contributor Jeff Boyd at
+http://hugin.sourceforge.net/releases/2011.0.0/
+
+
+TRANSLATIONS
+
+Many translations have been updated for this release.
+
+
+CHANGES SINCE 2010.4.0
+
+Despite some known issues (see section KNOWN ISSUES below) this release brings
+many major new features worth releasing now.  Hugin's own control point
+generator CPFind has been significantly improved;  the last project from the
+2010 Google Summer of Code has been integrated;  many general improvements
+have been made.
+
+
+_Improved Built-in Control Points Generator_
+
+CPFind's detection ability has been significantly improved, especially for
+wide angle (> FOV 65°) images, fisheye images, and rotated images.  Anecdotal
+evidence shows it to be more accurate than any other CP detector ever used
+with Hugin.  A thorough, scientific comparison against other CP detectors
+is welcome.  If you have well formed comparison results, please publish a link
+on the Hugin mailing list at http://groups.google.com/group/hugin-ptx/
+
+
+_Improved Fast Preview_
+
+An Overview pane has been added to the Fast Preview window.  Users can now
+interact with the panosphere like in a virtual reality viewer in real time
+and visualize all areas of the panorama with little distortion, including
+the zenith and nadir that are typically excessively distorted in the flat
+preview.
+
+It is now possible to drag individual images or arbitrary groups of images
+on the panosphere in the fast preview.
+
+A new gray point picker has been added for visual white balance correction.
+
+
+_Registration of Stereo Images_
+
+align_image_stack is commonly used for the alignment of slightly misaligned
+images, e.g. for creating a High Dynamic Range image  from multiple exposures
+when the camera was hand held.
+
+It has been extended with additional functionality for the registration of
+stereo images.
+
+
+_Other Improvements_
+
+* Man pages are now compressed and the generation is integrated in the CMake
+  process (Linux).
+* New Thoby projection modeling 10.5mm Nikkor fisheye lens.
+* Improved support for some keyboard shortcuts.
+* New Preferences: output file format (LDR only).
+* This release has the usual bugfixes and adds minor features.
+
+
+_Libraries and Build_
+
+* CMake 2.8 or newer is now required
+* Support has been added for gcc-4.6 compiler
+* Libpano13 needs to be at least 2.9.18
+
+
+CONTROL POINTS GENERATORS
+
+Since 2010.4 Hugin ships with its own 'Patent Free' control point generator.
+Third-party generators are still supported through the plug-in architecture.
+CPFind is the recommended control point generator and the only one endorsed
+by the Hugin project team.
+
+
+UPGRADING
+
+Upgrading from previous versions of Hugin should be seamless. If you do have
+problems with old settings, these can be reset in the Preferences by clicking
+'Load defaults'.
+
+It is strongly recommended to set the default control point detector to
+Hugin's CPFind.
+
+
+COMPILING
+
+Users compiling from source refer to the dependencies listed at
+http://wiki.panotools.org/Development_of_Open_Source_tools#Dependencies
+
+and the build processes listed at
+http://wiki.panotools.org/Development_of_Open_Source_tools#Build_your_Own_Test_Builds
+
+More information in the README and INSTALL_cmake files in the tarball.
+
+
+KNOWN ISSUES AND WORKAROUNDS
+
+On some versions of OSX, Hugin can't stitch the project.  Workaround:
+1. Save the project file in Hugin
+2. Open the project file in PTBatcherGUI (File / Add Project / select .pto file)
+3. Click the run button to stitch.
+details at https://bugs.launchpad.net/hugin/+bug/697039
+
+
+Plane overview is wrong if opening fast preview window the first time
+https://bugs.launchpad.net/hugin/+bug/726183
+
+
+Panosphere Overview window seperated from the content
+https://bugs.launchpad.net/hugin/+bug/726997
+
+
+An updated list of issues deemed to be critical, including discussions
+and workarounds is in the issue tracker.
+https://bugs.launchpad.net/hugin/+bugs?search=Search&field.importance=Critical
+
+
+THANKS
+
+Thanks to all the contributors to this release and members of the hugin-ptx
+mailing list, too many to mention here.
+
+Hugin can be found at http://hugin.sourceforge.net/ and at https://launchpad.net/hugin

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin-web: 2011.0.0 released

From: <hugin-cvs@li...> - 2011-05-29 19:48

details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin-web/hgrepo/h/hu/hugin/hugin-web/rev/f0cade030971
changeset: 251:f0cade030971
user:      Yuval Levy <yuv@...>
date:       Sun May 29 15:48:15 2011 -0400
description:
2011.0.0 released

diffstat:

 index.shtml                |  10 +++++++---
 news.html                  |   8 ++++++++
 releases/2011.0.0/en.shtml |   4 ----
 releases/index.shtml       |   9 +++++++++
 4 files changed, 24 insertions(+), 7 deletions(-)

diffs (80 lines):

diff -r 76a4b82cadab -r f0cade030971 index.shtml
--- a/index.shtml	Mon May 23 08:31:03 2011 -0400
+++ b/index.shtml	Sun May 29 15:48:15 2011 -0400
@@ -16,11 +16,15 @@
 
 <div class="alert">
 
-<h2>Hugin 2010.4.0 released! <small>2011-01-01</small></h2>
+<h2>Hugin 2011.0.0 released! <small>2011-05-29</small></h2>
+<p class="alert"><a href="releases/2011.0.0/">Release notes...</a>
+</p>
+
+<!--<h2>Hugin 2010.4.0 released! <small>2011-01-01</small></h2>
 <p class="alert"><a href="releases/2010.4.0/">Release notes...</a>
 [ <a href="releases/2010.4.0/it.shtml">Italiano...</a>
-<a href="releases/2010.4.0/de.shtml">Deutsch...</a>
-</p>
+<a href="releases/2010.4.0/de.shtml">Deutsch...</a> ]
+</p>-->
 
 <!--<h2>Hugin 2010.2.0 released! <small>2010-10-10</small></h2>
 <p class="alert"><a href="releases/2010.2.0/">Release notes...</a>
diff -r 76a4b82cadab -r f0cade030971 news.html
--- a/news.html	Mon May 23 08:31:03 2011 -0400
+++ b/news.html	Sun May 29 15:48:15 2011 -0400
@@ -8,6 +8,14 @@
 <!-- other news is also relevant, feel free to add anything Hugin related -->
 
 <p><strong>
+Hugin-2011.0.0 released
+</strong><small class="date">
+2011-05-29
+</small><br />
+Hugin is more than just a panorama stitcher
+</p>
+
+<p><strong>
 Hugin selected for 2011 Google Summer of Code
 </strong><small class="date">
 2011-03-19
diff -r 76a4b82cadab -r f0cade030971 releases/2011.0.0/en.shtml
--- a/releases/2011.0.0/en.shtml	Mon May 23 08:31:03 2011 -0400
+++ b/releases/2011.0.0/en.shtml	Sun May 29 15:48:15 2011 -0400
@@ -111,10 +111,6 @@
 
 <p>Hugin can be found at <a href="http://hugin.sourceforge.net/">SourceForge</a> and <a href="https://launchpad.net/hugin">Launchpad</a>.
 
-<p>The 2011.0.0_rc1 source tarball can be downloaded from
-<a href="http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.0_beta/hugin-2011.0.0_rc1.tar.bz2/download">SourceForge</a>
-or from <a href="http://launchpad.net/hugin/2011.0/2011.0rc1/+download/hugin-2011.0.0_rc1.tar.bz2">Launchpad</a>.
-
 <p>Users communities produce executables for their respective platforms.  Executables are likely to be announced within a few days of this tarball release on the <a href="http://groups.google.com/group/hugin-ptx">mailing list</a> and added to the <a href="http://sourceforge.net/projects/hugin/files/hugin/">download section</a> on SourceForge.
 
 <h2>Known Issues and Workarounds</h2>
diff -r 76a4b82cadab -r f0cade030971 releases/index.shtml
--- a/releases/index.shtml	Mon May 23 08:31:03 2011 -0400
+++ b/releases/index.shtml	Sun May 29 15:48:15 2011 -0400
@@ -12,6 +12,14 @@
 <div class="content">
 <h1>Hugin release notes</h1>
 
+<h2>Hugin 2011.0.0</h2>
+<ul>
+
+<li><a href="2011.0.0/">English release notes</a></li>
+
+</ul>
+
+
 <h2>Hugin 2010.4.0</h2>
 <ul>
 
@@ -19,6 +27,7 @@
 <li><a href="2010.4.0/de.shtml">German release notes</a></li>
 <li><a href="2010.4.0/it.shtml">Italian release notes</a></li>
 
+</ul>
 
 <h2>Hugin 2010.2.0</h2>
 <ul>

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Added tag 2011.0.0 for changeset 67a96...

From: <hugin-cvs@li...> - 2011-05-29 19:00

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/696461b22093
changeset:
diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r bf40d97f00ef -r 696461b22093 .hgtags
--- a/.hgtags	Sun May 29 19:39:41 2011 +0200
+++ b/.hgtags	Sun May 29 14:57:41 2011 -0400
@@ -64,3 +64,4 @@
 0000000000000000000000000000000000000000 hugin-2009.2.0_beta3
 af5ab8815d4d2a455ac88ec44f14ff416b2126fc 2009.2.0beta4
 0000000000000000000000000000000000000000 2009.2.0beta4
+67a96ebdac744cc4809e821cf98535077024f948 2011.0.0

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Use debian scripts to get package depe...

From: <hugin-cvs@li...> - 2011-05-29 17:40

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/bf40d97f00ef
changeset:
diffstat:

 CMakeLists.txt |  13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diffs (33 lines):

diff -r 06addb5595a4 -r bf40d97f00ef CMakeLists.txt
--- a/CMakeLists.txt	Sat May 28 11:59:49 2011 +0200
+++ b/CMakeLists.txt	Sun May 29 19:39:41 2011 +0200
@@ -8,10 +8,14 @@
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules )
 
+set(ARCH_TRIPLET)
 if(UNIX)
   FIND_PROGRAM(DPKG_ARCHITECTURE_EXECUTABLE dpkg-architecture)
   if(DPKG_ARCHITECTURE_EXECUTABLE)
-    EXECUTE_PROCESS(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH OUTPUT_VARIABLE ARCH_TRIPLET OUTPUT_STRIP_TRAILING_WHITESPACE)
+    EXECUTE_PROCESS(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
+      OUTPUT_VARIABLE ARCH_TRIPLET
+      ERROR_VARIABLE ERROR_ARCH_TRIPLET
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
   endif()
 endif()
 if(ARCH_TRIPLET)
@@ -573,9 +577,10 @@
 "Makefile\\\\.in$"
 "/\\\\.hg/"
  )
-SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libpano13(>=2.9.17)")
-# one day we'll get these to work right
-#SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libpano13(>=2.9.17), libpost2c2, libglew(>=1.5), freeglut3, libboost-filesystem(>=1.38.0), liblcms1, libopenexr6, libtiff4")
+
+# Use dpkg-shlibdeps to get the needed dependences
+SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+
 SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/Debian/postinst")
 INCLUDE(CPack)

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Updated Italian translation

From: <hugin-cvs@li...> - 2011-05-28 10:00

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/06addb5595a4
changeset:
diffstat:

 src/translations/it.po |  2324 +++++++++++++++++++++++++++++-----------------------
 1 files changed, 1283 insertions(+), 1041 deletions(-)

diffs (truncated from 5169 to 500 lines):

diff -r 5c3f97f80c1b -r 06addb5595a4 src/translations/it.po
--- a/src/translations/it.po	Sat May 28 09:44:18 2011 +0200
+++ b/src/translations/it.po	Sat May 28 11:59:49 2011 +0200
@@ -36,8 +36,8 @@
 "Project-Id-Version: hugin 0.8\n"
 "Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
 "group_id=77506&atid=550441\n"
-"POT-Creation-Date: 2011-02-27 08:45-0500\n"
-"PO-Revision-Date: 2011-02-27 16:29+0100\n"
+"POT-Creation-Date: 2011-05-28 11:57+0200\n"
+"PO-Revision-Date: 2011-05-28 11:24+0100\n"
 "Last-Translator: Cristian Marchi <cri.penta@..."
 "Language-Team: Italian <tp@..."
 "Language: it\n"
@@ -57,15 +57,18 @@
 
 #: hugin1/base_wx/huginConfig.cpp:47 hugin1/base_wx/huginConfig.cpp:57
 #: hugin1/base_wx/huginConfig.cpp:69 hugin1/base_wx/huginConfig.cpp:82
-#: hugin1/base_wx/RunStitchPanel.cpp:111 hugin1/hugin/AssistantPanel.cpp:361
-#: hugin1/hugin/AssistantPanel.cpp:428 hugin1/hugin/CPEditorPanel.cpp:2174
-#: hugin1/hugin/GLViewer.cpp:151 hugin1/hugin/GLViewer.cpp:161
-#: hugin1/hugin/MainFrame.cpp:145 hugin1/hugin/MainFrame.cpp:643
-#: hugin1/hugin/MainFrame.cpp:881 hugin1/hugin/MainFrame.cpp:1413
-#: hugin1/hugin/MainFrame.cpp:1872
+#: hugin1/base_wx/RunStitchPanel.cpp:111
+#: hugin1/calibrate_lens/LensCalFrame.cpp:99
+#: hugin1/calibrate_lens/LensCalFrame.cpp:398
+#: hugin1/calibrate_lens/LensCalFrame.cpp:462
+#: hugin1/hugin/AssistantPanel.cpp:361 hugin1/hugin/AssistantPanel.cpp:428
+#: hugin1/hugin/CPEditorPanel.cpp:2174 hugin1/hugin/GLViewer.cpp:151
+#: hugin1/hugin/GLViewer.cpp:161 hugin1/hugin/MainFrame.cpp:145
+#: hugin1/hugin/MainFrame.cpp:667 hugin1/hugin/MainFrame.cpp:905
+#: hugin1/hugin/MainFrame.cpp:1450 hugin1/hugin/MainFrame.cpp:1930
 #: hugin1/hugin/OptimizePhotometricPanel.cpp:565
 #: hugin1/hugin/OptimizePhotometricPanel.cpp:585
-#: hugin1/hugin/PanoPanel.cpp:996 hugin1/hugin/PanoPanel.cpp:1063
+#: hugin1/hugin/PanoPanel.cpp:996 hugin1/hugin/PanoPanel.cpp:1059
 #: hugin1/icpfind/AutoCtrlPointCreator.cpp:206
 #: hugin1/ptbatcher/BatchFrame.cpp:445 hugin1/ptbatcher/FindPanoDialog.cpp:265
 #: hugin1/ptbatcher/ProjectListBox.cpp:171
@@ -98,16 +101,73 @@
 #: hugin1/base_wx/huginConfig.cpp:219 hugin1/base_wx/huginConfig.cpp:224
 #: hugin1/base_wx/huginConfig.cpp:230 hugin1/base_wx/huginConfig.cpp:235
 #: hugin1/base_wx/huginConfig.cpp:240 hugin1/base_wx/huginConfig.cpp:245
+#: hugin1/calibrate_lens/LensCalFrame.cpp:411
+#: hugin1/calibrate_lens/LensCalFrame.cpp:590
+#: hugin1/calibrate_lens/LensCalFrame.cpp:613
+#: hugin1/calibrate_lens/LensCalFrame.cpp:621
+#: hugin1/calibrate_lens/LensCalFrame.cpp:729
+#: hugin1/calibrate_lens/LensCalFrame.cpp:737
+#: hugin1/calibrate_lens/LensCalFrame.cpp:771
+#: hugin1/calibrate_lens/LensCalFrame.cpp:843
 #: hugin1/hugin/AssistantPanel.cpp:432 hugin1/hugin/CPDetectorDialog.cpp:121
-#: hugin1/hugin/GLPreviewFrame.cpp:1362 hugin1/hugin/GLPreviewFrame.cpp:1369
-#: hugin1/hugin/GLPreviewFrame.cpp:1376 hugin1/hugin/GLPreviewFrame.cpp:1388
-#: hugin1/hugin/GLPreviewFrame.cpp:1395 hugin1/hugin/GLPreviewFrame.cpp:1402
-#: hugin1/hugin/MainFrame.cpp:639 hugin1/hugin/PreferencesDialog.cpp:868
+#: hugin1/hugin/GLPreviewFrame.cpp:1358 hugin1/hugin/GLPreviewFrame.cpp:1365
+#: hugin1/hugin/GLPreviewFrame.cpp:1372 hugin1/hugin/GLPreviewFrame.cpp:1386
+#: hugin1/hugin/GLPreviewFrame.cpp:1393 hugin1/hugin/GLPreviewFrame.cpp:1400
+#: hugin1/hugin/MainFrame.cpp:663 hugin1/hugin/MaskEditorPanel.cpp:448
+#: hugin1/hugin/PreferencesDialog.cpp:890
 #: hugin1/ptbatcher/FindPanoDialog.cpp:225
 #: hugin1/ptbatcher/FindPanoDialog.cpp:244
 msgid "Warning"
 msgstr "Avviso"
 
+# Tipo di obiettivo
+#: hugin1/base_wx/LensTools.cpp:36 hugin1/hugin/ImagesList.cpp:573
+msgid "Normal (rectilinear)"
+msgstr "Normale (rettilineo)"
+
+# Tipo di obiettivo
+#: hugin1/base_wx/LensTools.cpp:37 hugin1/hugin/ImagesList.cpp:574
+msgid "Panoramic (cylindrical)"
+msgstr "Panoramico (cilindrico)"
+
+# Tipo di obiettivo
+#: hugin1/base_wx/LensTools.cpp:38 hugin1/hugin/ImagesList.cpp:575
+msgid "Circular fisheye"
+msgstr "Fisheye circolare"
+
+# Tipo di obiettivo
+#: hugin1/base_wx/LensTools.cpp:39 hugin1/hugin/ImagesList.cpp:576
+msgid "Full frame fisheye"
+msgstr "Fisheye full-frame"
+
+#: hugin1/base_wx/LensTools.cpp:40 hugin1/hugin/GLPreviewFrame.cpp:1252
+#: hugin1/hugin/ImagesList.cpp:577 hugin1/hugin/PreviewFrame.cpp:617
+msgid "Equirectangular"
+msgstr "Equirettangolare"
+
+# Proiezione
+#: hugin1/base_wx/LensTools.cpp:41 hugin1/hugin/ImagesList.cpp:578
+#: hugin1/hugin/PanoPanel.cpp:157
+msgid "Orthographic"
+msgstr "Ortografica"
+
+# Proiezione
+#: hugin1/base_wx/LensTools.cpp:42 hugin1/hugin/ImagesList.cpp:579
+#: hugin1/hugin/PanoPanel.cpp:147
+msgid "Stereographic"
+msgstr "Stereografica"
+
+# Proiezione
+#: hugin1/base_wx/LensTools.cpp:43 hugin1/hugin/ImagesList.cpp:580
+#: hugin1/hugin/PanoPanel.cpp:158
+msgid "Equisolid"
+msgstr "Equisolida"
+
+# Proiezione
+#: hugin1/base_wx/LensTools.cpp:44 hugin1/hugin/ImagesList.cpp:581
+msgid "Fisheye Thoby"
+msgstr "Fisheye di Thoby"
+
 #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:160
 #, c-format
 msgid "Failed to kill process %ld, error %d: %s"
@@ -125,12 +185,12 @@
 
 #: hugin1/base_wx/MyExternalCmdExecDialog.cpp:606
 #: hugin1/ptbatcher/RunStitchFrame.cpp:43
-#: hugin1/stitch_project/hugin_stitch_project.cpp:124 translations/xrc.cpp:34
-#: translations/xrc.cpp:148 translations/xrc.cpp:441 translations/xrc.cpp:511
-#: translations/xrc.cpp:515 translations/xrc.cpp:519 translations/xrc.cpp:613
-#: translations/xrc.cpp:739 translations/xrc.cpp:837 xrc.cpp:34 xrc.cpp:148
-#: xrc.cpp:441 xrc.cpp:511 xrc.cpp:515 xrc.cpp:519 xrc.cpp:613 xrc.cpp:739
-#: xrc.cpp:837
+#: hugin1/stitch_project/hugin_stitch_project.cpp:124 translations/xrc.cpp:33
+#: translations/xrc.cpp:147 translations/xrc.cpp:481 translations/xrc.cpp:551
+#: translations/xrc.cpp:555 translations/xrc.cpp:559 translations/xrc.cpp:653
+#: translations/xrc.cpp:779 translations/xrc.cpp:879 xrc.cpp:33 xrc.cpp:147
+#: xrc.cpp:481 xrc.cpp:551 xrc.cpp:555 xrc.cpp:559 xrc.cpp:653 xrc.cpp:779
+#: xrc.cpp:879
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -161,7 +221,7 @@
 "hdr)|*.hdr;*.HDR|File EXR (*.exr)|*.exr;*.EXR|Tutti i file (*)|*"
 
 #: hugin1/base_wx/PTWXDlg.cpp:48 hugin1/base_wx/PTWXDlg.cpp:66
-#: hugin1/base_wx/PTWXDlg.cpp:118 translations/xrc.cpp:740 xrc.cpp:740
+#: hugin1/base_wx/PTWXDlg.cpp:118 translations/xrc.cpp:780 xrc.cpp:780
 msgid "Panorama Tools"
 msgstr "Panorama Tools"
 
@@ -230,45 +290,211 @@
 msgid "Error during running assistant"
 msgstr "Errore durante l'esecuzione dell'assistente"
 
-#: hugin1/hugin/AboutDialog.cpp:144
+#: hugin1/calibrate_lens/LensCalApp.cpp:59 hugin1/hugin/huginApp.cpp:179
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:75
+msgid "xrc directory not found in bundle"
+msgstr "Cartella xrc non trovata nel bundle"
+
+#: hugin1/calibrate_lens/LensCalApp.cpp:59
+#: hugin1/calibrate_lens/LensCalApp.cpp:67
+#: hugin1/calibrate_lens/LensCalApp.cpp:78 hugin1/hugin/huginApp.cpp:179
+#: hugin1/hugin/huginApp.cpp:191 hugin1/hugin/huginApp.cpp:204
+#: hugin1/hugin/MainFrame.cpp:1925 hugin1/ptbatcher/PTBatcherGUI.cpp:75
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:81 hugin1/ptbatcher/PTBatcherGUI.cpp:101
+#: hugin1/stitch_project/hugin_stitch_project.cpp:300
+msgid "Fatal Error"
+msgstr "Errore fatale"
+
+#: hugin1/calibrate_lens/LensCalApp.cpp:67 hugin1/hugin/huginApp.cpp:191
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:81
+#: hugin1/stitch_project/hugin_stitch_project.cpp:300
+msgid "Translations not found in bundle"
+msgstr "Traduzioni non trovate nel bundle"
+
+#: hugin1/calibrate_lens/LensCalApp.cpp:78 hugin1/hugin/huginApp.cpp:204
+#: hugin1/ptbatcher/PTBatcherGUI.cpp:101
+msgid ""
+"xrc directory not found, hugin needs to be properly installed\n"
+"Tried Path:"
+msgstr ""
+"Cartella xrc non trovata, Hugin deve essere installato correttamente.\n"
+"Percorso provato:"
+
+#: hugin1/calibrate_lens/LensCalFrame.cpp:98
+#: hugin1/calibrate_lens/LensCalFrame.cpp:461 hugin1/hugin/MainFrame.cpp:144
+#: hugin1/hugin/MainFrame.cpp:904
+#, c-format
+msgid ""
+"The filename(s) contains one of the following invalid characters: %s\n"
+"Hugin can not work with these filenames. Please rename your file(s) and try "
+"again."
+msgstr ""
+"Il nome del (o dei) file contiene uno o più dei caratteri non validi "
+"seguenti: %s\n"
+"Hugin non è in grado di operare con questi nomi di file. Rinominare il (o i) "
+"file e riprovare."
+
+#: hugin1/calibrate_lens/LensCalFrame.cpp:169
+msgid "Hugin Lens calibration GUI"
+msgstr "Interfaccia per la calibrazione degli obiettivi di Hugin"
+
+#: hugin1/calibrate_lens/LensCalFrame.cpp:371
+#, c-format
+msgid "Added %s"
+msgstr "Aggiunto %s"
+
+#: hugin1/calibrate_lens/LensCalFrame.cpp:397
+#, c-format
+msgid ""
+"The size of the images (%s) does not match with the already added image(s)."
+msgstr ""
+"La dimensione delle immagini (%s) non corrisponde a quella delle immagini "
+"già presenti."
+
+#: hugin1/calibrate_lens/LensCalFrame.cpp:410
+#, c-format
+msgid ""
+"The EXIF information of the added images (%s) are not consistent with the "
+"already added image(s).\n"
+"Please check the image again, if you selected the correct images."
+msgstr ""
+"Le informazioni EXIF delle immagini aggiunte (%s) non sono consistenti con "
+"quelle delle immagini già presenti.\n"
+"Assicurarsi di aver selezionato le immagini corrette."
+
+#: hugin1/calibrate_lens/LensCalFrame.cpp:419 hugin1/hugin/MainFrame.cpp:861
+#: hugin1/hugin/wxPanoCommand.cpp:413 hugin1/hugin/wxPanoCommand.cpp:592
+msgid "Add images"
+msgstr "Aggiungi immagini"
+
+#: hugin1/calibrate_lens/LensCalFrame.cpp:484 hugin1/hugin/MainFrame.cpp:938
+msgid "Add Image: cancel"
+msgstr "Aggiungi immagine: annulla"
+
+#: hugin1/calibrate_lens/LensCalFrame.cpp:492
+#: hugin1/calibrate_lens/LensCalFrame.cpp:502
+#, c-format
+msgid "%s (%d lines)"
+msgstr "%s (%d linee)"
+
+#: hugin1/calibrate_lens/LensCalFrame.cpp:590
+#: hugin1/calibrate_lens/LensCalFrame.cpp:613
+#: hugin1/calibrate_lens/LensCalFrame.cpp:729
+#: hugin1/calibrate_lens/LensCalFrame.cpp:771
+#: hugin1/calibrate_lens/LensCalFrame.cpp:843
+msgid ""
+"There are invalid values in the input boxes.\n"
+"Please check your inputs."
+msgstr ""
+"Sono stati inseriti dei valori non validi nei campi di input.\n"
+"Controllare l'input."
+
+#: hugin1/calibrate_lens/LensCalFrame.cpp:599
+msgid "Detecting edges..."
+msgstr "Ricerca dei bordi..."
+
+# (ndt) pulsante
+#: hugin1/calibrate_lens/LensCalFrame.cpp:601
+msgid "Finding lines..."
+msgstr "Ricerca linee..."
+
+#: hugin1/calibrate_lens/LensCalFrame.cpp:605
+#: hugin1/calibrate_lens/LensCalFrame.cpp:722
+msgid "Finished"
+msgstr "Finito"
+
+#: hugin1/calibrate_lens/LensCalFrame.cpp:621
+msgid ""
+"There are no detected lines.\n"
+"Please run \"Find lines\" before. If there are no lines found, change the "
+"parameters."
+msgstr ""
+"Non sono state individuate delle linee.\n"
+"Eseguire prima «Cerca linee». Se non vengono trovate delle linee, modificare "
+"i parametri."
+
+#: hugin1/calibrate_lens/LensCalFrame.cpp:706
+msgid "Optimizing lens distortions parameters..."
+msgstr "Ottimizzazione dei parametri di distorsione dell'obiettivo..."
+
+#: hugin1/calibrate_lens/LensCalFrame.cpp:737
+msgid ""
+"There are no detected lines.\n"
+"Please run \"Find lines\" and \"Optimize\" before saving the lens data. If "
+"there are no lines found, change the parameters."
+msgstr ""
+"Non sono state individuate delle linee.\n"
+"Eseguire «Cerca linee» e «Ottimizza» prima di salvare i dati dell'obiettivo. "
+"Se non vengono trovate delle linee, modificare i parametri."
+
+#: hugin1/calibrate_lens/LensCalFrame.cpp:742 hugin1/hugin/LensPanel.cpp:763
+msgid "Save lens parameters file"
+msgstr "Salva file parametri obiettivo"
+
+#: hugin1/calibrate_lens/LensCalFrame.cpp:744 hugin1/hugin/LensPanel.cpp:765
+msgid "Lens Project Files (*.ini)|*.ini|All files (*)|*"
+msgstr "File progetto obiettivo (*.ini)|*.ini|Tutti i file (*)|*"
+
+#: hugin1/calibrate_lens/LensCalFrame.cpp:755
+#: hugin1/calibrate_lens/LensCalFrame.cpp:786 hugin1/hugin/MainFrame.cpp:692
+#: hugin1/hugin/MaskEditorPanel.cpp:359
+#, c-format
+msgid "File %s exists. Overwrite?"
+msgstr "Il file %s esiste già. Sovrascriverlo?"
+
+#: hugin1/calibrate_lens/LensCalFrame.cpp:756
+#: hugin1/calibrate_lens/LensCalFrame.cpp:787 hugin1/hugin/MainFrame.cpp:693
+#: translations/xrc.cpp:417 xrc.cpp:417
+msgid "Save project"
+msgstr "Salva il progetto"
+
+#: hugin1/calibrate_lens/LensCalFrame.cpp:775 hugin1/hugin/MainFrame.cpp:680
+msgid "Save project file"
+msgstr "Salva file progetto"
+
+#: hugin1/calibrate_lens/LensCalFrame.cpp:776 hugin1/hugin/MainFrame.cpp:682
+msgid "Project files (*.pto)|*.pto|All files (*)|*"
+msgstr "File progetto (*.pto)|*.pto|Tutti i file (*)|*"
+
+#: hugin1/hugin/AboutDialog.cpp:126
 #, c-format
 msgid "Operating System: %s"
 msgstr "Sistema operativo: %s"
 
-#: hugin1/hugin/AboutDialog.cpp:147
+#: hugin1/hugin/AboutDialog.cpp:129
 msgid "64 bit"
 msgstr "64 bit"
 
-#: hugin1/hugin/AboutDialog.cpp:149
+#: hugin1/hugin/AboutDialog.cpp:131
 msgid "32 bit"
 msgstr "32 bit"
 
-#: hugin1/hugin/AboutDialog.cpp:150
+#: hugin1/hugin/AboutDialog.cpp:132
 #, c-format
 msgid "Architecture: %s"
 msgstr "Architettura: %s"
 
-#: hugin1/hugin/AboutDialog.cpp:153
+#: hugin1/hugin/AboutDialog.cpp:135
 #, c-format
 msgid "Free memory: %ld kiB"
 msgstr "Memoria libera: %ld kiB"
 
-#: hugin1/hugin/AboutDialog.cpp:156
+#: hugin1/hugin/AboutDialog.cpp:138
 #, c-format
 msgid "Active Codepage: %u"
 msgstr "Codifica caratteri attiva: %u"
 
-#: hugin1/hugin/AboutDialog.cpp:188
+#: hugin1/hugin/AboutDialog.cpp:170
 #, c-format
 msgid "Version: %s"
 msgstr "Versione: %s"
 
-#: hugin1/hugin/AboutDialog.cpp:189
+#: hugin1/hugin/AboutDialog.cpp:171
 #, c-format
 msgid "Path to resources: %s"
 msgstr "Percorso delle risorse: %s"
 
-#: hugin1/hugin/AboutDialog.cpp:190
+#: hugin1/hugin/AboutDialog.cpp:172
 #, c-format
 msgid "Path to data: %s"
 msgstr "Percorso dei dati: %s"
@@ -422,7 +648,7 @@
 msgstr "Eseguibili (*.exe,*.vbs,*.cmd, *.bat)|*.exe;*.vbs;*.cmd;*.bat"
 
 #: hugin1/hugin/CPEditorPanel.cpp:221 hugin1/hugin/CPListFrame.cpp:329
-#: hugin1/hugin/ImagesList.cpp:85 hugin1/hugin/MaskEditorPanel.cpp:100
+#: hugin1/hugin/ImagesList.cpp:85 hugin1/hugin/MaskEditorPanel.cpp:104
 msgid "#"
 msgstr "#"
 
@@ -494,8 +720,8 @@
 msgstr "Nessun punto simile trovato."
 
 #: hugin1/hugin/CPEditorPanel.cpp:1069 hugin1/hugin/CPEditorPanel.cpp:1082
-#: hugin1/hugin/GLPreviewFrame.cpp:2558 hugin1/hugin/MainFrame.cpp:522
-#: hugin1/hugin/PanoPanel.cpp:1339 hugin1/hugin/PanoPanel.cpp:1367
+#: hugin1/hugin/GLPreviewFrame.cpp:2576 hugin1/hugin/MainFrame.cpp:546
+#: hugin1/hugin/PanoPanel.cpp:1327 hugin1/hugin/PanoPanel.cpp:1355
 msgid "Hugin"
 msgstr "Ungherese"
 
@@ -532,8 +758,8 @@
 msgstr "Riga %d"
 
 #: hugin1/hugin/CPEditorPanel.cpp:1586 hugin1/hugin/CPListFrame.cpp:454
-#: hugin1/hugin/GLPreviewFrame.cpp:547 hugin1/hugin/GLPreviewFrame.cpp:551
-#: hugin1/hugin/PreviewFrame.cpp:231 translations/xrc.cpp:153 xrc.cpp:153
+#: hugin1/hugin/GLPreviewFrame.cpp:548 hugin1/hugin/GLPreviewFrame.cpp:552
+#: hugin1/hugin/PreviewFrame.cpp:231 translations/xrc.cpp:152 xrc.cpp:152
 msgid "normal"
 msgstr "normale"
 
@@ -565,7 +791,7 @@
 msgstr "Soglia di rilevamento angoli"
 
 #: hugin1/hugin/CPEditorPanel.cpp:1931 hugin1/hugin/CPEditorPanel.cpp:1935
-#: translations/xrc.cpp:222 xrc.cpp:222
+#: translations/xrc.cpp:221 xrc.cpp:221
 msgid "Create control points"
 msgstr "Crea punti di controllo"
 
@@ -608,7 +834,7 @@
 msgid "Loading model file"
 msgstr "Caricamento del file modello in corso..."
 
-#: hugin1/hugin/CPEditorPanel.cpp:2228 hugin1/hugin/MainFrame.cpp:1603
+#: hugin1/hugin/CPEditorPanel.cpp:2228 hugin1/hugin/MainFrame.cpp:1640
 #, c-format
 msgid "Removed %d control points"
 msgstr "Rimossi %d punti di controllo"
@@ -717,156 +943,151 @@
 msgstr "Trascinare per spostare"
 
 # tooltip
-#: hugin1/hugin/GLPreviewFrame.cpp:282
+#: hugin1/hugin/GLPreviewFrame.cpp:283
 msgid "Fast Panorama preview"
 msgstr "Anteprima panorama veloce"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:326 translations/xrc.cpp:749
-#: translations/xrc.cpp:756 xrc.cpp:749 xrc.cpp:756
+#: hugin1/hugin/GLPreviewFrame.cpp:327 translations/xrc.cpp:789
+#: translations/xrc.cpp:796 xrc.cpp:789 xrc.cpp:796
 msgid "Center"
 msgstr "Centra"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:327 hugin1/hugin/GLPreviewFrame.cpp:329
-#: translations/xrc.cpp:759 xrc.cpp:759
+#: hugin1/hugin/GLPreviewFrame.cpp:328 hugin1/hugin/GLPreviewFrame.cpp:330
+#: translations/xrc.cpp:799 xrc.cpp:799
 msgid "Fit"
 msgstr "Adatta"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:328 translations/xrc.cpp:761 xrc.cpp:761
+#: hugin1/hugin/GLPreviewFrame.cpp:329 translations/xrc.cpp:801 xrc.cpp:801
 msgid "Straighten"
 msgstr "Raddrizza"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:330 hugin1/hugin/GLPreviewFrame.cpp:2189
+#: hugin1/hugin/GLPreviewFrame.cpp:331 hugin1/hugin/GLPreviewFrame.cpp:2199
 #: hugin1/hugin/PanoPanel.cpp:946
 msgid "Autocrop"
 msgstr "Autoritaglio"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:348 hugin1/hugin/PreviewFrame.cpp:132
+#: hugin1/hugin/GLPreviewFrame.cpp:349 hugin1/hugin/PreviewFrame.cpp:132
 msgid "displayed images"
 msgstr "Immagini visualizzate"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:373 translations/xrc.cpp:769 xrc.cpp:769
+#: hugin1/hugin/GLPreviewFrame.cpp:374 translations/xrc.cpp:809 xrc.cpp:809
 msgid "All"
 msgstr "Tutte"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:374 translations/xrc.cpp:550
-#: translations/xrc.cpp:555 translations/xrc.cpp:697 translations/xrc.cpp:771
-#: xrc.cpp:550 xrc.cpp:555 xrc.cpp:697 xrc.cpp:771
+#: hugin1/hugin/GLPreviewFrame.cpp:375 translations/xrc.cpp:590
+#: translations/xrc.cpp:595 translations/xrc.cpp:737 translations/xrc.cpp:811
+#: xrc.cpp:590 xrc.cpp:595 xrc.cpp:737 xrc.cpp:811
 msgid "None"
 msgstr "Nessuna"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:383
+#: hugin1/hugin/GLPreviewFrame.cpp:384
 msgid "Hide"
 msgstr "Nascondi"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:430 hugin1/hugin/PreviewFrame.cpp:169
+#: hugin1/hugin/GLPreviewFrame.cpp:431 hugin1/hugin/PreviewFrame.cpp:169
 msgid "VFOV"
 msgstr "VFOV"
 
 # (ndt) suggerimento su un controllo scorrevole
-#: hugin1/hugin/GLPreviewFrame.cpp:434 hugin1/hugin/PreviewFrame.cpp:173
+#: hugin1/hugin/GLPreviewFrame.cpp:435 hugin1/hugin/PreviewFrame.cpp:173
 msgid "drag to change the vertical field of view"
 msgstr "Trascinare per modificare il campo inquadrato verticalmente"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:443 hugin1/hugin/PreviewFrame.cpp:182
+#: hugin1/hugin/GLPreviewFrame.cpp:444 hugin1/hugin/PreviewFrame.cpp:182
 msgid "HFOV"
 msgstr "HFOV"
 
 # (ndt) suggerimento su un controllo scorrevole
-#: hugin1/hugin/GLPreviewFrame.cpp:448 hugin1/hugin/PreviewFrame.cpp:187
+#: hugin1/hugin/GLPreviewFrame.cpp:449 hugin1/hugin/PreviewFrame.cpp:187
 msgid "drag to change the horizontal field of view"
 msgstr "Trascinare per modificare il campo inquadrato orizzontalmente"
 
-#: hugin1/hugin/GLPreviewFrame.cpp:478
+#: hugin1/hugin/GLPreviewFrame.cpp:479
 msgid "Panosphere"
 msgstr "Panosfera"

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Fixes typos

From: <hugin-cvs@li...> - 2011-05-28 07:44

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/5c3f97f80c1b
changeset:
diffstat:

 src/hugin1/hugin/wxPanoCommand.cpp         |  9 ++++-----
 src/hugin_script_interface/hpi.cpp         |  2 +-
 src/hugin_script_interface/hpi.h           |  2 +-
 src/hugin_script_interface/hpi_classes.cpp |  2 +-
 src/hugin_script_interface/hpi_classes.h   |  2 +-
 5 files changed, 8 insertions(+), 9 deletions(-)

diffs (70 lines):

diff -r 32055f79a8aa -r 5c3f97f80c1b src/hugin1/hugin/wxPanoCommand.cpp
--- a/src/hugin1/hugin/wxPanoCommand.cpp	Fri May 27 20:29:40 2011 +0200
+++ b/src/hugin1/hugin/wxPanoCommand.cpp	Sat May 28 09:44:18 2011 +0200
@@ -698,14 +698,13 @@
 #ifdef HUGIN_HSI
 bool PythonScriptPanoCmd::processPanorama(Panorama& pano)
 {
-    // TODO: add call to python machinery here.
-    std::cout << "TODO: run python script: " << m_scriptFile.c_str() << std::endl;
+    std::cout << "run python script: " << m_scriptFile.c_str() << std::endl;
 
-    int success = hsi::callhpi ( m_scriptFile.c_str() , 1 ,
-		           "HuginBase::Panorama*" , &pano ) ;
+    int success = hpi::callhpi ( m_scriptFile.c_str() , 1 ,
+                   "HuginBase::Panorama*" , &pano ) ;
 
     if(success!=0)
-        wxMessageBox(wxString::Format(wxT("Script return %d"),success),_("Result"), wxICON_INFORMATION);
+        wxMessageBox(wxString::Format(wxT("Script returned %d"),success),_("Result"), wxICON_INFORMATION);
     std::cout << "Python interface returned " << success << endl ;
     // notify other of change in panorama
     if(pano.getNrOfImages()>0)
diff -r 32055f79a8aa -r 5c3f97f80c1b src/hugin_script_interface/hpi.cpp
--- a/src/hugin_script_interface/hpi.cpp	Fri May 27 20:29:40 2011 +0200
+++ b/src/hugin_script_interface/hpi.cpp	Sat May 28 09:44:18 2011 +0200
@@ -47,7 +47,7 @@
 // now it's very convenient.
 #include <stdarg.h>
 
-namespace hsi
+namespace hpi
 {
 /** this is where we keep the single instance of class python_interface */
 static python_interface hpi_instance;
diff -r 32055f79a8aa -r 5c3f97f80c1b src/hugin_script_interface/hpi.h
--- a/src/hugin_script_interface/hpi.h	Fri May 27 20:29:40 2011 +0200
+++ b/src/hugin_script_interface/hpi.h	Sat May 28 09:44:18 2011 +0200
@@ -34,7 +34,7 @@
 #define hsi_IMPEX
 #endif
 
-namespace hsi
+namespace hpi
 {
 /**  simplified call interface to the Python Plugin facility.
  *   @param plugin_name the name of the plugin. This must name a python file which is in PYTHONPATH, 
diff -r 32055f79a8aa -r 5c3f97f80c1b src/hugin_script_interface/hpi_classes.cpp
--- a/src/hugin_script_interface/hpi_classes.cpp	Fri May 27 20:29:40 2011 +0200
+++ b/src/hugin_script_interface/hpi_classes.cpp	Sat May 28 09:44:18 2011 +0200
@@ -32,7 +32,7 @@
 
 #include "hpi_classes.h"
 
-namespace hsi
+namespace hpi
 {
 
 PyObject* python_interface::load_module ( const char* name )
diff -r 32055f79a8aa -r 5c3f97f80c1b src/hugin_script_interface/hpi_classes.h
--- a/src/hugin_script_interface/hpi_classes.h	Fri May 27 20:29:40 2011 +0200
+++ b/src/hugin_script_interface/hpi_classes.h	Sat May 28 09:44:18 2011 +0200
@@ -34,7 +34,7 @@
 #include "swigpyrun.h"         // contains SWIG access
 #include <panodata/Panorama.h>
 
-namespace hsi
+namespace hpi
 {
 /** a class which encapsulates the python interface. It will only function if it's activate()
  *  method is called. Note there is only a single instance of this class;

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Allow skipping of optimisation of whol...

From: <hugin-cvs@li...> - 2011-05-27 18:29

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/32055f79a8aa
changeset:
diffstat:

 src/hugin_base/algorithms/control_points/CleanCP.cpp |   7 +++++--
 src/hugin_base/algorithms/control_points/CleanCP.h   |   3 ++-
 src/tools/cpclean.cpp                                |  13 +++++++++++--
 3 files changed, 18 insertions(+), 5 deletions(-)

diffs (82 lines):

diff -r 2f64259cad1c -r 32055f79a8aa src/hugin_base/algorithms/control_points/CleanCP.cpp
--- a/src/hugin_base/algorithms/control_points/CleanCP.cpp	Fri May 27 20:01:08 2011 +0200
+++ b/src/hugin_base/algorithms/control_points/CleanCP.cpp	Fri May 27 20:29:40 2011 +0200
@@ -112,10 +112,13 @@
     return CPtoRemove;
 };
 
-UIntSet getCPoutsideLimit(Panorama pano, double n)
+UIntSet getCPoutsideLimit(Panorama pano, double n,bool skipOptimisation)
 {
     UIntSet CPtoRemove;
-    SmartOptimise::smartOptimize(pano);
+    if(!skipOptimisation)
+    {
+        SmartOptimise::smartOptimize(pano);
+    };
     CPVector allCP=pano.getCtrlPoints();
     //remove all horizontal and vertical CP for calculation of mean and sigma
     CPVector CPxy;
diff -r 2f64259cad1c -r 32055f79a8aa src/hugin_base/algorithms/control_points/CleanCP.h
--- a/src/hugin_base/algorithms/control_points/CleanCP.h	Fri May 27 20:01:08 2011 +0200
+++ b/src/hugin_base/algorithms/control_points/CleanCP.h	Fri May 27 20:29:40 2011 +0200
@@ -46,8 +46,9 @@
 /** optimises the whole panorama and removes all control points with error > mean+n*sigma 
   @param pano panorama which should be used
   @param n determines, how big the deviation from mean should be to determine wrong control points, default 2.0
+  @param skipOptimisation skips the optimisation step, the current position of the images is used
   @return set which contains control points with error > mean+n*sigma */
-IMPEX UIntSet getCPoutsideLimit(Panorama pano, double n=2.0);
+IMPEX UIntSet getCPoutsideLimit(Panorama pano, double n=2.0, bool skipOptimisation=false);
 
 /** returns these control points, which are in masks */
 IMPEX UIntSet getCPinMasks(Panorama pano);
diff -r 2f64259cad1c -r 32055f79a8aa src/tools/cpclean.cpp
--- a/src/tools/cpclean.cpp	Fri May 27 20:01:08 2011 +0200
+++ b/src/tools/cpclean.cpp	Fri May 27 20:29:40 2011 +0200
@@ -64,6 +64,7 @@
          << "     -n num   distance factor for checking (default: 2)" << endl
          << "     -p       do only pairwise optimisation (skip step 2)" << endl
          << "     -w       do optimise whole panorama (skip step 1)" << endl
+         << "     -s       skip optimisation step when optimisation the whole panorama" << endl
          << "     -h       shows help" << endl
          << endl;
 }
@@ -71,12 +72,13 @@
 int main(int argc, char *argv[])
 {
     // parse arguments
-    const char * optstring = "o:hn:pw";
+    const char * optstring = "o:hn:pws";
 
     int c;
     string output;
     bool onlyPair = false;
     bool wholePano = false;
+    bool skipOptimisation = false;
     double n = 2.0;
     while ((c = getopt (argc, argv, optstring)) != -1)
     {
@@ -106,6 +108,9 @@
         case 'w':
             wholePano = true;
             break;
+        case 's':
+            skipOptimisation = true;
+            break;
         case ':':
             cerr <<"Option -n requires a number" << endl;
             return 1;
@@ -185,7 +190,11 @@
         else
         {
             CPtoRemove.clear();
-            CPtoRemove=getCPoutsideLimit(pano,n);
+            if(skipOptimisation)
+            {
+                std::cout << endl << "Skipping optimisation, current image positions will be used." << endl;
+            };
+            CPtoRemove=getCPoutsideLimit(pano,n,skipOptimisation);
             if (CPtoRemove.size()>0)
                 for(UIntSet::reverse_iterator it = CPtoRemove.rbegin(); it != CPtoRemove.rend(); ++it)
                     pano.removeCtrlPoint(*it);

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Merge

From: <hugin-cvs@li...> - 2011-05-27 18:01

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/2f64259cad1c
changeset:
diffstat:

 CMakeLists.txt                      |      2 +-
 ChangeLog                           |  66645 +++++++++++++++++++++++++--------------
 Changelog.style                     |      5 +
 doc/releases/hugin-2011.0.0_rc2.txt |    200 +
 4 files changed, 43148 insertions(+), 23704 deletions(-)

diffs (truncated from 77050 to 500 lines):

diff -r 8f71e93e5592 -r 2f64259cad1c CMakeLists.txt
--- a/CMakeLists.txt	Fri May 27 19:59:23 2011 +0200
+++ b/CMakeLists.txt	Fri May 27 20:01:08 2011 +0200
@@ -72,7 +72,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 --style ${PROJECT_SOURCE_DIR}/Changelog.style
    WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
    OUTPUT_FILE ${PROJECT_SOURCE_DIR}/ChangeLog)
    MESSAGE("-- New ChangeLog generated")
diff -r 8f71e93e5592 -r 2f64259cad1c ChangeLog
--- a/ChangeLog	Fri May 27 19:59:23 2011 +0200
+++ b/ChangeLog	Fri May 27 20:01:08 2011 +0200
@@ -1,995 +1,3189 @@
-2011-02-27 08:50 -0500  Yuval Levy  <yuv@...>  (c27d2767632b [tip])
-
-	* CMakeLists.txt, mac/Version.xcconfig:
+2011-05-24 21:57 +0200  tmodes  (f00957574874)  
+
+	Updated doxygen documentation after the latest changes
+
+	+ src/hugin_script_interface/README.dox
+	> src/dox/folder.dox
+	> src/dox/mainpage.dox
+
+2011-05-24 20:17 +0200  Kornel Benko kornel.Benko@...  (83c965393b52)  
+
+	Missed this one while adapting to debian multi architecture. Spotted
+	by Andreas Metzler
+
+	> CMakeModules/FindGLUT.cmake
+
+2011-05-24 08:34 -0400  Yuv Mobile <yuv@...>  (d56cc6b2e7a8)  
+
+	added credits for FreeBSD port
+
+	> authors.txt
+
+2011-05-24 13:27 +0200  Bart van Andel bavanandel+code@...  (cd9cb5ee3f3b)  
+
+	Fix smartblend-hugin.bat to remove '--' argument separator
+
+	> platforms/windows/smartblend-wrapper/smartblend-hugin.bat
+
+2011-05-24 08:50 +0200  Kornel Benko kornel.Benko@...  (967c53582af3)  
+
+	Adapt to ubuntu 11.4
+
+	> CMakeLists.txt
+	> CMakeModules/FindExiv2.cmake
+	> CMakeModules/FindGLEW.cmake
+	> CMakeModules/FindGLUT.cmake
+	> CMakeModules/FindJPEG.cmake
+	> CMakeModules/FindLAPACK.cmake
+	> CMakeModules/FindOpenEXR.cmake
+	> CMakeModules/FindPANO13.cmake
+	> CMakeModules/FindPNG.cmake
+	> CMakeModules/FindTIFF.cmake
+	> CMakeModules/FindZLIB.cmake
+
+2011-05-23 18:19 +0200  tmodes  (92a1b9a20fbe)  
+
+	Correct dependencies in README
+
+	> README
+
+2011-05-22 20:24 -0400  Yuv Mobile <yuv@...>  (b6e202076fe1)  
+
+	fix generic name in Linux desktop entry for Hugin Calibrate Lens
+
+	> src/hugin1/calibrate_lens/calibrate_lens_gui.desktop
+
+2011-05-22 16:26 -0400  Yuv Mobile <yuv@...>  (38ac5ca1eaad)  
+
+	removed outdated and redundant README_WINDOWS file
+
+	- README_WINDOWS
+
+2011-05-22 16:23 -0400  Yuv Mobile <yuv@...>  (e564457d5254)  
+
+	updated README - section 2 still needs to be updated with an updated
+	list of tools
+
+	> README
+
+2011-05-22 20:22 +0200  tmodes  (8319a2dc456e)  
+
+	Added little version hint for swig
+
+	> src/hugin_script_interface/README_hsi.txt
+
+2011-05-22 20:22 +0200  tmodes  (900d835cf818)  
+
+	Improved progress messages of cpfind
+
+	> src/hugin_cpfind/cpfind/PanoDetector.cpp
+	> src/hugin_cpfind/cpfind/PanoDetector.h
+
+2011-05-22 10:33 +0200  tmodes  (e66f8552d4e7)  
+
+	Several changes to hugin_script_interface
+	* converted comments into missing doxygen statements
+	* separated declaration and definition of classes
+	* changed indent to 4 spaces
+	* write debug statements to stdout instead of stderr if it is a
+	logmessage
+
+	+ src/hugin_script_interface/hpi_classes.cpp
+	> src/hugin_script_interface/CMakeLists.txt
+	> src/hugin_script_interface/hpi.cpp
+	> src/hugin_script_interface/hpi.h
+	> src/hugin_script_interface/hpi_classes.h
+
+2011-05-22 09:48 +0200  tmodes  (bbf8b0748de1)  
+
+	Improved finding of crop area [702135] Patch by Vladimir Nadvornik
+
+	> src/hugin_base/algorithms/basic/CalculateOptimalROI.cpp
+
+2011-05-21 11:36 +0200  tmodes  (5cb5a33d8d5b)  
+
+	Show correctly focal length in calibrate_lens_GUI [7860359]
+
+	> src/hugin1/calibrate_lens/LensCalFrame.cpp
+
+2011-05-21 09:31 +0200  tmodes  (c264b1c7f03a)  
+
+	Updated README for python scripting
+
+	+ src/hugin_script_interface/README_hsi.txt
+	> INSTALL_cmake
+	- src/hugin_script_interface/README.hsi
+
+2011-05-21 09:06 +0200  tmodes  (a307c1de383b)  
+
+	Moved sample scripts into plugin sub-directory
+
+	+ src/hugin_script_interface/plugins/CMakeLists.txt
+	+ src/hugin_script_interface/plugins/README_woa.txt
+	+ src/hugin_script_interface/plugins/crop_cp.py
+	+ src/hugin_script_interface/plugins/demo_plugin.py
+	+ src/hugin_script_interface/plugins/top_five.py
+	+ src/hugin_script_interface/plugins/woa.py
+	> src/hugin_script_interface/CMakeLists.txt
+	- src/hugin_script_interface/demo_plugin.py
+	- src/hugin_script_interface/top_five.py
+
+2011-05-20 20:10 +0200  tmodes  (550598406a1f)  
+
+	Improved mouse handling for calibrate_lens_gui
+
+	> src/hugin1/calibrate_lens/LensCalFrame.cpp
+	> src/hugin1/calibrate_lens/LensCalFrame.h
+	> src/hugin1/calibrate_lens/LensCalImageCtrl.cpp
+	> src/hugin1/calibrate_lens/LensCalImageCtrl.h
+
+2011-05-19 21:00 +0200  tmodes  (92e62f736a64)  
+
+	Merge
+
+	> src/hugin1/ptbatcher/PTBatcherGUI.cpp
+
+2011-05-19 21:00 +0200  tmodes  (185fc6105646)  
+
+	Allow disabling/enabling of individual lines in calibrate_lens_gui
+	Use left/right mouse button
+
+	> src/hugin1/calibrate_lens/LensCalFrame.h
+	> src/hugin1/calibrate_lens/LensCalImageCtrl.cpp
+	> src/hugin1/calibrate_lens/LensCalImageCtrl.h
+	> src/hugin_base/lines/LinesTypes.h
+
+2011-05-18 21:49 +0200  tmodes  (48c4acf52307)  
+
+	Correct return value of wxConnection::OnRequest for wxWidgets 2.8
+	[784695]
+
+	> src/hugin1/ptbatcher/PTBatcherGUI.cpp
+
+2011-05-18 21:20 +0200  tmodes  (5fb6b2a03524)  
+
+	Fixes typo
+
+	> src/foreign/flann/general.h
+
+2011-05-18 20:26 +0200  tmodes  (e06c3eaccd86)  
+
+	Fixes install of python related files on Linux
+
+	> src/hugin_script_interface/CMakeLists.txt
+
+2011-05-18 20:13 +0200  tmodes  (22f217f27d83)  
+
+	Merge with python_scripting
+
+	+ src/hugin_script_interface/CMakeLists.txt
+	+ src/hugin_script_interface/README.hsi
+	+ src/hugin_script_interface/demo_plugin.py
+	+ src/hugin_script_interface/hpi.cpp
+	+ src/hugin_script_interface/hpi.h
+	+ src/hugin_script_interface/hpi.py
+	+ src/hugin_script_interface/hpi_classes.h
+	+ src/hugin_script_interface/hsi.i
+	+ src/hugin_script_interface/top_five.py
+	> CMakeLists.txt
+	> CMakeModules/FindExiv2.cmake
+	> CMakeModules/FindJPEG.cmake
+	> CMakeModules/FindPNG.cmake
+	> CMakeModules/FindTIFF.cmake
+	> CMakeModules/FindZLIB.cmake
+	> CMakeModules/win_bundle.cmake
+	> authors.txt
+	> src/CMakeLists.txt
+	> src/foreign/flann/CMakeLists.txt
+	> src/foreign/flann/algorithms/all_indices.h
+	> src/foreign/flann/algorithms/autotuned_index.h
+	> src/foreign/flann/algorithms/composite_index.h
+	> src/foreign/flann/algorithms/dist.h
+	> src/foreign/flann/algorithms/kdtree_index.h
+	> src/foreign/flann/algorithms/kdtree_single_index.h
+	> src/foreign/flann/algorithms/kmeans_index.h
+	> src/foreign/flann/algorithms/linear_index.h
+	> src/foreign/flann/flann.cpp
+	> src/foreign/flann/flann.h
+	> src/foreign/flann/flann.hpp
+	> src/foreign/flann/flann_cpp.cpp
+	> src/foreign/flann/flann_mpi.hpp
+	> src/foreign/flann/general.h
+	> src/foreign/flann/io/hdf5.h
+	> src/foreign/flann/nn/ground_truth.h
+	> src/foreign/flann/nn/index_testing.h
+	> src/foreign/flann/util/allocator.h
+	> src/foreign/flann/util/logger.cpp
+	> src/foreign/flann/util/logger.h
+	> src/foreign/flann/util/matrix.h
+	> src/foreign/flann/util/pair_iterator.hpp
+	> src/foreign/flann/util/random.h
+	> src/foreign/flann/util/result_set.h
+	> src/foreign/flann/util/saving.h
+	> src/foreign/vigra/vigra_impex/png.cxx
+	> src/hugin1/PT/PanoCommand.h
+	> src/hugin1/hugin/CMakeLists.txt
+	> src/hugin1/hugin/MainFrame.cpp
+	> src/hugin1/hugin/MainFrame.h
+	> src/hugin1/hugin/huginApp.cpp
+	> src/hugin1/hugin/huginApp.h
+	> src/hugin1/hugin/wxPanoCommand.cpp
+	> src/hugin1/hugin/wxPanoCommand.h
+	> src/hugin1/hugin/xrc/main_menu.xrc
+	> src/hugin1/ptbatcher/PTBatcherGUI.cpp
+	> src/hugin1/ptbatcher/PTBatcherGUI.h
+	> src/hugin_base/CMakeLists.txt
+	> src/hugin_base/algorithms/basic/CalculateCPStatistics.h
+	> src/hugin_base/algorithms/nona/FitPanorama.h
+	> src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.h
+	> src/hugin_base/hugin_math/Vector3.h
+	> src/hugin_base/hugin_math/hugin_math.h
+	> src/hugin_base/panodata/ControlPoint.h
+	> src/hugin_base/panodata/ImageVariableGroup.h
+	> src/hugin_base/panodata/Lens.h
+	> src/hugin_base/panodata/Panorama.h
+	> src/hugin_base/panodata/PanoramaData.h
+	> src/hugin_base/panodata/PanoramaVariable.h
+	> src/hugin_base/panodata/SrcPanoImage.h
+	> src/hugin_base/panotools/PanoToolsInterface.h
+
+2011-05-18 20:12 +0200  tmodes  (a4977f931f50)  
+
+	Fixes misplaced namespace
+
+	> src/hugin1/hugin/wxPanoCommand.cpp
+
+2011-05-18 10:25 +1000  Terry Duell <tduell@...>  (b7b7c4cbbfd0)  
+
+	Install calibrate_lens_gui.desktop on linux
+
+	+ src/hugin1/calibrate_lens/calibrate_lens_gui.desktop
+	> src/hugin1/calibrate_lens/CMakeLists.txt
+
+2011-05-17 21:03 +0200  tmodes  (f04b2a048181)  
+
+	Fixes interprocess communication between Hugin and PTBatcherGUI
+	[wxWidgets2.9 only]
+
+	> src/hugin1/ptbatcher/PTBatcherGUI.cpp
+	> src/hugin1/ptbatcher/PTBatcherGUI.h
+
+2011-05-17 21:01 +0200  tmodes  (2d0e916935d8)  
+
+	Some little modification to build dynamic libs on windows (optional)
+
+	> src/hugin1/hugin/huginApp.cpp
+	> src/hugin1/hugin/huginApp.h
+	> src/hugin_base/algorithms/basic/CalculateCPStatistics.h
+	> src/hugin_base/algorithms/nona/FitPanorama.h
+	> src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.h
+	> src/hugin_base/hugin_math/Vector3.h
+	> src/hugin_base/hugin_math/hugin_math.h
+	> src/hugin_base/panotools/PanoToolsInterface.h
+	> src/hugin_script_interface/hpi.cpp
+	> src/hugin_script_interface/hpi.h
+
+2011-05-17 20:54 +0200  tmodes  (4f3e6b1e251b)  
+
+	Changes to compile vigra_impex with libpng 1.5
+
+	> src/foreign/vigra/vigra_impex/png.cxx
+
+2011-05-17 20:53 +0200  tmodes  (26042722bf43)  
+
+	Updated flann to 1.6.8 Some little modification to allow building
+	dynamic version on windows were necessary
+
+	> src/foreign/flann/CMakeLists.txt
+	> src/foreign/flann/algorithms/all_indices.h
+	> src/foreign/flann/algorithms/autotuned_index.h
+	> src/foreign/flann/algorithms/composite_index.h
+	> src/foreign/flann/algorithms/dist.h
+	> src/foreign/flann/algorithms/kdtree_index.h
+	> src/foreign/flann/algorithms/kdtree_single_index.h
+	> src/foreign/flann/algorithms/kmeans_index.h
+	> src/foreign/flann/algorithms/linear_index.h
+	> src/foreign/flann/flann.cpp
+	> src/foreign/flann/flann.h
+	> src/foreign/flann/flann.hpp
+	> src/foreign/flann/flann_cpp.cpp
+	> src/foreign/flann/flann_mpi.hpp
+	> src/foreign/flann/general.h
+	> src/foreign/flann/io/hdf5.h
+	> src/foreign/flann/nn/ground_truth.h
+	> src/foreign/flann/nn/index_testing.h
+	> src/foreign/flann/util/allocator.h
+	> src/foreign/flann/util/logger.cpp
+	> src/foreign/flann/util/logger.h
+	> src/foreign/flann/util/matrix.h
+	> src/foreign/flann/util/pair_iterator.hpp
+	> src/foreign/flann/util/random.h
+	> src/foreign/flann/util/result_set.h
+	> src/foreign/flann/util/saving.h
+
+2011-05-17 20:52 +0200  tmodes  (b901e2049d64)  
+
+	Updated CMakeModules for newer versions
+
+	> CMakeModules/FindExiv2.cmake
+	> CMakeModules/FindJPEG.cmake
+	> CMakeModules/FindPNG.cmake
+	> CMakeModules/FindTIFF.cmake
+	> CMakeModules/FindZLIB.cmake
+	> CMakeModules/win_bundle.cmake
+
+2011-05-16 08:22 +0200  Kay F. Jahnke <_kfj@...>  (2bd081769bbc)  
+
+	merged default into python_scripting branch, changed python version
+	detection in CMakeLists.txt there
+
+	+ CMakeModules/FindTclap.cmake
+	+ CMakeModules/FindZThread.cmake
+	+ artwork-src/2011.0-splash/2011.0.splash.svg
+	+ artwork-src/2011.0-splash/SeattleSunset.png
+	+ artwork-src/2011.0-splash/readme.txt
+	+ doc/releases/hugin-2011.0.0_rc1.txt
+	+ platforms/windows/huginsetup/Plugins/AdvUninstLog-Readme.txt
+	+ platforms/windows/huginsetup/Plugins/AdvUninstLog.nsh
+	+ src/hugin1/base_wx/LensTools.cpp
+	+ src/hugin1/base_wx/LensTools.h
+	+ src/hugin1/calibrate_lens/CMakeLists.txt
+	+ src/hugin1/calibrate_lens/LensCalApp.cpp
+	+ src/hugin1/calibrate_lens/LensCalApp.h
+	+ src/hugin1/calibrate_lens/LensCalFrame.cpp
+	+ src/hugin1/calibrate_lens/LensCalFrame.h
+	+ src/hugin1/calibrate_lens/LensCalImageCtrl.cpp
+	+ src/hugin1/calibrate_lens/LensCalImageCtrl.h
+	+ src/hugin1/calibrate_lens/LensCalTypes.cpp
+	+ src/hugin1/calibrate_lens/LensCalTypes.h
+	+ src/hugin1/calibrate_lens/calibrate_lens_gui_rc.rc
+	+ src/hugin1/hugin/xrc/data/help_en_EN/Diffraction.html
+	+ src/hugin1/hugin/xrc/data/help_en_EN/Equirectangular_Panini.html
+	+ src/hugin1/hugin/xrc/data/help_en_EN/Panini.html
+	+ src/hugin1/hugin/xrc/data/intro.htm
+	+ src/hugin1/hugin/xrc/lenscal_frame.xrc
+	+ src/hugin_base/lines/CMakeLists.txt
+	+ src/hugin_base/lines/FindLines.cpp
+	+ src/hugin_base/lines/FindLines.h
+	+ src/hugin_base/lines/FindN8Lines.cpp
+	+ src/hugin_base/lines/FindN8Lines.h
+	+ src/hugin_base/lines/LinesTypes.h
+	> CMakeLists.txt
+	> CMakeModules/FindExiv2.cmake
+	> CMakeModules/win_bundle.cmake
+	> artwork-src/2010/splash/splash_with_artwork.svg
+	> doc/align_image_stack.pod
+	> doc/autooptimiser.pod
+	> doc/celeste_standalone.pod
+	> doc/deghosting_mask.pod
+	> doc/fulla.pod
+	> doc/hugin.pod
+	> doc/hugin_hdrmerge.pod
+	> doc/hugin_stitch_project.pod
+	> doc/nona.pod
+	> doc/nona_gui.pod
+	> doc/pto2mk.pod
+	> doc/releases/hugin-2011.0.0_beta3.txt
+	> doc/tca_correct.pod
+	> doc/vig_optimize.pod
+	> platforms/windows/huginsetup/CMakeLists.txt
+	> platforms/windows/huginsetup/HuginSetup.nsi
+	> platforms/windows/huginsetup/HuginSetup_common.nsh
+	> platforms/windows/huginsetup/Plugins/CMakeLists.txt
+	> platforms/windows/huginsetup/TODO.txt
+	> src/foreign/CMakeLists.txt
+	> src/foreign/vigra/vigra_impex/imageinfo.cxx
+	> src/foreign/vigra/vigra_impex/tiff.cxx
+	> src/hugin1/CMakeLists.txt
+	> src/hugin1/PT/PanoCommand.h
+	> src/hugin1/base_wx/CMakeLists.txt
+	> src/hugin1/base_wx/platform.cpp
+	> src/hugin1/hugin/AboutDialog.cpp
+	> src/hugin1/hugin/AboutDialog.h
+	> src/hugin1/hugin/AssistantPanel.cpp
+	> src/hugin1/hugin/GLPreviewFrame.cpp
+	> src/hugin1/hugin/GLPreviewFrame.h
+	> src/hugin1/hugin/HFOVDialog.cpp
+	> src/hugin1/hugin/HFOVDialog.h
+	> src/hugin1/hugin/LensPanel.cpp
+	> src/hugin1/hugin/MainFrame.cpp
+	> src/hugin1/hugin/MaskEditorPanel.cpp
+	> src/hugin1/hugin/MaskEditorPanel.h
+	> src/hugin1/hugin/MaskImageCtrl.cpp
+	> src/hugin1/hugin/MaskImageCtrl.h
+	> src/hugin1/hugin/MaskLoadDialog.cpp
+	> src/hugin1/hugin/OverviewOutlinesTool.cpp
+	> src/hugin1/hugin/PanoPanel.cpp
+	> src/hugin1/hugin/PanosphereSphereTool.cpp
+	> src/hugin1/hugin/PanosphereSphereTool.h
+	> src/hugin1/hugin/PreferencesDialog.cpp
+	> src/hugin1/hugin/PreviewIdentifyTool.cpp
+	> src/hugin1/hugin/PreviewIdentifyTool.h
+	> src/hugin1/hugin/TextureManager.cpp
+	> src/hugin1/hugin/huginApp.cpp
+	> src/hugin1/hugin/xrc/CMakeLists.txt
+	> src/hugin1/hugin/xrc/about.xrc
+	> src/hugin1/hugin/xrc/data/CMakeLists.txt
+	> src/hugin1/hugin/xrc/data/help_en_EN/Autooptimiser.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Cpfind.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Depth_of_Field.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Entrance_pupil.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Batch_Processor.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_tab.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_FAQ.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Fast_Preview_window.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Images_tab.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Keyboard_shortcuts.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Main_window.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Optimizer_tab.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preferences.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Reset_Values_window.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Stitcher_tab.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_translation_guide.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/NPP.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/No-parallax_point.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/PTOptimizer.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/PTtiff2psd.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Parallax.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Vignetting.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/help_index_en.hhk
+	> src/hugin1/hugin/xrc/data/help_en_EN/help_toc_en.hhc
+	> src/hugin1/hugin/xrc/data/help_en_EN/hugin_help_en_EN.hhp
+	> src/hugin1/hugin/xrc/data/help_en_EN/pages.txt
+	> src/hugin1/hugin/xrc/mask_editor_panel.xrc
+	> src/hugin1/ptbatcher/FindPanoDialog.cpp
+	> src/hugin1/ptbatcher/FindPanoDialog.h
+	> src/hugin_base/CMakeLists.txt
+	> src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.cpp
+	> src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp
+	> src/hugin_base/hugin_utils/utils.cpp
+	> src/hugin_base/hugin_utils/utils.h
+	> src/hugin_base/makefilelib/Makefile.cpp
+	> src/hugin_base/makefilelib/Variable.cpp
+	> src/hugin_base/makefilelib/Variable.h
+	> src/hugin_base/panodata/Mask.cpp
+	> src/hugin_base/panodata/Mask.h
+	> src/hugin_base/panodata/Panorama.cpp
+	> src/hugin_base/panodata/SrcPanoImage.cpp
+	> src/hugin_cpfind/CMakeLists.txt
+	> src/hugin_cpfind/cpfind/CMakeLists.txt
+	> src/hugin_cpfind/cpfind/PanoDetector.cpp
+	> src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp
+	> src/hugin_cpfind/cpfind/main.cpp
+	> src/hugin_cpfind/localfeatures/CMakeLists.txt
+	> src/hugin_cpfind/localfeatures/CircularKeyPointDescriptor.cpp
+	> src/hugin_script_interface/CMakeLists.txt
+	> src/hugin_shared.h
+	> src/tools/pano_trafo.cpp
+	> src/translations/hu.po
+	> src/translations/ja.po
+	> src/translations/pt_BR.po

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Extended checkpto based on parts.cpp f...

From: <hugin-cvs@li...> - 2011-05-27 18:01

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/8f71e93e5592
changeset:
diffstat:

 src/tools/checkpto.cpp |  96 +++++++++++++++++++++++++++++++++++++----------
 1 files changed, 75 insertions(+), 21 deletions(-)

diffs (128 lines):

diff -r f00957574874 -r 8f71e93e5592 src/tools/checkpto.cpp
--- a/src/tools/checkpto.cpp	Tue May 24 21:57:34 2011 +0200
+++ b/src/tools/checkpto.cpp	Fri May 27 19:59:23 2011 +0200
@@ -42,49 +42,103 @@
 using namespace HuginBase;
 using namespace AppBase;
 
-static void usage(const char * name)
-{
-    cout << name << ": helper program for hugins makefile assistant" << endl
-         << "checkpto version " << DISPLAY_VERSION << endl
-         << endl
-         << "Not intended for stand-alone use" << endl;
-}
-
-int main(int argc, char *argv[])
-{
-    if(argc!=2)
-    {
-        usage(argv[0]);
-        return 1;
-    };
-
-    string input=argv[1];
+static void usage(const char * name)
+{
+    cout << name << ": report the number of image chains in a project" << endl
+         << name << " version " << DISPLAY_VERSION << endl
+         << endl
+         << "Usage:  " << name << " input.pto" << endl
+         << endl
+         << name << " examins the connections between images in a project and" << endl
+         << "reports back the number of parts or image chains in that project" << endl
+         << endl
+         << "used by the assistant makefile" << endl
+         << endl;
+}
+
+int main(int argc, char *argv[])
+{
+    // parse arguments
+    const char * optstring = "h";
+
+    int c;
+    string output;
+    while ((c = getopt (argc, argv, optstring)) != -1)
+    {
+        switch (c) {
+        case 'h':
+            usage(argv[0]);
+            return 0;
+        case '?':
+            break;
+        default:
+            abort ();
+        }
+    }
+
+    if (argc - optind != 1) 
+    {
+        usage(argv[0]);
+        return -1;
+    };
+    
+    string input=argv[optind];
 
     Panorama pano;
     ifstream prjfile(input.c_str());
     if (!prjfile.good()) {
         cerr << "could not open script : " << input << endl;
-        return 1;
+        return -1;
     }
     pano.setFilePrefix(hugin_utils::getPathPrefix(input));
     DocumentData::ReadWriteError err = pano.readData(prjfile);
     if (err != DocumentData::SUCCESSFUL) {
         cerr << "error while parsing panos tool script: " << input << endl;
         cerr << "DocumentData::ReadWriteError code: " << err << endl;
-        return 1;
+        return -1;
     }
 
+    std::cout << endl 
+              << "Opened project " << input << endl << endl
+              << "Project contains" << endl
+              << pano.getNrOfImages() << " images" << endl
+              << pano.getNrOfCtrlPoints() << " control points" << endl << endl;
     CPGraph graph;
     createCPGraph(pano, graph);
     CPComponents comps;
     int n = findCPComponents(graph, comps);
     if(n==1)
     {
+        std::cout << "All images are connected." << endl;
+        // return value must be 0, otherwise the assistant does not continue
         return 0;
     }
     else
     {
-        std::cout << "Found unconnected images" << std::endl << "Stopping processing." << std::endl;
-        return 1;
+        std::cout << "Found unconnected images" << endl 
+                  << "There are " << n << " image chains." << endl;
+
+        std::cout << "Image groups: " << endl;
+        for (unsigned i=0; i < comps.size(); i++)
+        {
+            std::cout << "[";
+            CPComponents::value_type::const_iterator it;
+            size_t c=0;
+            for (it = comps[i].begin(); it != comps[i].end(); ++it)
+            {
+                std::cout << (*it);
+                if (c+1 != comps[i].size())
+                {
+                    std::cout << ", ";
+                }
+                c++;
+            }
+            std::cout << "]";
+            if (i+1 != comps.size())
+            {
+                std::cout << ", ";
+            }
+        }
+        return n;
     };
 }

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: * unified Changelog style (the same co...

From: <hugin-cvs@li...> - 2011-05-27 00:03

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/cf32c5e0ec6c
changeset:
diffstat:

 CMakeLists.txt  |      2 +-
 ChangeLog       |  66645 ++++++++++++++++++++++++++++++++++++++---------------------
 Changelog.style |      5 +
 3 files changed, 42948 insertions(+), 23704 deletions(-)

diffs (truncated from 76846 to 500 lines):

diff -r f00957574874 -r cf32c5e0ec6c CMakeLists.txt
--- a/CMakeLists.txt	Tue May 24 21:57:34 2011 +0200
+++ b/CMakeLists.txt	Thu May 26 20:01:32 2011 -0400
@@ -72,7 +72,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 --style ${PROJECT_SOURCE_DIR}/Changelog.style
    WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
    OUTPUT_FILE ${PROJECT_SOURCE_DIR}/ChangeLog)
    MESSAGE("-- New ChangeLog generated")
diff -r f00957574874 -r cf32c5e0ec6c ChangeLog
--- a/ChangeLog	Tue May 24 21:57:34 2011 +0200
+++ b/ChangeLog	Thu May 26 20:01:32 2011 -0400
@@ -1,995 +1,3189 @@
-2011-02-27 08:50 -0500  Yuval Levy  <yuv@...>  (c27d2767632b [tip])
-
-	* CMakeLists.txt, mac/Version.xcconfig:
+2011-05-24 21:57 +0200  tmodes  (f00957574874)  
+
+	Updated doxygen documentation after the latest changes
+
+	+ src/hugin_script_interface/README.dox
+	> src/dox/folder.dox
+	> src/dox/mainpage.dox
+
+2011-05-24 20:17 +0200  Kornel Benko kornel.Benko@...  (83c965393b52)  
+
+	Missed this one while adapting to debian multi architecture. Spotted
+	by Andreas Metzler
+
+	> CMakeModules/FindGLUT.cmake
+
+2011-05-24 08:34 -0400  Yuv Mobile <yuv@...>  (d56cc6b2e7a8)  
+
+	added credits for FreeBSD port
+
+	> authors.txt
+
+2011-05-24 13:27 +0200  Bart van Andel bavanandel+code@...  (cd9cb5ee3f3b)  
+
+	Fix smartblend-hugin.bat to remove '--' argument separator
+
+	> platforms/windows/smartblend-wrapper/smartblend-hugin.bat
+
+2011-05-24 08:50 +0200  Kornel Benko kornel.Benko@...  (967c53582af3)  
+
+	Adapt to ubuntu 11.4
+
+	> CMakeLists.txt
+	> CMakeModules/FindExiv2.cmake
+	> CMakeModules/FindGLEW.cmake
+	> CMakeModules/FindGLUT.cmake
+	> CMakeModules/FindJPEG.cmake
+	> CMakeModules/FindLAPACK.cmake
+	> CMakeModules/FindOpenEXR.cmake
+	> CMakeModules/FindPANO13.cmake
+	> CMakeModules/FindPNG.cmake
+	> CMakeModules/FindTIFF.cmake
+	> CMakeModules/FindZLIB.cmake
+
+2011-05-23 18:19 +0200  tmodes  (92a1b9a20fbe)  
+
+	Correct dependencies in README
+
+	> README
+
+2011-05-22 20:24 -0400  Yuv Mobile <yuv@...>  (b6e202076fe1)  
+
+	fix generic name in Linux desktop entry for Hugin Calibrate Lens
+
+	> src/hugin1/calibrate_lens/calibrate_lens_gui.desktop
+
+2011-05-22 16:26 -0400  Yuv Mobile <yuv@...>  (38ac5ca1eaad)  
+
+	removed outdated and redundant README_WINDOWS file
+
+	- README_WINDOWS
+
+2011-05-22 16:23 -0400  Yuv Mobile <yuv@...>  (e564457d5254)  
+
+	updated README - section 2 still needs to be updated with an updated
+	list of tools
+
+	> README
+
+2011-05-22 20:22 +0200  tmodes  (8319a2dc456e)  
+
+	Added little version hint for swig
+
+	> src/hugin_script_interface/README_hsi.txt
+
+2011-05-22 20:22 +0200  tmodes  (900d835cf818)  
+
+	Improved progress messages of cpfind
+
+	> src/hugin_cpfind/cpfind/PanoDetector.cpp
+	> src/hugin_cpfind/cpfind/PanoDetector.h
+
+2011-05-22 10:33 +0200  tmodes  (e66f8552d4e7)  
+
+	Several changes to hugin_script_interface
+	* converted comments into missing doxygen statements
+	* separated declaration and definition of classes
+	* changed indent to 4 spaces
+	* write debug statements to stdout instead of stderr if it is a
+	logmessage
+
+	+ src/hugin_script_interface/hpi_classes.cpp
+	> src/hugin_script_interface/CMakeLists.txt
+	> src/hugin_script_interface/hpi.cpp
+	> src/hugin_script_interface/hpi.h
+	> src/hugin_script_interface/hpi_classes.h
+
+2011-05-22 09:48 +0200  tmodes  (bbf8b0748de1)  
+
+	Improved finding of crop area [702135] Patch by Vladimir Nadvornik
+
+	> src/hugin_base/algorithms/basic/CalculateOptimalROI.cpp
+
+2011-05-21 11:36 +0200  tmodes  (5cb5a33d8d5b)  
+
+	Show correctly focal length in calibrate_lens_GUI [7860359]
+
+	> src/hugin1/calibrate_lens/LensCalFrame.cpp
+
+2011-05-21 09:31 +0200  tmodes  (c264b1c7f03a)  
+
+	Updated README for python scripting
+
+	+ src/hugin_script_interface/README_hsi.txt
+	> INSTALL_cmake
+	- src/hugin_script_interface/README.hsi
+
+2011-05-21 09:06 +0200  tmodes  (a307c1de383b)  
+
+	Moved sample scripts into plugin sub-directory
+
+	+ src/hugin_script_interface/plugins/CMakeLists.txt
+	+ src/hugin_script_interface/plugins/README_woa.txt
+	+ src/hugin_script_interface/plugins/crop_cp.py
+	+ src/hugin_script_interface/plugins/demo_plugin.py
+	+ src/hugin_script_interface/plugins/top_five.py
+	+ src/hugin_script_interface/plugins/woa.py
+	> src/hugin_script_interface/CMakeLists.txt
+	- src/hugin_script_interface/demo_plugin.py
+	- src/hugin_script_interface/top_five.py
+
+2011-05-20 20:10 +0200  tmodes  (550598406a1f)  
+
+	Improved mouse handling for calibrate_lens_gui
+
+	> src/hugin1/calibrate_lens/LensCalFrame.cpp
+	> src/hugin1/calibrate_lens/LensCalFrame.h
+	> src/hugin1/calibrate_lens/LensCalImageCtrl.cpp
+	> src/hugin1/calibrate_lens/LensCalImageCtrl.h
+
+2011-05-19 21:00 +0200  tmodes  (92e62f736a64)  
+
+	Merge
+
+	> src/hugin1/ptbatcher/PTBatcherGUI.cpp
+
+2011-05-19 21:00 +0200  tmodes  (185fc6105646)  
+
+	Allow disabling/enabling of individual lines in calibrate_lens_gui
+	Use left/right mouse button
+
+	> src/hugin1/calibrate_lens/LensCalFrame.h
+	> src/hugin1/calibrate_lens/LensCalImageCtrl.cpp
+	> src/hugin1/calibrate_lens/LensCalImageCtrl.h
+	> src/hugin_base/lines/LinesTypes.h
+
+2011-05-18 21:49 +0200  tmodes  (48c4acf52307)  
+
+	Correct return value of wxConnection::OnRequest for wxWidgets 2.8
+	[784695]
+
+	> src/hugin1/ptbatcher/PTBatcherGUI.cpp
+
+2011-05-18 21:20 +0200  tmodes  (5fb6b2a03524)  
+
+	Fixes typo
+
+	> src/foreign/flann/general.h
+
+2011-05-18 20:26 +0200  tmodes  (e06c3eaccd86)  
+
+	Fixes install of python related files on Linux
+
+	> src/hugin_script_interface/CMakeLists.txt
+
+2011-05-18 20:13 +0200  tmodes  (22f217f27d83)  
+
+	Merge with python_scripting
+
+	+ src/hugin_script_interface/CMakeLists.txt
+	+ src/hugin_script_interface/README.hsi
+	+ src/hugin_script_interface/demo_plugin.py
+	+ src/hugin_script_interface/hpi.cpp
+	+ src/hugin_script_interface/hpi.h
+	+ src/hugin_script_interface/hpi.py
+	+ src/hugin_script_interface/hpi_classes.h
+	+ src/hugin_script_interface/hsi.i
+	+ src/hugin_script_interface/top_five.py
+	> CMakeLists.txt
+	> CMakeModules/FindExiv2.cmake
+	> CMakeModules/FindJPEG.cmake
+	> CMakeModules/FindPNG.cmake
+	> CMakeModules/FindTIFF.cmake
+	> CMakeModules/FindZLIB.cmake
+	> CMakeModules/win_bundle.cmake
+	> authors.txt
+	> src/CMakeLists.txt
+	> src/foreign/flann/CMakeLists.txt
+	> src/foreign/flann/algorithms/all_indices.h
+	> src/foreign/flann/algorithms/autotuned_index.h
+	> src/foreign/flann/algorithms/composite_index.h
+	> src/foreign/flann/algorithms/dist.h
+	> src/foreign/flann/algorithms/kdtree_index.h
+	> src/foreign/flann/algorithms/kdtree_single_index.h
+	> src/foreign/flann/algorithms/kmeans_index.h
+	> src/foreign/flann/algorithms/linear_index.h
+	> src/foreign/flann/flann.cpp
+	> src/foreign/flann/flann.h
+	> src/foreign/flann/flann.hpp
+	> src/foreign/flann/flann_cpp.cpp
+	> src/foreign/flann/flann_mpi.hpp
+	> src/foreign/flann/general.h
+	> src/foreign/flann/io/hdf5.h
+	> src/foreign/flann/nn/ground_truth.h
+	> src/foreign/flann/nn/index_testing.h
+	> src/foreign/flann/util/allocator.h
+	> src/foreign/flann/util/logger.cpp
+	> src/foreign/flann/util/logger.h
+	> src/foreign/flann/util/matrix.h
+	> src/foreign/flann/util/pair_iterator.hpp
+	> src/foreign/flann/util/random.h
+	> src/foreign/flann/util/result_set.h
+	> src/foreign/flann/util/saving.h
+	> src/foreign/vigra/vigra_impex/png.cxx
+	> src/hugin1/PT/PanoCommand.h
+	> src/hugin1/hugin/CMakeLists.txt
+	> src/hugin1/hugin/MainFrame.cpp
+	> src/hugin1/hugin/MainFrame.h
+	> src/hugin1/hugin/huginApp.cpp
+	> src/hugin1/hugin/huginApp.h
+	> src/hugin1/hugin/wxPanoCommand.cpp
+	> src/hugin1/hugin/wxPanoCommand.h
+	> src/hugin1/hugin/xrc/main_menu.xrc
+	> src/hugin1/ptbatcher/PTBatcherGUI.cpp
+	> src/hugin1/ptbatcher/PTBatcherGUI.h
+	> src/hugin_base/CMakeLists.txt
+	> src/hugin_base/algorithms/basic/CalculateCPStatistics.h
+	> src/hugin_base/algorithms/nona/FitPanorama.h
+	> src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.h
+	> src/hugin_base/hugin_math/Vector3.h
+	> src/hugin_base/hugin_math/hugin_math.h
+	> src/hugin_base/panodata/ControlPoint.h
+	> src/hugin_base/panodata/ImageVariableGroup.h
+	> src/hugin_base/panodata/Lens.h
+	> src/hugin_base/panodata/Panorama.h
+	> src/hugin_base/panodata/PanoramaData.h
+	> src/hugin_base/panodata/PanoramaVariable.h
+	> src/hugin_base/panodata/SrcPanoImage.h
+	> src/hugin_base/panotools/PanoToolsInterface.h
+
+2011-05-18 20:12 +0200  tmodes  (a4977f931f50)  
+
+	Fixes misplaced namespace
+
+	> src/hugin1/hugin/wxPanoCommand.cpp
+
+2011-05-18 10:25 +1000  Terry Duell <tduell@...>  (b7b7c4cbbfd0)  
+
+	Install calibrate_lens_gui.desktop on linux
+
+	+ src/hugin1/calibrate_lens/calibrate_lens_gui.desktop
+	> src/hugin1/calibrate_lens/CMakeLists.txt
+
+2011-05-17 21:03 +0200  tmodes  (f04b2a048181)  
+
+	Fixes interprocess communication between Hugin and PTBatcherGUI
+	[wxWidgets2.9 only]
+
+	> src/hugin1/ptbatcher/PTBatcherGUI.cpp
+	> src/hugin1/ptbatcher/PTBatcherGUI.h
+
+2011-05-17 21:01 +0200  tmodes  (2d0e916935d8)  
+
+	Some little modification to build dynamic libs on windows (optional)
+
+	> src/hugin1/hugin/huginApp.cpp
+	> src/hugin1/hugin/huginApp.h
+	> src/hugin_base/algorithms/basic/CalculateCPStatistics.h
+	> src/hugin_base/algorithms/nona/FitPanorama.h
+	> src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.h
+	> src/hugin_base/hugin_math/Vector3.h
+	> src/hugin_base/hugin_math/hugin_math.h
+	> src/hugin_base/panotools/PanoToolsInterface.h
+	> src/hugin_script_interface/hpi.cpp
+	> src/hugin_script_interface/hpi.h
+
+2011-05-17 20:54 +0200  tmodes  (4f3e6b1e251b)  
+
+	Changes to compile vigra_impex with libpng 1.5
+
+	> src/foreign/vigra/vigra_impex/png.cxx
+
+2011-05-17 20:53 +0200  tmodes  (26042722bf43)  
+
+	Updated flann to 1.6.8 Some little modification to allow building
+	dynamic version on windows were necessary
+
+	> src/foreign/flann/CMakeLists.txt
+	> src/foreign/flann/algorithms/all_indices.h
+	> src/foreign/flann/algorithms/autotuned_index.h
+	> src/foreign/flann/algorithms/composite_index.h
+	> src/foreign/flann/algorithms/dist.h
+	> src/foreign/flann/algorithms/kdtree_index.h
+	> src/foreign/flann/algorithms/kdtree_single_index.h
+	> src/foreign/flann/algorithms/kmeans_index.h
+	> src/foreign/flann/algorithms/linear_index.h
+	> src/foreign/flann/flann.cpp
+	> src/foreign/flann/flann.h
+	> src/foreign/flann/flann.hpp
+	> src/foreign/flann/flann_cpp.cpp
+	> src/foreign/flann/flann_mpi.hpp
+	> src/foreign/flann/general.h
+	> src/foreign/flann/io/hdf5.h
+	> src/foreign/flann/nn/ground_truth.h
+	> src/foreign/flann/nn/index_testing.h
+	> src/foreign/flann/util/allocator.h
+	> src/foreign/flann/util/logger.cpp
+	> src/foreign/flann/util/logger.h
+	> src/foreign/flann/util/matrix.h
+	> src/foreign/flann/util/pair_iterator.hpp
+	> src/foreign/flann/util/random.h
+	> src/foreign/flann/util/result_set.h
+	> src/foreign/flann/util/saving.h
+
+2011-05-17 20:52 +0200  tmodes  (b901e2049d64)  
+
+	Updated CMakeModules for newer versions
+
+	> CMakeModules/FindExiv2.cmake
+	> CMakeModules/FindJPEG.cmake
+	> CMakeModules/FindPNG.cmake
+	> CMakeModules/FindTIFF.cmake
+	> CMakeModules/FindZLIB.cmake
+	> CMakeModules/win_bundle.cmake
+
+2011-05-16 08:22 +0200  Kay F. Jahnke <_kfj@...>  (2bd081769bbc)  
+
+	merged default into python_scripting branch, changed python version
+	detection in CMakeLists.txt there
+
+	+ CMakeModules/FindTclap.cmake
+	+ CMakeModules/FindZThread.cmake
+	+ artwork-src/2011.0-splash/2011.0.splash.svg
+	+ artwork-src/2011.0-splash/SeattleSunset.png
+	+ artwork-src/2011.0-splash/readme.txt
+	+ doc/releases/hugin-2011.0.0_rc1.txt
+	+ platforms/windows/huginsetup/Plugins/AdvUninstLog-Readme.txt
+	+ platforms/windows/huginsetup/Plugins/AdvUninstLog.nsh
+	+ src/hugin1/base_wx/LensTools.cpp
+	+ src/hugin1/base_wx/LensTools.h
+	+ src/hugin1/calibrate_lens/CMakeLists.txt
+	+ src/hugin1/calibrate_lens/LensCalApp.cpp
+	+ src/hugin1/calibrate_lens/LensCalApp.h
+	+ src/hugin1/calibrate_lens/LensCalFrame.cpp
+	+ src/hugin1/calibrate_lens/LensCalFrame.h
+	+ src/hugin1/calibrate_lens/LensCalImageCtrl.cpp
+	+ src/hugin1/calibrate_lens/LensCalImageCtrl.h
+	+ src/hugin1/calibrate_lens/LensCalTypes.cpp
+	+ src/hugin1/calibrate_lens/LensCalTypes.h
+	+ src/hugin1/calibrate_lens/calibrate_lens_gui_rc.rc
+	+ src/hugin1/hugin/xrc/data/help_en_EN/Diffraction.html
+	+ src/hugin1/hugin/xrc/data/help_en_EN/Equirectangular_Panini.html
+	+ src/hugin1/hugin/xrc/data/help_en_EN/Panini.html
+	+ src/hugin1/hugin/xrc/data/intro.htm
+	+ src/hugin1/hugin/xrc/lenscal_frame.xrc
+	+ src/hugin_base/lines/CMakeLists.txt
+	+ src/hugin_base/lines/FindLines.cpp
+	+ src/hugin_base/lines/FindLines.h
+	+ src/hugin_base/lines/FindN8Lines.cpp
+	+ src/hugin_base/lines/FindN8Lines.h
+	+ src/hugin_base/lines/LinesTypes.h
+	> CMakeLists.txt
+	> CMakeModules/FindExiv2.cmake
+	> CMakeModules/win_bundle.cmake
+	> artwork-src/2010/splash/splash_with_artwork.svg
+	> doc/align_image_stack.pod
+	> doc/autooptimiser.pod
+	> doc/celeste_standalone.pod
+	> doc/deghosting_mask.pod
+	> doc/fulla.pod
+	> doc/hugin.pod
+	> doc/hugin_hdrmerge.pod
+	> doc/hugin_stitch_project.pod
+	> doc/nona.pod
+	> doc/nona_gui.pod
+	> doc/pto2mk.pod
+	> doc/releases/hugin-2011.0.0_beta3.txt
+	> doc/tca_correct.pod
+	> doc/vig_optimize.pod
+	> platforms/windows/huginsetup/CMakeLists.txt
+	> platforms/windows/huginsetup/HuginSetup.nsi
+	> platforms/windows/huginsetup/HuginSetup_common.nsh
+	> platforms/windows/huginsetup/Plugins/CMakeLists.txt
+	> platforms/windows/huginsetup/TODO.txt
+	> src/foreign/CMakeLists.txt
+	> src/foreign/vigra/vigra_impex/imageinfo.cxx
+	> src/foreign/vigra/vigra_impex/tiff.cxx
+	> src/hugin1/CMakeLists.txt
+	> src/hugin1/PT/PanoCommand.h
+	> src/hugin1/base_wx/CMakeLists.txt
+	> src/hugin1/base_wx/platform.cpp
+	> src/hugin1/hugin/AboutDialog.cpp
+	> src/hugin1/hugin/AboutDialog.h
+	> src/hugin1/hugin/AssistantPanel.cpp
+	> src/hugin1/hugin/GLPreviewFrame.cpp
+	> src/hugin1/hugin/GLPreviewFrame.h
+	> src/hugin1/hugin/HFOVDialog.cpp
+	> src/hugin1/hugin/HFOVDialog.h
+	> src/hugin1/hugin/LensPanel.cpp
+	> src/hugin1/hugin/MainFrame.cpp
+	> src/hugin1/hugin/MaskEditorPanel.cpp
+	> src/hugin1/hugin/MaskEditorPanel.h
+	> src/hugin1/hugin/MaskImageCtrl.cpp
+	> src/hugin1/hugin/MaskImageCtrl.h
+	> src/hugin1/hugin/MaskLoadDialog.cpp
+	> src/hugin1/hugin/OverviewOutlinesTool.cpp
+	> src/hugin1/hugin/PanoPanel.cpp
+	> src/hugin1/hugin/PanosphereSphereTool.cpp
+	> src/hugin1/hugin/PanosphereSphereTool.h
+	> src/hugin1/hugin/PreferencesDialog.cpp
+	> src/hugin1/hugin/PreviewIdentifyTool.cpp
+	> src/hugin1/hugin/PreviewIdentifyTool.h
+	> src/hugin1/hugin/TextureManager.cpp
+	> src/hugin1/hugin/huginApp.cpp
+	> src/hugin1/hugin/xrc/CMakeLists.txt
+	> src/hugin1/hugin/xrc/about.xrc
+	> src/hugin1/hugin/xrc/data/CMakeLists.txt
+	> src/hugin1/hugin/xrc/data/help_en_EN/Autooptimiser.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Cpfind.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Depth_of_Field.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Entrance_pupil.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Batch_Processor.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_tab.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_FAQ.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Fast_Preview_window.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Images_tab.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Keyboard_shortcuts.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Main_window.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Optimizer_tab.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Preferences.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Reset_Values_window.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Stitcher_tab.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Hugin_translation_guide.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/NPP.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/No-parallax_point.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/PTOptimizer.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/PTtiff2psd.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Parallax.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/Vignetting.html
+	> src/hugin1/hugin/xrc/data/help_en_EN/help_index_en.hhk
+	> src/hugin1/hugin/xrc/data/help_en_EN/help_toc_en.hhc
+	> src/hugin1/hugin/xrc/data/help_en_EN/hugin_help_en_EN.hhp
+	> src/hugin1/hugin/xrc/data/help_en_EN/pages.txt
+	> src/hugin1/hugin/xrc/mask_editor_panel.xrc
+	> src/hugin1/ptbatcher/FindPanoDialog.cpp
+	> src/hugin1/ptbatcher/FindPanoDialog.h
+	> src/hugin_base/CMakeLists.txt
+	> src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExport.cpp
+	> src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp
+	> src/hugin_base/hugin_utils/utils.cpp
+	> src/hugin_base/hugin_utils/utils.h
+	> src/hugin_base/makefilelib/Makefile.cpp
+	> src/hugin_base/makefilelib/Variable.cpp
+	> src/hugin_base/makefilelib/Variable.h
+	> src/hugin_base/panodata/Mask.cpp
+	> src/hugin_base/panodata/Mask.h
+	> src/hugin_base/panodata/Panorama.cpp
+	> src/hugin_base/panodata/SrcPanoImage.cpp
+	> src/hugin_cpfind/CMakeLists.txt
+	> src/hugin_cpfind/cpfind/CMakeLists.txt
+	> src/hugin_cpfind/cpfind/PanoDetector.cpp
+	> src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp
+	> src/hugin_cpfind/cpfind/main.cpp
+	> src/hugin_cpfind/localfeatures/CMakeLists.txt
+	> src/hugin_cpfind/localfeatures/CircularKeyPointDescriptor.cpp
+	> src/hugin_script_interface/CMakeLists.txt
+	> src/hugin_shared.h
+	> src/tools/pano_trafo.cpp
+	> src/translations/hu.po
+	> src/translations/ja.po
+	> src/translations/pt_BR.po

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: 2011.0.0_rc2 release notes

From: <hugin-cvs@li...> - 2011-05-27 00:03

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/277c91976ed3
changeset:
diffstat:

 doc/releases/hugin-2011.0.0_rc2.txt |  200 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 200 insertions(+), 0 deletions(-)

diffs (204 lines):

diff -r cf32c5e0ec6c -r 277c91976ed3 doc/releases/hugin-2011.0.0_rc2.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/releases/hugin-2011.0.0_rc2.txt	Thu May 26 20:01:54 2011 -0400
@@ -0,0 +1,200 @@
+Hugin-2011.0.0_rc2 RELEASE NOTES
+
+ABOUT
+
+Hugin is more than just a panorama stitcher.  A new version is available.  This is a
+release candidate and may be declared a final release in a few days.
+
+Hugin can be found at
+* SourceForge:  http://hugin.sourceforge.net/
+* Launchpad:    https://launchpad.net/hugin
+
+
+DOWNLOAD
+
+The 2011.0.0_rc2 source tarball can be downloaded
+
+* from SourceForge at
+http://sourceforge.net/projects/hugin/files/hugin/hugin-2011.0_beta/hugin-2011.0.0_rc2.tar.bz2/download
+
+* from Launchpad at
+http://launchpad.net/hugin/2011.0/2011.0rc1/+download/hugin-2011.0.0_rc2.tar.bz2
+
+This is a source code release.  For executables see below.
+
+This tarball is equivalent to rev/changeset 5243:67a96ebdac74 in our Mercurial
+repository, where it is also tagged 2011.0.0_rc2
+
+Verify its SHA1SUM
+22e1ad3846291a9bbe58570683e213921a6f0116  hugin-2011.0.0_rc2.tar.bz2
+
+
+EXECUTABLES
+
+The binaries in this release are identical with the rc1 binaries.  No need
+to rebuild.  The only update is a script for wrapping Smartblend in Windows.
+
+Users communities produce executables for their respective platforms.
+
+These executables are then added to the download section on SourceForge at
+http://sourceforge.net/projects/hugin/files/hugin/
+
+A number of users have built recent snapshots and executables are likely to be
+announced within a few days of this tarball release.
+
+Watch http://groups.google.com/group/hugin-ptx for the announcements of binary
+releases.  If you don't see a binary for your platform it has most likely not
+been produced yet.  Consider stepping up to the task.  Instructions at
+
+http://wiki.panotools.org/Development_of_Open_Source_tools#Supported_Platforms
+
+Announce your build on http://groups.google.com/group/hugin-ptx
+
+
+SPLASH SCREEN
+
+To promote artists using Hugin the project has adopted a user-contributed
+artwork to enrich the splash screen of this release.
+
+Read more about the Seattle Sunset panorama and author/contributor Jeff Boyd at
+http://hugin.sourceforge.net/releases/2011.0.0/
+
+
+TRANSLATIONS
+
+Updated since the last beta tarball:
+* Brazilian (Luís Henrique Camargo Quiroz)
+* Czech translation (Vaclav Cerny)
+* Swedish translation (Ulf Wilhelmson)
+
+New strings have been added.  Now is a good time to help update your language.
+Instructions at http://wiki.panotools.org/Hugin_translation_guide
+
+
+CHANGES SINCE 2010.4.0
+
+Despite some known issues (see section KNOWN ISSUES below) this release brings
+many major new features worth releasing now.  Hugin's own control point
+generator CPFind has been significantly improved;  the last project from the
+2010 Google Summer of Code has been integrated;  many general improvements
+have been made.
+
+
+_Improved Built-in Control Points Generator_
+
+CPFind's detection ability has been significantly improved, especially for
+wide angle (> FOV 65°) images, fisheye images, and rotated images.  Anecdotal
+evidence shows it to be more accurate than any other CP detector ever used
+with Hugin.  A thorough, scientific comparison against other CP detectors
+is welcome.  If you have well formed comparison results, please publish a link
+on the Hugin mailing list at http://groups.google.com/group/hugin-ptx/
+
+
+_Improved Fast Preview_
+
+An Overview pane has been added to the Fast Preview window.  Users can now
+interact with the panosphere like in a virtual reality viewer in real time
+and visualize all areas of the panorama with little distortion, including
+the zenith and nadir that are typically excessively distorted in the flat
+preview.
+
+It is now possible to drag individual images or arbitrary groups of images
+on the panosphere in the fast preview.
+
+A new gray point picker has been added for visual white balance correction.
+
+
+_Registration of Stereo Images_
+
+align_image_stack is commonly used for the alignment of slightly misaligned
+images, e.g. for creating a High Dynamic Range image  from multiple exposures
+when the camera was hand held.
+
+It has been extended with additional functionality for the registration of
+stereo images.
+
+
+_Other Improvements_
+
+* Man pages are now compressed and the generation is integrated in the CMake
+  process (Linux).
+* New Thoby projection modeling 10.5mm Nikkor fisheye lens.
+* Improved support for some keyboard shortcuts.
+* New Preferences: output file format (LDR only).
+* This release has the usual bugfixes and adds minor features.
+
+
+_Libraries and Build_
+
+* CMake 2.8 or newer is now required
+* Support has been added for gcc-4.6 compiler
+* Libpano13 needs to be at least 2.9.18
+
+
+CONTROL POINTS GENERATORS
+
+Since 2010.4 Hugin ships with its own 'Patent Free' control point generator.
+Third-party generators are still supported through the plug-in architecture.
+CPFind is the recommended control point generator and the only one endorsed
+by the Hugin project team.
+
+
+UPGRADING
+
+Upgrading from previous versions of Hugin should be seamless. If you do have
+problems with old settings, these can be reset in the Preferences by clicking
+'Load defaults'.
+
+It is strongly recommended to set the default control point detector to
+Hugin's CPFind.
+
+
+COMPILING
+
+Users compiling from source refer to the dependencies listed at
+http://wiki.panotools.org/Development_of_Open_Source_tools#Dependencies
+
+and the build processes listed at
+http://wiki.panotools.org/Development_of_Open_Source_tools#Build_your_Own_Test_Builds
+
+More information in the README and INSTALL_cmake files in the tarball.
+
+
+KNOWN ISSUES AND WORKAROUNDS
+
+On some versions of OSX, Hugin can't stitch the project.  Workaround:
+1. Save the project file in Hugin
+2. Open the project file in PTBatcherGUI (File / Add Project / select .pto file)
+3. Click the run button to stitch.
+details at https://bugs.launchpad.net/hugin/+bug/697039
+
+
+Plane overview is wrong if opening fast preview window the first time
+https://bugs.launchpad.net/hugin/+bug/726183
+
+
+Panosphere Overview window seperated from the content
+https://bugs.launchpad.net/hugin/+bug/726997
+
+
+An updated list of issues deemed to be critical, including discussions
+and workarounds is in the issue tracker.
+https://bugs.launchpad.net/hugin/+bugs?search=Search&field.importance=Critical
+
+
+THANKS
+
+Thanks to all the contributors to this release and members of the hugin-ptx
+mailing list, too many to mention here.
+
+Hugin can be found at http://hugin.sourceforge.net/ and at https://launchpad.net/hugin
+
+
+CHANGELOG SINCE 2011.0.0_rc1
+
+2011-05-24  Bart  <Bart van Andel bavanandel+code@...>
+
+  * platforms/windows/smartblend-wrapper/smartblend-hugin.bat:
+  Fix smartblend-hugin.bat to remove '--' argument separator
+  [7f57393fd91d] [tip] <2011.0>
+

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Added tag 2011.0.0_rc2 for changeset 6...

From: <hugin-cvs@li...> - 2011-05-26 11:45

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/0f9fdaf56720
changeset: 5244:0f9fdaf56720
user:      Yuv Mobile <yuv@...>
date:       Thu May 26 07:44:37 2011 -0400
description:
Added tag 2011.0.0_rc2 for changeset 67a96ebdac74

diffstat:

 .hgtags |  1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diffs (8 lines):

diff -r 67a96ebdac74 -r 0f9fdaf56720 .hgtags
--- a/.hgtags	Thu May 26 07:16:36 2011 -0400
+++ b/.hgtags	Thu May 26 07:44:37 2011 -0400
@@ -27,3 +27,4 @@
 f7ea2426b8de94ded6e74b6d8db67ef79e722360 2011.0beta2
 dc55ab27036334b7b8e6ba9bef871be59d854f67 2011.0beta3
 ac287c432eb6ec5aee75931ff0627b120e87ae81 2011.0.0_rc1
+67a96ebdac744cc4809e821cf98535077024f948 2011.0.0_rc2

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Fix smartblend-hugin.bat to remove '--...

From: <hugin-cvs@li...> - 2011-05-24 11:40

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/cd9cb5ee3f3b
changeset: 5238:cd9cb5ee3f3b
user:      Bart van Andel bavanandel+code@...
date:       Tue May 24 13:27:26 2011 +0200
description:
Fix smartblend-hugin.bat to remove '--' argument separator

diffstat:

 platforms/windows/smartblend-wrapper/smartblend-hugin.bat |  2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diffs (12 lines):

diff -r 967c53582af3 -r cd9cb5ee3f3b platforms/windows/smartblend-wrapper/smartblend-hugin.bat
--- a/platforms/windows/smartblend-wrapper/smartblend-hugin.bat	Tue May 24 08:50:29 2011 +0200
+++ b/platforms/windows/smartblend-wrapper/smartblend-hugin.bat	Tue May 24 13:27:26 2011 +0200
@@ -16,6 +16,8 @@
 		shift
 	) else if "%arg:~0,2%"=="-f" (
 		echo [smartblend-wrapper] Skipping crop argument: %1
+	) else if "%arg:~0,2%"=="--" (
+		echo [smartblend-wrapper] Skipping argument separator: %1
 	) else if "%arg:~0,2%"=="-o" (
 		echo [smartblend-wrapper] Output file: %2
 		set SMARTBLENDARGS=%SMARTBLENDARGS% -o %2

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Fix smartblend-hugin.bat to remove '--...

From: <hugin-cvs@li...> - 2011-05-26 11:45

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/7f57393fd91d
changeset: 5242:7f57393fd91d
user:      Bart van Andel bavanandel+code@...
date:       Tue May 24 13:27:26 2011 +0200
description:
Fix smartblend-hugin.bat to remove '--' argument separator

diffstat:

 platforms/windows/smartblend-wrapper/smartblend-hugin.bat |  2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diffs (12 lines):

diff -r 0fd3e119979c -r 7f57393fd91d platforms/windows/smartblend-wrapper/smartblend-hugin.bat
--- a/platforms/windows/smartblend-wrapper/smartblend-hugin.bat	Sun May 15 19:08:47 2011 -0400
+++ b/platforms/windows/smartblend-wrapper/smartblend-hugin.bat	Tue May 24 13:27:26 2011 +0200
@@ -16,6 +16,8 @@
 		shift
 	) else if "%arg:~0,2%"=="-f" (
 		echo [smartblend-wrapper] Skipping crop argument: %1
+	) else if "%arg:~0,2%"=="--" (
+		echo [smartblend-wrapper] Skipping argument separator: %1
 	) else if "%arg:~0,2%"=="-o" (
 		echo [smartblend-wrapper] Output file: %2
 		set SMARTBLENDARGS=%SMARTBLENDARGS% -o %2

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Updated ChangeLog

From: <hugin-cvs@li...> - 2011-05-26 11:45

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/67a96ebdac74
changeset: 5243:67a96ebdac74
user:      Yuv Mobile <yuv@...>
date:       Thu May 26 07:16:36 2011 -0400
description:
Updated ChangeLog

diffstat:

 ChangeLog |  29939 +++++++++++++++++++++--------------------------------------------
 1 files changed, 9953 insertions(+), 19986 deletions(-)

diffs (truncated from 49374 to 500 lines):

diff -r 7f57393fd91d -r 67a96ebdac74 ChangeLog
--- a/ChangeLog	Tue May 24 13:27:26 2011 +0200
+++ b/ChangeLog	Thu May 26 07:16:36 2011 -0400
@@ -1,25 +1,35 @@
-2011-05-15 17:25 -0400  Yuval Levy  <yuv@...>  (8d1a92e73c9d [tip])
+2011-05-24  Bart  <Bart van Andel bavanandel+code@...>
+
+	* platforms/windows/smartblend-wrapper/smartblend-hugin.bat:
+	Fix smartblend-hugin.bat to remove '--' argument separator
+	[7f57393fd91d] [tip] <2011.0>
+
+2011-05-15  Yuval Levy  <yuv@...>
+
+	* .hgtags:
+	Added tag 2011.0.0_rc1 for changeset ac287c432eb6
+	[0fd3e119979c] <2011.0>
+
+	* ChangeLog:
+	Updated ChangeLog
+	[ac287c432eb6] [2011.0.0_rc1] <2011.0>
 
 	* src/hugin1/hugin/xrc/data/intro.htm:
 	updated intro screen
-
-2011-05-09 22:32 -0400  Matthew Petroff  <Matthew Petroff>  (53cd178bfb55)
+	[8d1a92e73c9d] <2011.0>
+
+2011-05-09  Matthew Petroff  <Matthew Petroff>
 
 	* src/hugin1/hugin/PreferencesDialog.cpp:
 	Fixes display of image cache memory on Windows (bug# 761231).
-
-2011-05-01 22:00 -0400  Yuval Levy  <yuv@...>  (02e1dd6fbef6)
+	[53cd178bfb55] <2011.0>
+
+2011-05-01  Yuval Levy  <yuv@...>
 
 	* src/hugin1/hugin/xrc/data/CMakeLists.txt:
 	clean CMake build from last commit
-
-2011-05-01 21:31 -0400  Yuval Levy  <yuv@...>  (1eb634cc4bf3)
-
-	* artwork-src/2011.0-splash/2011.0.splash.svg, artwork-
-	src/2011.0-splash/SeattleSunset.png, artwork-
-	src/2011.0-splash/readme.txt, src/hugin1/hugin/xrc/data/intro.htm:
-	new file.
-	* src/hugin1/hugin/xrc/data/about.txt: deleted file.
+	[02e1dd6fbef6] <2011.0>
+
 	* artwork-src/2011.0-splash/2011.0.splash.svg, artwork-
 	src/2011.0-splash/SeattleSunset.png, artwork-
 	src/2011.0-splash/readme.txt, src/hugin1/hugin/AboutDialog.cpp,
@@ -27,58 +37,62 @@
 	src/hugin1/hugin/xrc/data/intro.htm,
 	src/hugin1/hugin/xrc/data/splash.png:
 	Added 2011.0 splash screen by Jeff Boyd
-
-2011-05-01 14:27 -0400  Yuval Levy  <yuv@...>  (c6e4953cb02a)
+	[1eb634cc4bf3] <2011.0>
 
 	* artwork-src/2010/splash/splash_with_artwork.svg:
 	added layers to splash screen SVG to enable separate rendering of
 	bitmaps and compensate for Inkscape softness in rendering scaled
 	bitmaps
-
-2011-03-25 18:22 +0100  tmodes  <tmodes>  (54dea14f9966)
+	[c6e4953cb02a] <2011.0>
+
+2011-03-25  tmodes  <tmodes>
 
 	* src/hugin1/base_wx/platform.cpp:
 	Reject more characters
-
-2011-03-23 18:04 +0100  tmodes  <tmodes>  (7574625fcfe3)
+	[54dea14f9966] <2011.0>
+
+2011-03-23  tmodes  <tmodes>
 
 	* src/hugin1/base_wx/platform.cpp:
 	Reject also double quote
-
-2011-03-23 17:49 +0100  tmodes  <tmodes>  (7446aafa8dbb)
+	[7574625fcfe3] <2011.0>
 
 	* src/hugin1/base_wx/platform.cpp, src/hugin_base/algorithms/assistant
 	_makefile/AssistantMakefilelibExport.cpp, src/hugin_base/algorithms/
 	panorama_makefile/PanoramaMakefilelibExport.cpp:
 	Fixes quoting of some more characters
-
-2011-03-23 08:02 +0100  Vaclav Cerny  <vatoz@...>  (b740a5518806)
+	[7446aafa8dbb] <2011.0>
+
+2011-03-23  Vaclav Cerny  <vatoz@...>
 
 	* src/translations/cs_CZ.po:
 	Updated czech translation
-
-2011-03-23 00:29 +0000  Bruno Postle  <bruno@...>  (472072ea810d)
+	[b740a5518806] <2011.0>
+
+2011-03-23  Bruno Postle  <bruno@...>
 
 	* merge
-
-2011-03-23 00:27 +0000  Bruno Postle  <bruno@...>  (f2861af57e84)
+	[472072ea810d] <2011.0>
 
 	* src/hugin1/hugin/xrc/data/help_en_EN/Equirectangular_Panini.html,
 	src/hugin1/hugin/xrc/data/help_en_EN/Panini.html,
 	src/hugin1/hugin/xrc/data/help_en_EN/dewiki.pl:
 	More tweaks for generating the manual
-
-2011-03-22 20:36 +0100  tmodes  <tmodes>  (4b33ca2cda42)
+	[f2861af57e84] <2011.0>
+
+2011-03-22  tmodes  <tmodes>
 
 	* src/hugin1/hugin/xrc/data/help_en_EN/CMakeLists.txt:
 	Added css to compiled help file
-
-2011-03-22 16:59 +0000  Bruno Postle  <bruno@...>  (6e53c8840ae5)
+	[4b33ca2cda42] <2011.0>
+
+2011-03-22  Bruno Postle  <bruno@...>
 
 	* src/hugin1/hugin/xrc/data/help_en_EN/CMakeLists.txt:
 	Install the CSS for the manual
-
-2011-03-21 23:35 +0000  Bruno Postle  <bruno@...>  (69f592f8aa05)
+	[6e53c8840ae5] <2011.0>
+
+2011-03-21  Bruno Postle  <bruno@...>
 
 	* src/hugin1/hugin/xrc/data/help_en_EN/16bit.html,
 	src/hugin1/hugin/xrc/data/help_en_EN/16bit_workflow_with_hugin.html,
@@ -141,9 +155,9 @@
 	src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Assistant_tab.html,
 	src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Batch_Processor.html,
 	src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Camera_and_Lens_tab.html,
-	src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_tab.html, 
-	src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_table.html
-	, src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Crop_tab.html,
+	src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_tab.html, s
+	rc/hugin1/hugin/xrc/data/help_en_EN/Hugin_Control_Points_table.html,
+	src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Crop_tab.html,
 	src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Exposure_tab.html,
 	src/hugin1/hugin/xrc/data/help_en_EN/Hugin_FAQ.html,
 	src/hugin1/hugin/xrc/data/help_en_EN/Hugin_Fast_Preview_window.html,
@@ -214,9 +228,9 @@
 	src/hugin1/hugin/xrc/data/help_en_EN/Roll.html,
 	src/hugin1/hugin/xrc/data/help_en_EN/SmartBlend.html,
 	src/hugin1/hugin/xrc/data/help_en_EN/Spherical.html,
-	src/hugin1/hugin/xrc/data/help_en_EN/Stereographic_Projection.html, 
-	src/hugin1/hugin/xrc/data/help_en_EN/Straight_line_control_points.ht
-	ml, src/hugin1/hugin/xrc/data/help_en_EN/Swing_rod.html,
+	src/hugin1/hugin/xrc/data/help_en_EN/Stereographic_Projection.html, s
+	rc/hugin1/hugin/xrc/data/help_en_EN/Straight_line_control_points.htm
+	l, src/hugin1/hugin/xrc/data/help_en_EN/Swing_rod.html,
 	src/hugin1/hugin/xrc/data/help_en_EN/TIFF.html,
 	src/hugin1/hugin/xrc/data/help_en_EN/Tca_correct.html, src/hugin1/hu
 	gin/xrc/data/help_en_EN/The_General_Panini_Projection.html,
@@ -229,82 +243,69 @@
 	src/hugin1/hugin/xrc/data/help_en_EN/Yaw.html,
 	src/hugin1/hugin/xrc/data/help_en_EN/Zenith.html:
 	redo manual using updated dewiki script
-
-2011-03-21 23:33 +0000  Bruno Postle  <bruno@...>  (38f934c1eec3)
+	[69f592f8aa05] <2011.0>
 
 	* src/hugin1/hugin/xrc/data/help_en_EN/manual.css:
 	simplify CSS further
-
-2011-03-21 23:33 +0000  Bruno Postle  <bruno@...>  (c14997288d70)
+	[38f934c1eec3] <2011.0>
 
 	* src/hugin1/hugin/xrc/data/help_en_EN/dewiki.pl:
 	typo
-
-2011-03-21 23:10 +0000  Bruno Postle  <bruno@...>  (bd6e1cecb0f8)
-
-	* src/hugin1/hugin/xrc/data/help_en_EN/manual.css: new file.
+	[c14997288d70] <2011.0>
+
 	* src/hugin1/hugin/xrc/data/help_en_EN/dewiki.pl,
 	src/hugin1/hugin/xrc/data/help_en_EN/manual.css:
 	Manual: restore external links, add basic CSS support
-
-2011-03-21 22:44 +0000  Bruno Postle  <bruno@...>  (22b887c237d6)
+	[bd6e1cecb0f8] <2011.0>
 
 	* src/hugin1/hugin/xrc/data/help_en_EN/license.html:
 	fix broken html
-
-2011-03-21 20:13 +0100  tmodes  <tmodes>  (41878c7e22ca)
+	[22b887c237d6] <2011.0>
+
+2011-03-21  tmodes  <tmodes>
 
 	* src/hugin1/hugin/xrc/data/help_en_EN/Equirectangular_Panini.html,
 	src/hugin1/hugin/xrc/data/help_en_EN/Panini.html:
 	Some cleanup of manual
-
-2011-03-21 19:33 +0100  tmodes  <tmodes>  (1d06ae77d84c)
+	[41878c7e22ca] <2011.0>
 
 	* platforms/windows/huginsetup/CMakeLists.txt:
 	Don't install non-existing files
-
-2011-03-21 18:40 +0100  tmodes  <tmodes>  (d3365b495785)
+	[1d06ae77d84c] <2011.0>
 
 	* src/translations/pt_BR.po:
 	Updated brazilian portuguese translation (Luís Henrique Camargo
 	Quiroz)
-
-2011-03-21 18:23 +0100  tmodes  <tmodes>  (aee9c44d54d3)
+	[d3365b495785] <2011.0>
 
 	* src/hugin_base/algorithms/assistant_makefile/AssistantMakefilelibExp
 	ort.cpp, src/hugin_base/algorithms/panorama_makefile/PanoramaMakefil
 	elibExport.cpp:
 	Fixes quoting of single quote
-
-2011-03-21 18:22 +0100  tmodes  <tmodes>  (ec2651c073e8)
+	[aee9c44d54d3] <2011.0>
 
 	* src/hugin_base/makefilelib/Makefile.cpp:
 	Fixes quoting of ampersand [679353]
-
-2011-03-15 21:07 +0100  tmodes  <tmodes>  (36814983b01c)
+	[ec2651c073e8] <2011.0>
+
+2011-03-15  tmodes  <tmodes>
 
 	* src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExpor
 	t.cpp:
 	Fixes makefile if filename starts with hyphen [700283]
-
-2011-03-15 20:55 +0100  tmodes  <tmodes>  (44194bf21d5b)
+	[36814983b01c] <2011.0>
 
 	* src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExpor
 	t.cpp:
 	Fixes compression for exposure layers output
-
-2011-03-20 23:59 -0400  Matthew Petroff  <Matthew Petroff>  (42c62d1786ee)
+	[44194bf21d5b] <2011.0>
+
+2011-03-20  Matthew Petroff  <Matthew Petroff>
 
 	* CMakeLists.txt:
 	Forgot a line in previous commit to fix bug #723661.
-
-2011-03-20 23:13 -0400  Matthew Petroff  <Matthew Petroff>  (734ba7367ecb)
-
-	* platforms/windows/huginsetup/Plugins/AdvUninstLog-Readme.txt,
-	platforms/windows/huginsetup/Plugins/AdvUninstLog.nsh: new file.
-	* CMakeModules/Find7Zip.cmake,
-	platforms/windows/huginsetup/Plugins/nsis7z.dll,
-	platforms/windows/huginsetup/Plugins/nsisunz.dll: deleted file.
+	[42c62d1786ee] <2011.0>
+
 	* CMakeLists.txt, CMakeModules/Find7Zip.cmake,
 	platforms/windows/huginsetup/HuginSetup_common.nsh,
 	platforms/windows/huginsetup/Plugins/AdvUninstLog-Readme.txt,
@@ -314,8 +315,9 @@
 	platforms/windows/huginsetup/Plugins/nsisunz.dll:
 	Extensive changes to Windows install scripts to fix bug #723661
 	(7za.exe is also no longer required to build installer).
-
-2011-03-16 12:23 -0700  boyd  <boyd>  (1d3d0a820d2c)
+	[734ba7367ecb] <2011.0>
+
+2011-03-16  boyd  <boyd>
 
 	* src/hugin1/hugin/GLPreviewFrame.cpp,
 	src/hugin1/hugin/GLPreviewFrame.h,
@@ -323,38 +325,35 @@
 	src/hugin1/hugin/PreviewIdentifyTool.h:
 	Fixes bug #712802, so that identify in the preview updates the
 	overview and vice versa.
-
-2011-03-15 21:22 +0100  tmodes  <tmodes>  (351dd7aea158)
+	[1d3d0a820d2c] <2011.0>
+
+2011-03-15  tmodes  <tmodes>
 
 	* src/hugin1/hugin/GLPreviewFrame.cpp:
 	Fixes numerical transform in individual drag mode [735136]
-
-2011-03-16 18:44 +0000  Bruno Postle  <bruno@...>  (30c5b6c1a3ba)
+	[351dd7aea158] <2011.0>
+
+2011-03-16  Bruno Postle  <bruno@...>
 
 	* src/translations/sv.po:
 	Updated Swedish translation (Ulf Wilhelmson)
-
-2011-03-15 20:29 +0100  tmodes  <tmodes>  (bf7bca782a16)
+	[30c5b6c1a3ba] <2011.0>
+
+2011-03-15  tmodes  <tmodes>
 
 	* src/hugin1/hugin/xrc/data/help_en_EN/help_index_en.hhk,
 	src/hugin1/hugin/xrc/data/help_en_EN/help_toc_en.hhc,
 	src/hugin1/hugin/xrc/data/help_en_EN/hugin_help_en_EN.hhp:
 	Updated help file for latest changes
-
-2011-03-15 20:14 +0100  tmodes  <tmodes>  (fc525d97d676)
+	[bf7bca782a16] <2011.0>
 
 	* src/hugin1/hugin/huginApp.cpp:
 	More fixes for default filename Last path was missing in commit
 	5f15f569cdc8
-
-2011-03-14 23:42 +0000  Bruno Postle  <bruno@...>  (7226737670f5)
-
-	* src/hugin1/hugin/xrc/data/help_en_EN/200px-
-	Hugin-2011.0_fpw_overview.png, src/hugin1/hugin/xrc/data/help_en_EN/
-	5a12c95d04637539015c2d09b5002204.png,
-	src/hugin1/hugin/xrc/data/help_en_EN/Diffraction.html,
-	src/hugin1/hugin/xrc/data/help_en_EN/Equirectangular_Panini.html,
-	src/hugin1/hugin/xrc/data/help_en_EN/Panini.html: new file.
+	[fc525d97d676] <2011.0>
+
+2011-03-14  Bruno Postle  <bruno@...>
+
 	* src/hugin1/hugin/xrc/data/help_en_EN/200px-
 	Hugin-2011.0_fpw_overview.png, src/hugin1/hugin/xrc/data/help_en_EN/
 	5a12c95d04637539015c2d09b5002204.png,
@@ -386,223 +385,220 @@
 	src/hugin1/hugin/xrc/data/help_en_EN/Vignetting.html,
 	src/hugin1/hugin/xrc/data/help_en_EN/pages.txt:
 	Update manual from wiki, now approximately at 2011.0.0 level
-
-2011-03-14 19:29 +0100  tmodes  <tmodes>  (891d79e8232b)
+	[7226737670f5] <2011.0>
+
+2011-03-14  tmodes  <tmodes>
 
 	* Merged
-
-2011-03-14 19:25 +0100  tmodes  <tmodes>  (a4574e82c175)
+	[891d79e8232b] <2011.0>
 
 	* src/hugin_cpfind/cpfind/main.cpp:
 	Better error checking for commandline parameters
-
-2011-03-14 19:25 +0100  tmodes  <tmodes>  (adb4c3471750)
+	[a4574e82c175] <2011.0>
 
 	* src/hugin_cpfind/cpfind/PanoDetectorLogic.cpp:
 	Fixes scaling for full scale images [729720]
-
-2011-03-13 17:35 -0400  Yuval Levy  <yuv@...>  (8f1447ab8649)
+	[adb4c3471750] <2011.0>
+
+2011-03-13  Yuval Levy  <yuv@...>
 
 	* .hgtags:
 	Added tag 2011.0beta3 for changeset dc55ab270363
-
-2011-03-13 17:35 -0400  Yuval Levy  <yuv@...>  (dc55ab270363 [2011.0beta3])
+	[8f1447ab8649] <2011.0>
 
 	* ChangeLog:
 	Updated ChangeLog
-
-2011-03-13 19:51 +0100  tmodes  <tmodes>  (f9e2e6ed3e61)
+	[dc55ab270363] [2011.0beta3] <2011.0>
+
+2011-03-13  tmodes  <tmodes>
 
 	* src/hugin1/hugin/GLPreviewFrame.cpp:
 	Set image toggle button size to default Last changes results in too
 	big buttons
-
-2011-03-13 19:51 +0100  tmodes  <tmodes>  (dc7e1537f2b7)
+	[f9e2e6ed3e61] <2011.0>
 
 	* src/hugin1/hugin/AboutDialog.cpp:
 	Revert partially some changes: m_logo is no pointer, so don't set to
 	NULL
-
-2011-03-13 14:20 -0400  Yuval Levy  <yuv@...>  (3a274f80c25f)
+	[dc7e1537f2b7] <2011.0>
+
+2011-03-13  Yuval Levy  <yuv@...>
 
 	* src/hugin1/hugin/AboutDialog.cpp:
 	trying to fix bug# 733793
-
-2011-03-13 13:19 -0400  Yuval Levy  <yuv@...>  (aa3b40f4ad21)
+	[3a274f80c25f] <2011.0>
 
 	* CMakeLists.txt:
 	no need to specify branch with --follow options of hg log
-
-2011-03-13 13:14 -0400  Yuval Levy  <yuv@...>  (73db84749bfd)
+	[aa3b40f4ad21] <2011.0>
 
 	* src/hugin1/hugin/GLPreviewFrame.cpp:
 	toggle buttons in fast preview were still too small on default
 	Kubuntu
-
-2011-03-13 16:17 +0100  tmodes  <tmodes>  (0b204475079d)
+	[73db84749bfd] <2011.0>
+
+2011-03-13  tmodes  <tmodes>
 
 	* src/hugin1/hugin/AboutDialog.cpp:
 	Fixes crash in about window [733793]
-
-2011-03-13 15:26 +0100  tmodes  <tmodes>  (35210d7fd5f4)
+	[0b204475079d] <2011.0>
 
 	* src/hugin1/hugin/GLPreviewFrame.cpp, src/hugin1/hugin/MainFrame.cpp:
 	Fixes initialisation of overview window on Mac [731734]
-
-2011-03-13 09:12 +0100  tmodes  <tmodes>  (5f15f569cdc8)
+	[35210d7fd5f4] <2011.0>
 
 	* src/hugin1/hugin/MainFrame.cpp, src/hugin1/hugin/PanoPanel.cpp,
 	src/hugin1/hugin/huginApp.cpp, src/hugin_base/hugin_utils/utils.cpp,
 	src/hugin_base/hugin_utils/utils.h:
 	Propose correct and valid filename for saving project and stitching
 	[731217]
-
-2011-03-12 11:35 -0500  Yuv Mobile  <yuv@...>  (315050341fea)
+	[5f15f569cdc8] <2011.0>
+
+2011-03-12  Yuv Mobile  <yuv@...>
 
 	* CMakeLists.txt:
 	update log generating command for the specific branch
-
-2011-03-11 17:54 +0100  tmodes  <tmodes>  (45dc653144f3)
+	[315050341fea] <2011.0>
+
+2011-03-11  tmodes  <tmodes>
 
 	* src/hugin_base/panodata/SrcPanoImage.cpp:
 	Fixes metadata reading for newer Olympus cameras [732359] The used
 	tag FocalPlaneDialog was moved into Equipment sub-directory. So try
 	to read from this sub-directory.
-
-2011-03-09 20:25 +0100  tmodes  <tmodes>  (2c3545696c83)
+	[45dc653144f3] <2011.0>
+
+2011-03-09  tmodes  <tmodes>
 
 	* src/translations/hu.po:
 	Updated hungarian translation (Lajos Höss)
-
-2011-03-07 18:04 +0100  tmodes  <tmodes>  (6fcad1e7af5c)
+	[2c3545696c83] <2011.0>
+
+2011-03-07  tmodes  <tmodes>
 
 	* src/hugin1/PT/PanoCommand.h, src/hugin1/hugin/LensPanel.cpp:
 	Fixes reset exposure on Lens panel The introduction of the
 	CombinedPanoCommand in f71ccb911ead does not correctly reset the
 	output exposure value of the panorama. Fixes this by an extra
 	ResetMeanExposure PanoCommand.
-
-2011-03-06 14:16 +0100  tmodes  <tmodes>  (a1d2b90c2c84)
+	[6fcad1e7af5c] <2011.0>
+
+2011-03-06  tmodes  <tmodes>
 
 	* src/hugin1/hugin/GLPreviewFrame.cpp:
 	Update layout scale also for overview window after switching mode
-
-2011-03-06 14:16 +0100  tmodes  <tmodes>  (d68e47ace668)
+	[a1d2b90c2c84] <2011.0>
 
 	* src/hugin1/hugin/OverviewOutlinesTool.cpp,
 	src/hugin1/hugin/PanosphereSphereTool.cpp,
 	src/hugin1/hugin/TextureManager.cpp:
 	Fixes some color/intensity issue in overview window
-
-2011-03-06 14:15 +0100  tmodes  <tmodes>  (95db7bd4c3b4)
+	[d68e47ace668] <2011.0>
 
 	* src/hugin1/hugin/PanosphereSphereTool.cpp,
 	src/hugin1/hugin/PanosphereSphereTool.h:
 	Draw panosphere above images and not below [726186]
-
-2011-03-01 18:30 +0100  harryvanderwolf  <hvdwolf@...>  (3e3907665346)
+	[95db7bd4c3b4] <2011.0>
+
+2011-03-01  harryvanderwolf  <hvdwolf@...>
 
 	* src/translations/nl.po:
 	Updated dutch translation
-
-2011-03-01 13:53 +0100  mcri  <mcri>  (94e1c2bfc34b)
+	[3e3907665346] <2011.0>
+
+2011-03-01  mcri  <mcri>

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Updated doxygen documentation after th...

From: <hugin-cvs@li...> - 2011-05-24 19:57

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/f00957574874
changeset: 5241:f00957574874
user:      tmodes
date:       Tue May 24 21:57:34 2011 +0200
description:
Updated doxygen documentation after the latest changes

diffstat:

 src/dox/folder.dox                    |   9 ++++-
 src/dox/mainpage.dox                  |   3 +
 src/hugin_script_interface/README.dox |  48 ++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 1 deletions(-)

diffs (111 lines):

diff -r 83c965393b52 -r f00957574874 src/dox/folder.dox
--- a/src/dox/folder.dox	Tue May 24 20:17:02 2011 +0200
+++ b/src/dox/folder.dox	Tue May 24 21:57:34 2011 +0200
@@ -40,6 +40,9 @@
 \dir hugin_base/huginapp
   (code in this directory does not depends on wxWidgets and should not link against wxWidgets)
 
+\dir hugin_base/lines
+  Contains the code for huginlines - a lib for automatic finding straight lines in images
+  
 \dir hugin_base/makefilelib
   Contains the makefilelib which allows wrapping of makefile generation for GNU make.
   (code in this directory does not depends on wxWidgets and should not link against wxWidgets)
@@ -66,6 +69,9 @@
 \dir hugin1/base_wx
   Contains functions used by different programs libs.
 
+\dir hugin1/calibrate_lens
+  Contains the code for calibrate_lens_gui
+   
 \dir hugin1/hugin
  Contains the code for Hugin GUI.
 
@@ -85,5 +91,6 @@
 
 \dir hugin1/tools_vips
 
-
+\dir hugin_script_interface contains the code for the hugin scripting interface (hsi) 
+     and the hugin python interface (hpi)
 */
diff -r 83c965393b52 -r f00957574874 src/dox/mainpage.dox
--- a/src/dox/mainpage.dox	Tue May 24 20:17:02 2011 +0200
+++ b/src/dox/mainpage.dox	Tue May 24 21:57:34 2011 +0200
@@ -46,6 +46,7 @@
                   should not link against wxWidgets)
        - \ref hugin_cpfind  Contains the code of the control point detector
        - \ref lens_calibrate Contains the lens_calibrate lib and program
+       - \ref hugin_script_interface Contains the hugin scripting interface
        - \ref matchpoint  Contains the matchpoint program
        - \ref tools    Contains most of the command line tools
        - translations  Contains the translations
@@ -55,6 +56,7 @@
    -  \ref hugin_base/appbase
    -  \ref hugin_base/hugin_math  Contains different math helper functions.
    -  \ref hugin_base/huginapp
+   -  \ref hugin_base/lines Contains the lib for automatic finding straight lines in images
    -  \ref hugin_base/makefilelib  Contains the makefilelib which allows wrapping of makefile generation for GNU make.
    -  \ref hugin_base/nona
    -  \ref hugin_base/panodata  Contains the main HuginBase::Panorama object and all other base object used by HuginBase::Panorama.
@@ -64,6 +66,7 @@
 
    The hugin1 directory contains the libs and programs which depends on wxWidgets:
    -  \ref hugin1/base_wx  Contains functions used by different programs/libs.
+   -  \ref hugin1/calibrate_lens Contains the code for calibrate_lens_gui
    -  \ref hugin1/hugin Contains the code for Hugin GUI.
    -  \ref hugin1/icpfind  Contains the code for the icpfind lib and command line version.
    -  \ref hugin1/nona_gui  Contains code for nona_gui.
diff -r 83c965393b52 -r f00957574874 src/hugin_script_interface/README.dox
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hugin_script_interface/README.dox	Tue May 24 21:57:34 2011 +0200
@@ -0,0 +1,48 @@
+namespace hsi
+{
+/** @file README.dox
+
+@page hsihpi Hugin script interface and hugin python interface
+ 
+@section hsi Hugin script interface (hsi)
+
+The hugin script interface (hsi) provides a wrapper for the functions
+and classes in huginbase to Python. So you can use the huginbase 
+functionality inside Python.
+The wrapped function and classes in Python have the same name and
+interface like the C++ classes and function, see \ref hugin_base for
+details about the functions.
+To use it inside Python you need to import it with 
+@code 
+import hsi
+@endcode
+
+@section hpi Hugin Python interface (hpi)
+
+The hugin python interface provides the interface to call Python function
+from inside Hugin GUI.
+The main function is hsi::callhpi, which executes a given python script
+with the given parameters.
+
+@section hsibackground Background
+
+The wrapper are automatically created by Swig (http://www.swig.org/).
+Swig works for most parts of huginbase code. But there are some 
+points to consider. 
+
+#define SWIG - this is only defined when code is processed by SWIG. It's used
+to hide code from SWIG which it can't (yet?) handle.
+
+#define _HSI_IGNORE_SECTION - this is only defined during the separate C-
+preprocessing of certain hugin header files which use a technique
+dubbed 'lazy metaprogramming' which SWIG can't handle. Preprocessing
+'flattens' the files - it pulls in all code that is #included by them.
+Most of the code pulled in this way mustn't be wrapped by SWIG, so it
+is switched off via #ifndef _HSI_IGNORE_SECTION. 
+
+#define HUGIN_HSI - this is defined globally if hsi/hpi capability has been
+switched on. It is used to activate the hsi/hpi related code inside the 
+Hugin GUI.
+
+*/
+}
\ No newline at end of file

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Missed this one while adapting to debi...

From: <hugin-cvs@li...> - 2011-05-24 18:17

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/83c965393b52
changeset: 5240:83c965393b52
user:      Kornel Benko kornel.Benko@...
date:       Tue May 24 20:17:02 2011 +0200
description:
Missed this one while adapting to debian multi architecture. Spotted by Andreas Metzler

diffstat:

 CMakeModules/FindGLUT.cmake |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r d56cc6b2e7a8 -r 83c965393b52 CMakeModules/FindGLUT.cmake
--- a/CMakeModules/FindGLUT.cmake	Tue May 24 08:34:30 2011 -0400
+++ b/CMakeModules/FindGLUT.cmake	Tue May 24 20:17:02 2011 +0200
@@ -48,7 +48,7 @@
       )
   
     FIND_LIBRARY( GLUT_glut_LIBRARY glut
-      /usr/openwin/lib /usr/lib/x86_64-linux-gnu
+      /usr/openwin/lib ${SYSTEM_LIB_DIRS}
       )
     
     FIND_LIBRARY( GLUT_Xi_LIBRARY Xi

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: added credits for FreeBSD port

From: <hugin-cvs@li...> - 2011-05-24 12:34

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/d56cc6b2e7a8
changeset: 5239:d56cc6b2e7a8
user:      Yuv Mobile <yuv@...>
date:       Tue May 24 08:34:30 2011 -0400
description:
added credits for FreeBSD port

diffstat:

 authors.txt |  2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diffs (18 lines):

diff -r cd9cb5ee3f3b -r d56cc6b2e7a8 authors.txt
--- a/authors.txt	Tue May 24 13:27:26 2011 +0200
+++ b/authors.txt	Tue May 24 08:34:30 2011 -0400
@@ -9,12 +9,14 @@
 Jakub Bogusz	Polish translation
 Luís Henrique Camargo Quiroz	Brazilian translation
 Albert Capellades Badia	original Catalan translation
+Carlos Eduardo G. Carvalho	Original FreeBSD port
 Milo Casagrande	Italian translation
 Vaclav Cerny	Czech translation
 Jean-Luc Coulon	original French translation
 Marco Cucinato	Italian translation
 Antoine Deleforge	GSoC 2010 patent free control point detector
 Ademar de Souza Reis Jr.	original Brazilian translation and translation related fixes
+Vasil Dimov	FreeBSD port maintainer
 Serhij Dubyk	initial Ukrainian translation
 Terry Duell	updated tutorials, Fedora tester and packager
 Alexandre Duret-Lutz	code

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Adapt to ubuntu 11.4

From: <hugin-cvs@li...> - 2011-05-24 06:52

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/967c53582af3
changeset: 5237:967c53582af3
user:      Kornel Benko kornel.Benko@...
date:       Tue May 24 08:50:29 2011 +0200
description:
Adapt to ubuntu 11.4

diffstat:

 CMakeLists.txt                 |  25 +++++++++++++++++++------
 CMakeModules/FindExiv2.cmake   |   4 ++--
 CMakeModules/FindGLEW.cmake    |   2 +-
 CMakeModules/FindGLUT.cmake    |   6 +++---
 CMakeModules/FindJPEG.cmake    |   2 +-
 CMakeModules/FindLAPACK.cmake  |   9 +++------
 CMakeModules/FindOpenEXR.cmake |  30 ++++++++++--------------------
 CMakeModules/FindPANO13.cmake  |   4 ++--
 CMakeModules/FindPNG.cmake     |   2 +-
 CMakeModules/FindTIFF.cmake    |   4 ++--
 CMakeModules/FindZLIB.cmake    |   2 +-
 11 files changed, 45 insertions(+), 45 deletions(-)

diffs (315 lines):

diff -r 92a1b9a20fbe -r 967c53582af3 CMakeLists.txt
--- a/CMakeLists.txt	Mon May 23 18:19:47 2011 +0200
+++ b/CMakeLists.txt	Tue May 24 08:50:29 2011 +0200
@@ -8,6 +8,18 @@
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules )
 
+if(UNIX)
+  FIND_PROGRAM(DPKG_ARCHITECTURE_EXECUTABLE dpkg-architecture)
+  if(DPKG_ARCHITECTURE_EXECUTABLE)
+    EXECUTE_PROCESS(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH OUTPUT_VARIABLE ARCH_TRIPLET OUTPUT_STRIP_TRAILING_WHITESPACE)
+  endif()
+endif()
+if(ARCH_TRIPLET)
+  set(SYSTEM_LIB_DIRS /usr/lib /usr/lib/${ARCH_TRIPLET} /usr/local/lib)
+else()
+  set(SYSTEM_LIB_DIRS /usr/lib /usr/local/lib)
+endif()
+
 include(HuginMacros)
 include(CheckIncludeFiles)
 
@@ -278,12 +290,13 @@
 
 OPTION(BUILD_HSI "Python Scripting Interface" OFF)
 IF(BUILD_HSI)
-FIND_PACKAGE(SWIG REQUIRED)
-INCLUDE(${SWIG_USE_FILE})
+  find_program(SWIG_EXECUTABLE NAMES swig2.0 swig)
+  FIND_PACKAGE(SWIG REQUIRED)
+  INCLUDE(${SWIG_USE_FILE})
 
-FIND_PACKAGE(PythonLibs REQUIRED)
-INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
-ADD_DEFINITIONS(-DHUGIN_HSI)
+  FIND_PACKAGE(PythonLibs REQUIRED)
+  INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
+  ADD_DEFINITIONS(-DHUGIN_HSI)
 ENDIF()
 
 ##
@@ -495,7 +508,7 @@
 
 SET(CPACK_PACKAGE_VERSION_MAJOR "${V_MAJOR}")
 SET(CPACK_PACKAGE_VERSION_MINOR "${V_MINOR}")
-SET(CPACK_PACKAGE_VERSION_PATCH "${V_PATCH}")
+SET(CPACK_PACKAGE_VERSION_PATCH "${V_PATCH}.${CPACK_PACKAGE_VERSION_PATCH}")
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${V_MAJOR}.${V_MINOR}")
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "hugin-${V_MAJOR}.${V_MINOR}.${V_PATCH}")
 SET(CPACK_SOURCE_GENERATOR "TGZ;TBZ2")
diff -r 92a1b9a20fbe -r 967c53582af3 CMakeModules/FindExiv2.cmake
--- a/CMakeModules/FindExiv2.cmake	Mon May 23 18:19:47 2011 +0200
+++ b/CMakeModules/FindExiv2.cmake	Tue May 24 08:50:29 2011 +0200
@@ -98,13 +98,13 @@
        find_library_with_debug(EXIV2_LIBRARIES
           WIN32_DEBUG_POSTFIX d
           NAMES exiv2 libexiv2
-          PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/lib
+          PATHS ${SYSTEM_LIB_DIRS} ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/lib
        )
 
        find_library_with_debug(EXIV2EXPAT_LIBRARIES
           WIN32_DEBUG_POSTFIX d
           NAMES libexpat
-          PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/lib
+          PATHS ${SYSTEM_LIB_DIRS} ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.19/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.20/msvc/lib
        )
 
        # since exiv 0.19, xmpsdk needs explicit linked in static build
diff -r 92a1b9a20fbe -r 967c53582af3 CMakeModules/FindGLEW.cmake
--- a/CMakeModules/FindGLEW.cmake	Mon May 23 18:19:47 2011 +0200
+++ b/CMakeModules/FindGLEW.cmake	Tue May 24 08:50:29 2011 +0200
@@ -13,7 +13,7 @@
   ENDIF(${HUGIN_SHARED})
 ELSE(WIN32)
   FIND_PATH(GLEW_INCLUDE_DIR GL/glew.h PATHS /usr/include /usr/local/include)
-  FIND_LIBRARY(GLEW_LIBRARIES GLEW PATHS /usr/lib /usr/local/lib)
+  FIND_LIBRARY(GLEW_LIBRARIES GLEW PATHS ${SYSTEM_LIB_DIRS})
 ENDIF(WIN32)
 
 IF (GLEW_INCLUDE_DIR AND GLEW_LIBRARIES)
diff -r 92a1b9a20fbe -r 967c53582af3 CMakeModules/FindGLUT.cmake
--- a/CMakeModules/FindGLUT.cmake	Mon May 23 18:19:47 2011 +0200
+++ b/CMakeModules/FindGLUT.cmake	Tue May 24 08:50:29 2011 +0200
@@ -48,15 +48,15 @@
       )
   
     FIND_LIBRARY( GLUT_glut_LIBRARY glut
-      /usr/openwin/lib
+      /usr/openwin/lib /usr/lib/x86_64-linux-gnu
       )
     
     FIND_LIBRARY( GLUT_Xi_LIBRARY Xi
-      /usr/openwin/lib
+      /usr/openwin/lib /usr/lib/x86_64-linux-gnu
       )
     
     FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu
-      /usr/openwin/lib
+      /usr/openwin/lib /usr/lib/x86_64-linux-gnu
       )
     
   ENDIF (APPLE)
diff -r 92a1b9a20fbe -r 967c53582af3 CMakeModules/FindJPEG.cmake
--- a/CMakeModules/FindJPEG.cmake	Mon May 23 18:19:47 2011 +0200
+++ b/CMakeModules/FindJPEG.cmake	Tue May 24 08:50:29 2011 +0200
@@ -29,7 +29,7 @@
 find_library_with_debug(JPEG_LIBRARIES
   WIN32_DEBUG_POSTFIX d
   NAMES jpeg libjpeg wxjpeg
-  PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/jpeg-8c/lib ${SOURCE_BASE_DIR}/jpeg-8b/lib ${SOURCE_BASE_DIR}/jpeg-8a/Release ${SOURCE_BASE_DIR}/jpeg-8/Release ${SOURCE_BASE_DIR}/jpeg-8/lib ${wxWidgets_LIB_DIR}
+  PATHS ${SYSTEM_LIB_DIRS} ${SOURCE_BASE_DIR}/jpeg-8c/lib ${SOURCE_BASE_DIR}/jpeg-8b/lib ${SOURCE_BASE_DIR}/jpeg-8a/Release ${SOURCE_BASE_DIR}/jpeg-8/Release ${SOURCE_BASE_DIR}/jpeg-8/lib ${wxWidgets_LIB_DIR}
 )
 
 
diff -r 92a1b9a20fbe -r 967c53582af3 CMakeModules/FindLAPACK.cmake
--- a/CMakeModules/FindLAPACK.cmake	Mon May 23 18:19:47 2011 +0200
+++ b/CMakeModules/FindLAPACK.cmake	Tue May 24 08:50:29 2011 +0200
@@ -9,24 +9,21 @@
 
 FIND_LIBRARY(LAPACK_LAPACK_LIBRARY
   NAMES lapack
-  PATHS /usr/lib
-        /usr/local/lib
+  PATHS ${SYSTEM_LIB_DIRS}
         ${SOURCE_BASE_DIR}/
         ${SOURCE_BASE_DIR}/lapack
   )
 
 FIND_LIBRARY(LAPACK_BLAS_LIBRARY
   NAMES blas
-  PATHS /usr/lib
-        /usr/local/lib
+  PATHS ${SYSTEM_LIB_DIRS}
         ${SOURCE_BASE_DIR}/
         ${SOURCE_BASE_DIR}/lapack
   )
 
 FIND_LIBRARY(LAPACK_G2C_LIBRARY
   NAMES g2c
-  PATHS /usr/lib
-        /usr/local/lib
+  PATHS ${SYSTEM_LIB_DIRS}
         ${SOURCE_BASE_DIR}/
         ${SOURCE_BASE_DIR}/lapack
   )
diff -r 92a1b9a20fbe -r 967c53582af3 CMakeModules/FindOpenEXR.cmake
--- a/CMakeModules/FindOpenEXR.cmake	Mon May 23 18:19:47 2011 +0200
+++ b/CMakeModules/FindOpenEXR.cmake	Tue May 24 08:50:29 2011 +0200
@@ -34,8 +34,7 @@
   FIND_LIBRARY(OPENEXR_HALF_LIBRARY NAMES Half
     PATHS
     ${_OPENEXRLinkDir}
-    /usr/lib
-    /usr/local/lib
+    ${SYSTEM_LIB_DIRS}
     ${SOURCE_BASE_DIR}/Deploy/lib/HuginRelease
     ${SOURCE_BASE_DIR}/Deploy/lib/Release
   )
@@ -44,8 +43,7 @@
     NAMES Iex
     PATHS
     ${_OPENEXRLinkDir}
-    /usr/lib
-    /usr/local/lib
+    ${SYSTEM_LIB_DIRS}
     ${SOURCE_BASE_DIR}/Deploy/lib/HuginRelease
     ${SOURCE_BASE_DIR}/Deploy/lib/Release
   )
@@ -53,8 +51,7 @@
   FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY NAMES IlmThread
     PATHS
     ${_OPENEXRLinkDir}
-    /usr/lib
-    /usr/local/lib
+    ${SYSTEM_LIB_DIRS}
     ${SOURCE_BASE_DIR}/Deploy/lib/HuginRelease
     ${SOURCE_BASE_DIR}/Deploy/lib/Release
   )
@@ -62,8 +59,7 @@
   FIND_LIBRARY(OPENEXR_IMATH_LIBRARY NAMES Imath
     PATHS
     ${_OPENEXRLinkDir}
-    /usr/lib
-    /usr/local/lib
+    ${SYSTEM_LIB_DIRS}
     ${SOURCE_BASE_DIR}/Deploy/lib/HuginRelease
     ${SOURCE_BASE_DIR}/Deploy/lib/Release
   )
@@ -72,8 +68,7 @@
   FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY NAMES IlmImf 
     PATHS
     ${_OPENEXRLinkDir}
-    /usr/lib
-    /usr/local/lib
+    ${SYSTEM_LIB_DIRS}
     ${SOURCE_BASE_DIR}/Deploy/lib/HuginRelease
     ${SOURCE_BASE_DIR}/Deploy/lib/Release
   )
@@ -81,8 +76,7 @@
   FIND_LIBRARY(OPENEXR_HALF_LIBRARY_DEBUG NAMES Half
     PATHS
     ${_OPENEXRLinkDir}
-    /usr/lib
-    /usr/local/lib
+    ${SYSTEM_LIB_DIRS}
     ${SOURCE_BASE_DIR}/Deploy/lib/HuginDebug
     ${SOURCE_BASE_DIR}/Deploy/lib/Debug
   )
@@ -91,8 +85,7 @@
     NAMES Iex
     PATHS
     ${_OPENEXRLinkDir}
-    /usr/lib
-    /usr/local/lib
+    ${SYSTEM_LIB_DIRS}
     ${SOURCE_BASE_DIR}/Deploy/lib/HuginDebug
     ${SOURCE_BASE_DIR}/Deploy/lib/Debug
   )
@@ -100,8 +93,7 @@
   FIND_LIBRARY(OPENEXR_ILMTHREAD_LIBRARY_DEBUG NAMES IlmThread
     PATHS
     ${_OPENEXRLinkDir}
-    /usr/lib
-    /usr/local/lib
+    ${SYSTEM_LIB_DIRS}
     ${SOURCE_BASE_DIR}/Deploy/lib/HuginDebug
     ${SOURCE_BASE_DIR}/Deploy/lib/Debug
   )
@@ -109,8 +101,7 @@
   FIND_LIBRARY(OPENEXR_IMATH_LIBRARY_DEBUG NAMES Imath
     PATHS
     ${_OPENEXRLinkDir}
-    /usr/lib
-    /usr/local/lib
+    ${SYSTEM_LIB_DIRS}
     ${SOURCE_BASE_DIR}/Deploy/lib/HuginDebug
     ${SOURCE_BASE_DIR}/Deploy/lib/Debug
   )
@@ -118,8 +109,7 @@
   FIND_LIBRARY(OPENEXR_ILMIMF_LIBRARY_DEBUG NAMES IlmImf 
     PATHS
     ${_OPENEXRLinkDir}
-    /usr/lib
-    /usr/local/lib
+    ${SYSTEM_LIB_DIRS}
     ${SOURCE_BASE_DIR}/Deploy/lib/HuginDebug
     ${SOURCE_BASE_DIR}/Deploy/lib/Debug
   )
diff -r 92a1b9a20fbe -r 967c53582af3 CMakeModules/FindPANO13.cmake
--- a/CMakeModules/FindPANO13.cmake	Mon May 23 18:19:47 2011 +0200
+++ b/CMakeModules/FindPANO13.cmake	Tue May 24 08:50:29 2011 +0200
@@ -22,7 +22,7 @@
 
 FIND_LIBRARY(PANO13_LIBRARIES
   NAMES pano13
-  PATHS /usr/lib /usr/local/lib 
+  PATHS ${SYSTEM_LIB_DIRS} 
         "${PANO13_INCLUDE_DIR}/pano13/Release LIB CMD"
         "${PANO13_INCLUDE_DIR}/pano13/Release CMD/Win32"
         ${PANO13_INCLUDE_DIR}/pano13/Release
@@ -63,7 +63,7 @@
   ENDIF(NOT PANO13_FIND_QUIETLY)
   FIND_LIBRARY( PANO13_DEBUG_LIBRARIES
     NAMES Panotools pano13d pano13
-    PATHS /usr/lib /usr/local/lib 
+    PATHS ${SYSTEM_LIB_DIRS}
 	  "${PANO13_INCLUDE_DIR}/pano13/Debug LIB CMD"
 	  "${PANO13_INCLUDE_DIR}/pano13/Debug CMD/Win32"
 	  ${PANO13_INCLUDE_DIR}/pano13/Debug
diff -r 92a1b9a20fbe -r 967c53582af3 CMakeModules/FindPNG.cmake
--- a/CMakeModules/FindPNG.cmake	Mon May 23 18:19:47 2011 +0200
+++ b/CMakeModules/FindPNG.cmake	Tue May 24 08:50:29 2011 +0200
@@ -34,7 +34,7 @@
   find_library_with_debug(PNG_LIBRARIES
     WIN32_DEBUG_POSTFIX d
     NAMES png libpng libpng14 libpng15 wxpng
-    PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/libpng/lib ${SOURCE_BASE_DIR}/lpng142/lib ${SOURCE_BASE_DIR}/lpng141/lib ${SOURCE_BASE_DIR}/lpng140/lib ${wxWidgets_LIB_DIR}
+    PATHS ${SYSTEM_LIB_DIRS} ${SOURCE_BASE_DIR}/libpng/lib ${SOURCE_BASE_DIR}/lpng142/lib ${SOURCE_BASE_DIR}/lpng141/lib ${SOURCE_BASE_DIR}/lpng140/lib ${wxWidgets_LIB_DIR}
   )
 
   include(FindPackageHandleStandardArgs)
diff -r 92a1b9a20fbe -r 967c53582af3 CMakeModules/FindTIFF.cmake
--- a/CMakeModules/FindTIFF.cmake	Mon May 23 18:19:47 2011 +0200
+++ b/CMakeModules/FindTIFF.cmake	Tue May 24 08:50:29 2011 +0200
@@ -32,7 +32,7 @@
 # and the import library libtiff_i for dynamic build
   find_library(TIFF_LIBRARIES
     NAMES libtiff_i
-    PATHS /usr/lib /usr/local/lib
+    PATHS ${SYSTEM_LIB_DIRS}
           ${SOURCE_BASE_DIR}/tiff-4.0.0beta7/libtiff
           ${SOURCE_BASE_DIR}/tiff-4.0.0beta6/libtiff
           ${SOURCE_BASE_DIR}/tiff-4.0.0beta5/libtiff
@@ -41,7 +41,7 @@
   find_library_with_debug(TIFF_LIBRARIES
     WIN32_DEBUG_POSTFIX d
     NAMES tiff libtiff wxtiff
-    PATHS /usr/lib /usr/local/lib
+    PATHS ${SYSTEM_LIB_DIRS}
           ${SOURCE_BASE_DIR}/tiff-4.0.0beta7/libtiff
           ${SOURCE_BASE_DIR}/tiff-4.0.0beta6/libtiff
           ${SOURCE_BASE_DIR}/tiff-4.0.0beta5/libtiff
diff -r 92a1b9a20fbe -r 967c53582af3 CMakeModules/FindZLIB.cmake
--- a/CMakeModules/FindZLIB.cmake	Mon May 23 18:19:47 2011 +0200
+++ b/CMakeModules/FindZLIB.cmake	Tue May 24 08:50:29 2011 +0200
@@ -33,7 +33,7 @@
 find_library_with_debug(ZLIB_LIBRARIES
   WIN32_DEBUG_POSTFIX d
   NAMES z zlib zlib1 wxzlib
-  PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/zlib/lib ${SOURCE_BASE_DIR}/zlib ${wxWidgets_LIB_DIR}
+  PATHS ${SYSTEM_LIB_DIRS} ${SOURCE_BASE_DIR}/zlib/lib ${SOURCE_BASE_DIR}/zlib ${wxWidgets_LIB_DIR}
 )

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Correct dependencies in README

From: <hugin-cvs@li...> - 2011-05-23 16:20

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/92a1b9a20fbe
changeset: 5236:92a1b9a20fbe
user:      tmodes
date:       Mon May 23 18:19:47 2011 +0200
description:
Correct dependencies in README

diffstat:

 README |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (21 lines):

diff -r b6e202076fe1 -r 92a1b9a20fbe README
--- a/README	Sun May 22 20:24:48 2011 -0400
+++ b/README	Mon May 23 18:19:47 2011 +0200
@@ -62,11 +62,14 @@
     Exiv2 Image metadata library
     GLEW the OpenGL Extension Wrangler Library
     freeglut or glut, the OpenGL utility toolkit
-    libGLU the OpenGL utility library
-    libxi
-    libxmu
     gettext
     optionally, lapack
+    on Unix you need also
+        libGLU the OpenGL utility library
+        libxi
+        libxmu
+    on Windows you need
+        HTML Help Workshop for generating compiled HTML help file    
     for the optional Python Scripting Interface (currently functional and tested only on Linux and Windows)
         Python version >=2.6
         SWIG >=2.0 - If Python >=3.2, SWIG must be >=2.0.4

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin-web: polished 2011.0.0 release notes

From: <hugin-cvs@li...> - 2011-05-23 12:31

details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin-web/hgrepo/h/hu/hugin/hugin-web/rev/76a4b82cadab
changeset: 250:76a4b82cadab
user:      Yuv Mobile <yuv@...>
date:       Mon May 23 08:31:03 2011 -0400
description:
polished 2011.0.0 release notes

diffstat:

 releases/2011.0.0/en.shtml |  7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diffs (24 lines):

diff -r 83c62074b356 -r 76a4b82cadab releases/2011.0.0/en.shtml
--- a/releases/2011.0.0/en.shtml	Sun May 15 18:59:28 2011 -0400
+++ b/releases/2011.0.0/en.shtml	Mon May 23 08:31:03 2011 -0400
@@ -82,11 +82,6 @@
 
 <p>Many translations have been updated for this release.</p>
 
-<h3>Other Improvements</h3>
-
-<p>This release has the usual bugfixes, adds minor features, and provides some
-more command-line tools for scripting panorama projects.</p>
-
 <!-- Note for translators: the rest is mostly the same as the previous release announcement -->
 
 <h2>Control point generators</h2>
@@ -147,7 +142,7 @@
 <p>The Hugin project is proud to promote artwork created with Hugin in the
 splash screen of this release.</p>
 
-<p>Artist <em>Jeff Boyd</em> took the pictures for the <em>Seattle Sunset Panorama</em>
+<p>Artist <em>Jeff Boyd</em> took the pictures for the <em><a href="http://www.flickr.com/photos/60904226@...>" target="_blank">Seattle Sunset Panorama</a></em>
 on December 26, 2009, an exceptionally rare cloudless winter day,
 close to sunset, from Queen Anne Hill, using a Canon Rebel XT with the kit 18-55mm
 lens at 55mm.  The resulting panorama is 9690x3300 pixels.</p>

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: fix generic name in Linux desktop entr...

From: <hugin-cvs@li...> - 2011-05-23 00:24

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/b6e202076fe1
changeset: 5235:b6e202076fe1
user:      Yuv Mobile <yuv@...>
date:       Sun May 22 20:24:48 2011 -0400
description:
fix generic name in Linux desktop entry for Hugin Calibrate Lens

diffstat:

 src/hugin1/calibrate_lens/calibrate_lens_gui.desktop |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 38ac5ca1eaad -r b6e202076fe1 src/hugin1/calibrate_lens/calibrate_lens_gui.desktop
--- a/src/hugin1/calibrate_lens/calibrate_lens_gui.desktop	Sun May 22 16:26:51 2011 -0400
+++ b/src/hugin1/calibrate_lens/calibrate_lens_gui.desktop	Sun May 22 20:24:48 2011 -0400
@@ -2,7 +2,7 @@
 [Desktop Entry]
 Name=Hugin Calibrate Lens
 Comment=Stitch photographs together
-GenericName=Panorama stitcher
+GenericName=Lens Calibrator
 Categories=Graphics;
 Exec=calibrate_lens_gui
 Icon=hugin

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: removed outdated and redundant README_...

From: <hugin-cvs@li...> - 2011-05-22 20:28

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/38ac5ca1eaad
changeset: 5234:38ac5ca1eaad
user:      Yuv Mobile <yuv@...>
date:       Sun May 22 16:26:51 2011 -0400
description:
removed outdated and redundant README_WINDOWS file

diffstat:

 README_WINDOWS |  40 ----------------------------------------
 1 files changed, 0 insertions(+), 40 deletions(-)

diffs (44 lines):

diff -r e564457d5254 -r 38ac5ca1eaad README_WINDOWS
--- a/README_WINDOWS	Sun May 22 16:23:39 2011 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-
-
-This package contains the following programs:
-
- - hugin, The main program, a GUI for the panorama tools suite
-   and some programs included here.
-
- - nona, a simple replacement for PTStitcher (doesn't support most
-   features of PTStitcher, but faster, opensource and
-   will be extended in the future).
- 
- - nona_gui, nona with a graphical progress bar.
-
- - autooptimiser, optimise a panorama pairwise, starting from an
-   anchor image. cmd line version of the pairwise mode in hugin
-   
- - panoglviewer, a fast OpenGL accelerated viewer for spherical
-   panoramas.
-
-These programs are build on top of the panorama tools library,
-http://panotools.sourceforge.net/
-
-hugin can be used to stitch multiple images together. The resulting image can
-span 360 degrees. Another common use is the creation of very high resolution
-pictures by combining multiple images.
-
-See http://hugin.sourceforge.net/ for more information an tutorials.
-
-typical use:
-
-1. load images
-2. specify initial parameters (lens etc)
-3. select control points points.
-4. run optimizer to estimate image positions
-5. set output parameters and stitch images together.
-
-
-Please use the hugin-ptx mailing list if you have questions or suggestions:
-http://groups.google.com/group/hugin-ptx
-

[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: updated README - section 2 still needs...

From: <hugin-cvs@li...> - 2011-05-22 20:28

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/e564457d5254
changeset: 5233:e564457d5254
user:      Yuv Mobile <yuv@...>
date:       Sun May 22 16:23:39 2011 -0400
description:
updated README - section 2 still needs to be updated with an updated list of tools

diffstat:

 README |  68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 57 insertions(+), 11 deletions(-)

diffs (95 lines):

diff -r 8319a2dc456e -r e564457d5254 README
--- a/README	Sun May 22 20:22:47 2011 +0200
+++ b/README	Sun May 22 16:23:39 2011 -0400
@@ -32,11 +32,54 @@
 
 3. DEPENDENCIES
 
-The following external programs are REQUIRED:
+Hugin is work in progress and dependencies can be added any time.
 
-1. enblend 3.2 or later, this includes the enfuse tool
-2. exiftool from the Image::ExifTool perl module
-3. gnu make is required for stitching
+Hugin depends on the following packages. The list may be
+incomplete, and there may be some platform-specific dependencies.
+
+For the latest updates, check
+http://wiki.panotools.org/Development_of_Open_Source_tools#Dependencies
+
+
+3.1. Build-Time Dependencies
+
+Users compiling Hugin from source will need:
+
+    The wxWidgets GUI toolkit version >=2.7.0. 2.9 support is experimental. 2.8.11 is recommended.
+    boost >=1.34. The following boost libraries are used:
+        filesystem
+        graph
+        iostreams
+        regex
+        signals
+        system
+        thread
+    libtiff the TIFF library with LZW support.
+    libpano13 version >=2.9.18
+    libjpg the JPEG library
+    libpng the PNG library
+    libopenexr the OpenEXR library
+    Exiv2 Image metadata library
+    GLEW the OpenGL Extension Wrangler Library
+    freeglut or glut, the OpenGL utility toolkit
+    libGLU the OpenGL utility library
+    libxi
+    libxmu
+    gettext
+    optionally, lapack
+    for the optional Python Scripting Interface (currently functional and tested only on Linux and Windows)
+        Python version >=2.6
+        SWIG >=2.0 - If Python >=3.2, SWIG must be >=2.0.4
+    Hugin can be compiled with gcc-4.4.4, gcc-4.5.1, and gcc-4.6, as well as with MSVC 2008 and MSVC 2010.
+    The build process requires CMake version >=2.8
+
+
+3.2. At runtime
+
+    enblend >= 3.2 is required.
+    Exiftool is recommended.
+    Starting with Hugin 2010.3 and newer, Hugin ships with its own control points generator cpfind. Prior to 2010.3 another optional but recommended runtime dependency was a control points generator.
+    Optionally Python argparse command-line parsing library for the Python scripts. 
 
 
 4. USE
@@ -62,14 +105,17 @@
 
 6. KNOWN ISSUES / INCOMPATIBILITIES / LIMITATIONS
 
-Linux: Compiz interferes with the fast preview window. This is not a hugin 
-specific issue. Research shows all direct rendered stuff will have various 
-problems under Compiz:
-https://bugs.launchpad.net/ubuntu/+source/xorg-server/+bug/96991
-...until xorg has "Redirected direct rendering", which might take a long time.
+Check the Hugin FAQ and bug tracker
 
-It's not an issue with NVidia's proprietary driver.
+http://wiki.panotools.org/Hugin_FAQ#Known_Limitations
 
+An updated list of issues deemed to be critical,
+including discussions and workarounds, is in the issue tracker
+
+https://bugs.launchpad.net/hugin/+bugs?search=Search&field.importance=Critical
+
+
+Linux: Compiz interferes with the fast preview window.
 If you're affected, the workaround is to not use Compiz.
 
 Some components of Hugin have been reported not to deal well with image files
@@ -77,7 +123,7 @@
 your images files so that all image files in a project are unique.
 
 
-SUPPORT / COMMUNITY
+7. SUPPORT / COMMUNITY
 
 Please use the hugin-ptx mailing list if you have questions or suggestions:
 http://groups.google.com/group/hugin-ptx

Next Messages