https://svn.lrde.epita.fr/svn/oln/trunk/milena
Index: ChangeLog from Thierry Geraud thierry.geraud@lrde.epita.fr
Move to trash non-up-to-date image types.
* mln/core/image/bgraph_image.hh, * mln/core/image/bgraph_psite.hh, * mln/core/image/mono_obased_rle_encode.hh, * mln/core/image/mono_obased_rle_image.hh, * mln/core/image/mono_rle_encode.hh, * mln/core/image/mono_rle_image.hh, * mln/core/image/obased_rle_encode.hh, * mln/core/image/obased_rle_image.hh, * mln/core/image/rle_encode.hh, * mln/core/image/rle_image.hh, * mln/core/image/sparse_encode.hh, * mln/core/image/sparse_image.hh, * mln/core/image/value_enc_image.hh, * mln/core/image/value_encode.hh, * tests/core/image/bgraph_image.cc, * tests/core/image/fi_adaptor.cc, * tests/core/image/mono_obased_rle_image.cc, * tests/core/image/mono_rle_image.cc, * tests/core/image/obased_rle_image.cc, * tests/core/image/rle_image.cc, * tests/core/image/sparse_image.cc, * tests/core/image/value_enc_image.cc: Move...
* trash/bgraph_image.cc, * trash/bgraph_image.hh, * trash/bgraph_psite.hh, * trash/fi_adaptor.cc, * trash/mono_obased_rle_encode.hh, * trash/mono_obased_rle_image.cc, * trash/mono_obased_rle_image.hh, * trash/mono_rle_encode.hh, * trash/mono_rle_image.cc, * trash/mono_rle_image.hh, * trash/obased_rle_encode.hh, * trash/obased_rle_image.cc, * trash/obased_rle_image.hh, * trash/rle_encode.hh, * trash/rle_image.cc, * trash/rle_image.hh, * trash/sparse_encode.hh, * trash/sparse_image.cc, * trash/sparse_image.hh, * trash/value_enc_image.cc, * trash/value_enc_image.hh, * trash/value_encode.hh: ...here.
* tests/core/image/Makefile.am: Remove dead lines. De-activate code for freeimage since fi_adaptor was trashed.
* mln/core/site_set/status.txt, * mln/core/image/status.txt: Remove; obsolete.
Makefile.am | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-)
Index: tests/core/image/Makefile.am --- tests/core/image/Makefile.am (revision 3930) +++ tests/core/image/Makefile.am (working copy) @@ -8,7 +8,6 @@ imorph \ vmorph
-##FIXME: re-enable tests check_PROGRAMS = \ complex_image \ edge_image \ @@ -20,19 +19,9 @@ line_graph_image \ vertex_image
-## bgraph_image \ -## mono_obased_rle_image \ -## mono_rle_image \ -## obased_rle_image \ -## rle_image \ -## sparse_image \ -## value_enc_image - -
noinst_HEADERS = complex_image.hh
-##bgraph_image_SOURCES = bgraph_image.cc complex_image_SOURCES = complex_image.cc graph_image_SOURCES = graph_image.cc flat_image_SOURCES = flat_image.cc @@ -40,21 +29,15 @@ image2d_SOURCES = image2d.cc image3d_SOURCES = image3d.cc line_graph_image_SOURCES = line_graph_image.cc -##mono_obased_rle_image_SOURCES = mono_obased_rle_image.cc -##mono_rle_image_SOURCES = mono_rle_image.cc -##obased_rle_image_SOURCES = obased_rle_image.cc -##rle_image_SOURCES = rle_image.cc -##sparse_image_SOURCES = sparse_image.cc -##value_enc_image_SOURCES = value_enc_image.cc vertex_image_SOURCES = vertex_image.cc edge_image_SOURCES = edge_image.cc
# Tests depending on the FreeImagePlus library. -if FREEIMAGEPLUS - check_PROGRAMS += fi_adaptor - fi_adaptor_SOURCES = fi_adaptor.cc - fi_adaptor_CPPFLAGS = $(AM_CPPFLAGS) $(FREEIMAGEPLUS_CPPFLAGS) - fi_adaptor_LDFLAGS = $(AM_LDFLAGS) $(FREEIMAGEPLUS_LDFLAGS) -endif +#if FREEIMAGEPLUS +# check_PROGRAMS += fi_adaptor +# fi_adaptor_SOURCES = fi_adaptor.cc +# fi_adaptor_CPPFLAGS = $(AM_CPPFLAGS) $(FREEIMAGEPLUS_CPPFLAGS) +# fi_adaptor_LDFLAGS = $(AM_LDFLAGS) $(FREEIMAGEPLUS_LDFLAGS) +#endif
TESTS = $(check_PROGRAMS)
-
Thierry Geraud