Mercurial > mxe-octave
comparison src/msvc-of-image-1.patch @ 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 | |
| children |
comparison
equal
deleted
inserted
replaced
| 3342:5e9dc7f88328 | 3343:42cde4acbfe6 |
|---|---|
| 1 diff -ur image/src/bwlabeln.cc image-new/src/bwlabeln.cc | |
| 2 --- image/src/bwlabeln.cc 2012-10-23 19:42:12 +0100 | |
| 3 +++ image-new/src/bwlabeln.cc 2013-01-15 03:54:03 +0000 | |
| 4 @@ -54,13 +54,13 @@ | |
| 5 if (na > nb) | |
| 6 return false; | |
| 7 octave_idx_type i = 0; | |
| 8 - while (a(i) == b(i) and i < na) | |
| 9 + while (a(i) == b(i) && i < na) | |
| 10 { | |
| 11 i++; | |
| 12 } | |
| 13 | |
| 14 if (i == na //They're equal, but this is strict order | |
| 15 - or a(i) > b(i) ) | |
| 16 + || a(i) > b(i) ) | |
| 17 return false; | |
| 18 | |
| 19 return true; | |
| 20 @@ -145,7 +145,7 @@ | |
| 21 //The zero coordinates are the centre, and the negative ones | |
| 22 //are the ones reflected about the centre, and we don't need | |
| 23 //to consider those. | |
| 24 - if( aidx == zero or neighbours.find(-aidx) != neighbours.end() ) | |
| 25 + if( aidx == zero || neighbours.find(-aidx) != neighbours.end() ) | |
| 26 continue; | |
| 27 | |
| 28 neighbours.insert (aidx); |