1. 15 Sep, 2011 2 commits
  2. 14 Sep, 2011 9 commits
    • Roland Levillain's avatar
      Merge branch 'next' into next-next · 7b475d5b
      Roland Levillain authored
      Conflicts:
      	ChangeLog
      	milena/ChangeLog
      7b475d5b
    • Roland Levillain's avatar
      Merge branch 'master' into next-next · 6342ded2
      Roland Levillain authored
      Conflicts:
      	milena/ChangeLog
      6342ded2
    • Roland Levillain's avatar
      Address some errors reported by clang. · 2da2a4a8
      Roland Levillain authored
      	* mln/data/fill.hh (mln::data::internal::fill_dispatch): Move this
      	function after the routines it calls.
      2da2a4a8
    • Roland Levillain's avatar
      Address clang's warnings. · 392e46d0
      Roland Levillain authored
      	* mln/algebra/h_vec.hh,
      	* mln/core/image/dmorph/sub_image.hh,
      	* mln/core/internal/pixel_impl.hh,
      	* mln/core/site_set/box.hh,
      	* mln/core/site_set/p_array.hh,
      	* mln/metal/vec.hh,
      	* mln/pw/internal/image_base.hh,
      	* mln/topo/adj_higher_face_iter.hh,
      	* mln/topo/adj_lower_face_iter.hh,
      	* mln/topo/algebraic_face.hh,
      	* mln/topo/face.hh,
      	* mln/topo/face_data.hh:
      	Use `class' and `struct' uniformly in declarations and
      	definitions.
      	* mln/convert/impl/from_double_to_value.hh,
      	* mln/convert/impl/from_float_to_value.hh,
      	* mln/convert/impl/from_int_to_value.hh,
      	* mln/core/image/complex_window_piter.hh,
      	* mln/core/point.hh,
      	* mln/opt/element.hh,
      	* mln/value/lut_vec.hh:
      	Comment out unused arguments.
      	* mln/topo/complex.hh [NDEBUG]:	Avoid a warning about an unused
      	variable.
      392e46d0
    • Roland Levillain's avatar
      Update tests/core/image/graph_image. · 93e65faa
      Roland Levillain authored
      	* tests/core/image/graph_image.cc (main): Actually print the
      	graph.
      	Update comments.
      93e65faa
    • Roland Levillain's avatar
      Make SCRIBO's copyright headers uniform. · 6fa9f281
      Roland Levillain authored
      	* tests/data.hh.in: Here.
      6fa9f281
    • Roland Levillain's avatar
      Make Milena's copyright headers uniform. · 7a285417
      Roland Levillain authored
      	* apps/mesh-segm-skel/io.hh,
      	* apps/mesh-segm-skel/mesh-complex-max-curv-segm.cc,
      	* apps/mesh-segm-skel/mesh-complex-max-curv.cc,
      	* apps/mesh-segm-skel/mesh-complex-segm.cc,
      	* apps/mesh-segm-skel/mesh-complex-skel.cc,
      	* apps/mesh-segm-skel/mesh-max-curv.cc,
      	* apps/mesh-segm-skel/mesh-pinv-curv.cc,
      	* apps/mesh-segm-skel/mesh-segm.cc,
      	* apps/mesh-segm-skel/mesh-skel.cc,
      	* apps/mesh-segm-skel/off-to-vtk-bin.cc,
      	* apps/mesh-segm-skel/save_bin_alt.hh,
      	* apps/mesh-segm-skel/trimesh/misc.hh,
      	* apps/papers/levillain.09.ismm/complex.cc,
      	* apps/papers/levillain.09.ismm/image2d.cc,
      	* doc/benchmark/canvas.cc,
      	* doc/benchmark/median/median_bench.cc,
      	* doc/benchmark/morpho/erosion.cc,
      	* doc/examples/trash/erosion.cc,
      	* doc/examples/trash/graph.cc,
      	* doc/examples/trash/labeling_algo.cc,
      	* doc/examples/trash/mk_graph.cc,
      	* doc/oldies/2008__tour1.cc,
      	* doc/oldies/2008__tour1_extra.cc,
      	* doc/oldies/2008__tour2.cc,
      	* doc/oldies/2008__tour3.cc,
      	* doc/tools/sample_utils.hh,
      	* mln/morpho/watershed/topological.hh,
      	* trash/bgraph_image.cc,
      	* trash/bgraph_image.hh,
      	* trash/bgraph_psite.hh,
      	* trash/boost_graph.cc,
      	* trash/boost_graph.hh,
      	* trash/boost_graph_access.hh,
      	* trash/boost_graph_property.hh,
      	* trash/boost_graph_structure.hh,
      	* trash/clock_neighb.hh,
      	* trash/clock_neighb2d.cc,
      	* trash/clock_neighb2d.hh,
      	* trash/clock_neighb2d_bis.cc,
      	* trash/display_color_pretty.cc,
      	* trash/display_color_pretty.hh,
      	* trash/display_remove.hh,
      	* trash/display_save.hh,
      	* trash/display_save_and_show.hh,
      	* trash/display_show.cc,
      	* trash/display_show.hh,
      	* trash/fi_adaptor.cc,
      	* trash/fi_adaptor.hh,
      	* trash/graph_image.hh,
      	* trash/line_graph_image.hh,
      	* 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/neighb_get.hh,
      	* trash/neighb_image.cc,
      	* trash/neighb_image.hh,
      	* trash/obased_rle_encode.hh,
      	* trash/obased_rle_image.cc,
      	* trash/obased_rle_image.hh,
      	* trash/p_bgraph.cc,
      	* trash/p_bgraph.hh,
      	* trash/p_bgraph_piter.hh,
      	* trash/rle_encode.hh,
      	* trash/rle_image.cc,
      	* trash/rle_image.hh,
      	* trash/save_and_show.cc,
      	* trash/sparse_encode.hh,
      	* trash/sparse_image.cc,
      	* trash/sparse_image.hh,
      	* trash/t_image.cc,
      	* trash/t_image.hh,
      	* trash/to_tiles.cc,
      	* trash/to_tiles.hh,
      	* trash/translate_image.cc,
      	* trash/translate_image.hh,
      	* trash/value_enc_image.cc,
      	* trash/value_enc_image.hh,
      	* trash/value_encode.hh:
      	Here.
      7a285417
    • Roland Levillain's avatar
      Clean up milena/ChangeLog. · bcc4cb81
      Roland Levillain authored
      bcc4cb81
    • Roland Levillain's avatar
      Fix the distcleancheck target. · d75d3264
      Roland Levillain authored
      	* tests/binarization/Makefile.am (MOSTLYCLEANFILES): New.
      	Add res.pbm.
      d75d3264
  3. 13 Sep, 2011 4 commits
  4. 12 Sep, 2011 8 commits
  5. 10 Sep, 2011 2 commits
    • Roland Levillain's avatar
      Fix compilation dependencies of unit tests in Scribo. · c760a8e9
      Roland Levillain authored
      	* tests/unit_test/Makefile.am (COND_TESTS):
      	Add cond_tests_magickxx, cond_tests_magickxx_qt and
      	cond_tests_magickxx_tesseract.
      	Remove cond_tests_qt_tesseract_tiff.
      	* tests/unit_test/cond_tests_magickxx,
      	* tests/unit_test/cond_tests_magickxx_qt,
      	* tests/unit_test/cond_tests_magickxx_tesseract:
      	New.
      	* tests/unit_test/cond_tests_qt_tesseract_tiff: Remove (empty)
      	file.
      	* tests/unit_test/cond_tests_magickxx_tesseract_tiff: Add
      	scribo/toolchain/content_in_doc.hh.
      	* tests/unit_test/cond_tests_qt: Remove
      	scribo/io/xml/internal/full_xml_visitor.hh and
      	scribo/io/xml/load.hh.
      	* tests/unit_test/cond_tests_tesseract_tiff: Remove.
      	scribo/toolchain/content_in_doc.hh.
      	* tests/unit_test/cond_tests_magickxx_qt_tesseract_tiff:
      	Remove empty line.
      	* tests/unit_test/unit-tests.mk: Regen.
      c760a8e9
    • Roland Levillain's avatar
      Fix compilation dependencies in Scribo. · 4ff49763
      Roland Levillain authored
      	* src/contest/DAE-2011/Makefile.am
      	(content_in_hdoc_dae_CPPFLAGS, content_in_doc_dae_CPPFLAGS)
      	* src/contest/hdlac-2011/Makefile.am
      	(content_in_hdoc_hdlac_CPPFLAGS):
      	Add $(MAGICKXX_CPPFLAGS).
      	* src/debug/Makefile.am
      	(noinst_PROGRAMS): Move show_lines_boldness...
      	(noinst_PROGRAMS) [HAVE_MAGICKXX, HAVE_TESSERACT]: ...here.
      	(show_lines_boldness_SOURCES): Remove.
      	(show_lines_boldness_SOURCES)
      	(show_lines_boldness_CPPFLAGS)
      	(show_lines_boldness_LDFLAGS)
      	[HAVE_MAGICKXX, HAVE_TESSERACT]: New.
      	(show_text_lines_CPPFLAGS)
      	(show_text_lines_wo_seps_CPPFLAGS)
      	[HAVE_MAGICKXX, HAVE_QT, HAVE_TESSERACT]:
      	Add $(TESSERACT_CPPFLAGS).
      4ff49763
  6. 09 Sep, 2011 1 commit
  7. 08 Sep, 2011 8 commits
  8. 07 Sep, 2011 3 commits
  9. 06 Sep, 2011 3 commits