Mercurial > hg > octave-image

changeset 446:d83e1b147daf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use STL min() instead of preprocessor's define
author thomas-weber
date Tue, 15 Mar 2011 19:02:12 +0000
parents 654b3ffe1ec7
children 298c64d16989
files src/bwlabel.cc
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/bwlabel.cc
+++ b/src/bwlabel.cc
@@ -30,9 +30,9 @@
 
 
 #include <oct.h>
+#include <algorithm>
 
 #define     NO_OBJECT       0
-#define     MIN(x, y)       (((x) < (y)) ? (x) : (y))
 
 static int find (int set [], int x)
 {
@@ -193,7 +193,7 @@
                         }
                       else
                         {
-                          int tlabel = MIN (B, C);
+                          int tlabel = std::min (B, C);
                           lset [B] = tlabel;
                           lset [C] = tlabel;
                           L.elem (r, c) = tlabel;