Mercurial > mxe-octave
view src/msvc-of-image-1.patch @ 4618:de2eedecd6ba
update broken PKG_UPDATE rules, handle missing update rules
* Makefile.in: add handling for packages with no update rule
* src/gtk2.mk, src/gtk3.mk, src/libvpx.mk, src/taglib.mk,
src/hunspell.mk, src/vala.mk : use github tags for version info
* src/llvm.mk: add '?' to update url
* src/openscenegraph.mk: update SED rule for version extraction
* src/pthread-stubs.mk, src/qt5.mk, src/renderproto.mk,
src/sm.mk, src/s2tc.mk, src/util-macros.mk: added dummy PKG_UPDATE rule
* src/qscintilla.mk: change search name for version extraction
* src/qtbase.mk: use short pkg version in update path
* src/suitesparse.mk: update change in main url/version url
* src/tre.mk: update download page link
* src/vmime.mk: update download and update url
* src/wget.mk, src/xapian-core.mk: update url, sed rule
* src/wt.mk: update to use github download/update
* src/src-msys-libcrypt.mk: update sed rule
author | John Donoghue |
---|---|
date | Fri, 09 Mar 2018 11:46:42 -0500 |
parents | 42cde4acbfe6 |
children |
line wrap: on
line source
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);