[med-svn] [mia] 05/07: correct patch mess
Gert Wollny
gert-guest at moszumanska.debian.org
Mon Apr 25 20:17:09 UTC 2016
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository mia.
commit 2496cbbcd03518aeeff0d3f8b9b6c80e38b1cb20
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Mon Apr 25 10:23:05 2016 +0000
correct patch mess
---
debian/patches/01_spellcheck_corrections.patch | 66 --------------------------
debian/patches/series | 1 -
mia/3d/cost/ngf.cc | 1 -
mia/3d/ppmatrix.cc | 2 -
mia/core/test_slopestatistics.cc | 5 +-
mia/core/test_sparse_solver.cc | 1 -
mia/core/waveletslopeclassifier.cc | 1 -
src/2dmyocard-segment.cc | 2 -
src/2dsegment-fuzzyw.cc | 1 -
src/2dseries-segdistance.cc | 2 -
src/wavelettrans.cc | 1 -
test/test_minimizer.cc | 2 +-
12 files changed, 4 insertions(+), 81 deletions(-)
diff --git a/debian/patches/01_spellcheck_corrections.patch b/debian/patches/01_spellcheck_corrections.patch
index 9e7c7a2..ba9682f 100644
--- a/debian/patches/01_spellcheck_corrections.patch
+++ b/debian/patches/01_spellcheck_corrections.patch
@@ -5,69 +5,3 @@ Origin: upstream
Forwarded: not-needed
Last-Update: 2015-11-24
---- a/mia/2d/filter/thresh.cc
-+++ b/mia/2d/filter/thresh.cc
-@@ -70,7 +70,7 @@ C2DThreshNImageFilterFactory::C2DThreshNImageFilterFactory():
- m_thresh(5.0)
- {
- add_parameter("shape", make_param(m_shape, "4n", false, "neighborhood shape to take into account"));
-- add_parameter("thresh", make_param(m_thresh, false, "The threshhold value"));
-+ add_parameter("thresh", make_param(m_thresh, false, "The threshold value"));
- }
-
- C2DFilter *C2DThreshNImageFilterFactory::do_create()const
-@@ -80,8 +80,8 @@ C2DFilter *C2DThreshNImageFilterFactory::do_create()const
-
- const std::string C2DThreshNImageFilterFactory::do_get_descr() const
- {
-- return "This filter sets all pixels of an image to zero that fall below a certain threshhold and "
-- "whose neighbours in a given neighborhood shape also fall below a this threshhold";
-+ return "This filter sets all pixels of an image to zero that fall below a certain threshold and "
-+ "whose neighbours in a given neighborhood shape also fall below a this threshold";
- }
-
- extern "C" EXPORT CPluginBase *get_plugin_interface()
---- mia-2.2.7.orig/mia/template/watershed.hh
-+++ mia-2.2.7/mia/template/watershed.hh
-@@ -323,7 +323,7 @@ TWatershedFilterPlugin<dim>::TWatershedF
- this->add_parameter("n", make_param(m_neighborhood, "sphere:r=1", false, "Neighborhood for watershead region growing"));
- this->add_parameter("mark", new mia::CBoolParameter(m_with_borders, false, "Mark the segmented watersheds with a special gray scale value"));
- this->add_parameter("thresh", make_coi_param(m_thresh, 0, 1.0, false, "Relative gradient norm threshold. The actual value "
-- "threshhold value is thresh * (max_grad - min_grad) + min_grad. Bassins "
-+ "threshold value is thresh * (max_grad - min_grad) + min_grad. Bassins "
- "separated by gradients with a lower norm will be joined"));
- this->add_parameter("evalgrad", new mia::CBoolParameter(m_eval_grad, false, "Set to 1 if the input image does "
- "not represent a gradient norm image"));
---- mia-2.2.7.orig/src/2dgroundtruthreg.cc
-+++ mia-2.2.7/src/2dgroundtruthreg.cc
-@@ -166,7 +166,7 @@ int do_main( int argc, char *argv[] )
- options.add(make_opt( pgt_params.beta, "beta", 'B', "temporal second derivative penalty weight",
- CCmdOptionFlags::required));
- options.add(make_opt( pgt_params.rho_thresh, "rho_thresh", 'R',
-- "crorrelation threshhold for neighborhood analysis", CCmdOptionFlags::required));
-+ "correlation threshold for neighborhood analysis", CCmdOptionFlags::required));
-
-
-
---- mia-2.2.7.orig/src/2dmyoicapgt.cc
-+++ mia-2.2.7/src/2dmyoicapgt.cc
-@@ -480,7 +480,7 @@ int do_main( int argc, char *argv[] )
- options.add(make_opt( pgt_alpha, "alpha", 'A', "spacial neighborhood penalty weight"));
- options.add(make_opt( pgt_beta, "beta", 'B', "temporal second derivative penalty weight"));
- options.add(make_opt( pgt_rho_thresh, "rho-thresh", 'T',
-- "crorrelation threshhold for neighborhood analysis"));
-+ "correlation threshold for neighborhood analysis"));
-
-
-
---- mia-2.2.7.orig/src/2dmyopgt-nonrigid.cc
-+++ mia-2.2.7/src/2dmyopgt-nonrigid.cc
-@@ -147,7 +147,7 @@ int do_main( int argc, char *argv[] )
- options.add(make_opt( alpha, "alpha", 'A', "spacial neighborhood penalty weight"));
- options.add(make_opt( beta, "beta", 'B', "temporal second derivative penalty weight"));
- options.add(make_opt( rho_thresh, "rho-thresh", 'R',
-- "crorrelation threshhold for neighborhood analysis"));
-+ "correlation threshold for neighborhood analysis"));
- options.add(make_opt( skip_images, "skip", 'k', "skip images at the beginning of the series "
- "e.g. because as they are of other modalities"));
-
diff --git a/debian/patches/series b/debian/patches/series
index ea83086..adb8975 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-mia-2.2.7-accumulate-not-declared.patch
01_spellcheck_corrections.patch
02_accumulate-not-declared-mia-2.2.7.patch
diff --git a/mia/3d/cost/ngf.cc b/mia/3d/cost/ngf.cc
index 0b044d8..8002166 100644
--- a/mia/3d/cost/ngf.cc
+++ b/mia/3d/cost/ngf.cc
@@ -21,7 +21,6 @@
#include <mia/3d/cost/ngf.hh>
#include <mia/3d/nfg.hh>
-#include <numeric>
NS_BEGIN(ngf_3dimage_cost)
diff --git a/mia/3d/ppmatrix.cc b/mia/3d/ppmatrix.cc
index 1fd85ca..bda3d76 100644
--- a/mia/3d/ppmatrix.cc
+++ b/mia/3d/ppmatrix.cc
@@ -32,8 +32,6 @@
#include <emmintrin.h>
#endif
-#include <numeric>
-
using namespace tbb;
using namespace std;
diff --git a/mia/core/test_slopestatistics.cc b/mia/core/test_slopestatistics.cc
index b1b9973..af11d4d 100644
--- a/mia/core/test_slopestatistics.cc
+++ b/mia/core/test_slopestatistics.cc
@@ -19,11 +19,12 @@
*/
#include <mia/internal/autotest.hh>
-#include <mia/core/slopestatistics.hh>
#include <stdexcept>
#include <cmath>
-#include <numeric>
+
+#include <mia/core/slopestatistics.hh>
+
using namespace std;
NS_MIA_USE
diff --git a/mia/core/test_sparse_solver.cc b/mia/core/test_sparse_solver.cc
index 9677087..3f837f2 100644
--- a/mia/core/test_sparse_solver.cc
+++ b/mia/core/test_sparse_solver.cc
@@ -22,7 +22,6 @@
#include <mia/internal/autotest.hh>
#include <mia/core/sparse_solver.hh>
-#include <numeric>
/**
This test only tests the general idea of the unified solver class, and
diff --git a/mia/core/waveletslopeclassifier.cc b/mia/core/waveletslopeclassifier.cc
index d28fa6d..51da392 100644
--- a/mia/core/waveletslopeclassifier.cc
+++ b/mia/core/waveletslopeclassifier.cc
@@ -20,7 +20,6 @@
#include <map>
#include <algorithm>
-#include <numeric>
#include <stdexcept>
#include <cmath>
diff --git a/src/2dmyocard-segment.cc b/src/2dmyocard-segment.cc
index ffdf727..ec57817 100644
--- a/src/2dmyocard-segment.cc
+++ b/src/2dmyocard-segment.cc
@@ -43,8 +43,6 @@
#include <mia/2d/transformfactory.hh>
#include <mia/2d/datafield.cxx>
-#include <numeric>
-
NS_MIA_USE;
using namespace std;
diff --git a/src/2dsegment-fuzzyw.cc b/src/2dsegment-fuzzyw.cc
index 6a2d084..243973c 100644
--- a/src/2dsegment-fuzzyw.cc
+++ b/src/2dsegment-fuzzyw.cc
@@ -29,7 +29,6 @@
#include <memory>
#include <vector>
-#include <numeric>
using namespace mia;
using namespace std;
diff --git a/src/2dseries-segdistance.cc b/src/2dseries-segdistance.cc
index 5e31e94..31fceed 100644
--- a/src/2dseries-segdistance.cc
+++ b/src/2dseries-segdistance.cc
@@ -37,8 +37,6 @@
#include <mia/2d/imageio.hh>
#include <mia/2d/filter.hh>
-#include <numeric>
-
using namespace std;
using namespace mia;
using xmlpp::DomParser;
diff --git a/src/wavelettrans.cc b/src/wavelettrans.cc
index 3d96b55..20186d5 100644
--- a/src/wavelettrans.cc
+++ b/src/wavelettrans.cc
@@ -20,7 +20,6 @@
#define VSTREAM_DOMAIN "wavelet"
-#include <cmath>
#include <fstream>
#include <sstream>
#include <iostream>
diff --git a/test/test_minimizer.cc b/test/test_minimizer.cc
index f02482c..f189b8c 100644
--- a/test/test_minimizer.cc
+++ b/test/test_minimizer.cc
@@ -27,7 +27,7 @@
#include <mia/core/minimizer.hh>
#include <mia/core/cmdlineparser.hh>
#include <mia/core/msgstream.hh>
-#include <numeric>
+
using namespace std;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mia.git
More information about the debian-med-commit
mailing list