[med-svn] [SCM] mia branch, master, updated. upstream/2.0.7-64-gb612b58

Gert Wollny gw.fossdev at gmail.com
Wed Feb 27 10:38:41 UTC 2013


The following commit has been merged in the master branch:
commit 9935eb26955c5dae63b30bb255343fb6fee8c3b8
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Tue Feb 26 16:45:13 2013 +0100

    Revert to 8ef661f458284

diff --git a/debian/libmia-2.0-8.install b/debian/libmia-2.0-8.install
new file mode 100644
index 0000000..d22e72d
--- /dev/null
+++ b/debian/libmia-2.0-8.install
@@ -0,0 +1,2 @@
+usr/lib/*/lib*.so.*
+usr/lib/*/mia-2.0/plugins/*
diff --git a/debian/libmia-2.0-8.lintian-overrides b/debian/libmia-2.0-8.lintian-overrides
new file mode 100644
index 0000000..b43eb0e
--- /dev/null
+++ b/debian/libmia-2.0-8.lintian-overrides
@@ -0,0 +1,10 @@
+#
+#The package provides multiple libraries, which means no unique soname can be given
+#
+libmia-2.0-8 binary: package-name-doesnt-match-sonames 
+
+#
+# The SOURCE_FORTIFY=2 flag is used, but in many cases the compiler is just good enough
+# to detect that fortification is not needed
+#
+libmia-2.0-8 binary: hardening-no-fortify-functions
diff --git a/debian/libmia-2.0-dev.install b/debian/libmia-2.0-dev.install
new file mode 100644
index 0000000..7aa69d1
--- /dev/null
+++ b/debian/libmia-2.0-dev.install
@@ -0,0 +1,4 @@
+usr/include/*
+usr/lib/*/lib*.so
+usr/lib/*/mia-2.0/include/*
+usr/lib/*/pkgconfig/*
diff --git a/debian/libmia-2.0-doc.doc-base b/debian/libmia-2.0-doc.doc-base
new file mode 100644
index 0000000..c782486
--- /dev/null
+++ b/debian/libmia-2.0-doc.doc-base
@@ -0,0 +1,9 @@
+Document: mia-programming-reference
+Title: MIA Library programming reference
+Author: Gert Wollny 
+Abstract: This is the Doxygen reference of the MIA libraries 
+Section: Programming/libraries
+
+Format: HTML
+Index: /usr/share/doc/mia-2.0/libdoc/index.html
+Files: /usr/share/doc/mia-2.0/libdoc/*.html
diff --git a/debian/libmia-2.0-doc.install b/debian/libmia-2.0-doc.install
new file mode 100644
index 0000000..9e3bcdf
--- /dev/null
+++ b/debian/libmia-2.0-doc.install
@@ -0,0 +1,2 @@
+usr/share/doc/mia-2.0/libdoc/*
+
diff --git a/mia/3d/filter/test_scale.cc b/mia/3d/filter/test_scale.cc
index 6e9bcae..90c9e51 100644
--- a/mia/3d/filter/test_scale.cc
+++ b/mia/3d/filter/test_scale.cc
@@ -203,10 +203,7 @@ BOOST_AUTO_TEST_CASE( test_downscale_float_persists )
 	for (size_t i = 0; i < 64; ++i) {
 
 		cvdebug() << i << ":" << fscaled[i] << " - " << test_float[i] << '\n'; 
-		if (fabs(test_float[i]) > 1e-16) 
-			BOOST_CHECK_CLOSE(fscaled[i], test_float[i], 0.1); 
-		else 
-			BOOST_CHECK((fabs(fscaled[i]) < 1e-16)); 
+		BOOST_CHECK_CLOSE(fscaled[i], test_float[i], 0.1); 
 	}
 		
 
diff --git a/mia/core/test_splineparzenmi.cc b/mia/core/test_splineparzenmi.cc
index 7856ae2..9fac7e0 100644
--- a/mia/core/test_splineparzenmi.cc
+++ b/mia/core/test_splineparzenmi.cc
@@ -254,12 +254,9 @@ BOOST_FIXTURE_TEST_CASE( test_self, CSplineParzenMIFixture )
 			cvdebug() << self_grad << " vs " << test_grad << ":" << self_grad / test_grad<<"\n"; 
 
 
-			// if the gradient is very small test against 'close to zero'
-			if (fabs(test_grad) > 1e-16) 
+			if (test_grad != 0) 
 				BOOST_CHECK_CLOSE(self_grad, test_grad, 0.1); 
-			else 
-				BOOST_CHECK(fabs(self_grad) < 1e-16);
-                }	
+                }
 	
 }
 

-- 
Packaging of mia in Debian



More information about the debian-med-commit mailing list