April 2013 - Olena-patches

olena: olena-2.0-551-g51571df scribo/src/text_in_picture.cc: Add more debug options fix return value in main().
by Guillaume Lazzara 25 Apr '13

25 Apr '13

--- scribo/ChangeLog | 5 +++++ scribo/src/text_in_picture.cc | 22 +++++++++++++--------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a67d6ad..81ed8ac 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 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. diff --git a/scribo/src/text_in_picture.cc b/scribo/src/text_in_picture.cc index 64e1462..eb3b65a 100644 --- a/scribo/src/text_in_picture.cc +++ b/scribo/src/text_in_picture.cc @@ -27,7 +27,7 @@ #include <libgen.h> #include <iostream> -#include <mln/io/magick/load.hh> +#include <mln/io/magick/all.hh> #include <scribo/toolchain/text_in_picture.hh> #include <scribo/debug/option_parser.hh> @@ -47,6 +47,8 @@ static const scribo::debug::toggle_data toggle_desc[] = // name, description, default value { "fg-extraction", "Detect and slit foreground/background components. (default: disabled)", false }, { "ms-bin", "Use a multi-scale binarization. (default: enabled)", true }, + { "alternate-results", "Save debug images with all the text bboxes. (default: disabled)", false }, + { "debug", "Enable debug outputs (default: disabled).", false }, {0, 0, false} }; @@ -77,10 +79,10 @@ int main(int argc, char* argv[]) return 1; if (options.is_set("debug-prefix")) - { scribo::debug::logger().set_filename_prefix(options.opt_value("debug-prefix").c_str()); + + if (options.is_enabled("debug")) scribo::debug::logger().set_level(scribo::debug::All); - } mln_trace("main"); @@ -93,6 +95,9 @@ int main(int argc, char* argv[]) bool multi_scale_bin = options.is_enabled("ms-bin"); unsigned lambda = atoi(options.opt_value("lambda").c_str()); + if (options.is_enabled("alternate-results")) + scribo::debug::logger().set_level(scribo::debug::Results); + if (verbose) std::cout << "Using max_dim_size = " << max_dim_size << " - fg_extraction = " << fg_extraction @@ -105,11 +110,10 @@ int main(int argc, char* argv[]) max_dim_size, lambda, verbose); - io::ppm::save(mln::labeling::colorize(value::rgb8(), - comps.labeled_image(), - comps.nelements()), - options.arg("output.ppm")); - + io::magick::save(mln::labeling::colorize(value::rgb8(), + comps.labeled_image(), + comps.nelements()), + options.arg("output.ppm")); - return comps.nelements() != 0; + return 0; } -- 1.7.2.5

1 0

olena: olena-2.0-550-g806244e scribo/toolchain/internal/text_in_picture_functor.hh: Rename debug outputs.
by Guillaume Lazzara 25 Apr '13

25 Apr '13

--- scribo/ChangeLog | 5 ++++ .../toolchain/internal/text_in_picture_functor.hh | 22 ++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1fe01ca..a67d6ad 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,8 @@ +2013-04-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * scribo/toolchain/internal/text_in_picture_functor.hh: Rename + debug outputs. + 2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr> * src/primitive/extract/lines_pattern.cc: Fix description. diff --git a/scribo/scribo/toolchain/internal/text_in_picture_functor.hh b/scribo/scribo/toolchain/internal/text_in_picture_functor.hh index 8d12612..cc7921f 100644 --- a/scribo/scribo/toolchain/internal/text_in_picture_functor.hh +++ b/scribo/scribo/toolchain/internal/text_in_picture_functor.hh @@ -267,7 +267,7 @@ namespace scribo # ifndef SCRIBO_NDEBUG scribo::debug::logger().log_image(scribo::debug::AuxiliaryResults, fg, - "foreground.ppm"); + "foreground"); # endif // ! SCRIBO_NDEBUG } else @@ -353,7 +353,7 @@ namespace scribo literal::yellow, literal::green, anchor::MassCenter), - "links.ppm"); + "links"); } # endif // ! SCRIBO_NDEBUG @@ -384,7 +384,7 @@ namespace scribo scribo::debug::logger().log_image(scribo::debug::AuxiliaryResults, hratio_decision_image, - "hratio_links_decision_image.ppm"); + "hratio_links_decision_image"); } # endif // ! SCRIBO_NDEBUG @@ -405,7 +405,7 @@ namespace scribo scribo::debug::logger().log_image(scribo::debug::AuxiliaryResults, overlap_decision_image, - "overlap_links_decision_image.ppm"); + "overlap_links_decision_image"); } # endif // ! SCRIBO_NDEBUG @@ -436,7 +436,7 @@ namespace scribo 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); scribo::draw::bounding_boxes(decision_image, @@ -444,7 +444,7 @@ namespace scribo scribo::debug::logger().log_image(scribo::debug::AuxiliaryResults, decision_image, - "group_image.ppm"); + "group_image"); } # endif // ! SCRIBO_NDEBUG @@ -467,7 +467,7 @@ namespace scribo scribo::debug::logger().log_image(scribo::debug::AuxiliaryResults, decision_image, - "small_groups_filter.ppm"); + "small_groups_filter"); } # endif // ! SCRIBO_NDEBUG @@ -493,7 +493,7 @@ namespace scribo scribo::debug::logger().log_image(scribo::debug::AuxiliaryResults, decision_image, - "thin_groups_filter.ppm"); + "thin_groups_filter"); } # endif // ! SCRIBO_NDEBUG @@ -529,7 +529,7 @@ namespace scribo scribo::debug::logger().log_image(scribo::debug::AuxiliaryResults, decision_image, - "group_with_holes_filter.ppm"); + "group_with_holes_filter"); } # endif // ! SCRIBO_NDEBUG @@ -550,11 +550,11 @@ namespace scribo scribo::debug::logger().log_image(scribo::debug::Results, scribo::debug::highlight_text_area(input_rgb, output), - "input_with_bboxes.ppm"); + "input_with_bboxes"); scribo::debug::logger().log_image(scribo::debug::Results, scribo::debug::text_areas_image(input_rgb, output), - "out_text.ppm"); + "out_text"); } # endif // ! SCRIBO_NDEBUG -- 1.7.2.5

1 0

olena: branch xml2doc-fix-template-path created: olena-2.0-550-gdd1f5ea
by git＠lrde.epita.fr 24 Apr '13

24 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 xml2doc-fix-template-path has been created at dd1f5ea8df10a364153a922cbf6b1c023fb16d13 (commit) - Log ----------------------------------------------------------------- dd1f5ea demo/xml2doc/main.cc: Add --template-path option. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-553-g3105f43 demo/xml2doc/main.cc: Add --template-path option.
by Guillaume Lazzara 24 Apr '13

24 Apr '13

--- scribo/ChangeLog | 4 ++++ scribo/demo/xml2doc/main.cc | 27 ++++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 90de65c..6f048f1 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -14,6 +14,10 @@ 2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/xml2doc/main.cc: Add --template-path option. + +2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/primitive/extract/lines_pattern.cc: Fix description. 2013-02-27 Anthony Seure <anthony.seure(a)lrde.epita.fr> diff --git a/scribo/demo/xml2doc/main.cc b/scribo/demo/xml2doc/main.cc index 5606d2d..dd49094 100644 --- a/scribo/demo/xml2doc/main.cc +++ b/scribo/demo/xml2doc/main.cc @@ -28,6 +28,8 @@ #include "datarootdir.hh" +static QString template_path; + void check_xsltproc() { @@ -42,7 +44,11 @@ void check_xsltproc() QString get_datarootdir(const QString& file) { - QFile f(SCRIBO_LOCAL_DATAROOTDIR "/templates/" + file); + QFile f(template_path + "/templates/" + file); + if (f.exists()) + return template_path + "/templates/"; + + f.setFileName(SCRIBO_LOCAL_DATAROOTDIR "/templates/" + file); if (f.exists()) return SCRIBO_LOCAL_DATAROOTDIR "/templates/"; @@ -90,7 +96,7 @@ int svg_base64(const QString& xml, const QString& svg) int main(int argc, char **argv) { QString man = \ - "xml_transform\n" + "Usage: scribo-xml2doc [--template-path <dir>] [OPTIONS]\n" "OPTIONS:\n\n" "HTML output:\n" @@ -138,8 +144,23 @@ int main(int argc, char **argv) QString option(argv[1]); - if (argc > 4) + if (argc == 5 || argc == 7) { + if (argc == 7) + { + if ("--template-path" == option) + { + template_path = argv[2]; + argv += 2; + option = QString(argv[1]); + } + else + { + qDebug() << man; + return 1; + } + } + if ("--html-full" == option) { check_xsltproc(); -- 1.7.2.5

1 0

olena: olena-2.0-550-gdd1f5ea demo/xml2doc/main.cc: Add --template-path option.
by Guillaume Lazzara 24 Apr '13

24 Apr '13

--- scribo/ChangeLog | 4 ++++ scribo/demo/xml2doc/main.cc | 27 ++++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 1fe01ca..5705d60 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/xml2doc/main.cc: Add --template-path option. + +2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/primitive/extract/lines_pattern.cc: Fix description. 2013-02-27 Anthony Seure <anthony.seure(a)lrde.epita.fr> diff --git a/scribo/demo/xml2doc/main.cc b/scribo/demo/xml2doc/main.cc index 5606d2d..dd49094 100644 --- a/scribo/demo/xml2doc/main.cc +++ b/scribo/demo/xml2doc/main.cc @@ -28,6 +28,8 @@ #include "datarootdir.hh" +static QString template_path; + void check_xsltproc() { @@ -42,7 +44,11 @@ void check_xsltproc() QString get_datarootdir(const QString& file) { - QFile f(SCRIBO_LOCAL_DATAROOTDIR "/templates/" + file); + QFile f(template_path + "/templates/" + file); + if (f.exists()) + return template_path + "/templates/"; + + f.setFileName(SCRIBO_LOCAL_DATAROOTDIR "/templates/" + file); if (f.exists()) return SCRIBO_LOCAL_DATAROOTDIR "/templates/"; @@ -90,7 +96,7 @@ int svg_base64(const QString& xml, const QString& svg) int main(int argc, char **argv) { QString man = \ - "xml_transform\n" + "Usage: scribo-xml2doc [--template-path <dir>] [OPTIONS]\n" "OPTIONS:\n\n" "HTML output:\n" @@ -138,8 +144,23 @@ int main(int argc, char **argv) QString option(argv[1]); - if (argc > 4) + if (argc == 5 || argc == 7) { + if (argc == 7) + { + if ("--template-path" == option) + { + template_path = argv[2]; + argv += 2; + option = QString(argv[1]); + } + else + { + qDebug() << man; + return 1; + } + } + if ("--html-full" == option) { check_xsltproc(); -- 1.7.2.5

1 0

olena: branch exp/TL updated: olena-2.0-597-gad20949
by git＠lrde.epita.fr 24 Apr '13

24 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/TL has been updated via ad209491c16f7c64ce240725776dedb1ff387f1b (commit) via 4376a9cc3724123c1a73c893d82746dfd8c873c3 (commit) via 929a663e0c26be70a6ef2e7828ef061a9c861842 (commit) from 018a18b7bba231b035ea1555c0b7776bfa7e5f83 (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 ----------------------------------------------------------------- ad20949 Merge branch 'exp/magick-improvements' into exp/TL ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 18 ++ milena/mln/convert/impl/from_value_to_value.hh | 44 +++--- milena/mln/io/magick/load.hh | 206 +++++++++++++++--------- milena/mln/io/magick/save.hh | 9 +- milena/mln/value/rgb.hh | 26 +++- 5 files changed, 201 insertions(+), 102 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-597-gad20949 Merge branch 'exp/magick-improvements' into exp/TL
by Guillaume Lazzara 24 Apr '13

24 Apr '13

This is a merge commit message of the following branches: Merge: 018a18b 4376a9c milena/ChangeLog | 18 ++ milena/mln/convert/impl/from_value_to_value.hh | 44 +++--- milena/mln/io/magick/load.hh | 206 +++++++++++++++--------- milena/mln/io/magick/save.hh | 9 +- milena/mln/value/rgb.hh | 26 +++- 5 files changed, 201 insertions(+), 102 deletions(-) diff --cc milena/mln/value/rgb.hh index 1a38c18,24bf438..30941e2 --- a/milena/mln/value/rgb.hh +++ b/milena/mln/value/rgb.hh @@@ -360,17 -360,11 +360,17 @@@ namespace ml namespace value { - /// \internal Conversion: rgb -> bool. + /*! + \brief Conversion: rgb -> bool. + \ingroup fromto + */ template <unsigned m> - void from_to_(const value::rgb<m>& from, bool& to); + void from_to_(const rgb<m>& from, bool& to); - /// \internal Conversion: rgb to hsl_ + /*! + \brief Conversion: rgb to hsl_ + \ingroup fromto + */ void from_to_(const rgb<16>& from, hsl_<float,float,float>& to); @@@ -381,12 -372,18 +381,21 @@@ void from_to_(const rgb<8>& from, hsl_<float,float,float>& to); - /// \internal Conversion: bool -> rgb. + /*! + \brief Conversion: bool -> rgb. + \ingroup fromto + */ template <unsigned m> - void from_to_(bool from, value::rgb<m>& to); + void from_to_(bool from, rgb<m>& to); + + /*! + \brief Conversion: rgb -> rgb. + \pre n <= m + \ingroup fromto + */ + template <unsigned n, unsigned m> + void + from_to_(const rgb<n>& from, rgb<m>& to); } // end of namespace mln::value hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-557-g707680b Handle 16 bits value types with io::magick.
by Guillaume Lazzara 24 Apr '13

24 Apr '13

* mln/io/magick/load.hh, * mln/io/magick/save.hh: Enable portions of code supporting 16bits images if GraphicsMagick supports it. --- milena/ChangeLog | 8 ++ milena/mln/io/magick/load.hh | 206 +++++++++++++++++++++++++++--------------- milena/mln/io/magick/save.hh | 9 +- 3 files changed, 144 insertions(+), 79 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 14d36de..4b4c4a9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 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 diff --git a/milena/mln/io/magick/load.hh b/milena/mln/io/magick/load.hh index 3044729..0962303 100644 --- a/milena/mln/io/magick/load.hh +++ b/milena/mln/io/magick/load.hh @@ -39,6 +39,7 @@ # include <mln/value/int_u8.hh> # include <mln/value/rgb8.hh> +# include <mln/value/rgb16.hh> # include <mln/io/magick/internal/init_magick.hh> @@ -58,48 +59,47 @@ namespace mln \param[out] ima The image data are loaded into. \param[in] filename The name of the input file. + \warning In order to use 16bits images, the version + installed on the system must be compiled with a 16 bits + Quantum (16 bits per channel). On most Linux distribution, + it is compiled with a 8 bits Quantum (8 bits per channel) + and converts automatically 16 bits images toward 8 bits + images. + + \warning 32bits images are not supported by Milena for the + moment. + \ingroup iomagick */ template <typename I> void load(Image<I>& ima, const std::string& filename); - // FIXME: Unfinished? -#if 0 - /** Load data from a file into a Milena tiled image using - Magick++. - - \param[out] ima The image data are loaded into. - \param[in] filename The name of the input file. */ - template <typename T> - void load(Image<tiled2d<T> >& ima, const std::string& filename); -#endif - - # ifndef MLN_INCLUDE_ONLY namespace impl { + template <unsigned n> inline bool - do_it(const value::rgb8& in, bool& out) + do_it(const value::rgb<n>& in, bool& out) { if (in.red() != in.green() || in.green() != in.blue()) { std::cerr << "error: attempt to load what looks like a color\n" - "(mln::value::rgb8) image into a Boolean (bool) image" << - std::endl; + "(mln::value::rgb" << n << ") image into a Boolean (bool) image" + << std::endl; return false; } if (in.red() != 0 && - in.red() != mln_max(value::rgb8::red_t)) + in.red() != mln_max(typename value::rgb<n>::red_t)) { std::cerr << "error: attempt to load what looks like a grayscale\n" - "(mln::value::int_u8) image into a Boolean (bool) image" << - std::endl; + "(mln::value::int_u" << n << ") image into a Boolean (bool) image" + << std::endl; return false; } @@ -107,16 +107,27 @@ namespace mln return true; } + template <unsigned n, unsigned m> inline bool - do_it(const value::rgb8& in, value::int_u8& out) + do_it(const value::rgb<n>& in, value::int_u<m>& out) { + if (n > m) + { + std::cerr << "error: attempt to load high quantification values (" + << n + << " bits) into low quantification values (" + << m + << ")." << std::endl; + return false; + } + if (in.red() != in.green() || in.green() != in.blue()) { std::cerr << "error: attempt to load what looks like a color\n" - "(mln::value::rgb8) image into a grayscale\n" - "(mln::int_u8 values) image" << std::endl; + "(mln::value::rgb" << n << ") image into a grayscale\n" + "(mln::int_u" << m << " values) image" << std::endl; return false; } @@ -124,14 +135,90 @@ namespace mln return true; } - inline + template <unsigned n> + bool + do_it(const value::rgb<n>& in, value::rgb<n>& out) + { + out = in; + return true; + } + + template <unsigned n, unsigned m> bool - do_it(const value::rgb8& in, value::rgb8& out) + do_it(const value::rgb<n>& in, value::rgb<m>& out) { - out = in; + if (n > m) + { + std::cerr << "error: attempt to load high quantification values (" + << n + << " bits) into low quantification values (" + << m + << ")." << std::endl; + return false; + } + + convert::from_to(in, out); return true; } + + template <typename V, typename I> + void load(I& ima, const std::string& filename) + { + // FIXME: Handle Magick++'s exceptions (see either + // ImageMagick++'s or GraphicsMagick++'s documentation). + Magick::Image magick_ima(filename); + magick_ima.read(filename); + magick_ima.type(Magick::TrueColorType); + int nrows = magick_ima.rows(); + int ncols = magick_ima.columns(); + mln_site(I) pmin(0, 0); + mln_site(I) pmax(nrows - 1, ncols - 1); + + mln_concrete(I) result(box<mln_site(I)>(pmin, pmax)); + initialize(ima, result); + + def::coord + minrow = geom::min_row(ima), + mincol = geom::min_col(ima), + maxrow = geom::max_row(ima), + maxcol = geom::max_col(ima); + + Magick::Pixels view(magick_ima); + // Note that `ncols' is passed before `nrows'. + Magick::PixelPacket* pixels = view.get(0, 0, ima.ncols(), ima.nrows()); + mln_value(I) *ptr_ima = &ima(ima.domain().pmin()); + + unsigned row_offset = ima.delta_offset(dpoint2d(+1, - ncols)); + + for (def::coord row = minrow; row <= maxrow; + ++row, ptr_ima += row_offset) + for (def::coord col = mincol; col <= maxcol; ++col) + { + /* Each channel of a Magick++ image is coded on a + Magick::Quantum value, which can be an 8-, 16- or 32-bit + integer. Load the most significant bits of each channel + into a component of an mln::value::rgb8 value (i.e., into + an mln::value::int_u8 value). */ + V c(pixels->red >> 8 * (sizeof(Magick::Quantum) + - sizeof(typename V::red_t)), + pixels->green >> 8 * (sizeof(Magick::Quantum) + - sizeof(typename V::green_t)), + pixels->blue >> 8 * (sizeof(Magick::Quantum) + - sizeof(typename V::blue_t))); + mln_value(I) res; + if (!do_it(c, res)) + { + std::cerr << "while trying to load `" << filename << "'" + << std::endl; + abort(); + } + + *ptr_ima++ = res; + ++pixels; + } + } + } // end of namespace mln::io::magick::impl @@ -147,58 +234,27 @@ namespace mln 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.read(filename); - magick_ima.type(Magick::TrueColorType); - int nrows = magick_ima.rows(); - int ncols = magick_ima.columns(); - mln_site(I) pmin(0, 0); - mln_site(I) pmax(nrows - 1, ncols - 1); - - mln_concrete(I) result(box<mln_site(I)>(pmin, pmax)); - initialize(ima, result); - - def::coord - minrow = geom::min_row(ima), - mincol = geom::min_col(ima), - maxrow = geom::max_row(ima), - maxcol = geom::max_col(ima); - - Magick::Pixels view(magick_ima); - // Note that `ncols' is passed before `nrows'. - Magick::PixelPacket* pixels = view.get(0, 0, ima.ncols(), ima.nrows()); - mln_value(I) *ptr_ima = &ima(ima.domain().pmin()); - - unsigned row_offset = ima.delta_offset(dpoint2d(+1, - ncols)); - - for (def::coord row = minrow; row <= maxrow; - ++row, ptr_ima += row_offset) - for (def::coord col = mincol; col <= maxcol; ++col) - { + unsigned quantum_size = sizeof(Magick::Quantum); + switch(quantum_size) + { + case 1: + impl::load<value::rgb8>(ima, filename); + break; + + case 2: +# if (QuantumDepth == 16) // Enable if the current version of + // GraphicsMagick is compatible. + impl::load<value::rgb16>(ima, filename); + break; +#endif - /* Each channel of a Magick++ image is coded on a - Magick::Quantum value, which can be an 8-, 16- or 32-bit - integer. Load the most significant bits of each channel - into a component of an mln::value::rgb8 value (i.e., into - an mln::value::int_u8 value). */ - value::rgb8 c(pixels->red >> 8 * (sizeof(Magick::Quantum) - - sizeof(value::rgb8::red_t)), - pixels->green >> 8 * (sizeof(Magick::Quantum) - - sizeof(value::rgb8::green_t)), - pixels->blue >> 8 * (sizeof(Magick::Quantum) - - sizeof(value::rgb8::blue_t))); - mln_value(I) res; - if (!impl::do_it(c, res)) - { - std::cerr << "while trying to load `" << filename << "'" - << std::endl; - abort(); - } - *ptr_ima++ = res; - ++pixels; - } + case 4: + default: + std::cerr << "Quantum size not supported! Values in each channel" + " must be encoded in 8 or 16 bits. (" << quantum_size * 8 << "bits here)" + << std::endl; + abort(); + } } diff --git a/milena/mln/io/magick/save.hh b/milena/mln/io/magick/save.hh index 8437462..93b3c58 100644 --- a/milena/mln/io/magick/save.hh +++ b/milena/mln/io/magick/save.hh @@ -186,8 +186,9 @@ namespace mln value << 8 * (sizeof(Magick::Quantum) - sizeof(value::int_u8))); } + template <unsigned n> inline - Magick::Color get_color(const value::rgb8& value) + Magick::Color get_color(const value::rgb<n>& value) { /* Each channel of a Magick++ image is coded on a Magick::Quantum value, which can be an 8-, 16- or 32-bit @@ -197,11 +198,11 @@ namespace mln channels. */ return Magick::Color (value.red() << 8 * (sizeof(Magick::Quantum) - - sizeof(value::rgb8::red_t)), + - sizeof(typename value::rgb<n>::red_t)), value.green() << 8 * (sizeof(Magick::Quantum) - - sizeof(value::rgb8::green_t)), + - sizeof(typename value::rgb<n>::green_t)), value.blue() << 8 * (sizeof(Magick::Quantum) - - sizeof(value::rgb8::blue_t))); + - sizeof(typename value::rgb<n>::blue_t))); } -- 1.7.2.5

1 0

olena: olena-2.0-556-g5c00887 Relax conversion dispatch.
by Guillaume Lazzara 24 Apr '13

24 Apr '13

* 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>. --- milena/ChangeLog | 10 +++++ milena/mln/convert/impl/from_value_to_value.hh | 44 +++++++++++++----------- milena/mln/value/rgb.hh | 26 ++++++++++++-- 3 files changed, 57 insertions(+), 23 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4bce1ed..14d36de 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,13 @@ +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. diff --git a/milena/mln/convert/impl/from_value_to_value.hh b/milena/mln/convert/impl/from_value_to_value.hh index fea91a3..9c93e5a 100644 --- a/milena/mln/convert/impl/from_value_to_value.hh +++ b/milena/mln/convert/impl/from_value_to_value.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2012 EPITA Research and Development +// Copyright (C) 2008, 2009, 2012, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -65,25 +65,29 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - // Case 1: - - template <typename V, typename W> - void - from_value_to_value_(const mln::value::Vectorial<V>& from, - mln::value::Vectorial<W>& to) - { - exact(to) = exact(from).to_equiv(); - } - - // Case 2: - - template <typename V, typename W> - void - from_value_to_value_(const mln::value::Scalar<V>& from, - mln::value::Scalar<W>& to) - { - exact(to) = exact(from).to_equiv(); - } + // We want to disable this code since it prevents types of + // different quantification to rely on from_to_ overload and + // handle specific conversions. (ex: rgb16 towards rgb8) + + // // Case 1: + + // template <typename V, typename W> + // void + // from_value_to_value_(const mln::value::Vectorial<V>& from, + // mln::value::Vectorial<W>& to) + // { + // exact(to) = exact(from).to_equiv(); + // } + + // // Case 2: + + // template <typename V, typename W> + // void + // from_value_to_value_(const mln::value::Scalar<V>& from, + // mln::value::Scalar<W>& to) + // { + // exact(to) = exact(from).to_equiv(); + // } template <typename V, typename W> inline diff --git a/milena/mln/value/rgb.hh b/milena/mln/value/rgb.hh index b29b479..24bf438 100644 --- a/milena/mln/value/rgb.hh +++ b/milena/mln/value/rgb.hh @@ -362,7 +362,7 @@ namespace mln /// \internal Conversion: rgb -> bool. template <unsigned m> - void from_to_(const value::rgb<m>& from, bool& to); + void from_to_(const rgb<m>& from, bool& to); /// \internal Conversion: rgb to hsl_ void @@ -374,7 +374,16 @@ namespace mln /// \internal Conversion: bool -> rgb. template <unsigned m> - void from_to_(bool from, value::rgb<m>& to); + void from_to_(bool from, rgb<m>& to); + + /*! + \brief Conversion: rgb -> rgb. + \pre n <= m + \ingroup fromto + */ + template <unsigned n, unsigned m> + void + from_to_(const rgb<n>& from, rgb<m>& to); } // end of namespace mln::value @@ -762,7 +771,7 @@ namespace mln template <unsigned m> void - from_to_(bool from, mln::value::rgb<m>& to) + from_to_(bool from, rgb<m>& to) { static mln::literal::white_t* white_ = 0; static mln::literal::black_t* black_ = 0; @@ -775,6 +784,17 @@ namespace mln to = *black_; } + template <unsigned n, unsigned m> + void + from_to_(const rgb<n>& from, rgb<m>& to) + { + mln_assertion(n <= m); + to.red() = from.red(); + to.green() = from.green(); + to.blue() = from.blue(); + } + + } // end of namespace mln::value } // end of namespace mln -- 1.7.2.5

1 0

olena: branch exp/TL updated: olena-2.0-594-g018a18b
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/TL has been updated via 018a18b7bba231b035ea1555c0b7776bfa7e5f83 (commit) via e42c33ee80ab8dce3a77644a9ba5b4e6cf6d1521 (commit) via 027bc33ddeb178615228542ff80112199786ce46 (commit) via bf546a8ede0d53aeaff42277833fc22b5a29a480 (commit) from 3d74e203c5bccd50cd39ef03524cdbf817d094ac (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 ----------------------------------------------------------------- 018a18b Merge branch 'exp/magick-improvements' into exp/TL ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 19 +++ .../mln/io/{pgms/load.hh => magick/get_header.hh} | 86 ++++++++----- milena/mln/io/magick/save.hh | 141 ++++++++++++++++---- milena/tests/io/magick/Makefile.am | 1 + .../tests/io/magick/get_header.cc | 45 ++++--- milena/tests/io/magick/save.cc | 2 +- 6 files changed, 222 insertions(+), 72 deletions(-) copy milena/mln/io/{pgms/load.hh => magick/get_header.hh} (50%) copy scribo/tests/primitive/extract/lines_v_pattern.cc => milena/tests/io/magick/get_header.cc (59%) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0