[Pkg-phototools-devel] [PATCH 1/5] Removed unneeded patches
Stefan Peter
s_peter at swissonline.ch
Tue Apr 28 11:43:23 UTC 2015
Signed-off-by: Stefan Peter <s_peter at swissonline.ch>
diff --git a/debian/patches/52_044b08eb6adf_Several_fixes_to_treelistctrl.diff b/debian/patches/52_044b08eb6adf_Several_fixes_to_treelistctrl.diff
deleted file mode 100644
index 2fc5e62..0000000
--- a/debian/patches/52_044b08eb6adf_Several_fixes_to_treelistctrl.diff
+++ /dev/null
@@ -1,82 +0,0 @@
-# HG changeset patch
-# User tmodes
-# Date 1410813314 -7200
-# Mon Sep 15 22:35:14 2014 +0200
-# Node ID 044b08eb6adfbeec59f84c2004a64acd9933513d
-# Parent 0a3d2d097156c451779c4d316b4bbc0b6ff74cb1
-Several fixes to treelistctrl
-
-diff -r 0a3d2d097156 -r 044b08eb6adf src/hugin1/hugin/treelistctrl.cpp
---- a/src/hugin1/hugin/treelistctrl.cpp Sat Sep 13 16:22:34 2014 +0200
-+++ b/src/hugin1/hugin/treelistctrl.cpp Mon Sep 15 22:35:14 2014 +0200
-@@ -769,7 +769,7 @@
- const wxString &value = wxEmptyString,
- const wxPoint &pos = wxDefaultPosition,
- const wxSize &size = wxDefaultSize,
-- int style = 0,
-+ long style = 0,
- const wxValidator& validator = wxDefaultValidator,
- const wxString &name = wxTextCtrlNameStr );
- ~wxEditTextCtrl();
-@@ -1129,7 +1129,7 @@
- const wxString &value,
- const wxPoint &pos,
- const wxSize &size,
-- int style,
-+ long style,
- const wxValidator& validator,
- const wxString &name)
- : wxTextCtrl (parent, id, value, pos, size, style | wxSIMPLE_BORDER | wxTE_PROCESS_ENTER, validator, name)
-@@ -4874,9 +4874,9 @@
- long style, const wxValidator &validator,
- const wxString& name)
- {
-- long main_style = style & ~(wxSIMPLE_BORDER|wxSUNKEN_BORDER|wxDOUBLE_BORDER|
-- wxRAISED_BORDER|wxSTATIC_BORDER);
-- main_style |= wxWANTS_CHARS ;
-+ long main_style = style & ~(wxBORDER_SIMPLE | wxBORDER_SUNKEN | wxBORDER_DOUBLE |
-+ wxBORDER_RAISED | wxBORDER_STATIC);
-+ main_style |= wxWANTS_CHARS ;
- long ctrl_style = style & ~(wxVSCROLL|wxHSCROLL);
-
- if (!wxControl::Create(parent, id, pos, size, ctrl_style, validator, name)) {
-@@ -5065,15 +5065,19 @@
- }
- }
-
--void wxTreeListCtrl::SetWindowStyle(const long style)
-+void wxTreeListCtrl::SetWindowStyleFlag(long style)
- {
-- if(m_main_win)
-- m_main_win->SetWindowStyle(style);
-- m_windowStyle = style;
-+ if (m_main_win)
-+ {
-+ long main_style = style & ~(wxBORDER_SIMPLE | wxBORDER_SUNKEN | wxBORDER_DOUBLE | wxBORDER_RAISED | wxBORDER_STATIC);
-+ main_style |= wxWANTS_CHARS;
-+ m_main_win->SetWindowStyle(main_style);
-+ };
-+ m_windowStyle = style & ~(wxVSCROLL | wxHSCROLL);
- // TODO: provide something like wxTL_NO_HEADERS to hide m_header_win
- }
-
--long wxTreeListCtrl::GetWindowStyle() const
-+long wxTreeListCtrl::GetWindowStyleFlag() const
- {
- long style = m_windowStyle;
- if(m_main_win)
-diff -r 0a3d2d097156 -r 044b08eb6adf src/hugin1/hugin/treelistctrl.h
---- a/src/hugin1/hugin/treelistctrl.h Sat Sep 13 16:22:34 2014 +0200
-+++ b/src/hugin1/hugin/treelistctrl.h Mon Sep 15 22:35:14 2014 +0200
-@@ -363,9 +363,8 @@
- virtual bool SetFont ( const wxFont &font );
-
- // set the styles.
-- void SetWindowStyle (const long styles);
-- long GetWindowStyle() const;
-- long GetWindowStyleFlag () const { return GetWindowStyle(); }
-+ virtual void SetWindowStyleFlag (long styles);
-+ virtual long GetWindowStyleFlag() const;
-
- // number of children
- // ------------------
diff --git a/debian/patches/53_f88dc95914ae_Use_correct_class_wxStaticBitmap_for_bitmap_controls.diff b/debian/patches/53_f88dc95914ae_Use_correct_class_wxStaticBitmap_for_bitmap_controls.diff
deleted file mode 100644
index a7054a3..0000000
--- a/debian/patches/53_f88dc95914ae_Use_correct_class_wxStaticBitmap_for_bitmap_controls.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-# HG changeset patch
-# User tmodes
-# Date 1410813488 -7200
-# Mon Sep 15 22:38:08 2014 +0200
-# Node ID f88dc95914ae93693b8f01ae8366101817ef4f83
-# Parent 044b08eb6adfbeec59f84c2004a64acd9933513d
-Use correct class wxStaticBitmap for bitmap controls (PanoOutputDialog)
-
-diff -r 044b08eb6adf -r f88dc95914ae src/hugin1/hugin/PanoOutputDialog.cpp
---- a/src/hugin1/hugin/PanoOutputDialog.cpp Mon Sep 15 22:35:14 2014 +0200
-+++ b/src/hugin1/hugin/PanoOutputDialog.cpp Mon Sep 15 22:38:08 2014 +0200
-@@ -153,14 +153,14 @@
- {
- XRCCTRL(*this, "output_hdr", wxCheckBox)->SetValue(true);
- XRCCTRL(*this, "output_hdr", wxCheckBox)->Enable(true);
-- XRCCTRL(*this, "output_hdr_bitmap", wxCheckBox)->Enable(true);
-+ XRCCTRL(*this, "output_hdr_bitmap", wxStaticBitmap)->Enable(true);
- return;
- }
- //hide hdr controls for simple interface
- if(m_guiLevel==GUI_SIMPLE)
- {
- XRCCTRL(*this, "output_hdr", wxCheckBox)->Hide();
-- XRCCTRL(*this, "output_hdr_bitmap", wxCheckBox)->Hide();
-+ XRCCTRL(*this, "output_hdr_bitmap", wxStaticBitmap)->Hide();
- XRCCTRL(*this, "output_hdr_format_label", wxStaticText)->Hide();
- XRCCTRL(*this, "output_hdr_format", wxChoice)->Hide();
- XRCCTRL(*this, "output_hdr_compression_label", wxStaticText)->Hide();
-@@ -173,20 +173,20 @@
- {
- XRCCTRL(*this, "output_normal", wxCheckBox)->SetValue(true);
- XRCCTRL(*this, "output_normal", wxCheckBox)->Enable(true);
-- XRCCTRL(*this, "output_normal_bitmap", wxCheckBox)->Enable(true);
-+ XRCCTRL(*this, "output_normal_bitmap", wxStaticBitmap)->Enable(true);
- if(m_pano.getNrOfImages()==1 || m_stacks.size()==m_pano.getNrOfImages())
- {
- return;
- };
- };
- XRCCTRL(*this, "output_fused_blended", wxCheckBox)->Enable(true);
-- XRCCTRL(*this, "output_fused_blended_bitmap", wxCheckBox)->Enable(true);
-+ XRCCTRL(*this, "output_fused_blended_bitmap", wxStaticBitmap)->Enable(true);
- XRCCTRL(*this, "output_blended_fused", wxCheckBox)->Enable(true);
-- XRCCTRL(*this, "output_blended_fused_bitmap", wxCheckBox)->Enable(true);
-+ XRCCTRL(*this, "output_blended_fused_bitmap", wxStaticBitmap)->Enable(true);
- if(m_guiLevel!=GUI_SIMPLE)
- {
- XRCCTRL(*this, "output_hdr", wxCheckBox)->Enable(true);
-- XRCCTRL(*this, "output_hdr_bitmap", wxCheckBox)->Enable(true);
-+ XRCCTRL(*this, "output_hdr_bitmap", wxStaticBitmap)->Enable(true);
- };
- if(m_pano.getNrOfImages() % m_stacks.size() == 0)
- {
diff --git a/debian/patches/54_59938e35626e_Fixes_formating_of_2_strings.diff b/debian/patches/54_59938e35626e_Fixes_formating_of_2_strings.diff
deleted file mode 100644
index c9d7a9f..0000000
--- a/debian/patches/54_59938e35626e_Fixes_formating_of_2_strings.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-# HG changeset patch
-# User tmodes
-# Date 1414259156 -7200
-# Sat Oct 25 19:45:56 2014 +0200
-# Branch hugin_executor
-# Node ID 59938e35626e2a5efb681597047414921bbc5e4d
-# Parent f02768b61fb549d2626f47aefa0ca713d7374f49
-Fixes formating of 2 strings
-Should fixed assert errors [1385707]
-
-diff --git a/src/hugin1/base_wx/huginConfig.cpp b/src/hugin1/base_wx/huginConfig.cpp
---- a/src/hugin1/base_wx/huginConfig.cpp
-+++ b/src/hugin1/base_wx/huginConfig.cpp
-@@ -74,7 +74,7 @@
-
- wxFileName lastImg(wxString(pano.getImage(pano.getNrOfImages()-1).getFilename().c_str(),HUGIN_CONV_FILENAME));
- placeholder[wxT("%lastimage")]=lastImg.GetName();
-- placeholder[wxT("%#images")]=wxString::Format(wxT("%d"), pano.getNrOfImages());
-+ placeholder[wxT("%#images")]=wxString::Format(wxT("%lu"), (unsigned long)pano.getNrOfImages());
- PanoramaOptions opts=pano.getOptions();
- pano_projection_features proj;
- if (panoProjectionFeaturesQuery(opts.getProjection(), &proj))
-diff --git a/src/hugin1/ptbatcher/ProjectListBox.cpp b/src/hugin1/ptbatcher/ProjectListBox.cpp
---- a/src/hugin1/ptbatcher/ProjectListBox.cpp
-+++ b/src/hugin1/ptbatcher/ProjectListBox.cpp
-@@ -286,7 +286,7 @@
- switch(i)
- {
- case 0:
-- return wxString::Format(_T("%d"),project->id);
-+ return wxString::Format(_T("%ld"),project->id);
- case 1:
- return project->path;
- case 2:
diff --git a/debian/patches/55_6510_dc996061de70_Fixes_one_format_string.diff b/debian/patches/55_6510_dc996061de70_Fixes_one_format_string.diff
deleted file mode 100644
index 557bb36..0000000
--- a/debian/patches/55_6510_dc996061de70_Fixes_one_format_string.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-# HG changeset patch
-# User tmodes
-# Date 1391242867 -3600
-# Sat Feb 01 09:21:07 2014 +0100
-# Branch hugin_parallel_openmp
-# Node ID dc996061de709f8fcfdd435e4841c48a9852a737
-# Parent 56059be698f512a01f48e88102f894c2463ae207
-Fixes one format string
-
-diff -r 56059be698f5 -r dc996061de70 src/hugin1/hugin/CPImageCtrl.cpp
---- a/src/hugin1/hugin/CPImageCtrl.cpp Fri Jan 24 18:27:52 2014 +0100
-+++ b/src/hugin1/hugin/CPImageCtrl.cpp Sat Feb 01 09:21:07 2014 +0100
-@@ -1027,7 +1027,7 @@
- {
- DisplayedControlPoint dcp(cp, this, mirrored);
- dcp.SetColour(pointColors[m_points.size() % pointColors.size()], textColours[m_points.size() % textColours.size()]);
-- dcp.SetLabel(wxString::Format(wxT("%d"), m_points.size()));
-+ dcp.SetLabel(wxString::Format(wxT("%lu"), (unsigned long int)m_points.size()));
- m_points.push_back(dcp);
- }
-
diff --git a/debian/patches/56_6851_768b9649a243_Fixes_2_debug_assert_messages_in_about_dialog.diff b/debian/patches/56_6851_768b9649a243_Fixes_2_debug_assert_messages_in_about_dialog.diff
deleted file mode 100644
index 0fe3fe9..0000000
--- a/debian/patches/56_6851_768b9649a243_Fixes_2_debug_assert_messages_in_about_dialog.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-# HG changeset patch
-# User tmodes
-# Date 1425205953 -3600
-# Sun Mar 01 11:32:33 2015 +0100
-# Node ID 768b9649a2436e35bca1ac6a5cbbf4fe0edd27d5
-# Parent 3afaaaff9287fe74f32ffff9f366547309f4704b
-Fixes 2 debug assert messages in about dialog [1426837]
-
-diff -r 3afaaaff9287 -r 768b9649a243 src/hugin1/hugin/AboutDialog.cpp
---- a/src/hugin1/hugin/AboutDialog.cpp Sun Mar 01 10:13:05 2015 +0100
-+++ b/src/hugin1/hugin/AboutDialog.cpp Sun Mar 01 11:32:33 2015 +0100
-@@ -111,7 +111,7 @@
- GetSystemInformation(&font);
-
- // the notebook
-- m_about_notebook = XRCCTRL(*this,"about_dlg",wxNotebook);
-+ m_about_notebook = XRCCTRL(*this,"about_notebook", wxNotebook);
- // the logo
- m_logoImgCtrl = XRCCTRL(*this, "about_logo", wxStaticBitmap);
-
-@@ -145,7 +145,7 @@
- text=text+wxT("\n")+wxString::Format(_("Architecture: %s"),is64.c_str());
- // wxGetFreeMemory returns a wxMemorySize, which is undocumented.
- // However, we know -1 is returned on failure, so it must be signed.
-- text=text+wxT("\n")+wxString::Format(_("Free memory: %ld kiB"),(long long) wxGetFreeMemory().GetValue()/1024);
-+ text=text+wxT("\n")+wxString::Format(_("Free memory: %lld kiB"),(long long) wxGetFreeMemory().GetValue()/1024);
- #ifdef _WINDOWS
- UINT cp=GetACP();
- text=text+wxT("\n")+wxString::Format(_("Active Codepage: %u"),cp);
diff --git a/debian/patches/57_6852_0443fd122958_Check_date_before_formatting.diff b/debian/patches/57_6852_0443fd122958_Check_date_before_formatting.diff
deleted file mode 100644
index d66b859..0000000
--- a/debian/patches/57_6852_0443fd122958_Check_date_before_formatting.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-# HG changeset patch
-# User tmodes
-# Date 1425206092 -3600
-# Sun Mar 01 11:34:52 2015 +0100
-# Node ID 0443fd1229588f5f205d2c74337c6e5f17844a7e
-# Parent 768b9649a2436e35bca1ac6a5cbbf4fe0edd27d5
-Check date before formatting
-
-Should probably fix debug assertion [1426837]
-
-diff -r 768b9649a243 -r 0443fd122958 src/hugin1/ptbatcher/ProjectListBox.cpp
---- a/src/hugin1/ptbatcher/ProjectListBox.cpp Sun Mar 01 11:32:33 2015 +0100
-+++ b/src/hugin1/ptbatcher/ProjectListBox.cpp Sun Mar 01 11:34:52 2015 +0100
-@@ -303,19 +303,25 @@
- return _("Assistant");
- };
- case 7:
-- return project->GetStatusText(); //all following cases default to an empty string if file is missing
-+ return project->GetStatusText();
-+ //all following cases default to an empty string if file is missing
- case 3:
- if(project->status!=Project::MISSING)
- {
-- return project->modDate.FormatDate()+_T(", ")+project->modDate.FormatTime();
-- }
-+ if (project->modDate.IsValid())
-+ {
-+ return project->modDate.Format();
-+ };
-+ };
-+ return wxEmptyString;
- case 4:
- if(project->status!=Project::MISSING)
- {
- str = GetLongerFormatName(project->options.outputImageType);
- str = str+wxT(" (.")+wxString::FromAscii(project->options.outputImageType.c_str())+wxT(")");
- return str;
-- }
-+ };
-+ return wxEmptyString;
- case 5:
- if(project->status!=Project::MISSING)
- {
-@@ -330,6 +336,7 @@
- return _T("");
- }
- };
-+ return wxEmptyString;
- case 6:
- if(project->status!=Project::MISSING)
- {
-@@ -338,6 +345,7 @@
- str = str << project->options.getHeight();
- return str;
- }
-+ return wxEmptyString;
- default:
- return _T("");
- }
diff --git a/debian/patches/series b/debian/patches/series
index 14bf8bf..a81157b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,3 @@
42_stoplinklibXI_libXmu
43_fallbackhelp.patch
-52_044b08eb6adf_Several_fixes_to_treelistctrl.diff
-53_f88dc95914ae_Use_correct_class_wxStaticBitmap_for_bitmap_controls.diff
-54_59938e35626e_Fixes_formating_of_2_strings.diff
-55_6510_dc996061de70_Fixes_one_format_string.diff
-56_6851_768b9649a243_Fixes_2_debug_assert_messages_in_about_dialog.diff
-57_6852_0443fd122958_Check_date_before_formatting.diff
+
--
1.9.1
More information about the Pkg-phototools-devel
mailing list