https://svn.lrde.epita.fr/svn/oln/trunk/milena
Index: ChangeLog
from Thierry Geraud <thierry.geraud(a)lrde.epita.fr>
Move obsolete image types and clock_nbh2d into trash.
* mln/core/image/morph/t_image.hh,
* tests/core/image/morph/t_image.cc: Move to...
* trash/t_image.hh,
* trash/t_image.cc: ...these new trash files.
* mln/core/clock_neighb.hh,
* mln/core/clock_neighb2d.hh,
* tests/core/other/clock_neighb2d.cc: Move to...
* trash/clock_neighb.hh,
* trash/clock_neighb2d.hh,
* trash/clock_neighb2d.cc: ...trash.
* tests/core/other/clock_test.cc: Rename and move to...
* trash/clock_neighb2d_bis.cc: ...trash.
* mln/core/image/tr_mesh.hh: Remove; empty class.
* mln/core/image/morph/all.hh: Remove.
* mln/core/image/morph: Remove directory.
* tests/core/image/morph/Makefile.am: Remove.
* tests/core/image/morph: Remove.
* mln/core/image/all.hh: Update.
* mln/trait/images.hh: Update.
* mln/core/all.hh: Update.
* tests/core/other/Makefile.am: Update.
* tests/core/image/Makefile.am: Update.
mln/core/all.hh | 5 ++---
mln/core/image/all.hh | 4 ----
mln/trait/images.hh | 9 ++++-----
tests/core/image/Makefile.am | 1 -
tests/core/other/Makefile.am | 5 -----
5 files changed, 6 insertions(+), 18 deletions(-)
Index: mln/trait/images.hh
--- mln/trait/images.hh (revision 3935)
+++ mln/trait/images.hh (working copy)
@@ -1,5 +1,5 @@
-// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
-// (LRDE)
+// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+// Laboratory (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
@@ -36,6 +36,8 @@
/// \todo Split this file into many.
///
/// \todo the 'nature' prop is not set yet in image types.
+///
+/// \todo The image list is not up-to-date (and move it elsewhere !)
# include <iostream>
# include <string>
@@ -114,14 +116,11 @@
template <typename T> struct image2d;
template <typename T> struct image3d;
namespace pw { template <typename F, typename S> class image; }
- template <typename P, typename T> class rle_image;
- template <typename P, typename T> class sparse_image;
// Morphers.
template <typename I, typename F> struct image_if_base;
template <typename I, typename D> class decorated_image;
template <typename I, typename S> class sub_image;
- template <typename I> struct t_image;
template <typename I> class safe_image;
template <typename T, typename I> class cast_image_;
namespace value { template <unsigned n, typename I> struct stack_image; }
Index: mln/core/image/all.hh
--- mln/core/image/all.hh (revision 3935)
+++ mln/core/image/all.hh (working copy)
@@ -36,7 +36,6 @@
// Sub-directories.
-# include <mln/core/image/morph/all.hh>
# include <mln/core/image/dmorph/all.hh>
# include <mln/core/image/imorph/all.hh>
# include <mln/core/image/vmorph/all.hh>
@@ -61,9 +60,6 @@
# include <mln/core/image/image1d.hh>
# include <mln/core/image/image2d.hh>
# include <mln/core/image/image3d.hh>
-# include <mln/core/image/sparse_encode.hh>
-# include <mln/core/image/sparse_image.hh>
-# include <mln/core/image/tr_mesh.hh>
# include <mln/core/image/vertex_image.hh>
Index: mln/core/all.hh
--- mln/core/all.hh (revision 3935)
+++ mln/core/all.hh (working copy)
@@ -1,4 +1,5 @@
-// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory
+// (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
@@ -45,8 +46,6 @@
// Local directory.
# include <mln/core/a_point_of.hh>
# include <mln/core/category.hh>
-# include <mln/core/clock_neighb.hh>
-# include <mln/core/clock_neighb2d.hh>
# include <mln/core/dpoints_pixter.hh>
# include <mln/core/contract.hh>
# include <mln/core/dpoint.hh>
Index: tests/core/other/Makefile.am
--- tests/core/other/Makefile.am (revision 3935)
+++ tests/core/other/Makefile.am (working copy)
@@ -2,12 +2,9 @@
include $(top_srcdir)/milena/tests/tests.mk
-##FIXME: re-enable tests
check_PROGRAMS = \
box_runstart_piter \
category \
-## clock_neighb2d \
-## clock_test \
dpoints_pixter \
graph_elt_neighborhood \
graph_elt_neighborhood_if \
@@ -27,8 +24,6 @@
box_runstart_piter_SOURCES = box_runstart_piter.cc
category_SOURCES = category.cc
-##clock_neighb2d_SOURCES = clock_neighb2d.cc
-##clock_test_SOURCES = clock_test.cc
dpoints_pixter_SOURCES = dpoints_pixter.cc
graph_elt_neighborhood_SOURCES = graph_elt_neighborhood.cc
graph_elt_neighborhood_if_SOURCES = graph_elt_neighborhood_if.cc
Index: tests/core/image/Makefile.am
--- tests/core/image/Makefile.am (revision 3935)
+++ tests/core/image/Makefile.am (working copy)
@@ -3,7 +3,6 @@
include $(top_srcdir)/milena/tests/tests.mk
SUBDIRS = \
- morph \
dmorph \
imorph \
vmorph