[Pkg-octave-commit] [octave-image] 03/04: d/p/prevent-endless-loop-on-i386.diff: Drop patch (applied upstream)

[Rafael Laboissière]

This is an automated email from the git hooks/post-receive script.

rlaboiss-guest pushed a commit to branch master
in repository octave-image.

commit df3ea91da0cb02a1986f20d950ac7147dce780e2
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Mon Oct 20 12:02:09 2014 -0200

    d/p/prevent-endless-loop-on-i386.diff: Drop patch (applied upstream)
---
 debian/patches/prevent-endless-loop-on-i386.diff | 52 ------------------------
 debian/patches/series                            |  1 -
 2 files changed, 53 deletions(-)

diff --git a/debian/patches/prevent-endless-loop-on-i386.diff b/debian/patches/prevent-endless-loop-on-i386.diff
deleted file mode 100644
index 7061f11..0000000
--- a/debian/patches/prevent-endless-loop-on-i386.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Prevent endless loop in bwdist on i386
- bwdist's test suite looped endlessly on i386 when compiled with optimization.
- The reason seems to be a lack of machine precision.
-Author: Carnë Draug <carandraug at octave.org>
-Origin: <upstream>, http://sourceforge.net/p/octave/image/ci/43cd1c5e095503a52866dbcfb35f6a4a43a431cb/
-Bug: https://savannah.gnu.org/bugs/index.php?41831
-Forwarded: not-needed
-Applied-Upstream: http://sourceforge.net/p/octave/image/ci/43cd1c5e095503a52866dbcfb35f6a4a43a431cb/
-Last-Update: 2014-03-11
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/bwdist.cc
-+++ b/src/bwdist.cc
-@@ -65,7 +65,7 @@
-         }
-     }
- 
--  float olddist2, newdist2, newdistx, newdisty;
-+  double olddist2, newdist2, newdistx, newdisty;
-   bool changed;
- 
-   // Initialize index offsets for the current image width
-@@ -641,5 +641,29 @@
- %! assert (dout, dist)
- %! assert (cout, c)
- 
-+## The quasi-euclidean method is apparently sensitive to a machine precision
-+## error that happens in x86 systems only. This test will cause an endless
-+## loop in case of a regression.
-+%!test
-+%! bw = [  0   1   1   0   0   0   1   0
-+%!         0   0   0   0   0   0   0   0
-+%!         1   1   0   0   0   0   0   0
-+%!         0   0   0   0   0   0   1   0
-+%!         0   0   0   0   1   0   0   1
-+%!         0   0   0   0   0   0   0   0
-+%!         1   0   0   0   0   0   0   0
-+%!         0   0   1   0   0   1   1   0];
-+%! out = single ([
-+%! 1.00000   0.00000   0.00000   1.00000   2.00000   1.00000   0.00000   1.00000
-+%! 1.00000   1.00000   1.00000   sqrt(2)   sqrt(2)+1 sqrt(2)   1.00000   sqrt(2)
-+%! 0.00000   0.00000   1.00000   2.00000   2.00000   sqrt(2)   1.00000   sqrt(2)
-+%! 1.00000   1.00000   sqrt(2)   sqrt(2)   1.00000   1.00000   0.00000   1.00000
-+%! 2.00000   2.00000   2.00000   1.00000   0.00000   1.00000   1.00000   0.00000
-+%! 1.00000   sqrt(2)   2.00000   sqrt(2)   1.00000   sqrt(2)   sqrt(2)   1.00000
-+%! 0.00000   1.00000   1.00000   sqrt(2)   sqrt(2)   1.00000   1.00000   sqrt(2)
-+%! 1.00000   1.00000   0.00000   1.00000   1.00000   0.00000   0.00000   1.00000
-+%! ]);
-+%! assert (bwdist (bw, "quasi-euclidean"), out);
-+
- %!error <unknown METHOD> bwdist (bw, "not a valid method");
- */
diff --git a/debian/patches/series b/debian/patches/series
index e3c866e..d0dd8d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 autoload-yes.patch
 use-dpkg-buildflags.patch
-prevent-endless-loop-on-i386.diff

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave-image.git