view src/msvc-of-image-1.patch @ 5495:fb50ae69121c

Add build rule for python3 (bug #58689). * src/build-python3.mk: Add build rule for python3 version 3.8.3. * dist-files.mk: Add new file to list. * index.html: Add new package to list. * src/build-setuptools.mk: Update to version 44.1.1 (last version compatible with python2). Use python2. Set installation prefix. * src/build-mako.mk: Use python2. Set installation prefix. * src/build-markupsafe.mk: Use python2. Set installation prefix. * src/mesa.mk: Windows rule depends on scons. Use python2. * src/nsis.mk: Depend on scons. Use python2.
author Markus Mützel <markus.muetzel@gmx.de>
date Sun, 05 Jul 2020 12:21:53 +0200
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);