[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:39 UTC 2013


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

    add patch to let tests run through on powerpc 32 bit

diff --git a/debian/libmia-2.0-8.install b/debian/libmia-2.0-8.install
deleted file mode 100644
index d22e72d..0000000
--- a/debian/libmia-2.0-8.install
+++ /dev/null
@@ -1,2 +0,0 @@
-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
deleted file mode 100644
index b43eb0e..0000000
--- a/debian/libmia-2.0-8.lintian-overrides
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-#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
deleted file mode 100644
index 7aa69d1..0000000
--- a/debian/libmia-2.0-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index c782486..0000000
--- a/debian/libmia-2.0-doc.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-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
deleted file mode 100644
index 9e3bcdf..0000000
--- a/debian/libmia-2.0-doc.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/doc/mia-2.0/libdoc/*
-
diff --git a/mia/3d/filter/test_scale.cc b/mia/3d/filter/test_scale.cc
index 90c9e51..6e9bcae 100644
--- a/mia/3d/filter/test_scale.cc
+++ b/mia/3d/filter/test_scale.cc
@@ -203,7 +203,10 @@ BOOST_AUTO_TEST_CASE( test_downscale_float_persists )
 	for (size_t i = 0; i < 64; ++i) {
 
 		cvdebug() << i << ":" << fscaled[i] << " - " << test_float[i] << '\n'; 
-		BOOST_CHECK_CLOSE(fscaled[i], test_float[i], 0.1); 
+		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)); 
 	}
 		
 
diff --git a/mia/core/test_splineparzenmi.cc b/mia/core/test_splineparzenmi.cc
index 9fac7e0..7856ae2 100644
--- a/mia/core/test_splineparzenmi.cc
+++ b/mia/core/test_splineparzenmi.cc
@@ -254,9 +254,12 @@ BOOST_FIXTURE_TEST_CASE( test_self, CSplineParzenMIFixture )
 			cvdebug() << self_grad << " vs " << test_grad << ":" << self_grad / test_grad<<"\n"; 
 
 
-			if (test_grad != 0) 
+			// if the gradient is very small test against 'close to zero'
+			if (fabs(test_grad) > 1e-16) 
 				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