Commit 98848eeb authored by Nicolas Burrus's avatar Nicolas Burrus

* arith/tests/min1: fix.

    prcs2git-id: 0_6_stable.9
parent 7b43a71a
......@@ -184,7 +184,7 @@
(oln/convol/fast_gaussian.hh 3050 1033408273 26_fast_gauss 1.4)
(oln/types/nrgb.hh 1962 1033408273 i/19_nrgb.hh 1.1)
(aclocal.m4 28942 1042028832 e/8_aclocal.m4 1.25.1.1.1.1)
(tests/arith/tests/min1 602 1042028832 o/50_min1 1.1)
(tests/arith/tests/min1 596 1042029371 o/50_min1 1.2)
(oln/morpho/erosion.hh 4231 1026899980 b/4_erosion.hh 1.6)
(utilities/morpho/Makefile.in 182281 1042028832 i/31_Makefile.i 1.6.1.2.1.1)
(Makefile.am 250 1041978419 2_Makefile.a 1.14.1.1)
......@@ -408,7 +408,7 @@
(oln/core/window3d.hh 7771 1027017573 c/13_window3d.h 1.5)
(oln/types/yiq.hh 1921 1033408273 i/23_yiq.hh 1.1)
(tests/check/data.hh 177 1017828804 f/6_data.hh 1.1)
(ChangeLog 90434 1042028832 6_ChangeLog 1.50.1.98.1.1.1.7)
(ChangeLog 90433 1042029371 6_ChangeLog 1.50.1.98.1.1.1.8)
(tests/README 5048 1026230945 f/4_README 1.2)
(tests/meta/gen_test.cc 11140 1027592345 f/34_gen_test.c 1.4)
(oln/meta/basics.hh 3702 1027952101 c/4_basics.hh 1.5)
......
2003-01-08 Nicolas Burrus <burrus_n@lrde.epita.fr>
* configure.ac: add arith directory.
* ISSUES: update.
......
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Olena")
(Project-Version oln 0_6_stable 8)
(Parent-Version oln 0_6_stable 6)
(Version-Log "2003-01-08 Nicolas Burrus <burrus_n@lrde.epita.fr>
* configure.ac: add arith directory.
* ISSUES: update.
* oln/arith/ops.hh: replace std::min and std::min by min and max.
* oln/core/apply.hh: add workaround for g++-2.95 bug.
* oln/types/optraits_bin.hh: add min and max traits.
(Project-Version oln 0_6_stable 9)
(Parent-Version oln 0_6_stable 8)
(Version-Log "* arith/tests/min1: fix.
")
(New-Version-Log "")
(Checkin-Time "Wed, 08 Jan 2003 13:27:12 +0100")
(Checkin-Time "Wed, 08 Jan 2003 13:36:11 +0100")
(Checkin-Login burrus_n)
;; diff-ignore ^configure$
;; diff-ignore aclocal\.m4$
......@@ -122,7 +115,7 @@
(Project-Keywords)
(Files
(aclocal.m4 (oln/e/8_aclocal.m4 1.25.1.1.1.1 640))
(ChangeLog (oln/6_ChangeLog 1.50.1.98.1.1.1.7 640))
(ChangeLog (oln/6_ChangeLog 1.50.1.98.1.1.1.8 640))
(configure.ac (oln/3_configure. 1.29.1.1 640))
(configure (oln/e/7_configure 1.38.1.4 750))
(README (oln/1_README 1.4 640))
......@@ -767,16 +760,7 @@
;; Files added by populate at Wed, 08 Jan 2003 12:51:28 +0100,
;; to version 0_6_stable.6(w), by burrus_n:
(tests/arith/tests/min1 (oln/o/50_min1 1.1 640))
)
(Merge-Parents
(0_6_stable.7 complete
(ChangeLog ChangeLog ChangeLog m) (Makefile.am Makefile.am Makefile.am r)
(Makefile.in Makefile.in Makefile.in m) (tests/Makefile.in tests/Makefile.in tests/Makefile.in m)
(utilities/Makefile.in utilities/Makefile.in utilities/Makefile.in m) (utilities/Makefile.am utilities/Makefile.am utilities/Makefile.am r)
(utilities/generate_morpho.sh utilities/generate_morpho.sh utilities/generate_morpho.sh r) (utilities/morpho/morpho_template.cc utilities/morpho/morpho_template.cc utilities/morpho/morpho_template.cc r)
(utilities/morpho/morpho_template_extrema.cc utilities/morpho/morpho_template_extrema.cc utilities/morpho/morpho_template_extrema.cc r) (utilities/morpho/morpho_template_watershed.cc utilities/morpho/morpho_template_watershed.cc utilities/morpho/morpho_template_watershed.cc r)
(utilities/morpho/morpho_template_with_neighb.cc utilities/morpho/morpho_template_with_neighb.cc utilities/morpho/morpho_template_with_neighb.cc r) (utilities/morpho/morpho_template_gaussian.cc utilities/morpho/morpho_template_gaussian.cc utilities/morpho/morpho_template_gaussian.cc r)
(utilities/morpho/morpho_template_with_twowin.cc utilities/morpho/morpho_template_with_twowin.cc utilities/morpho/morpho_template_with_twowin.cc r) (utilities/morpho/morpho_template_with_functor.cc utilities/morpho/morpho_template_with_functor.cc utilities/morpho/morpho_template_with_functor.cc r))
(tests/arith/tests/min1 (oln/o/50_min1 1.2 640))
)
(Merge-Parents)
(New-Merge-Parents)
#include <oln/basics2d.hh>
#include <oln/morpho/minmax.hh>
#include <oln/arith/ops.hh>
#include <oln/types/all.hh>
using namespace oln;
......@@ -16,12 +16,12 @@ int main()
for_all (it2)
im2[it2] = 1;
image2d<bin> imin = morpho::min (im1, im2);
image2d<bin> imin = arith::min (im1, im2);
image2d<bin>::iter itmin(imin);
for_all (itmin)
assert (imin[itmin] == bin(0));
image2d<bin> imax = morpho::max (im1, im2);
image2d<bin> imax = arith::max (im1, im2);
image2d<bin>::iter itmax(imax);
for_all (itmax)
assert (imax[itmax] == bin(1));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment