April 2013 - Olena-patches

olena: olena-2.0-594-g018a18b Merge branch 'exp/magick-improvements' into exp/TL
by Guillaume Lazzara 23 Apr '13

23 Apr '13

This is a merge commit message of the following branches: Merge: 3d74e20 e42c33e Conflicts: milena/ChangeLog milena/ChangeLog | 19 +++++ milena/mln/io/magick/get_header.hh | 114 +++++++++++++++++++++++++++ milena/mln/io/magick/save.hh | 141 ++++++++++++++++++++++++++++------ milena/tests/io/magick/Makefile.am | 1 + milena/tests/io/magick/get_header.cc | 64 +++++++++++++++ milena/tests/io/magick/save.cc | 2 +- 6 files changed, 316 insertions(+), 25 deletions(-) diff --cc milena/ChangeLog index 1d8ef7c,4bce1ed..3d50c65 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@@ -1,201 -1,22 +1,220 @@@ + 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-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> * doc/mln/convert.dox: Fix from_to_ module name. hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch exp/magick-improvements updated: olena-2.0-552-ge42c33e
by git＠lrde.epita.fr 23 Apr '13

23 Apr '13

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 exp/magick-improvements has been updated discards eca09c3768543be05f6d207c2947d66e13109b28 (commit) via e42c33ee80ab8dce3a77644a9ba5b4e6cf6d1521 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (eca09c3768543be05f6d207c2947d66e13109b28) \ N -- N -- N (e42c33ee80ab8dce3a77644a9ba5b4e6cf6d1521) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 ----------------------------------------------------------------- e42c33e tests/io/magick/save.cc: Kill compilation warnings. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-555-g2fd7966 tests/io/magick/save.cc: Kill compilation warnings.
by Guillaume Lazzara 23 Apr '13

23 Apr '13

--- milena/ChangeLog | 4 ++++ milena/tests/io/magick/save.cc | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 775731e..4bce1ed 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 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. diff --git a/milena/tests/io/magick/save.cc b/milena/tests/io/magick/save.cc index d650180..4430db8 100644 --- a/milena/tests/io/magick/save.cc +++ b/milena/tests/io/magick/save.cc @@ -66,7 +66,7 @@ test(const image2d<T>& lena_mln, const std::string& temp_filename) } -int main(int /* argc */, char* argv[]) +int main() { using namespace mln; -- 1.7.2.5

1 0

olena: olena-2.0-552-ge42c33e tests/io/magick/save.cc: Kill compilation warnings.
by Guillaume Lazzara 23 Apr '13

23 Apr '13

--- milena/ChangeLog | 4 ++++ milena/tests/io/magick/save.cc | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 775731e..4bce1ed 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 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. diff --git a/milena/tests/io/magick/save.cc b/milena/tests/io/magick/save.cc index d650180..4430db8 100644 --- a/milena/tests/io/magick/save.cc +++ b/milena/tests/io/magick/save.cc @@ -66,7 +66,7 @@ test(const image2d<T>& lena_mln, const std::string& temp_filename) } -int main(int /* argc */, char* argv[]) +int main() { using namespace mln; -- 1.7.2.5

1 0

olena: branch exp/magick-improvements created: olena-2.0-552-geca09c3
by git＠lrde.epita.fr 23 Apr '13

23 Apr '13

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 exp/magick-improvements has been created at eca09c3768543be05f6d207c2947d66e13109b28 (commit) - Log ----------------------------------------------------------------- eca09c3 tests/io/magick/save.cc: Kill compilation warnings. 027bc33 Add save options to magick::save. bf546a8 Add a new routine to get image headers thanks to GraphicsMagick. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-552-geca09c3 tests/io/magick/save.cc: Kill compilation warnings.
by Guillaume Lazzara 23 Apr '13

23 Apr '13

--- milena/tests/io/magick/save.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/milena/tests/io/magick/save.cc b/milena/tests/io/magick/save.cc index d650180..4430db8 100644 --- a/milena/tests/io/magick/save.cc +++ b/milena/tests/io/magick/save.cc @@ -66,7 +66,7 @@ test(const image2d<T>& lena_mln, const std::string& temp_filename) } -int main(int /* argc */, char* argv[]) +int main() { using namespace mln; -- 1.7.2.5

1 0

olena: olena-2.0-554-ge8c91e1 Add save options to magick::save.
by Guillaume Lazzara 23 Apr '13

23 Apr '13

* mln/io/magick/save.hh: Add save_options structure. --- milena/ChangeLog | 6 ++ milena/mln/io/magick/save.hh | 141 ++++++++++++++++++++++++++++++++++------- 2 files changed, 123 insertions(+), 24 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1e49435..775731e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 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, diff --git a/milena/mln/io/magick/save.hh b/milena/mln/io/magick/save.hh index d8ca8a1..8437462 100644 --- a/milena/mln/io/magick/save.hh +++ b/milena/mln/io/magick/save.hh @@ -58,29 +58,71 @@ namespace mln namespace magick { - /*! \brief Save a Milena image into a file using Magick++. - \overload + /*! + \brief Store specific save options to use with Magick++. + \ingroup iomagick + */ + struct save_options + { + save_options(); + + /*! \brief Define the compression algorithm. + + By default it is set to Magick::NoCompression. + */ + Magick::CompressionType compression_type; + + /*! \brief Define the image type in output (RGB, Bilevel,...). + + By default it is set to Magick::OptimizeType which will + decide automatically the best type according to image + characteristics. + */ + Magick::ImageType image_type; + }; + - \param[in] ima The image to save. - \param[in] filename The name of the output file. + /*! + \brief Save a Milena image into a file using Magick++. + \overload - \ingroup iomagick + \param[in] ima The image to save. + \param[in] filename The name of the output file. + + \ingroup iomagick */ template <typename I> void save(const Image& ima, const std::string& filename); - /*! \brief Save a Milena image into a file using Magick++. - \param[in] ima The image to save. + /*! + \brief Save a Milena image into a file using Magick++. + \overload + + \param[in] ima The image to save. + \param[in] options Save options. + \param[in] filename The name of the output file. + + \ingroup iomagick + */ + template <typename I> + void + save(const Image& ima, const save_options& options, + const std::string& filename); + + /*! + \brief Save a Milena image into a file using Magick++. + \overload - \param[in] opacity_mask Mask used to set pixel opacity_mask in output - image. Output format must support this feature to be taken - into account. + \param[in] ima The image to save. + \param[in] opacity_mask Mask used to set pixel opacity_mask in output + image. Output format must support this feature to be taken + into account. - \param[in] filename The name of the output file. + \param[in] filename The name of the output file. - \ingroup iomagick + \ingroup iomagick */ template <typename I, typename J> void @@ -88,20 +130,39 @@ namespace mln const std::string& filename); - // FIXME: Unfinished? -#if 0 - /** Save a Milena tiled image into a file using Magick++. + /*! + \brief Save a Milena image into a file using Magick++. - \param[out] ima The image to save. - \param[in] filename The name of the output file. */ - template <typename T> + \param[in] ima The image to save. + \param[in] opacity_mask Mask used to set pixel opacity_mask in output + image. Output format must support this feature to be taken + into account. + \param[in] options Save options. + \param[in] filename The name of the output file. + + \ingroup iomagick + */ + template <typename I, typename J> void - save(const Image< tiled2d<T> >& ima, const std::string& filename); -#endif + save(const Image& ima, const Image<J>& opacity_mask, + const save_options& options, const std::string& filename); # ifndef MLN_INCLUDE_ONLY + namespace internal + { + + inline + void set_options(Magick::Image& magick_ima, + const save_options& options) + { + magick_ima.compressType(options.compression_type); + magick_ima.type(options.image_type); + } + + } // end of mln::io::magick::internal + namespace impl { @@ -468,10 +529,22 @@ namespace mln } // end of namespace mln::io::magick::internal + // save_options + inline + save_options::save_options() + : compression_type(Magick::NoCompression), + image_type(Magick::OptimizeType) + { + } + + + + // Facades + template <typename I, typename J> void save(const Image& ima_, const Image<J>& opacity_mask_, - const std::string& filename) + const save_options& options, const std::string& filename) { mln_trace("mln::io::magick::save"); @@ -524,21 +597,41 @@ namespace mln internal::paste_data_dispatch(ima, magick_ima); } + // Take options into account. + internal::set_options(magick_ima, options); + magick_ima.write(filename); } - - template <typename I> inline void save(const Image& ima, const std::string& filename) { mln_ch_value(I,bool) opacity_mask; - save(ima, opacity_mask, filename); + save_options options; + save(ima, opacity_mask, options, filename); + } + + template <typename I> + inline + void + save(const Image& ima, const save_options& options, + const std::string& filename) + { + mln_ch_value(I,bool) opacity_mask; + save(ima, opacity_mask, options, filename); } + template <typename I, typename J> + void + save(const Image& ima, const Image<J>& opacity_mask, + const std::string& filename) + { + save_options options; + save(ima, opacity_mask, options, filename); + } # endif // ! MLN_INCLUDE_ONLY -- 1.7.2.5

1 0

olena: olena-2.0-551-g027bc33 Add save options to magick::save.
by Guillaume Lazzara 23 Apr '13

23 Apr '13

* mln/io/magick/save.hh: Add save_options structure. --- milena/ChangeLog | 6 ++ milena/mln/io/magick/save.hh | 141 ++++++++++++++++++++++++++++++++++------- 2 files changed, 123 insertions(+), 24 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1e49435..775731e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 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, diff --git a/milena/mln/io/magick/save.hh b/milena/mln/io/magick/save.hh index d8ca8a1..8437462 100644 --- a/milena/mln/io/magick/save.hh +++ b/milena/mln/io/magick/save.hh @@ -58,29 +58,71 @@ namespace mln namespace magick { - /*! \brief Save a Milena image into a file using Magick++. - \overload + /*! + \brief Store specific save options to use with Magick++. + \ingroup iomagick + */ + struct save_options + { + save_options(); + + /*! \brief Define the compression algorithm. + + By default it is set to Magick::NoCompression. + */ + Magick::CompressionType compression_type; + + /*! \brief Define the image type in output (RGB, Bilevel,...). + + By default it is set to Magick::OptimizeType which will + decide automatically the best type according to image + characteristics. + */ + Magick::ImageType image_type; + }; + - \param[in] ima The image to save. - \param[in] filename The name of the output file. + /*! + \brief Save a Milena image into a file using Magick++. + \overload - \ingroup iomagick + \param[in] ima The image to save. + \param[in] filename The name of the output file. + + \ingroup iomagick */ template <typename I> void save(const Image& ima, const std::string& filename); - /*! \brief Save a Milena image into a file using Magick++. - \param[in] ima The image to save. + /*! + \brief Save a Milena image into a file using Magick++. + \overload + + \param[in] ima The image to save. + \param[in] options Save options. + \param[in] filename The name of the output file. + + \ingroup iomagick + */ + template <typename I> + void + save(const Image& ima, const save_options& options, + const std::string& filename); + + /*! + \brief Save a Milena image into a file using Magick++. + \overload - \param[in] opacity_mask Mask used to set pixel opacity_mask in output - image. Output format must support this feature to be taken - into account. + \param[in] ima The image to save. + \param[in] opacity_mask Mask used to set pixel opacity_mask in output + image. Output format must support this feature to be taken + into account. - \param[in] filename The name of the output file. + \param[in] filename The name of the output file. - \ingroup iomagick + \ingroup iomagick */ template <typename I, typename J> void @@ -88,20 +130,39 @@ namespace mln const std::string& filename); - // FIXME: Unfinished? -#if 0 - /** Save a Milena tiled image into a file using Magick++. + /*! + \brief Save a Milena image into a file using Magick++. - \param[out] ima The image to save. - \param[in] filename The name of the output file. */ - template <typename T> + \param[in] ima The image to save. + \param[in] opacity_mask Mask used to set pixel opacity_mask in output + image. Output format must support this feature to be taken + into account. + \param[in] options Save options. + \param[in] filename The name of the output file. + + \ingroup iomagick + */ + template <typename I, typename J> void - save(const Image< tiled2d<T> >& ima, const std::string& filename); -#endif + save(const Image& ima, const Image<J>& opacity_mask, + const save_options& options, const std::string& filename); # ifndef MLN_INCLUDE_ONLY + namespace internal + { + + inline + void set_options(Magick::Image& magick_ima, + const save_options& options) + { + magick_ima.compressType(options.compression_type); + magick_ima.type(options.image_type); + } + + } // end of mln::io::magick::internal + namespace impl { @@ -468,10 +529,22 @@ namespace mln } // end of namespace mln::io::magick::internal + // save_options + inline + save_options::save_options() + : compression_type(Magick::NoCompression), + image_type(Magick::OptimizeType) + { + } + + + + // Facades + template <typename I, typename J> void save(const Image& ima_, const Image<J>& opacity_mask_, - const std::string& filename) + const save_options& options, const std::string& filename) { mln_trace("mln::io::magick::save"); @@ -524,21 +597,41 @@ namespace mln internal::paste_data_dispatch(ima, magick_ima); } + // Take options into account. + internal::set_options(magick_ima, options); + magick_ima.write(filename); } - - template <typename I> inline void save(const Image& ima, const std::string& filename) { mln_ch_value(I,bool) opacity_mask; - save(ima, opacity_mask, filename); + save_options options; + save(ima, opacity_mask, options, filename); + } + + template <typename I> + inline + void + save(const Image& ima, const save_options& options, + const std::string& filename) + { + mln_ch_value(I,bool) opacity_mask; + save(ima, opacity_mask, options, filename); } + template <typename I, typename J> + void + save(const Image& ima, const Image<J>& opacity_mask, + const std::string& filename) + { + save_options options; + save(ima, opacity_mask, options, filename); + } # endif // ! MLN_INCLUDE_ONLY -- 1.7.2.5

1 0

olena: olena-2.0-553-g199e5c9 Add a new routine to get image headers thanks to GraphicsMagick.
by Guillaume Lazzara 23 Apr '13

23 Apr '13

* mln/io/magick/get_header.hh, * mln/tests/io/magick/get_header.cc: New * mln/tests/io/magick/Makefile.am: New target. --- milena/ChangeLog | 9 ++ .../mln/io/{pgms/load.hh => magick/get_header.hh} | 86 +++++++++++++------- milena/tests/io/magick/Makefile.am | 1 + .../tests/io/magick/get_header.cc | 45 +++++++---- 4 files changed, 94 insertions(+), 47 deletions(-) copy milena/mln/io/{pgms/load.hh => magick/get_header.hh} (50%) copy scribo/tests/primitive/extract/lines_h_pattern.cc => milena/tests/io/magick/get_header.cc (59%) diff --git a/milena/ChangeLog b/milena/ChangeLog index edf3a65..1e49435 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +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-17 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/mln/convert.dox: Fix from_to_ module name. diff --git a/milena/mln/io/pgms/load.hh b/milena/mln/io/magick/get_header.hh similarity index 50% copy from milena/mln/io/pgms/load.hh copy to milena/mln/io/magick/get_header.hh index ce54224..b34c5f3 100644 --- a/milena/mln/io/pgms/load.hh +++ b/milena/mln/io/magick/get_header.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2009, 2012 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,23 +23,23 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_IO_PGMS_LOAD_HH -# define MLN_IO_PGMS_LOAD_HH +#ifndef MLN_IO_MAGICK_GET_HEADER_HH +# define MLN_IO_MAGICK_GET_HEADER_HH /// \file /// -/// \brief Define a function which loads multiple pgm images into -/// a 3D image. +/// \brief Routines reading image headers based on Magick++. -# include <iostream> -# include <fstream> -# include <string> +# include <cstdlib> + +# include <Magick++.h> # include <mln/core/image/image2d.hh> -# include <mln/core/image/image3d.hh> + # include <mln/value/int_u8.hh> -# include <mln/io/pnms/load.hh> -# include <mln/make/image3d.hh> +# include <mln/value/rgb8.hh> + +# include <mln/io/magick/internal/init_magick.hh> namespace mln @@ -49,42 +48,67 @@ namespace mln namespace io { - namespace pgms + namespace magick { - /*! \brief Load pgm images as slices of a 3D Milena image. - * - * \param[out] ima A reference to the 3D image which will receive - * data. - * \param[in] filenames The list of 2D images to load.. - * - * \ingroup iopgm - */ - template <typename V> - void load(image3d<V>& ima, - const util::array<std::string>& filenames); + /*! + \brief Store magick file header. + \ingroup iomagick + */ + struct magick_header + { + int height; + int width; + unsigned depth; + Magick::ImageType image_type; + }; + + + /*! \brief Get image header from a file using Magick++. + + \param[in] filename The name of the input file. + + \return A structure with several header information. + + \ingroup iomagick + */ + magick_header get_header(const std::string& filename); + # ifndef MLN_INCLUDE_ONLY - template <typename V> inline - void load(image3d<V>& ima, - const util::array<std::string>& filenames) + magick_header get_header(const std::string& filename) { - mln_trace("mln::io::pgms::load"); + mln_trace("mln::io::magick::get_header"); - io::pnms::load<V>(PGM, ima, filenames); + // Initialize GraphicsMagick only once. + static internal::init_magick init; + (void) init; + // FIXME: Handle Magick++'s exceptions (see either + // ImageMagick++'s or GraphicsMagick++'s documentation). + Magick::Image magick_ima(filename); + magick_ima.ping(filename); + + magick_header header; + header.height = magick_ima.rows(); + header.width = magick_ima.columns(); + header.depth = magick_ima.depth(); + header.image_type = magick_ima.type(); + + return header; } + # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::io::pgms + } // end of namespace mln::io::magick } // end of namespace mln::io } // end of namespace mln -#endif // ! MLN_IO_PGMS_LOAD_HH +#endif // ! MLN_IO_MAGICK_GET_HEADER_HH diff --git a/milena/tests/io/magick/Makefile.am b/milena/tests/io/magick/Makefile.am index cad11e9..e0221d7 100644 --- a/milena/tests/io/magick/Makefile.am +++ b/milena/tests/io/magick/Makefile.am @@ -20,6 +20,7 @@ AM_CPPFLAGS += $(MAGICKXX_CPPFLAGS) AM_LDFLAGS = $(MAGICKXX_LDFLAGS) check_PROGRAMS = \ + get_header \ load \ save diff --git a/scribo/tests/primitive/extract/lines_h_pattern.cc b/milena/tests/io/magick/get_header.cc similarity index 59% copy from scribo/tests/primitive/extract/lines_h_pattern.cc copy to milena/tests/io/magick/get_header.cc index 64c09f8..f5f048b 100644 --- a/scribo/tests/primitive/extract/lines_h_pattern.cc +++ b/milena/tests/io/magick/get_header.cc @@ -23,29 +23,42 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -// \file - -#include <mln/core/image/image2d.hh> -#include <mln/data/compare.hh> -#include <mln/io/pbm/load.hh> -#include <scribo/primitive/extract/lines_h_pattern.hh> - +#include <iostream> +#include <mln/io/magick/get_header.hh> #include "tests/data.hh" int main() { using namespace mln; - using namespace scribo; - image2d<bool> input; - io::pbm::load(input, SCRIBO_IMG_DIR "/lines_discontinued.pbm"); + // PBM. + { + io::magick::magick_header + header = io::magick::get_header(MLN_IMG_DIR "/tiny.pbm"); + mln_assertion(header.width == 18); + mln_assertion(header.height == 22); + mln_assertion(header.depth == 1); + mln_assertion(header.image_type == 1); + } - image2d<bool> ref; - io::pbm::load(ref, - SCRIBO_TESTS_DIR "/primitive/extract/lines_h_pattern.ref.pbm"); + // PGM. + { + io::magick::magick_header + header = io::magick::get_header(MLN_IMG_DIR "/tiny.pgm"); + mln_assertion(header.width == 16); + mln_assertion(header.height == 16); + mln_assertion(header.depth == 8); + mln_assertion(header.image_type == 2); + } - image2d<bool> - vlines = primitive::extract::lines_h_pattern(input, 51, 3); + // PPM. + { + io::magick::magick_header + header = io::magick::get_header(MLN_IMG_DIR "/tiny.ppm"); + mln_assertion(header.width == 16); + mln_assertion(header.height == 16); + mln_assertion(header.depth == 8); + mln_assertion(header.image_type == 6); + } - mln_assertion(vlines == ref); } -- 1.7.2.5

1 0

olena: olena-2.0-550-gbf546a8 Add a new routine to get image headers thanks to GraphicsMagick.
by Guillaume Lazzara 23 Apr '13

23 Apr '13

* mln/io/magick/get_header.hh, * mln/tests/io/magick/get_header.cc: New * mln/tests/io/magick/Makefile.am: New target. --- milena/ChangeLog | 9 ++ .../mln/io/{pgms/load.hh => magick/get_header.hh} | 86 +++++++++++++------- milena/tests/io/magick/Makefile.am | 1 + .../tests/io/magick/get_header.cc | 45 +++++++---- 4 files changed, 94 insertions(+), 47 deletions(-) copy milena/mln/io/{pgms/load.hh => magick/get_header.hh} (50%) copy scribo/tests/primitive/extract/lines_h_pattern.cc => milena/tests/io/magick/get_header.cc (59%) diff --git a/milena/ChangeLog b/milena/ChangeLog index edf3a65..1e49435 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +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-17 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/mln/convert.dox: Fix from_to_ module name. diff --git a/milena/mln/io/pgms/load.hh b/milena/mln/io/magick/get_header.hh similarity index 50% copy from milena/mln/io/pgms/load.hh copy to milena/mln/io/magick/get_header.hh index ce54224..b34c5f3 100644 --- a/milena/mln/io/pgms/load.hh +++ b/milena/mln/io/magick/get_header.hh @@ -1,5 +1,4 @@ -// Copyright (C) 2009, 2012 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -24,23 +23,23 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef MLN_IO_PGMS_LOAD_HH -# define MLN_IO_PGMS_LOAD_HH +#ifndef MLN_IO_MAGICK_GET_HEADER_HH +# define MLN_IO_MAGICK_GET_HEADER_HH /// \file /// -/// \brief Define a function which loads multiple pgm images into -/// a 3D image. +/// \brief Routines reading image headers based on Magick++. -# include <iostream> -# include <fstream> -# include <string> +# include <cstdlib> + +# include <Magick++.h> # include <mln/core/image/image2d.hh> -# include <mln/core/image/image3d.hh> + # include <mln/value/int_u8.hh> -# include <mln/io/pnms/load.hh> -# include <mln/make/image3d.hh> +# include <mln/value/rgb8.hh> + +# include <mln/io/magick/internal/init_magick.hh> namespace mln @@ -49,42 +48,67 @@ namespace mln namespace io { - namespace pgms + namespace magick { - /*! \brief Load pgm images as slices of a 3D Milena image. - * - * \param[out] ima A reference to the 3D image which will receive - * data. - * \param[in] filenames The list of 2D images to load.. - * - * \ingroup iopgm - */ - template <typename V> - void load(image3d<V>& ima, - const util::array<std::string>& filenames); + /*! + \brief Store magick file header. + \ingroup iomagick + */ + struct magick_header + { + int height; + int width; + unsigned depth; + Magick::ImageType image_type; + }; + + + /*! \brief Get image header from a file using Magick++. + + \param[in] filename The name of the input file. + + \return A structure with several header information. + + \ingroup iomagick + */ + magick_header get_header(const std::string& filename); + # ifndef MLN_INCLUDE_ONLY - template <typename V> inline - void load(image3d<V>& ima, - const util::array<std::string>& filenames) + magick_header get_header(const std::string& filename) { - mln_trace("mln::io::pgms::load"); + mln_trace("mln::io::magick::get_header"); - io::pnms::load<V>(PGM, ima, filenames); + // Initialize GraphicsMagick only once. + static internal::init_magick init; + (void) init; + // FIXME: Handle Magick++'s exceptions (see either + // ImageMagick++'s or GraphicsMagick++'s documentation). + Magick::Image magick_ima(filename); + magick_ima.ping(filename); + + magick_header header; + header.height = magick_ima.rows(); + header.width = magick_ima.columns(); + header.depth = magick_ima.depth(); + header.image_type = magick_ima.type(); + + return header; } + # endif // ! MLN_INCLUDE_ONLY - } // end of namespace mln::io::pgms + } // end of namespace mln::io::magick } // end of namespace mln::io } // end of namespace mln -#endif // ! MLN_IO_PGMS_LOAD_HH +#endif // ! MLN_IO_MAGICK_GET_HEADER_HH diff --git a/milena/tests/io/magick/Makefile.am b/milena/tests/io/magick/Makefile.am index cad11e9..e0221d7 100644 --- a/milena/tests/io/magick/Makefile.am +++ b/milena/tests/io/magick/Makefile.am @@ -20,6 +20,7 @@ AM_CPPFLAGS += $(MAGICKXX_CPPFLAGS) AM_LDFLAGS = $(MAGICKXX_LDFLAGS) check_PROGRAMS = \ + get_header \ load \ save diff --git a/scribo/tests/primitive/extract/lines_h_pattern.cc b/milena/tests/io/magick/get_header.cc similarity index 59% copy from scribo/tests/primitive/extract/lines_h_pattern.cc copy to milena/tests/io/magick/get_header.cc index 64c09f8..f5f048b 100644 --- a/scribo/tests/primitive/extract/lines_h_pattern.cc +++ b/milena/tests/io/magick/get_header.cc @@ -23,29 +23,42 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -// \file - -#include <mln/core/image/image2d.hh> -#include <mln/data/compare.hh> -#include <mln/io/pbm/load.hh> -#include <scribo/primitive/extract/lines_h_pattern.hh> - +#include <iostream> +#include <mln/io/magick/get_header.hh> #include "tests/data.hh" int main() { using namespace mln; - using namespace scribo; - image2d<bool> input; - io::pbm::load(input, SCRIBO_IMG_DIR "/lines_discontinued.pbm"); + // PBM. + { + io::magick::magick_header + header = io::magick::get_header(MLN_IMG_DIR "/tiny.pbm"); + mln_assertion(header.width == 18); + mln_assertion(header.height == 22); + mln_assertion(header.depth == 1); + mln_assertion(header.image_type == 1); + } - image2d<bool> ref; - io::pbm::load(ref, - SCRIBO_TESTS_DIR "/primitive/extract/lines_h_pattern.ref.pbm"); + // PGM. + { + io::magick::magick_header + header = io::magick::get_header(MLN_IMG_DIR "/tiny.pgm"); + mln_assertion(header.width == 16); + mln_assertion(header.height == 16); + mln_assertion(header.depth == 8); + mln_assertion(header.image_type == 2); + } - image2d<bool> - vlines = primitive::extract::lines_h_pattern(input, 51, 3); + // PPM. + { + io::magick::magick_header + header = io::magick::get_header(MLN_IMG_DIR "/tiny.ppm"); + mln_assertion(header.width == 16); + mln_assertion(header.height == 16); + mln_assertion(header.depth == 8); + mln_assertion(header.image_type == 6); + } - mln_assertion(vlines == ref); } -- 1.7.2.5

1 0