Mercurial > mxe-octave

annotate src/msvc-of-image-1.patch @ 5947:09d3533acacf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/build-cmake.mk, src/cmake.mk: update v3.21.4
author John Donoghue <john.donoghue@ieee.org>
date Thu, 11 Nov 2021 09:49:11 -0500
parents 42cde4acbfe6
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3343
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
1 diff -ur image/src/bwlabeln.cc image-new/src/bwlabeln.cc
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
2 --- image/src/bwlabeln.cc 2012-10-23 19:42:12 +0100
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
3 +++ image-new/src/bwlabeln.cc 2013-01-15 03:54:03 +0000
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -54,13 +54,13 @@
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5 if (na > nb)
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6 return false;
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7 octave_idx_type i = 0;
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 - while (a(i) == b(i) and i < na)
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 + while (a(i) == b(i) && i < na)
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
10 {
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11 i++;
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
12 }
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
13
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
14 if (i == na //They're equal, but this is strict order
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
15 - or a(i) > b(i) )
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
16 + || a(i) > b(i) )
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
17 return false;
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
18
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
19 return true;
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
20 @@ -145,7 +145,7 @@
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
21 //The zero coordinates are the centre, and the negative ones
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
22 //are the ones reflected about the centre, and we don't need
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
23 //to consider those.
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
24 - if( aidx == zero or neighbours.find(-aidx) != neighbours.end() )
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
25 + if( aidx == zero || neighbours.find(-aidx) != neighbours.end() )
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
26 continue;
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
27
42cde4acbfe6 [MSVC] Patch image pkg to remove unsupported C++ syntax.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
28 neighbours.insert (aidx);