Mercurial > mxe-octave
changeset 3343:42cde4acbfe6
[MSVC] Patch image pkg to remove unsupported C++ syntax.
* src/msvc-of-image-1.patch: New patch.
| author | Michael Goffioul <michael.goffioul@gmail.com> |
|---|---|
| date | Sun, 01 Dec 2013 12:34:13 -0500 |
| parents | 5e9dc7f88328 |
| children | b799b3f81a1e |
| files | src/msvc-of-image-1.patch |
| diffstat | 1 files changed, 28 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/msvc-of-image-1.patch Sun Dec 01 12:34:13 2013 -0500 @@ -0,0 +1,28 @@ +diff -ur image/src/bwlabeln.cc image-new/src/bwlabeln.cc +--- image/src/bwlabeln.cc 2012-10-23 19:42:12 +0100 ++++ image-new/src/bwlabeln.cc 2013-01-15 03:54:03 +0000 +@@ -54,13 +54,13 @@ + if (na > nb) + return false; + octave_idx_type i = 0; +- while (a(i) == b(i) and i < na) ++ while (a(i) == b(i) && i < na) + { + i++; + } + + if (i == na //They're equal, but this is strict order +- or a(i) > b(i) ) ++ || a(i) > b(i) ) + return false; + + return true; +@@ -145,7 +145,7 @@ + //The zero coordinates are the centre, and the negative ones + //are the ones reflected about the centre, and we don't need + //to consider those. +- if( aidx == zero or neighbours.find(-aidx) != neighbours.end() ) ++ if( aidx == zero || neighbours.find(-aidx) != neighbours.end() ) + continue; + + neighbours.insert (aidx);