30 Apr
2013
30 Apr
'13
11:51 a.m.
This is a merge commit message of the following branches:
Merge: cc0d930 493bf10
Conflicts:
scribo/ChangeLog
milena/ChangeLog | 9 +
milena/mln/data/fill_without_localization.hh | 364 ++++++++++++++++++++
milena/tests/data/Makefile.am | 3 +-
milena/tests/data/fill_without_localization.cc | 81 +++++
scribo/ChangeLog | 14 +
scribo/scribo/binarization/sauvola_ms_split.hh | 4 +
.../toolchain/internal/text_in_picture_functor.hh | 22 +-
scribo/src/text_in_picture.cc | 22 +-
8 files changed, 498 insertions(+), 21 deletions(-)
diff --cc milena/ChangeLog
index d5bb9fd,ec9e11e..8a0bc09
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@@ -1,511 -1,14 +1,520 @@@
+2013-04-24 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Handle 16 bits value types with io::magick.
+
+ * mln/io/magick/load.hh,
+ * mln/io/magick/save.hh: Enable portions of code supporting 16bits
+ images if GraphicsMagick supports it.
+
+2013-04-24 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Relax conversion dispatch.
+
+ * mln/convert/impl/from_value_to_value.hh: Disable dispatch and
+ rely on from_to().
+
+ * mln/value/rgb.hh: Add a from_to_() overload to handle conversion
+ from rgb<n> to rgb<m>.
+
+2013-04-23 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * tests/io/magick/save.cc: Kill compilation warnings.
+
+2013-04-23 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add save options to magick::save.
+
+ * mln/io/magick/save.hh: Add save_options structure.
+
+2013-04-23 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add a new routine to get image headers thanks to GraphicsMagick.
+
+ * mln/io/magick/get_header.hh,
+ * mln/tests/io/magick/get_header.cc: New
+
+ * mln/tests/io/magick/Makefile.am: New target.
+
+2013-04-29 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * tests/fun/Makefile.am: Remove duplicate subdir entry for v2v.
+
+2013-04-29 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Swap arguments in data::convert.
+
+ * mln/data/convert.hh: Here.
+
+ * apps/morphers/iz.cc,
+ * demos/inter_pixel/inter_pixel.cc,
+ * doc/examples/trash/graph.cc,
+ * doc/mln/convert.dox,
+ * mln/debug/superpose.hh,
+ * mln/morpho/watershed/superpose.hh,
+ * mln/world/binary_2d/subsample.hh,
+ * tests/data/compute_in_window.cc,
+ * tests/data/convert.cc: Update calls to data::convert.
+
+2013-04-29 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * doc/mln/io/io.dox: List the required dependencies for each I/O
+ type.
+
+2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/core/internal/image_base.hh: Add more documentation for
+ destroy() method.
+
+2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * doc/mln/topo/topo.dox: New. Introduce mathematical topology
+ module.
+
+2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add more "See also" statement in function documentation.
+
+ * mln/fun/v2b/always_false.hh,
+ * mln/fun/v2b/always_true.hh,
+ * mln/fun/v2b/lnot.hh,
+ * mln/fun/v2b/threshold_ge.hh,
+ * mln/fun/v2b/threshold_le.hh,
+ * mln/fun/v2v/abs.hh,
+ * mln/fun/v2v/all_to.hh,
+ * mln/fun/v2v/array.hh,
+ * mln/fun/v2v/cast.hh,
+ * mln/fun/v2v/ch_function_value.hh,
+ * mln/fun/v2v/component.hh,
+ * mln/fun/v2v/convert.hh,
+ * mln/fun/v2v/dec.hh,
+ * mln/fun/v2v/enc.hh,
+ * mln/fun/v2v/hsl_to_rgb.hh,
+ * mln/fun/v2v/id.hh,
+ * mln/fun/v2v/inc.hh,
+ * mln/fun/v2v/index_of_value.hh,
+ * mln/fun/v2v/linear.hh,
+ * mln/fun/v2v/mahalanobis.hh,
+ * mln/fun/v2v/norm.hh,
+ * mln/fun/v2v/projection.hh,
+ * mln/fun/v2v/qt_rgb_to_int_u.hh,
+ * mln/fun/v2v/rgb8_to_rgbn.hh,
+ * mln/fun/v2v/rgb_to_hsl.hh,
+ * mln/fun/v2v/rgb_to_int_u.hh,
+ * mln/fun/v2v/rgb_to_luma.hh,
+ * mln/fun/v2v/round.hh,
+ * mln/fun/v2v/round_sat.hh,
+ * mln/fun/v2v/saturate.hh,
+ * mln/fun/v2v/value_at_index.hh,
+ * mln/fun/v2v/wrap.hh,
+ * mln/fun/vv2b/eq.hh,
+ * mln/fun/vv2b/ge.hh,
+ * mln/fun/vv2b/gt.hh,
+ * mln/fun/vv2b/implies.hh,
+ * mln/fun/vv2b/le.hh,
+ * mln/fun/vv2b/lt.hh,
+ * mln/fun/vv2v/diff_abs.hh,
+ * mln/fun/vv2v/land.hh,
+ * mln/fun/vv2v/land_not.hh,
+ * mln/fun/vv2v/lor.hh,
+ * mln/fun/vv2v/lxor.hh,
+ * mln/fun/vv2v/max.hh,
+ * mln/fun/vv2v/min.hh,
+ * mln/fun/vv2v/vec.hh: Here.
+
+2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/make/relabelfun.hh: Fix bad variable replacement.
+
+2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * doc/Doxyfile.in: Enable BRIEF_MEMBER_DESC.
+
+2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * doc/split-examples.mk: Regen.
+
+2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/core/concept/function.hh: Make Function_vv2b inherit from
+ Function_vv2v.
+
+2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add function module in Milena documentation.
+
+ * doc/mln/fun/fun.dox: Add new documentation groups.
+
+ * doc/mln/main.dox: Include a figure of the function hierarchy.
+
+ * mln/fun/n2v/white_gaussian.hh,
+ * mln/fun/v2v/abs.hh,
+ * mln/fun/v2v/cast.hh,
+ * mln/fun/v2v/ch_function_value.hh,
+ * mln/fun/v2v/component.hh,
+ * mln/fun/v2v/convert.hh,
+ * mln/fun/v2v/dec.hh,
+ * mln/fun/v2v/enc.hh,
+ * mln/fun/v2v/hsl_to_rgb.hh,
+ * mln/fun/v2v/id.hh,
+ * mln/fun/v2v/inc.hh,
+ * mln/fun/v2v/linear.hh,
+ * mln/fun/v2v/norm.hh,
+ * mln/fun/v2v/projection.hh,
+ * mln/fun/v2v/qt_rgb_to_int_u.hh,
+ * mln/fun/v2v/rgb8_to_rgbn.hh,
+ * mln/fun/v2v/rgb_to_hsl.hh,
+ * mln/fun/v2v/rgb_to_int_u.hh,
+ * mln/fun/v2v/rgb_to_luma.hh,
+ * mln/fun/v2v/round.hh,
+ * mln/fun/v2v/round_sat.hh,
+ * mln/fun/v2v/saturate.hh,
+ * mln/fun/v2v/wrap.hh,
+ * mln/fun/v2w2v/all.hh,
+ * mln/fun/v2w2v/cos.hh,
+ * mln/fun/v2w_w2v/all.hh,
+ * mln/fun/v2w_w2v/norm.hh,
+ * mln/fun/vv2b/all.hh,
+ * mln/fun/vv2b/eq.hh,
+ * mln/fun/vv2b/ge.hh,
+ * mln/fun/vv2b/gt.hh,
+ * mln/fun/vv2b/implies.hh,
+ * mln/fun/vv2b/le.hh,
+ * mln/fun/vv2b/lt.hh: Move to their respective function group.
+
+2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * doc/mln/convert.dox: Fix a typo.
+
+2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * doc/Makefile.am: Do not regenerate non-generated images.
+
+2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add a new figure in Milena documentation.
+
+ * doc/img/function_hierarchy.png,
+ * doc/img/src/function_hierarchy.dia: New.
+
+2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Move fun::i2v, fun::stat and fun::v2i in fun::v2v.
+
+ * mln/fun/i2v/all_to.hh,
+ * mln/fun/i2v/array.hh,
+ * mln/fun/i2v/value_at_index.hh,
+ * mln/fun/stat/mahalanobis.hh,
+ * mln/fun/v2i/index_of_value.hh,
+ * tests/fun/i2v/all_to.cc,
+ * tests/fun/i2v/array.cc,
+ * tests/fun/i2v/value_at_index.cc,
+ * tests/fun/stat/mahalanobis.cc,
+ * tests/fun/v2i/index_of_value.cc: Move...
+
+ * mln/fun/v2v/all_to.hh,
+ * mln/fun/v2v/array.hh,
+ * mln/fun/v2v/index_of_value.hh,
+ * mln/fun/v2v/mahalanobis.hh,
+ * mln/fun/v2v/value_at_index.hh,
+ * tests/fun/v2v/all_to.cc,
+ * tests/fun/v2v/array.cc,
+ * tests/fun/v2v/index_of_value.cc,
+ * tests/fun/v2v/mahalanobis.cc,
+ * tests/fun/v2v/value_at_index.cc,
+ * tests/fun/x2x/composed.cc,
+ * tests/fun/x2x/translation.cc: ... here.
+
+ * mln/fun/stat/all.hh,
+ * mln/fun/i2v/essential.hh,
+ * mln/fun/i2v/all.hh,
+ * mln/fun/v2i/all.hh,
+ * tests/fun/i2v/Makefile.am,
+ * tests/fun/stat/Makefile.am,
+ * tests/fun/v2i/Makefile.am: Remove.
+
+ * tests/fun/Makefile.am: Remove deprecated subdirs.
+
+ * tests/fun/v2v/Makefile.am: Add new targets.
+
+ * apps/papers/levillain.09.ismm/classif-graph.cc,
+ * doc/examples/graph-data.cc,
+ * doc/examples/split/graph-data-4.cc.raw,
+ * doc/examples/trash/graph.cc,
+ * doc/examples/trash/mk_graph.cc,
+ * doc/examples/trash/tuto_bis.cc,
+ * headers.mk,
+ * mln/accu/label_used.hh,
+ * mln/accu/stat/var.hh,
+ * mln/algebra/vec.hh,
+ * mln/core/image/edge_image.hh,
+ * mln/core/image/image1d.hh,
+ * mln/core/image/image2d.hh,
+ * mln/core/image/image3d.hh,
+ * mln/core/image/vertex_image.hh,
+ * mln/core/internal/labeled_image_base.hh,
+ * mln/core/routine/init.hxx,
+ * mln/core/site_set/p_array.hh,
+ * mln/core/window.hh,
+ * mln/data/transform.spe.hh,
+ * mln/fun/all.hh,
+ * mln/fun/essential.hh,
+ * mln/fun/x2x/translation.hh,
+ * mln/histo/point_from_value.hh,
+ * mln/labeling/colorize.hh,
+ * mln/labeling/mean_values.hh,
+ * mln/labeling/pack.hh,
+ * mln/labeling/relabel.hh,
+ * mln/make/edge_image.hh,
+ * mln/make/p_edges_with_mass_centers.hh,
+ * mln/make/p_vertices_with_mass_centers.hh,
+ * mln/make/relabelfun.hh,
+ * mln/make/voronoi.hh,
+ * mln/metal/vec.hh,
+ * mln/morpho/line_gradient.hh,
+ * mln/trait/ch_function_value.hh,
+ * mln/util/array.hh,
+ * mln/value/lut_vec.hh,
+ * mln/win/ball.hh,
+ * tests/algebra/h_mat.cc,
+ * tests/algebra/mat.cc,
+ * tests/algebra/vec2.cc,
+ * tests/core/image/edge_image.cc,
+ * tests/core/image/graph_image.cc,
+ * tests/core/image/imorph/labeled_image.cc,
+ * tests/core/image/line_graph_image.cc,
+ * tests/core/image/vertex_and_edge_image.cc,
+ * tests/core/image/vertex_image.cc,
+ * tests/core/other/graph_elt_neighborhood.cc,
+ * tests/core/other/graph_elt_window.cc,
+ * tests/core/other/point_set_compatibility.cc,
+ * tests/core/site_set/p_vertices.cc,
+ * tests/draw/graph.cc,
+ * tests/graph/labeling.cc,
+ * tests/make/p_edges_with_mass_centers.cc,
+ * tests/make/p_vertices_with_mass_centers.cc,
+ * tests/morpho/artificial_line_graph_image_wst.cc,
+ * tests/morpho/closing/area_on_vertices.cc,
+ * tests/morpho/graph_image_morpho.cc,
+ * tests/morpho/graph_image_wst.cc,
+ * tests/morpho/lena_line_graph_image_wst1.cc,
+ * tests/morpho/lena_line_graph_image_wst2.cc,
+ * tests/morpho/line_graph_image_morpho.cc,
+ * tests/morpho/line_graph_image_wst.cc,
+ * tests/morpho/opening/area_on_vertices.cc,
+ * tests/pw/image.cc,
+ * tests/unit_test/unit-tests.mk,
+ * tools/area_flooding.cc: Rename fun::i2v, fun::stat and fun::v2i
+ namespaces to v2v.
+
+2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/core/concept/function.hh: Document function interface for
+ each concept.
+
+2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/core/image/image2d_ffmpeg.hh: Fix compilation issues.
+
+2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/core/image/image2d_ffmpeg.hh: Enable fastest access.
+
+2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/core/image/image2d_ffmpeg.hh: New image type for ffmpeg frames.
+
+2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add support for graylevel images in labeling::blobs.
+
+ * mln/canvas/labeling/blobs.hh: Add a fastest version and make it
+ support graylevel images.
+
+ * mln/labeling/blobs.hh,
+ * mln/labeling/blobs_and_compute.hh: Add support for graylevel images.
+
+ * tests/labeling/blobs.cc,
+ * tests/labeling/blobs_and_compute.cc: Add a test for graylevel images.
+
+ * tests/labeling/Makefile.am: Remove all_blobs target.
+
+ * mln/labeling/all_blobs.hh,
+ * tests/labeling/all_blobs.cc: Remove.
+
+2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/core/internal/pixel_impl.hh: Add change_offset().
+
+2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add a labeling routine working on grayscale images.
+
+ * mln/canvas/labeling/blobs.hh,
+ * mln/labeling/blobs.hh,
+ * mln/labeling/blobs_and_compute.hh: Introduce a new functor
+ method handles().
+
+ * tests/labeling/Makefile.am: Add target.
+
+ * mln/labeling/all_blobs.hh,
+ * tests/labeling/all_blobs.cc: New.
+
+2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Kill Doxygen warnings.
+
+ * mln/data/convert.hh: Add a missing \overload.
+
+ * mln/value/qt/rgb32.hh: Do not force autolink.
+
+2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Specify conversion formulas for rgb to integer conversion
+ functions.
+
+ * mln/fun/v2v/rgb_to_int_u.hh,
+ * mln/fun/v2v/rgb_to_luma.hh: Here.
+
+2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Create sub-modules in image geometry module.
+
+ * doc/mln/geom/geom.dox: Add cropping sub-module.
+
+ * doc/mln/transformation.dox: Add new sub-modules.
+
+ * mln/binarization/threshold.hh: Move to conversion module.
+
+ * mln/geom/crop.hh,
+ * mln/geom/crop_without_localization.hh,
+ * mln/geom/horizontal_symmetry.hh,
+ * mln/geom/rotate.hh,
+ * mln/geom/translate.hh,
+ * mln/geom/vertical_symmetry.hh,
+ * mln/registration/icp.hh,
+ * mln/subsampling/antialiased.hh,
+ * mln/upscaling/art/scale2x.hh,
+ * mln/upscaling/art/scale3x.hh: Move to newly created sub-modules.
+
+2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * doc/mln/convert.dox: Fix typos.
+
+2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add documentation about image conversions.
+
+ * doc/mln/convert.dox: Add examples and explanations.
+
+ * mln/convert/from_to.hh,
+ * mln/convert/to.hh,
+ * mln/convert/to_image.hh,
+ * mln/convert/to_p_array.hh,
+ * mln/convert/to_p_set.hh,
+ * mln/convert/to_qimage.hh,
+ * mln/convert/to_qimage_nocopy.hh,
+ * mln/convert/to_upper_window.hh,
+ * mln/convert/to_window.hh,
+ * mln/data/convert.hh,
+ * mln/fun/v2v/convert.hh,
+ * mln/fun/v2v/hsl_to_rgb.hh,
+ * mln/fun/v2v/qt_rgb_to_int_u.hh,
+ * mln/fun/v2v/rgb8_to_rgbn.hh,
+ * mln/fun/v2v/rgb_to_hsl.hh,
+ * mln/fun/v2v/rgb_to_int_u.hh,
+ * mln/fun/v2v/rgb_to_luma.hh: Add to conversion module.
+
+2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * mln/data/convert.hh: Introduce a new overload taking a
+ conversion function as parameter.
+
+2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Add references to from_to_ overloads in documentation.
+
+ * mln/algebra/h_mat.hh,
+ * mln/algebra/quat.hh,
+ * mln/algebra/vec.hh,
+ * mln/convert/from_to.hh,
+ * mln/convert/impl/from_double_to_value.hh,
+ * mln/convert/impl/from_float_to_value.hh,
+ * mln/convert/impl/from_unsigned_to_value.hh,
+ * mln/core/alias/neighb2d.hh,
+ * mln/core/alias/neighb3d.hh,
+ * mln/core/alias/window1d.hh,
+ * mln/core/alias/window2d.hh,
+ * mln/core/alias/window3d.hh,
+ * mln/core/concept/gpoint.hh,
+ * mln/core/image/#image2d#,
+ * mln/core/image/image1d.hh,
+ * mln/core/image/image2d.hh,
+ * mln/core/image/image3d.hh,
+ * mln/core/mixed_neighb.hh,
+ * mln/core/neighb.hh,
+ * mln/core/w_window.hh,
+ * mln/fun/i2v/array.hh,
+ * mln/histo/array.hh,
+ * mln/util/array.hh,
+ * mln/util/object_id.hh,
+ * mln/value/hsl.hh,
+ * mln/value/int_u.hh,
+ * mln/value/label.hh,
+ * mln/value/qt/rgb32.hh,
+ * mln/value/rgb.hh: Add to from_to_ group.
+
+2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Explain how to iterate over an image in tutorial.
+
+ * doc/examples/split/tuto3_rw_image-3.cc.raw,
+ * doc/examples/split/tuto3_rw_image-4.cc.raw,
+ * doc/examples/split/tuto3_rw_image-5.cc.raw,
+ * doc/examples/split/tuto3_rw_image-6.cc.raw,
+ * doc/examples/split/tuto3_rw_image-7.cc.raw,
+ * doc/examples/split/tuto3_rw_image-8.cc.raw: Regen.
+
+ * doc/examples/tuto3_rw_image.cc: Add an example with iterators.
+
+ * doc/tutorial.tex: Add more explanations on iterators.
+
+2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Introduce image transformation module in documentation.
+
+ * doc/mln/main.dox: Create new group.
+
+ * mln/geom/crop.hh,
+ * mln/geom/crop_without_localization.hh,
+ * mln/geom/horizontal_symmetry.hh,
+ * mln/geom/rotate.hh,
+ * mln/geom/translate.hh,
+ * mln/geom/vertical_symmetry.hh,
+ * mln/registration/icp.hh,
+ * mln/subsampling/antialiased.hh,
+ * mln/upscaling/art/scale2x.hh,
+ * mln/upscaling/art/scale3x.hh: move to this new group.
+
+2013-04-19 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Make template parameter name more consistant with naming
+ conventions.
+
+ * mln/core/image/image1d.hh,
+ * mln/core/image/image2d.hh,
+ * mln/core/image/image3d.hh: Here.
+
2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr>
+ Add data::fill_without_localization.
+
+ * mln/data/fill_without_localization.hh,
+ * tests/data/fill_without_localization.cc: New.
+
+ * tests/data/Makefile.am: Add a new target.
+
+ 2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr>
+
* doc/mln/convert.dox: Fix from_to_ module name.
2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr>
diff --cc scribo/ChangeLog
index 0cf0bda,90de65c..a68399f
--- a/scribo/ChangeLog
+++ b/scribo/ChangeLog
@@@ -1,87 -1,17 +1,101 @@@
+ 2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * scribo/binarization/sauvola_ms_split.hh: Make use of all arguments.
+
+ 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * scribo/src/text_in_picture.cc: Add more debug options fix return
+ value in main().
+
+ 2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * scribo/toolchain/internal/text_in_picture_functor.hh: Rename
+ debug outputs.
+
+2013-04-29 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Swap arguments of data::convert in Scribo.
+
+ * scribo/debug/alignment_decision_image.hh,
+ * scribo/debug/bboxes_enlarged_image.hh,
+ * scribo/debug/bboxes_image.hh,
+ * scribo/debug/char_space_image.hh,
+ * scribo/debug/decision_image.hh,
+ * scribo/debug/line_info_image.hh,
+ * scribo/debug/linked_bboxes_image.hh,
+ * scribo/debug/links_decision_image.hh,
+ * scribo/debug/links_image.hh,
+ * scribo/debug/looks_like_a_text_line_image.hh,
+ * scribo/debug/mean_and_base_lines_image.hh,
+ * scribo/debug/save_table_image.hh,
+ * scribo/primitive/extract/alignments.hh,
+ * scribo/primitive/extract/separators_nonvisible.hh,
+ * scribo/text/extract_paragraphs.hh,
+ * scribo/text/extract_paragraphs_hdoc.hh,
+ * scribo/toolchain/internal/text_in_doc_preprocess_functor.hh,
+ * scribo/toolchain/internal/text_in_picture_functor.hh,
+ * src/debug/show_lines_boldness.cc,
+ * src/debug/show_links_left_right_links_validation.cc,
+ * src/debug/show_links_several_right_overlap.cc,
+ * src/debug/show_links_single_down.cc,
+ * src/debug/show_links_single_left.cc,
+ * src/debug/show_links_single_left_dmax_ratio.cc,
+ * src/debug/show_links_single_right.cc,
+ * src/debug/show_links_single_right_dmax_ratio.cc,
+ * src/debug/show_links_single_up.cc,
+ * src/debug/show_objects_large.cc,
+ * src/debug/show_objects_small.cc,
+ * src/debug/show_objects_thick.cc,
+ * src/debug/show_objects_thin.cc,
+ * src/debug/show_text_lines.cc,
+ * src/debug/show_text_lines_wo_seps.cc,
+ * src/filter/objects_large.cc,
+ * src/filter/objects_small.cc,
+ * src/filter/objects_thick.cc,
+ * src/filter/objects_thin.cc,
+ * src/filter/objects_with_holes.cc,
+ * src/filter/objects_with_holes_pgm.cc,
+ * src/non_text_components.cc,
+ * src/preprocessing/preprocess.cc,
+ * src/primitive/extract/alignments.cc,
+ * src/primitive/extract/discontinued_hlines.cc,
+ * src/primitive/extract/discontinued_lines.cc,
+ * src/primitive/extract/discontinued_vlines.cc,
+ * src/primitive/extract/thick_hlines.cc,
+ * src/primitive/extract/thick_vlines.cc,
+ * src/primitive/group/group_from_rag.cc,
+ * src/table/rebuild_opening.cc,
+ * src/table/rebuild_rank.cc,
+ * src/util/component_precise_outline.cc,
+ * tests/primitive/extract/alignments.cc: Here.
+
+2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * doc/Doxyfile.in: Disable QHP generation.
+
+2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ * src/text_in_picture.cc: Add more descriptions in usage.
+
+2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr>
+
+ Rename fun::i2v, fun::stat and fun::v2i to fun::v2v.
+
+ * scribo/postprocessing/fill_object_holes.hh,
+ * scribo/preprocessing/denoise_bg.hh,
+ * scribo/preprocessing/denoise_fg.hh,
+ * scribo/primitive/extract/non_text_kmean.hh,
+ * scribo/primitive/group/apply.hh,
+ * scribo/primitive/group/from_graph.hh,
+ * scribo/primitive/group/from_single_link.hh,
+ * scribo/primitive/regroup/from_single_left_link.hh,
+ * scribo/primitive/regroup/from_single_left_link_wrt_h_ratio.hh,
+ * scribo/core/line_set.hh,
+ * scribo/core/paragraph_set.hh,
+ * scribo/filter/object_groups_with_holes.hh,
+ * scribo/filter/objects_with_holes.hh,
+ * scribo/fun/v2b/label_to_bool.hh: Here.
+
2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr>
* src/primitive/extract/lines_pattern.cc: Fix description.
diff --cc scribo/scribo/toolchain/internal/text_in_picture_functor.hh
index 77b6581,cc7921f..211422b
--- a/scribo/scribo/toolchain/internal/text_in_picture_functor.hh
+++ b/scribo/scribo/toolchain/internal/text_in_picture_functor.hh
@@@ -437,9 -436,9 +437,9 @@@ namespace scrib
scribo::debug::logger().log_image(scribo::debug::AuxiliaryResults,
decision_image,
- "group_and_object_image.ppm");
+ "group_and_object_image");
- decision_image = data::convert(value::rgb8(), input);
+ decision_image = data::convert(input, value::rgb8());
scribo::draw::bounding_boxes(decision_image,
raw_group_image, literal::blue);
hooks/post-receive
--
Olena, a generic and efficient image processing platform