[med-svn] [Git][med-team/mia][master] 2 commits: d/p: Add patch to handle latest boost
Gert Wollny (@gewo)
gitlab at salsa.debian.org
Sun Nov 21 14:02:38 GMT 2021
Gert Wollny pushed to branch master at Debian Med / mia
Commits:
c2132287 by Gert Wollny at 2021-11-21T14:26:32+01:00
d/p: Add patch to handle latest boost
- - - - -
e0ef32c8 by Gert Wollny at 2021-11-21T14:57:04+01:00
Update changelog
- - - - -
3 changed files:
- debian/changelog
- + debian/patches/0001-Fix-compilation-with-latest-BOOST.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+mia (2.4.7-8) unstable; urgency=medium
+
+ * Fix compilation with latest BOOST
+
+ -- Gert Wollny <gewo at debian.org> Sun, 21 Nov 2021 14:56:19 +0100
+
mia (2.4.7-8~exp1) experimental; urgency=medium
* Fix compilation with g++11, Closes: #984233
=====================================
debian/patches/0001-Fix-compilation-with-latest-BOOST.patch
=====================================
@@ -0,0 +1,203 @@
+From 9c4ea09d01d88ec94bced8911811e562cd436a84 Mon Sep 17 00:00:00 2001
+From: Gert Wollny <gert.wollny at collabora.com>
+Date: Sun, 21 Nov 2021 14:14:24 +0100
+Subject: [PATCH] Fix compilation with latest BOOST
+
+---
+ mia/2d/test_filter_cast.cc | 2 +-
+ mia/2d/test_segframe.cc | 14 +++++++-------
+ mia/2d/test_segmentation.cc | 18 +++++++++---------
+ mia/3d/filter/test_mask.cc | 10 +++++-----
+ mia/3d/test_ica.cc | 4 ++--
+ mia/3d/test_image.cc | 2 ++
+ mia/internal/autotest.hh | 2 ++
+ 7 files changed, 28 insertions(+), 24 deletions(-)
+
+diff --git a/mia/2d/test_filter_cast.cc b/mia/2d/test_filter_cast.cc
+index 1b314b52..3c8e1230 100644
+--- a/mia/2d/test_filter_cast.cc
++++ b/mia/2d/test_filter_cast.cc
+@@ -26,7 +26,7 @@
+
+ #include <boost/type_traits.hpp>
+ #include <boost/mpl/list.hpp>
+-
++#include <boost/mpl/vector.hpp>
+
+ NS_MIA_USE
+ using namespace std;
+diff --git a/mia/2d/test_segframe.cc b/mia/2d/test_segframe.cc
+index ef9c65f4..1d52c59d 100644
+--- a/mia/2d/test_segframe.cc
++++ b/mia/2d/test_segframe.cc
+@@ -35,11 +35,11 @@ namespace bfs = boost::filesystem;
+
+ extern const char *testframe_init;
+ extern const char *testframe_init2;
+-const size_t size = 3;
+-const float x_init[size] = {10.0, 20.0, 0.0};
+-const float y_init[size] = {20.0, 10.0, 4.0};
+-const float x_init2[size] = {11.0, 21.0, 1.0};
+-const float y_init2[size] = {21.0, 11.0, 5.0};
++const size_t init_size = 3;
++const float x_init[init_size] = {10.0, 20.0, 0.0};
++const float y_init[init_size] = {20.0, 10.0, 4.0};
++const float x_init2[init_size] = {11.0, 21.0, 1.0};
++const float y_init2[init_size] = {21.0, 11.0, 5.0};
+
+
+ BOOST_AUTO_TEST_CASE( test_frame_rename_files )
+@@ -390,13 +390,13 @@ BOOST_AUTO_TEST_CASE(segframe_write)
+ CSegFrame::Sections sections;
+ CSegSection::Points points;
+
+- for (size_t i = 0; i < size; ++i)
++ for (size_t i = 0; i < init_size; ++i)
+ points.push_back(CSegPoint2D(x_init[i], y_init[i]));
+
+ sections.push_back(CSegSection("white", points, 1));
+ points.clear();
+
+- for (size_t i = 0; i < size; ++i)
++ for (size_t i = 0; i < init_size; ++i)
+ points.push_back(CSegPoint2D(x_init2[i], y_init2[i]));
+
+ sections.push_back(CSegSection("red", points, 1));
+diff --git a/mia/2d/test_segmentation.cc b/mia/2d/test_segmentation.cc
+index 2b97aa7d..c0b0f577 100644
+--- a/mia/2d/test_segmentation.cc
++++ b/mia/2d/test_segmentation.cc
+@@ -66,16 +66,16 @@ BOOST_AUTO_TEST_CASE(segpoint_write)
+ BOOST_CHECK_EQUAL(xmldoc, testdoc);
+ }
+
+-const size_t size = 3;
+-const float x_init[size] = {10.0, 20.0, 0.0};
+-const float y_init[size] = {20.0, 10.0, 4.0};
++const size_t init_size = 3;
++const float x_init[init_size] = {10.0, 20.0, 0.0};
++const float y_init[init_size] = {20.0, 10.0, 4.0};
+
+-const float x_init_shift[size] = {9.0, 19.0, -1.0};
+-const float y_init_shift[size] = {18.0, 8.0, 2.0};
++const float x_init_shift[init_size] = {9.0, 19.0, -1.0};
++const float y_init_shift[init_size] = {18.0, 8.0, 2.0};
+
+
+-const float x_init2[size] = {11.0, 21.0, 1.0};
+-const float y_init2[size] = {21.0, 11.0, 5.0};
++const float x_init2[init_size] = {11.0, 21.0, 1.0};
++const float y_init2[init_size] = {21.0, 11.0, 5.0};
+
+
+
+@@ -228,7 +228,7 @@ BOOST_AUTO_TEST_CASE(segment_section_write)
+ {
+ CSegSection::Points points;
+
+- for (size_t i = 0; i < size; ++i)
++ for (size_t i = 0; i < init_size; ++i)
+ points.push_back(CSegPoint2D(x_init[i], y_init[i]));
+
+ CSegSection section("white", points, 1);
+@@ -567,7 +567,7 @@ void SectionTestRead::check(const float *x_data, const float *y_data) const
+ const CSegSection::Points& points = section.get_points();
+ BOOST_REQUIRE(points.size() == 3);
+
+- for (size_t i = 0; i < size; ++i) {
++ for (size_t i = 0; i < init_size; ++i) {
+ BOOST_CHECK_EQUAL(points[i].x, x_data[i]);
+ BOOST_CHECK_EQUAL(points[i].y, y_data[i]);
+ }
+diff --git a/mia/3d/filter/test_mask.cc b/mia/3d/filter/test_mask.cc
+index b59ecb9c..ba8a5a4f 100644
+--- a/mia/3d/filter/test_mask.cc
++++ b/mia/3d/filter/test_mask.cc
+@@ -33,7 +33,7 @@ const size_t nz = 2;
+ const size_t s = nx * ny * nz;
+
+
+-const C3DBounds size(nx, ny, nz);
++const C3DBounds img_size(nx, ny, nz);
+
+ struct MaskFixture: public TFiltertestFixture<T3DImage> {
+ MaskFixture();
+@@ -51,8 +51,8 @@ const bool init_mask[s] = { 0, 0, 1, 1, 1, 0, 1, 0, 1,
+
+ MaskFixture::MaskFixture()
+ {
+- mask.reset(new C3DBitImage(size, init_mask ));
+- src.reset(new C3DUIImage(size, init_src));
++ mask.reset(new C3DBitImage(img_size, init_mask ));
++ src.reset(new C3DUIImage(img_size, init_src));
+ CDatapool::instance().add("binary.@", create_image3d_vector(mask));
+ CDatapool::instance().add("uint.@", create_image3d_vector(src));
+ }
+@@ -63,7 +63,7 @@ BOOST_FIXTURE_TEST_CASE( test_mask, MaskFixture )
+ 0, 10, 11, 12, 0, 14, 0, 16, 0
+ };
+ auto filter = BOOST_TEST_create_from_plugin<C3DMaskImageFilterFactory>("mask:input=binary.@");
+- run(size, init_src, size, test_data, *filter);
++ run(img_size, init_src, img_size, test_data, *filter);
+ }
+
+
+@@ -73,6 +73,6 @@ BOOST_FIXTURE_TEST_CASE( test_rmask, MaskFixture )
+ 0, 10, 11, 12, 0, 14, 0, 16, 0
+ };
+ auto filter = BOOST_TEST_create_from_plugin<C3DMaskImageFilterFactory>("mask:input=uint.@");
+- run(size, init_mask, size, test_data, *filter);
++ run(img_size, init_mask, img_size, test_data, *filter);
+ }
+
+diff --git a/mia/3d/test_ica.cc b/mia/3d/test_ica.cc
+index 21d02ecc..554f2eb0 100644
+--- a/mia/3d/test_ica.cc
++++ b/mia/3d/test_ica.cc
+@@ -30,7 +30,7 @@ const size_t slices = 5;
+ const size_t nx = 2;
+ const size_t ny = 5;
+ const size_t nz = 1;
+-const C3DBounds size(nx, ny, nz);
++const C3DBounds img_size(nx, ny, nz);
+
+ struct ICA3DSeriesFixture {
+ ICA3DSeriesFixture();
+@@ -179,7 +179,7 @@ ICA3DSeriesFixture::ICA3DSeriesFixture():
+ mean[4] = -4.f;
+
+ for (size_t i = 0; i < slices; ++i)
+- image_set.push_back(C3DFImage(size, data_rows[i]));
++ image_set.push_back(C3DFImage(img_size, data_rows[i]));
+ }
+
+ void ICA3DSeriesFixture::check(const C3DFImage& mixed, const C3DFImage& expect)
+diff --git a/mia/3d/test_image.cc b/mia/3d/test_image.cc
+index e82e596d..107633be 100644
+--- a/mia/3d/test_image.cc
++++ b/mia/3d/test_image.cc
+@@ -29,6 +29,8 @@
+ #include <mia/core/boundary_conditions.hh>
+
+
++#include <boost/mpl/vector.hpp>
++
+
+ NS_MIA_USE
+ using namespace std;
+diff --git a/mia/internal/autotest.hh b/mia/internal/autotest.hh
+index 4458c0b2..b3e2e7ca 100644
+--- a/mia/internal/autotest.hh
++++ b/mia/internal/autotest.hh
+@@ -41,6 +41,8 @@
+ #include <mia/core/plugin_base.hh>
+ #include <mia/internal/main.hh>
+
++#include <boost/mpl/vector.hpp>
++
+ const mia::SProgramDescription description = {
+ {mia::pdi_group, "Test"},
+ {mia::pdi_short, "Unit test."},
+--
+2.30.2
+
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
fix-boost-headers.patch
fix-g++11.diff
+0001-Fix-compilation-with-latest-BOOST.patch
View it on GitLab: https://salsa.debian.org/med-team/mia/-/compare/c9a1c8d57adde3ab68b3cf54934fd2d136d161b4...e0ef32c8d61997d3b2ebbe3af4a41623e0ef145a
--
View it on GitLab: https://salsa.debian.org/med-team/mia/-/compare/c9a1c8d57adde3ab68b3cf54934fd2d136d161b4...e0ef32c8d61997d3b2ebbe3af4a41623e0ef145a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20211121/a0ffe0fb/attachment-0001.htm>
More information about the debian-med-commit
mailing list