[Pkg-phototools-devel] [PATCH 5/5] Added 2 additional patches from the 2015.0 branch of the hugin mercurial repo.

[Stefan Peter]

Signed-off-by: Stefan Peter <s_peter at swissonline.ch>

diff --git a/debian/patches/110_hg6903_Fixes_a_further_assert_message.patch b/debian/patches/110_hg6903_Fixes_a_further_assert_message.patch
new file mode 100644
index 0000000..c6a9cf8
--- /dev/null
+++ b/debian/patches/110_hg6903_Fixes_a_further_assert_message.patch
@@ -0,0 +1,22 @@
+# HG changeset patch
+# User tmodes
+# Date 1430152202 -7200
+#      Mon Apr 27 18:30:02 2015 +0200
+# Branch 2015.0
+# Node ID aace4a6969bc710d07f8b3f67acb9da60bc54035
+# Parent  60638f1fcaf0ec310fffa6a6bba3e8f4cda6f5fb
+Fixes a further assert message
+(grafted from 6c5dfd3461b7a5c4d25268f81b1deccb35f5bc58)
+
+diff -r 60638f1fcaf0 -r aace4a6969bc src/hugin1/hugin/PanoOperation.cpp
+--- a/src/hugin1/hugin/PanoOperation.cpp	Sun Apr 26 10:52:03 2015 +0200
++++ b/src/hugin1/hugin/PanoOperation.cpp	Mon Apr 27 18:30:02 2015 +0200
+@@ -704,7 +704,7 @@
+     }
+     if (removedCPs.size()>0)
+     {
+-        wxMessageBox(wxString::Format(_("Removed %lu control points"), removedCPs.size()), _("Cleaning"),wxOK|wxICON_INFORMATION,parent);
++        wxMessageBox(wxString::Format(_("Removed %lu control points"), (unsigned long int)removedCPs.size()), _("Cleaning"), wxOK | wxICON_INFORMATION, parent);
+         return new PanoCommand::RemoveCtrlPointsCmd(pano,removedCPs);
+     };
+     return NULL;
diff --git a/debian/patches/111_hg6904_Fixes_crash_in_cp_editor.patch b/debian/patches/111_hg6904_Fixes_crash_in_cp_editor.patch
new file mode 100644
index 0000000..80d587b
--- /dev/null
+++ b/debian/patches/111_hg6904_Fixes_crash_in_cp_editor.patch
@@ -0,0 +1,58 @@
+# HG changeset patch
+# User tmodes
+# Date 1430152263 -7200
+#      Mon Apr 27 18:31:03 2015 +0200
+# Branch 2015.0
+# Node ID 213b546a477e92af1baab1578295f85434afa5b5
+# Parent  aace4a6969bc710d07f8b3f67acb9da60bc54035
+Fixes crash in cp editor [1449065]
+(grafted from 6ee10a0fd1cbbc5dda08d86dabef7a556ba9b686)
+
+diff -r aace4a6969bc -r 213b546a477e src/hugin1/hugin/CPEditorPanel.cpp
+--- a/src/hugin1/hugin/CPEditorPanel.cpp	Mon Apr 27 18:30:02 2015 +0200
++++ b/src/hugin1/hugin/CPEditorPanel.cpp	Mon Apr 27 18:31:03 2015 +0200
+@@ -96,6 +96,7 @@
+ {
+     DEBUG_TRACE("**********************");
+     m_pano = 0;
++    m_countCP = 0;
+ }
+ 
+ bool CPEditorPanel::Create(wxWindow* parent, wxWindowID id,
+@@ -1183,6 +1184,12 @@
+         m_cpModeChoice->Thaw();
+     }
+     UpdateTransforms();
++    // check if number of control points has changed, if so we need to update our variables
++    if (pano.getNrOfCtrlPoints() != m_countCP)
++    {
++        m_countCP = pano.getNrOfCtrlPoints();
++        UpdateDisplay(false);
++    };
+     DEBUG_TRACE("");
+ }
+ 
+@@ -1321,6 +1328,12 @@
+             update=true;
+         }
+     }
++    // check if number of control points has changed, if so we need to update our variables
++    if (pano.getNrOfCtrlPoints() != m_countCP)
++    {
++        m_countCP = pano.getNrOfCtrlPoints();
++        update = true;
++    };
+ 
+     // if there is no selection, select the first one.
+     if (m_rightImageNr == UINT_MAX && nrImages > 0) {
+diff -r aace4a6969bc -r 213b546a477e src/hugin1/hugin/CPEditorPanel.h
+--- a/src/hugin1/hugin/CPEditorPanel.h	Mon Apr 27 18:30:02 2015 +0200
++++ b/src/hugin1/hugin/CPEditorPanel.h	Mon Apr 27 18:31:03 2015 +0200
+@@ -256,6 +256,7 @@
+     // this set contains all points that are mirrored (point 1 in right window,
+     // point 2 in left window), in local point numbers
+     std::set<unsigned int> mirroredPoints;
++    size_t m_countCP;
+ 
+     CPImageCtrl::ImageRotation m_leftRot;
+     CPImageCtrl::ImageRotation m_rightRot;
diff --git a/debian/patches/series b/debian/patches/series
index 1b85ae3..2a8730c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 42_stoplinklibXI_libXmu
 43_fallbackhelp.patch
-
 100_enable_python_scripts.patch
+110_hg6903_Fixes_a_further_assert_message.patch
+111_hg6904_Fixes_crash_in_cp_editor.patch
-- 
1.9.1