Olena-patches September 2011

olena-patches@lrde.epita.fr

7 participants
173 discussions

Start a nNew thread

branch next-next updated: last-svn-commit-1019-g167d972
by git＠lrde.epita.fr 15 Sep '11

15 Sep '11

1 0

last-svn-commit-1019-g167d972 Prepare the forthcoming release.
by Roland Levillain 15 Sep '11

15 Sep '11

* AUTHORS: Update. * NEWS: Update. Aesthetic changes. * README: Update documentation with respect to ImageMagick and GraphicsMagick. --- AUTHORS | 14 ++++- ChangeLog | 10 ++++ NEWS | 165 +++++++++++++++++++++++++++++++----------------------------- README | 30 ++++++++++-- 4 files changed, 132 insertions(+), 87 deletions(-) diff --git a/AUTHORS b/AUTHORS index 73aed4a..f12b60e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -15,7 +15,7 @@ Active LRDE Staff. - Numerous hours spent thinking about Olena. * Guillaume Lazzara z(a)lrde.epita.fr - - Work on Scribo + - SCRIBO module main author and maintainer. - Library improvements. * Roland Levillain roland(a)lrde.epita.fr @@ -56,6 +56,7 @@ Past contributors of LRDE Staff. - Library improvements. * Yann Jacquelet jacquelet(a)lrde.epita.fr + - SCRIBO-related work. ======== @@ -91,6 +92,9 @@ Students from Class 2011. Students from Class 2010. ========================= +* Florent D'Halluin + - Document layout viewer. + * Etienne Folio - Color type traits. @@ -99,14 +103,18 @@ Students from Class 2009. ========================= * Alexandre Abraham - - R/w functions. + - R/W functions. + - Topological watershed transform. * Nicolas Ballas - Image properties. - Data routines. +* Vivien Delmon + - Misc. corrections. + * Matthieu Garrigues - - Value types and i/o. + - Value types and I/Os. - Draft of the FLLT. * Ugo Jardonnet diff --git a/ChangeLog b/ChangeLog index 147f653..e4eadbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2011-09-15 Roland Levillain <roland(a)lrde.epita.fr> + Prepare the forthcoming release. + + * AUTHORS: Update. + * NEWS: Update. + Aesthetic changes. + * README: Update documentation with respect to ImageMagick and + GraphicsMagick. + +2011-09-15 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac: Fix the initialization of Magick++ flags. 2011-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/NEWS b/NEWS index 94e8bf2..fb5b6a6 100644 --- a/NEWS +++ b/NEWS @@ -1,80 +1,85 @@ * Olena 1.0a - * Add compilation support with g++-4.5. - - * Improvements of accumulators: - - Add properties, - - New histo3d_rgb.hh, - - Add new methods. - - * Fix compilation with multiple files by introducing the - MLN_WO_GLOBAL_VARS macro. - - * Extend type conversion: - - New convert::from_to overloads, - - New convert::to_qimage() and convert::to_qimage_nocopy() - (conversion towards Qt's QImage type), - - New conversion functions : fun::v2v::qt_rgb_to_int_u, - fun::v2v::rgb8_to_rgbn, fun::v2v::rgb_to_int_u, - fun::v2v::rgb_to_luma. - - * Overall performance Improvement in morphological skeleton - computation. - - * Add fast/fastest implementations: - - arith::revert(), - - data::paste(), - - labeling::compute(), - - morpho::skeleton_constrained(), - - transform::influence_zone_geodesic(). - - * New algorithms: - - clustering::kmean_rgb(), - - data::split(), - - histo::equalize(), - - labeling::value_and_compute(), - - subsampling::antialiased(), - - world::rgb::invert(), - - geom::horizontal_symmetry(), - - geom::vertical_symmetry(), - - geom::translate(), - - morpho::tree::component_tree(), - - morpho::tree::dual_input_tree(), - - morpho::watershed::topological(), - - transform::influence_zone_geodesic_saturated(), - - upscaling::art::scaling2x(), - - upscaling::art::scaling3x(). + * This release includes for the first time the SCRIBO module + for Document Image Analysis (DIA). + + * Add compilation support for g++ 4.5 and some limited support + for clang. + + * Compilation with multiple files is now possible using the + MLN_WO_GLOBAL_VARS macro. + + * New algorithms. + - clustering::kmean_rgb. + - data::split. + - histo::equalize. + - labeling::value_and_compute. + - subsampling::antialiased. + - world::rgb::invert. + - geom::horizontal_symmetry. + - geom::vertical_symmetry. + - geom::translate. + - morpho::tree::component_tree. + - morpho::tree::dual_input_tree. + - morpho::watershed::topological. + - transform::influence_zone_geodesic_saturated. + - upscaling::art::scaling2x. + - upscaling::art::scaling3x. + + * Add fast/fastest implementations for various algorithms. + - arith::revert. + - data::paste. + - labeling::compute. + - morpho::skeleton_constrained. + - transform::influence_zone_geodesic. + + * Overall performance improvements in morphological skeleton + computation. + + * New labeling canvas. + - canvas::labeling::blobs (replace canvas::labeling). + - canvas::labeling::sorted. + - canvas::labeling::video. - * New default 3D neighborhoods/windows. + * New function concept: Function_n2v. - * New debug tools: - - debug::mosaic(), - - debug::z_order(). + * The routine labeling::colorize is now deterministic with + respect to an execution run. - * New drawing tools: - - draw::box_plain(), - - draw::dashed_line(), - - draw::site_set(), - - draw::polygon(). + * New type conversions. + - New convert::from_to overloads. + - New convert::to_qimage and convert::to_qimage_nocopy + (conversion towards Qt's QImage type). + - New conversion functions : fun::v2v::qt_rgb_to_int_u, + fun::v2v::rgb8_to_rgbn, fun::v2v::rgb_to_int_u, + fun::v2v::rgb_to_luma. - * New function concept: Function_n2v. + * New graph image types supporting mixed site types (both + edges and vertices). - * I/O improvements: - - Add raw data I/O functions, - - Improve ImageMagick I/O performance, - - Add support for FLD format. + * Improvements in accumulators. + - New properties. + - New RGB 3D histrogram (accu::stat::histo3d_rgb) + - Add new methods. - * Make labeling::colorize() deterministic. + * New default 3D neighborhoods/windows. * New 3D window type: win::sline3d. - * New labeling canvas: - - canvas::labeling::blobs (replace canvas::labeling), - - canvas::labeling::sorted, - - canvas::labeling::video. + * New debug tools. + - debug::mosaic. + - debug::z_order. - * New graph image types supporting mixed site types (both - edges and vertices) + * New drawing tools. + - draw::box_plain. + - draw::dashed_line. + - draw::site_set. + - draw::polygon. + + * I/O improvements. + - New raw data I/O functions. + - Improved ImageMagick/GraphicsMagick I/O performances. + - Support for FLD format. * Various bug fixes and improvements. @@ -133,7 +138,7 @@ Now any comment should use Doxygen style (i.e. /*! ... */). You can also write some programs inside the comments. They are compiled at documentation generation time. It is useful to - illustrate some algorithms with concrete input and output. To + illustrate some algorithms with concrete input and output. To use this feature the program has to be between \code and \endcode tags. If you produce an image, you can include it in the comments with the \image command, using the same name you used to produce @@ -145,13 +150,13 @@ * Border behavior can be controlled with the behavior hierarchy. If an algorithm support it, you can choose the way the image - border will be seen. Three behaviors are available: mirror, + border will be seen. Three behaviors are available: mirror, replicate or user defined value. * Attribute opening/closing enhancement - Make the algorithm more generic. - Add a lot of attributes (area, disk, square, dist, - rectangle, volume, height, maxvalue, minvalue). + rectangle, volume, height, maxvalue, minvalue). * Change the color conversion system - CIE RGB is the main color system i.e. it can be converted @@ -284,18 +289,18 @@ * Color: - nrgb_8, nrgb_16, nrgb_32: new types for NTSC RGB. The - conversion from and to YIQ and HSI which assumed NTSC RGB + conversion from and to YIQ and HSI which assumed NTSC RGB has been adjusted to actually use nrgb_* (instead of rgb_*) and renamed accordingly. - yuv_8, yuv_16, yuv_32: New types. The currently available conversions are - hsi yuv - \ / + hsi yuv + \ / rgb -- nrgb - \ / \ - xyz yiq + \ / \ + xyz yiq * Various cleanups and bug fixes. Especially: - border handling (mirroring, copying) simplified and fixed. @@ -320,7 +325,7 @@ * Casts: - `cast::round': similar to C's round() - `cast::rbound': ditto, but constrained to fit the - output type's range. + output type's range. * I/O: - Support for `image_3d<int_u<N> >' (as PNM P2 & P5). @@ -332,7 +337,7 @@ - `level::connected_component': Number connected components. - `morpho::geodesic_dilation', `morpho::simple_geodesic_dilation'. - `morpho::geodesic_erosion', `morpho::simple_geodesic_erosion'. - - `morpho::get_plus_se_only', `morpho::get_plus_se_p', + - `morpho::get_plus_se_only', `morpho::get_plus_se_p', `morpho::get_minus_se_only', `morpho::get_minus_se_p': Split a structural element in a `plus' (lexically before than the center) and `minus' (after). @@ -351,7 +356,7 @@ * Types: - `vec<N,T>' uses an array to store its elements - and accepts builtin types. + and accepts builtin types. - `rgb<T>' has been replaced by `rgb_8', `rgb_16', `rgb_32' - `xyz_8', `xyz_16', `xyz_32' are new types. - the latter six types are instances of the `color' type. @@ -390,11 +395,11 @@ * Conversion are organized in the following hierarchy conversion<Inferior> - ^ - | + ^ + | conversion_to_type<To,Inferior> - ^ - | + ^ + | conversion_from_type_to_type<From,To,Inferior> All children of conversion_from_type_to_type are models of diff --git a/README b/README index cc49a02..3f2af00 100644 --- a/README +++ b/README @@ -283,11 +283,33 @@ prefix, e.g.:: ./configure --with-gdcm=/usr/local -Olena use Magick++ to read and write images in common formats. As for -other optional dependencies, you can specify where it is located (if -needed) at configuration time:: +Olena uses the Magick++ API provided by ImageMagick or GraphicsMagick +to read and write images in common formats. As for other optional +dependencies, you can specify where such a package is located (if +needed) at configuration time, using either:: - ./configure --with-magickxx=/usr/local/ + ./configure --with-imagemagickxx=/usr/local/ + +or + + ./configure --with-graphicsmagickxx=/usr/local/ + +respectively. + +If ``configure`` finds both ImageMagick and GraphicsMagick in your +system (either automatically or because you used one of the above +flags), the former is chosen by default. If you want to select +GraphicsMagick instead, tell configure explicitly that you do not want +to use ImageMagick. For instance, in the case where configure is able +to discover GraphicsMagick by itself, the following command line is +enough:: + + ./configure --with-imagemagickxx=no + +Otherwise, it suffices to combine it with the option telling where +GraphicsMagick is located:: + + ./configure --with-imagemagickxx=no --with-graphicsmagickxx=/usr/local Other libraries --------------- -- 1.7.2.5

1 0

branch next-next updated: last-svn-commit-1018-g3a7649b
by git＠lrde.epita.fr 15 Sep '11

15 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next-next has been updated via 3a7649bf5a71c31b399d7c1aeaed4532e8be981d (commit) from 1027a673b78b40befda24b6ac6b08c31bceaaa01 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 3a7649b configure.ac: Fix the initialization of Magick++ flags. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ configure.ac | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-1018-g3a7649b configure.ac: Fix the initialization of Magick++ flags.
by Roland Levillain 15 Sep '11

15 Sep '11

--- ChangeLog | 4 ++++ configure.ac | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1d18b62..147f653 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-09-15 Roland Levillain <roland(a)lrde.epita.fr> + + * configure.ac: Fix the initialization of Magick++ flags. + 2011-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> * distrib/macports/Portfile.in: Force the use of GraphicsMagick. diff --git a/configure.ac b/configure.ac index 670727b..47efa55 100644 --- a/configure.ac +++ b/configure.ac @@ -218,10 +218,11 @@ OLN_WITH_LIB_PKG_CONFIG([GraphicsMagick++], [Magick++.h], [Magick++], # If both ImageMagick and GraphicsMagic are available, choose the # former by default. (Use `--with-imagemagickxx=no' to ignore an # installation of ImageMagick and let configure try GraphicsMagick). -if test "x$oln_have_imagemagickxx"; then +if test "x$with_imagemagickxx" != xno \ + && test "x$oln_have_imagemagickxx" = xyes; then MAGICKXX_CPPFLAGS=$IMAGEMAGICKXX_CPPFLAGS MAGICKXX_LDFLAGS=$IMAGEMAGICKXX_LDFLAGS -else +elif test "x$oln_have_graphicsmagickxx" = xyes; then MAGICKXX_CPPFLAGS=$GRAPHICSMAGICKXX_CPPFLAGS MAGICKXX_LDFLAGS=$GRAPHICSMAGICKXX_LDFLAGS fi -- 1.7.2.5

1 0

branch next-next updated: last-svn-commit-1017-g1027a67
by lazzara＠lrde.epita.fr 15 Sep '11

15 Sep '11

1 0

branch unstable/scribo updated: last-svn-commit-1017-g1027a67
by lazzara＠lrde.epita.fr 15 Sep '11

15 Sep '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch unstable/scribo has been updated via 1027a673b78b40befda24b6ac6b08c31bceaaa01 (commit) via b7e6a030c8169fe67d513274f46f1395fde66710 (commit) via 4b5e69d7c7dd9c3ab54573feb9ebae747cc32b17 (commit) via a18fffd15637b40f7cd774d0566550db626c5b7b (commit) via be6caa853434eadedfa885a85790cb9f86f59814 (commit) via 529ef5836b3f6050a90335828b1d342c8a323325 (commit) via 3c5fe6c2fd9b29347b9f7fcb0147bcfbc1e0ff6a (commit) via 8983aa5cb7b8c7aebedee99131764f448f471138 (commit) via 9cc6925dffc4b546650723dd75e53ac5d2f71893 (commit) via e80b2c3d8bb12a622721384de6c202d81be09575 (commit) via 23e94fc9b9b5c330175c666a775002dd5213e105 (commit) via 7b475d5b5b1460d20193d9812ceb68c74ff8f5ad (commit) via 6342ded2362f10ba0ebeb32f6fb57fcd52b41efa (commit) via 2da2a4a8ca9e452c4e8a8eaf1d764e18f02b5ae3 (commit) via 392e46d0a98af31c9df948be1e3de4f60674d65c (commit) via 93e65faac760da0e701c1b7e07110a35b5ee77a9 (commit) via 6fa9f281d16ce7b3fac728a5e23b25ca90e15fcd (commit) via 7a2854173de2d3d9917ebc14e5589be6ab91445f (commit) via bcc4cb8186728694667d5453a10cc592cc10c86e (commit) via d75d3264f57d27414556a2e8b15d1452c7937ccc (commit) via ac1a1dacd9ad8009809a8cd2867bbcd67fc110fe (commit) via 3c76d368389afeb0ef7cab77dbe1901b1bf6ff69 (commit) via c4bb3f89369ffeb277be7c669a9b08b583bfc795 (commit) via 742ddd1264342667c087c0d6cb17e7bd0203dc95 (commit) via 2f44565f67f0ef414e59ad84967397cce6167bfd (commit) via ba06191be781af162bcb24ca39daa16c7ed1a904 (commit) from bb48d4e30c860f9a8da69c53b791bd1697791aa8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 1027a67 distrib/macports/Portfile.in: Force the use of GraphicsMagick. b7e6a03 bootstrap: Fix minimum required version for convert. 4b5e69d configure.ac: Handle both GraphicsMagick and ImageMagick. a18fffd README: Add more information. be6caa8 distrib/macports/Portfile.in: Use -fno-strict-aliasing flag for Mac OS X Lion. 529ef58 Fix Portfile dependencies. 3c5fe6c Fix Scribo build system. 8983aa5 demo/viewer/main.cc: Fix an issue with Tesseract 2.x and specific locales. 9cc6925 Improve text justification in HTML document reconstruction. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 24 +++ bootstrap | 6 +- configure.ac | 23 ++- distrib/macports/Portfile.in | 14 +- milena/ChangeLog | 206 +++++++++++++++++++- milena/apps/mesh-segm-skel/io.hh | 28 ++-- .../mesh-segm-skel/mesh-complex-max-curv-segm.cc | 28 ++-- .../apps/mesh-segm-skel/mesh-complex-max-curv.cc | 28 ++-- milena/apps/mesh-segm-skel/mesh-complex-segm.cc | 28 ++-- milena/apps/mesh-segm-skel/mesh-complex-skel.cc | 28 ++-- milena/apps/mesh-segm-skel/mesh-max-curv.cc | 28 ++-- milena/apps/mesh-segm-skel/mesh-pinv-curv.cc | 28 ++-- milena/apps/mesh-segm-skel/mesh-segm.cc | 28 ++-- milena/apps/mesh-segm-skel/mesh-skel.cc | 28 ++-- milena/apps/mesh-segm-skel/save_bin_alt.hh | 28 ++-- milena/apps/mesh-segm-skel/trimesh/misc.hh | 28 ++-- milena/apps/papers/levillain.09.ismm/complex.cc | 28 ++-- milena/apps/papers/levillain.09.ismm/image2d.cc | 28 ++-- milena/doc/benchmark/canvas.cc | 28 ++-- milena/doc/benchmark/median/median_bench.cc | 28 ++-- milena/doc/benchmark/morpho/erosion.cc | 28 ++-- milena/doc/examples/trash/erosion.cc | 28 ++-- milena/doc/examples/trash/graph.cc | 28 ++-- milena/doc/examples/trash/labeling_algo.cc | 28 ++-- milena/doc/examples/trash/mk_graph.cc | 28 ++-- milena/doc/oldies/2008__tour1.cc | 28 ++-- milena/doc/oldies/2008__tour1_extra.cc | 28 ++-- milena/doc/oldies/2008__tour2.cc | 28 ++-- milena/doc/oldies/2008__tour3.cc | 28 ++-- milena/doc/tools/sample_utils.hh | 28 ++-- milena/img/lena.pgm | 3 +- milena/mln/algebra/h_vec.hh | 8 +- milena/mln/convert/impl/from_double_to_value.hh | 6 +- milena/mln/convert/impl/from_float_to_value.hh | 7 +- milena/mln/convert/impl/from_int_to_value.hh | 7 +- milena/mln/core/image/complex_window_piter.hh | 6 +- milena/mln/core/image/dmorph/sub_image.hh | 6 +- milena/mln/core/internal/pixel_impl.hh | 5 +- milena/mln/core/point.hh | 2 +- milena/mln/core/site_set/box.hh | 13 +- milena/mln/core/site_set/p_array.hh | 9 +- milena/mln/data/fill.hh | 19 +- milena/mln/io/dicom/load.hh | 32 ++-- milena/mln/metal/vec.hh | 5 +- .../reconstruction/by_dilation/union_find.hh | 17 ++- .../morpho/reconstruction/by_erosion/union_find.hh | 17 ++- milena/mln/morpho/watershed/topological.hh | 28 ++-- milena/mln/opt/element.hh | 6 +- milena/mln/pw/internal/image_base.hh | 6 +- milena/mln/topo/adj_higher_face_iter.hh | 5 +- milena/mln/topo/adj_lower_face_iter.hh | 5 +- milena/mln/topo/algebraic_face.hh | 5 +- milena/mln/topo/complex.hh | 5 +- milena/mln/topo/face.hh | 5 +- milena/mln/topo/face_data.hh | 11 +- milena/mln/value/lut_vec.hh | 5 +- milena/sandbox/theo/tufa_2008/gradient.cc | 28 ++-- milena/tests/core/image/graph_image.cc | 29 ++-- milena/tests/linear/log.cc | 4 +- .../morpho/reconstruction/by_dilation/Makefile.am | 14 +- .../{union_find.cc => union_find_on_functions.cc} | 1 + .../{union_find.cc => union_find_on_sets.cc} | 12 +- .../morpho/reconstruction/by_erosion/Makefile.am | 14 +- .../{union_find.cc => union_find_on_functions.cc} | 1 + .../{union_find.cc => union_find_on_sets.cc} | 10 +- milena/trash/bgraph_image.cc | 28 ++-- milena/trash/bgraph_image.hh | 28 ++-- milena/trash/bgraph_psite.hh | 28 ++-- milena/trash/boost_graph.cc | 28 ++-- milena/trash/boost_graph.hh | 28 ++-- milena/trash/boost_graph_access.hh | 28 ++-- milena/trash/boost_graph_property.hh | 28 ++-- milena/trash/boost_graph_structure.hh | 29 ++-- milena/trash/clock_neighb.hh | 28 ++-- milena/trash/clock_neighb2d.cc | 28 ++-- milena/trash/clock_neighb2d.hh | 28 ++-- milena/trash/clock_neighb2d_bis.cc | 28 ++-- milena/trash/display_color_pretty.cc | 28 ++-- milena/trash/display_color_pretty.hh | 28 ++-- milena/trash/display_remove.hh | 28 ++-- milena/trash/display_save.hh | 28 ++-- milena/trash/display_save_and_show.hh | 28 ++-- milena/trash/display_show.cc | 28 ++-- milena/trash/display_show.hh | 28 ++-- milena/trash/fi_adaptor.cc | 28 ++-- milena/trash/fi_adaptor.hh | 28 ++-- milena/trash/graph_image.hh | 28 ++-- milena/trash/line_graph_image.hh | 28 ++-- milena/trash/mono_obased_rle_encode.hh | 28 ++-- milena/trash/mono_obased_rle_image.cc | 28 ++-- milena/trash/mono_obased_rle_image.hh | 28 ++-- milena/trash/mono_rle_encode.hh | 28 ++-- milena/trash/mono_rle_image.cc | 28 ++-- milena/trash/mono_rle_image.hh | 28 ++-- milena/trash/neighb_get.hh | 28 ++-- milena/trash/neighb_image.cc | 28 ++-- milena/trash/neighb_image.hh | 28 ++-- milena/trash/obased_rle_encode.hh | 28 ++-- milena/trash/obased_rle_image.cc | 28 ++-- milena/trash/obased_rle_image.hh | 28 ++-- milena/trash/p_bgraph.cc | 28 ++-- milena/trash/p_bgraph.hh | 28 ++-- milena/trash/p_bgraph_piter.hh | 28 ++-- milena/trash/rle_encode.hh | 28 ++-- milena/trash/rle_image.cc | 28 ++-- milena/trash/rle_image.hh | 28 ++-- milena/trash/save_and_show.cc | 28 ++-- milena/trash/sparse_encode.hh | 28 ++-- milena/trash/sparse_image.cc | 28 ++-- milena/trash/sparse_image.hh | 28 ++-- milena/trash/t_image.cc | 28 ++-- milena/trash/t_image.hh | 28 ++-- milena/trash/to_tiles.cc | 28 ++-- milena/trash/to_tiles.hh | 28 ++-- milena/trash/translate_image.cc | 28 ++-- milena/trash/translate_image.hh | 28 ++-- milena/trash/value_enc_image.cc | 28 ++-- milena/trash/value_enc_image.hh | 28 ++-- milena/trash/value_encode.hh | 28 ++-- scribo/ChangeLog | 45 ++++- scribo/README | 55 ++++-- scribo/demo/review/Makefile.am | 2 +- scribo/demo/viewer/Makefile.am | 3 +- scribo/demo/viewer/main.cc | 14 ++ scribo/demo/xml2doc/templates/html/css.css | 7 +- scribo/demo/xml2doc/templates/html/main.xsl | 27 +++- scribo/demo/xml2doc/templates/html/main_base64.xsl | 65 ++++++- scribo/src/toolchain/nepomuk/Makefile.am | 7 +- scribo/tests/Makefile.am | 36 ++-- scribo/tests/binarization/Makefile.am | 2 + scribo/tests/binarization/sauvola.ref.pbm | Bin 32884 -> 32884 bytes scribo/tests/binarization/sauvola_ms.ref.pbm | Bin 32884 -> 32884 bytes scribo/tests/data.hh.in | 28 ++-- 133 files changed, 1719 insertions(+), 1414 deletions(-) copy milena/tests/morpho/reconstruction/by_dilation/{union_find.cc => union_find_on_functions.cc} (97%) rename milena/tests/morpho/reconstruction/by_dilation/{union_find.cc => union_find_on_sets.cc} (87%) copy milena/tests/morpho/reconstruction/by_erosion/{union_find.cc => union_find_on_functions.cc} (97%) rename milena/tests/morpho/reconstruction/by_erosion/{union_find.cc => union_find_on_sets.cc} (87%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-1009-g9cc6925 Improve text justification in HTML document reconstruction.
by Guillaume Lazzara 15 Sep '11

15 Sep '11

* demo/xml2doc/templates/html/css.css, * demo/xml2doc/templates/html/main.xsl, * demo/xml2doc/templates/html/main_base64.xsl: Add new CSS rules. --- milena/ChangeLog | 8 +++ scribo/demo/xml2doc/templates/html/css.css | 7 +- scribo/demo/xml2doc/templates/html/main.xsl | 27 +++++++- scribo/demo/xml2doc/templates/html/main_base64.xsl | 65 +++++++++++++++++-- 4 files changed, 93 insertions(+), 14 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e565b8b..e447f1b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2011-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> + + Improve text justification in HTML document reconstruction. + + * demo/xml2doc/templates/html/css.css, + * demo/xml2doc/templates/html/main.xsl, + * demo/xml2doc/templates/html/main_base64.xsl: Add new CSS rules. + 2011-09-15 Roland Levillain <roland(a)lrde.epita.fr> Update Milena tests w.r.t. the new version of lena.pgm. diff --git a/scribo/demo/xml2doc/templates/html/css.css b/scribo/demo/xml2doc/templates/html/css.css index baf03cf..6781a2c 100644 --- a/scribo/demo/xml2doc/templates/html/css.css +++ b/scribo/demo/xml2doc/templates/html/css.css @@ -32,8 +32,9 @@ position:absolute; border:0; } -.line noop +.line:after { - width:1000px; + content: ""; display: inline-block; -} \ No newline at end of file + width: 100%; +} diff --git a/scribo/demo/xml2doc/templates/html/main.xsl b/scribo/demo/xml2doc/templates/html/main.xsl index 46b4b8f..0da3889 100644 --- a/scribo/demo/xml2doc/templates/html/main.xsl +++ b/scribo/demo/xml2doc/templates/html/main.xsl @@ -40,10 +40,11 @@ position:absolute; border:0; } - .line noop + .line:after { - width:1000px; + content: ""; display: inline-block; + width: 100%; } </style> </head> @@ -174,6 +175,12 @@ </xsl:choose> </xsl:variable> +  + <xsl:variable name="char_width"> + <xsl:value-of select="@charWidth" /> + </xsl:variable> + +  <xsl:variable name="x_height"> <xsl:value-of select="@xHeight" /> @@ -226,17 +233,29 @@ </xsl:choose> </xsl:variable> +  + <xsl:variable name="fsize"> + <xsl:choose> + <xsl:when test="($a + $d) > (1.16 * (37 * $char_width) div 17)"> + <xsl:value-of select="((37 * $char_width) d ( 17)" /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="($a + $d)" /> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <span class="line"> <xsl:attribute name="style"> height:auto; - font-size:<xsl:value-of select="$a + $d" />px; + font-size:<xsl:value-of select="$fsize" />px; width:<xsl:value-of select="$x2 - $x1" />px; left:<xsl:value-of select="$x1 " />px; top:<xsl:value-of select="$y1 " />px; color:<xsl:value-of select="$color" />; </xsl:attribute> <xsl:value-of select="@text"/> - <noop /> </span>  </xsl:template> diff --git a/scribo/demo/xml2doc/templates/html/main_base64.xsl b/scribo/demo/xml2doc/templates/html/main_base64.xsl index 623f4a2..eb04722 100644 --- a/scribo/demo/xml2doc/templates/html/main_base64.xsl +++ b/scribo/demo/xml2doc/templates/html/main_base64.xsl @@ -41,10 +41,11 @@ position:absolute; border:0; } - .line noop + .line:after { - width:1000px; + content: ""; display: inline-block; + width: 100%; } </style>  @@ -114,7 +115,19 @@  - <xsl:apply-templates select="Line"/> + +  + <xsl:variable name="char_width"> + <xsl:value-of select="@charWidth" /> + </xsl:variable> + + + <xsl:apply-templates select="Line"> +  + <xsl:with-param name="par_char_width" select="$char_width"/> + </xsl:apply-templates> + + </xsl:template> @@ -127,6 +140,10 @@ --> <xsl:template match="Line"> +  + <xsl:param name="par_char_width"/> + +   @@ -183,6 +200,11 @@ </xsl:choose> </xsl:variable> +  + <xsl:variable name="char_width"> + <xsl:value-of select="@charWidth" /> + </xsl:variable> +  <xsl:variable name="x_height"> <xsl:value-of select="@xHeight" /> @@ -235,17 +257,29 @@ </xsl:choose> </xsl:variable> +  + <xsl:variable name="fsize"> + <xsl:choose> + <xsl:when test="($a + $d) > (1.16 * (37 * $par_char_width) div 17)"> + <xsl:value-of select="((37 * $par_char_width) div 17)" /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="($a + $d)" /> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <span class="line"> <xsl:attribute name="style"> height:auto; - font-size:<xsl:value-of select="$a + $d" />px; + font-size:<xsl:value-of select="$fsize" />px; width:<xsl:value-of select="$x2 - $x1" />px; left:<xsl:value-of select="$x1 " />px; top:<xsl:value-of select="$y1 " />px; color:<xsl:value-of select="$color" />; </xsl:attribute> <xsl:value-of select="@text"/> - <noop /> </span>  </xsl:template> @@ -321,6 +355,11 @@ </xsl:choose> </xsl:variable> +  + <xsl:variable name="char_width"> + <xsl:value-of select="@charWidth" /> + </xsl:variable> +  <xsl:variable name="x_height"> <xsl:value-of select="../../@x_height" /> @@ -373,19 +412,31 @@ </xsl:choose> </xsl:variable> +  + <xsl:variable name="fsize"> + <xsl:choose> + <xsl:when test="($a + $d) > (1.16 * (37 * $par_char_width) div 17)"> + <xsl:value-of select="((37 * $par_char_width) div 17)" /> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="($a + $d)" /> + </xsl:otherwise> + </xsl:choose> + </xsl:variable> + + <div class="line" onmouseover="this.style.opacity=0.2;this.filters.alpha.opacity=20" onmouseout="this.style.opacity=1;this.filters.alpha.opacity=100"> <xsl:attribute name="style"> opacity:1; height:auto; - font-size:<xsl:value-of select="$a+$d" />px; + font-size:<xsl:value-of select="$fsize" />px; width:<xsl:value-of select="$x2 - $x1" />px; left:<xsl:value-of select="$x1 " />px; top:<xsl:value-of select="$y1 " />px; color:<xsl:value-of select="$color" />; </xsl:attribute> <xsl:value-of select="@text"/> - <noop /> </div> </xsl:if>  -- 1.7.2.5

1 0

last-svn-commit-1017-g1027a67 distrib/macports/Portfile.in: Force the use of GraphicsMagick.
by Guillaume Lazzara 15 Sep '11

15 Sep '11

--- ChangeLog | 4 ++++ distrib/macports/Portfile.in | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ec2a71..1d18b62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * distrib/macports/Portfile.in: Force the use of GraphicsMagick. + +2011-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * bootstrap: Fix minimum required version for convert. 2011-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/distrib/macports/Portfile.in b/distrib/macports/Portfile.in index 13d5ea7..ea329bf 100644 --- a/distrib/macports/Portfile.in +++ b/distrib/macports/Portfile.in @@ -25,6 +25,8 @@ depends_lib port:GraphicsMagick \ supported_archs i386 x86_64 +configure.args-append --with-imagemagickxx=no + variant scribo description {Add a DIA framework} { depends_lib-append port:tesseract \ port:qt4-mac \ -- 1.7.2.5

1 0

last-svn-commit-1016-gb7e6a03 bootstrap: Fix minimum required version for convert.
by Guillaume Lazzara 15 Sep '11

15 Sep '11

--- ChangeLog | 4 ++++ bootstrap | 6 +++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index f62ded0..3ec2a71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * bootstrap: Fix minimum required version for convert. + +2011-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Handle both GraphicsMagick and ImageMagick. 2011-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/bootstrap b/bootstrap index 6a68272..481a93e 100755 --- a/bootstrap +++ b/bootstrap @@ -154,7 +154,11 @@ export LIBTOOLIZE=$libtoolize require $libtoolize 1.5.22 require doxygen 1.5.6 -require convert 6.3.7 +# We used to require `convert' from ImageMagick 6.3.7, but `convert' +# from GraphicsMagick 1.3.12 is also fine. Use that later revision +# number even if ImageMagick is actually used so as to be compatible +# with both implementations. +require convert 1.3.12 -version require hevea 1.10 -version -- 1.7.2.5

1 0

last-svn-commit-1015-g4b5e69d configure.ac: Handle both GraphicsMagick and ImageMagick.
by Guillaume Lazzara 15 Sep '11

15 Sep '11

--- ChangeLog | 4 ++++ configure.ac | 23 +++++++++++++++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 596ad39..f62ded0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * configure.ac: Handle both GraphicsMagick and ImageMagick. + +2011-09-15 Guillaume Lazzara <z(a)lrde.epita.fr> + * distrib/macports/Portfile.in: Use -fno-strict-aliasing flag for Mac OS X Lion. diff --git a/configure.ac b/configure.ac index 2563153..670727b 100644 --- a/configure.ac +++ b/configure.ac @@ -209,8 +209,27 @@ OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio]) # Magick++. # # ---------- # -OLN_WITH_LIB_PKG_CONFIG([Magick++], [Magick++.h], [Magick++], [magickxx], - [MAGICKXX], [], [ImageMagick++]) +OLN_WITH_LIB_PKG_CONFIG([ImageMagick++], [Magick++.h], [Magick++], + [imagemagickxx], [IMAGEMAGICKXX]) + +OLN_WITH_LIB_PKG_CONFIG([GraphicsMagick++], [Magick++.h], [Magick++], + [graphicsmagickxx], [GRAPHICSMAGICKXX]) + +# If both ImageMagick and GraphicsMagic are available, choose the +# former by default. (Use `--with-imagemagickxx=no' to ignore an +# installation of ImageMagick and let configure try GraphicsMagick). +if test "x$oln_have_imagemagickxx"; then + MAGICKXX_CPPFLAGS=$IMAGEMAGICKXX_CPPFLAGS + MAGICKXX_LDFLAGS=$IMAGEMAGICKXX_LDFLAGS +else + MAGICKXX_CPPFLAGS=$GRAPHICSMAGICKXX_CPPFLAGS + MAGICKXX_LDFLAGS=$GRAPHICSMAGICKXX_LDFLAGS +fi +AC_SUBST([MAGICKXX_CPPFLAGS]) +AC_SUBST([MAGICKXX_LDFLAGS]) +AM_CONDITIONAL([HAVE_MAGICKXX], + [test "x$oln_have_imagemagickxx" = xyes \ + || test "x$oln_have_graphicsmagickxx" = xyes]) # ---- # # Qt. # -- 1.7.2.5

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
18
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches September 2011