[Olena-patches] olena: olena-2.0-660-g6a4f5c6 Merge branch 'exp/newdoc' into exp/TL

This is a merge commit message of the following branches: Merge: 57e5da7 f4024c0 Conflicts: milena/ChangeLog milena/ChangeLog | 205 ++++ milena/doc/Doxyfile.in | 3 +- milena/doc/examples-outputs.mk | 54 + milena/doc/examples.dox | 12 +- milena/doc/examples.mk | 3 + milena/doc/examples/extended_image.cc | 51 + milena/doc/examples/sub_image.cc | 46 + milena/doc/examples/transformed_image.cc | 31 + milena/doc/figures.mk | 13 + milena/doc/figures/sub_image-1.pbm | 5 + milena/doc/figures/sub_image-2.pbm | Bin 0 -> 115 bytes milena/doc/mln/core/alias/box1d.dox | 4 +- milena/doc/mln/core/alias/box2d.dox | 4 +- milena/doc/mln/core/alias/box2d_h.dox | 4 +- milena/doc/mln/core/alias/box3d.dox | 4 +- milena/doc/mln/core/image/images.dox | 272 +++++- milena/doc/mln/core/image/morphers.dox | 9 +- milena/doc/mln/core/macros.dox | 79 ++ milena/doc/mln/labeling/labeling.dox | 39 +- milena/doc/mln/literal/literal.dox | 14 + milena/doc/mln/main.dox | 6 + milena/doc/mln/value/value.dox | 22 +- milena/doc/outputs.mk | 3 + milena/doc/programs-examples.mk | 9 +- milena/doc/ref-guide.tex | 37 +- milena/mln/algebra/vec.hh | 15 + milena/mln/core/concept/image.hh | 63 +- milena/mln/core/concept/iterator.hh | 47 +- milena/mln/core/concept/neighborhood.hh | 2 +- milena/mln/core/concept/site_set.hh | 2 +- milena/mln/core/concept/value.hh | 2 +- milena/mln/core/concept/window.hh | 2 +- milena/mln/core/image/dmorph/extended.hh | 41 +- milena/mln/core/image/dmorph/sub_image.hh | 37 +- milena/mln/core/image/dmorph/transformed_image.hh | 33 +- milena/mln/core/macros.hh | 1174 ++++++++++++++++++++- milena/mln/core/pixter1d.hh | 2 - milena/mln/core/routine/duplicate.hh | 24 +- milena/mln/core/site_set/box.hh | 51 + milena/mln/core/var.hh | 26 +- milena/mln/data/convert.hh | 1 - milena/mln/data/transform.hh | 51 +- milena/mln/debug/trace.hh | 18 + milena/mln/fun/p2b/antilogy.hh | 16 +- milena/mln/fun/p2b/big_chess.hh | 30 +- milena/mln/fun/p2b/chess.hh | 22 +- milena/mln/fun/p2b/has.hh | 12 +- milena/mln/fun/p2b/tautology.hh | 15 +- milena/mln/fun/p2p/fold.hh | 16 +- milena/mln/fun/p2p/mirror.hh | 29 +- milena/mln/fun/p2p/translation.hh | 19 +- milena/mln/fun/p2v/elifs.hh | 16 +- milena/mln/fun/p2v/iota.hh | 23 +- milena/mln/fun/p2v/ternary.hh | 23 +- milena/mln/fun/x2v/bilinear.hh | 12 +- milena/mln/fun/x2v/l1_norm.hh | 8 +- milena/mln/fun/x2v/nneighbor.hh | 67 +- milena/mln/fun/x2v/trilinear.hh | 11 +- milena/mln/io/pdf/load.hh | 12 +- milena/mln/literal/black.hh | 10 +- milena/mln/literal/colors.hh | 89 ++- milena/mln/literal/identity.hh | 10 +- milena/mln/literal/max.hh | 10 +- milena/mln/literal/min.hh | 9 +- milena/mln/literal/one.hh | 10 +- milena/mln/literal/origin.hh | 10 +- milena/mln/literal/white.hh | 8 +- milena/mln/literal/zero.hh | 11 +- milena/mln/make/vec.hh | 7 +- milena/mln/trait/value_.hh | 87 ++- milena/mln/value/qt/rgb32.hh | 2 +- 71 files changed, 2839 insertions(+), 275 deletions(-) diff --cc milena/ChangeLog index 8a0bc09,89d615b..0b4eefd --- a/milena/ChangeLog +++ b/milena/ChangeLog @@@ -1,40 -1,208 +1,245 @@@ + 2013-05-13 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + * doc/mln/labeling/labeling.dox: Write general documentation on + labeling. + + 2013-05-13 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + * doc/ref-guide.tex: Mention *_without_localization routines in + reference guide. + + 2013-05-13 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Document sub_image morpher. + + * doc/examples-outputs.mk, + * doc/examples.mk, + * doc/figures.mk, + * doc/outputs.mk, + * doc/programs-examples.mk: Regen. + + * doc/examples.dox: Revamp layout and add link to the new sub_image + example. + + * doc/examples/sub_image.cc, + * doc/outputs/sub_image.txt, + * doc/figures/sub_image-1.pbm, + * doc/figures/sub_image-2.pbm: New. + + * mln/core/image/dmorph/sub_image.hh: Write documentation. + + 2013-04-30 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + * mln/core/routine/duplicate.hh: Document this routine. + + 2013-04-30 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Small fixes in documentation. + + * doc/mln/core/image/morphers.dox: Add a reference to duplicate(). + + * mln/core/pixter1d.hh: Remove \internal commands. + + * mln/data/transform.hh: Improve layout of pseudo-code. + + * mln/io/pdf/load.hh: Remove duplicate '*' in comments. + + 2013-04-30 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Improve documentation of several macros. + + * mln/core/concept/iterator.hh: Document arguments. + + * mln/core/macros.hh: Add more documentation details for iterator + related macros. + + * mln/core/var.hh: Fix typos. + + * mln/debug/trace.hh: Add documentation to mln_trace and + mln_trace_warning. + + * mln/trait/value_.hh: Add documentation to several common macros. + + 2013-04-30 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Fix missing parts of mln::box interface in documentation. + + * doc/mln/core/alias/box1d.dox, + * doc/mln/core/alias/box2d.dox, + * doc/mln/core/alias/box2d_h.dox, + * doc/mln/core/alias/box3d.dox: Make class inherit from box_impl. + + 2013-04-30 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + * mln/core/var.hh: Document mln_VAR(). + + 2013-04-30 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Cross reference algebra::vec and make::vec in their respective + documentation. + + * mln/algebra/vec.hh, + * mln/make/vec.hh: Here. + + 2013-04-30 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Document extended and transformed_image morphers. + + * doc/examples-outputs.mk, + * doc/examples.mk, + * doc/outputs.mk: Regen. + + * doc/examples.dox: Add link to new examples. + + * doc/outputs/extended_image.txt, + * doc/outputs/transformed_image.txt, + * doc/examples/extended_image.cc, + * doc/examples/transformed_image.cc: New. + + * doc/programs-examples.mk: Add new example programs. + + * mln/core/image/dmorph/extended.hh, + * mln/core/image/dmorph/transformed_image.hh: Write documentation + and insert example code. + + * mln/fun/p2p/fold.hh, + * mln/fun/p2p/mirror.hh, + * mln/fun/p2p/translation.hh: Make references to + transformed_image. + + 2013-04-30 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + * mln/core/site_set/box.hh: Add shrink() and to_smaller() members. + + 2013-04-30 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Add a module related to literals. + + * doc/mln/literal/literal.dox: New. + + * mln/literal/black.hh, + * mln/literal/colors.hh, + * mln/literal/identity.hh, + * mln/literal/max.hh, + * mln/literal/min.hh, + * mln/literal/one.hh, + * mln/literal/origin.hh, + * mln/literal/white.hh, + * mln/literal/zero.hh: Move to literal module. + + 2013-04-30 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Small fixes in existing documentation. + + * mln/data/convert.hh: Remove a duplicate \overload. + + * mln/core/macros.hh: Fix definitions. + + * mln/value/qt/rgb32.hh: Fix invalid cross reference. + + 2013-04-30 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + * mln/core/concept/iterator.hh: Document iterator macros. + + 2013-04-30 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Move concepts in their related type module. + + * mln/core/concept/image.hh, + * mln/core/concept/neighborhood.hh, + * mln/core/concept/site_set.hh, + * mln/core/concept/value.hh, + * mln/core/concept/window.hh: Here. + + 2013-04-30 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + * doc/Doxyfile.in: Hide 'It' symbol. + + 2013-04-30 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + * doc/mln/core/image/images.dox: Document generic image interface. + + 2013-04-30 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + * doc/mln/main.dox: Set macro module as top level entry. + + 2013-04-30 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + * mln/core/concept/image.hh: Document Image concept. + + 2013-04-30 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + * doc/mln/value/value/dox: Specify that built-in types can be + used. + + 2013-04-29 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Introduce a new module for useful macros. + + * doc/mln/core/macros.dox: New. + + * doc/mln/main.dox: New module. + + * mln/core/macros.hh: Add comments. + + 2013-04-29 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Improve documentation in fun::p2b, fun::p2p, fun::p2v and + fun::x2v. + + * mln/fun/p2b/antilogy.hh, + * mln/fun/p2b/big_chess.hh, + * mln/fun/p2b/chess.hh, + * mln/fun/p2b/has.hh, + * mln/fun/p2b/tautology.hh, + * mln/fun/p2p/fold.hh, + * mln/fun/p2p/mirror.hh, + * mln/fun/p2p/translation.hh, + * mln/fun/p2v/elifs.hh, + * mln/fun/p2v/iota.hh, + * mln/fun/p2v/ternary.hh, + * mln/fun/x2v/bilinear.hh, + * mln/fun/x2v/l1_norm.hh, + * mln/fun/x2v/nneighbor.hh, + * mln/fun/x2v/trilinear.hh: Here. + +2013-04-24 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + 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 &lt;z(a)lrde.epita.fr&gt; + + 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 &lt;z(a)lrde.epita.fr&gt; + + * tests/io/magick/save.cc: Kill compilation warnings. + +2013-04-23 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + Add save options to magick::save. + + * mln/io/magick/save.hh: Add save_options structure. + +2013-04-23 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + + 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 &lt;z(a)lrde.epita.fr&gt; * tests/fun/Makefile.am: Remove duplicate subdir entry for v2v. hooks/post-receive -- Olena, a generic and efficient image processing platform