From: <hug...@li...> - 2010-09-09 21:40:28
|
details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/8f6f6692982f changeset: 4324:8f6f6692982f user: Yuval Levy <yu...@us...> date: Thu Sep 09 10:32:10 2010 -0400 description: updated authors list details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/d10557ac9b2e changeset: 4325:d10557ac9b2e user: Bruno Postle <br...@po...> date: Thu Sep 09 22:39:58 2010 +0100 description: merge diffstat: authors.txt | 14 ++++++++------ src/celeste/PGMImage.cpp | 6 ++++-- src/hugin1/hugin/OptimizePanel.cpp | 7 +++++++ 3 files changed, 19 insertions(+), 8 deletions(-) diffs (97 lines): diff -r e1f91781858f -r d10557ac9b2e authors.txt --- a/authors.txt Mon Sep 06 13:45:14 2010 +0200 +++ b/authors.txt Thu Sep 09 22:39:58 2010 +0100 @@ -17,13 +17,14 @@ Alexandre Duret-Lutz code Lu Fang initial Chinese Simplified translation Skip Gaede OS X build fixes -Daniel German bug patch +Daniel German bug fixes, GSoC mentor 2010 Niels Giesen Dutch translation Jorge González González original Spanish translation Felix Hagemann bug reports and patches Ed Halley gui, documentation Robert Hart bug reports and patches Juha Helminen Code +Brian Hoffmann German translation of NSIS windows installer Ad Huikeshoven automated Windows snapshot builds Iouri Ivliev bug fixes Marek Januszewski Code, initial Polish translation @@ -37,8 +38,8 @@ Höss Lajos Hungarian translation Rick Langford Traditional Chinese original translation and updates Homin Lee initial Korean translation -James Legg GSoC 2008 OpenGL fast preview GSoC 2009 new layout -Yuval Levy Community Builder, GSoC admin 2007 and 2009, GSoC mentor 2007 and 2008, Windows build, original Windows installer, bugfixes, fixes Italian translation +James Legg GSoC 2008 OpenGL fast preview, GSoC 2009 new layout, GSoC 2010 mentor +Yuval Levy Community Builder, GSoC admin 2007 and 2009, GSoC mentor 2007 and 2008, Windows build, original Windows installer (0.7.0 and 0.8.0 InnoSetup), bugfixes, fixes Italian translation Wim Lewis Code fix Roger Luethi Code Caolán McNamara code fix @@ -46,15 +47,16 @@ Zoran Mesec GSoC 2007 feature detector, GSoC 2008 mentor, initial Slovenian translation Andreas Metzler Debian packaging Andrew Mihal original author of enblend, enfuse, nona-gpu. GSoC 2009 mentor -Thomas Modes code and bugfixes +Thomas Modes statistic CP cleaner, multi-row CP detection, masking tool, GSoC 2010 mentor, code and bugfixes Tiziano Müller code John Navas MSI installer José Alejandro Carrillo Neira Spanish translation -Tim Nugent GSoC 2008 Celeste, GSoC 2009 Lens Calibration +Tim Nugent GSoC 2008 Celeste, GSoC 2009 Lens Calibration, GSoC 2010 mentor Simon Oosthoek Dutch translation +Emanuele Panz Windows installer (2010.02 transition to Nullsoft NSIS) Gerry Patterson Code Eduardo Pérez Esteban Spanish translation -Bruno Postle initial packaging, website, documentation, initial British English translation, GSoC 2009 mentor +Bruno Postle initial packaging, website, documentation, initial British English translation, GSoC 2009 mentor, GSoC 2010 admin and mentor, release manager on many occasions including 2010.02 Alexandre Prokoudine Initial Russian translation, GSoC 2008 admin Jozef Riha original Slovak translation Marijn Ros bug reports and patches diff -r e1f91781858f -r d10557ac9b2e src/celeste/PGMImage.cpp --- a/src/celeste/PGMImage.cpp Mon Sep 06 13:45:14 2010 +0200 +++ b/src/celeste/PGMImage.cpp Thu Sep 09 22:39:58 2010 +0100 @@ -221,7 +221,8 @@ // set dimensions of pixelmap and allocate memory mWidth = width; mHeight = height; - strcpy( mMagicNumber, "P5" ); + mMagicNumber[0] = 'P'; + mMagicNumber[1] = '5'; mNumLevels = 255; Allocate( kChars ); @@ -341,7 +342,8 @@ // set dimensions of pixelmap and allocate memory mWidth = width; mHeight = height; - strcpy( mMagicNumber, "P5" ); + mMagicNumber[0] = 'P'; + mMagicNumber[1] = '5'; mNumLevels = 255; Allocate( kChars ); diff -r e1f91781858f -r d10557ac9b2e src/hugin1/hugin/OptimizePanel.cpp --- a/src/hugin1/hugin/OptimizePanel.cpp Mon Sep 06 13:45:14 2010 +0200 +++ b/src/hugin1/hugin/OptimizePanel.cpp Thu Sep 09 22:39:58 2010 +0100 @@ -1000,13 +1000,20 @@ default: break; } + bool optXYZ=m_x_list->IsChecked(0) || m_y_list->IsChecked(0) || m_z_list->IsChecked(0); // don't optimize translation of anchor image + // if translation should be optimized, then also optimise yaw and pitch of anchor for (std::vector<unsigned int>::iterator it = refImgs.begin(); it != refImgs.end(); it++) { m_x_list->Check(*it, false); m_y_list->Check(*it, false); m_z_list->Check(*it, false); + if(optXYZ) + { + m_yaw_list->Check(*it,true); + m_pitch_list->Check(*it,true); + }; } // disable all manual settings m_yaw_list->Disable(); |