From: <hug...@li...> - 2013-05-07 20:01:16
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/20e34581ca6a changeset: 6279:20e34581ca6a user: tmodes date: Tue May 07 21:56:31 2013 +0200 description: Fixes crash with uninitialized variables diffstat: src/hugin1/hugin/PanoOutputDialog.cpp | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diffs (31 lines): diff -r 8d1a8e19bc69 -r 20e34581ca6a src/hugin1/hugin/PanoOutputDialog.cpp --- a/src/hugin1/hugin/PanoOutputDialog.cpp Sun May 05 09:06:54 2013 +0200 +++ b/src/hugin1/hugin/PanoOutputDialog.cpp Tue May 07 21:56:31 2013 +0200 @@ -44,7 +44,7 @@ EVT_SPINCTRL(XRCID("output_height"), PanoOutputDialog::OnHeightChanged) END_EVENT_TABLE() -PanoOutputDialog::PanoOutputDialog(wxWindow *parent, PT::Panorama& pano, GuiLevel guiLevel) : m_pano(pano) +PanoOutputDialog::PanoOutputDialog(wxWindow *parent, PT::Panorama& pano, GuiLevel guiLevel) : m_pano(pano), m_aspect(0) { // load our children. some children might need special // initialization. this will be done later. @@ -376,10 +376,16 @@ void PanoOutputDialog::OnWidthChanged(wxSpinEvent & e) { - m_edit_height->SetValue(m_edit_width->GetValue()*m_aspect); + if(m_aspect>0) + { + m_edit_height->SetValue(m_edit_width->GetValue()*m_aspect); + }; }; void PanoOutputDialog::OnHeightChanged(wxSpinEvent & e) { - m_edit_width->SetValue(m_edit_height->GetValue()/m_aspect); + if(m_aspect>0) + { + m_edit_width->SetValue(m_edit_height->GetValue()/m_aspect); + }; }; |
From: <hug...@li...> - 2013-05-07 20:01:16
|
branch: 2013.0 details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/f6fff45d5eac changeset: 6280:f6fff45d5eac user: tmodes date: Tue May 07 21:56:31 2013 +0200 description: Fixes crash with uninitialized variables diffstat: src/hugin1/hugin/PanoOutputDialog.cpp | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diffs (31 lines): diff -r 9928ad3bd989 -r f6fff45d5eac src/hugin1/hugin/PanoOutputDialog.cpp --- a/src/hugin1/hugin/PanoOutputDialog.cpp Tue Apr 09 20:58:03 2013 +0200 +++ b/src/hugin1/hugin/PanoOutputDialog.cpp Tue May 07 21:56:31 2013 +0200 @@ -44,7 +44,7 @@ EVT_SPINCTRL(XRCID("output_height"), PanoOutputDialog::OnHeightChanged) END_EVENT_TABLE() -PanoOutputDialog::PanoOutputDialog(wxWindow *parent, PT::Panorama& pano, GuiLevel guiLevel) : m_pano(pano) +PanoOutputDialog::PanoOutputDialog(wxWindow *parent, PT::Panorama& pano, GuiLevel guiLevel) : m_pano(pano), m_aspect(0) { // load our children. some children might need special // initialization. this will be done later. @@ -376,10 +376,16 @@ void PanoOutputDialog::OnWidthChanged(wxSpinEvent & e) { - m_edit_height->SetValue(m_edit_width->GetValue()*m_aspect); + if(m_aspect>0) + { + m_edit_height->SetValue(m_edit_width->GetValue()*m_aspect); + }; }; void PanoOutputDialog::OnHeightChanged(wxSpinEvent & e) { - m_edit_width->SetValue(m_edit_height->GetValue()/m_aspect); + if(m_aspect>0) + { + m_edit_width->SetValue(m_edit_height->GetValue()/m_aspect); + }; }; |