Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

last-svn-commit-668-g47b8275 scribo/core/document.hh: Add new methods.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/scribo/core/document.hh | 31 +++++++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a576dc2..f6248fa 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/core/document.hh: Add new methods. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/io/xml/save.hh: Add conditions before saving elements and text. diff --git a/scribo/scribo/core/document.hh b/scribo/scribo/core/document.hh index 93d9348..daa0d7b 100644 --- a/scribo/scribo/core/document.hh +++ b/scribo/scribo/core/document.hh @@ -48,21 +48,24 @@ namespace scribo document(); document(const char *filename); + void open(); + const char * filename() const; + void set_filename(const char*name); bool is_valid() const; const line_set<L>& text() const; + bool has_text() const; void set_text(const line_set<L>& line); const component_set<L>& elements() const; + bool has_elements() const; void set_elements(const component_set<L>& elements); const mln::image2d<value::rgb8>& image() const; private: - void open(); - const char *filename_; mln::image2d<mln::value::rgb8> image_; @@ -99,6 +102,14 @@ namespace scribo template <typename L> void + document<L>::set_filename(const char *filename) + { + filename_ = filename; + } + + + template <typename L> + void document<L>::open() { mln::io::magick::load(image_, filename_); @@ -122,6 +133,14 @@ namespace scribo template <typename L> + bool + document<L>::has_text() const + { + return lines_.is_valid(); + } + + + template <typename L> void document<L>::set_text(const line_set<L>& line) { @@ -138,6 +157,14 @@ namespace scribo template <typename L> + bool + document<L>::has_elements() const + { + return elements_.is_valid(); + } + + + template <typename L> void document<L>::set_elements(const component_set<L>& elements) { -- 1.5.6.5

14 years, 2 months

last-svn-commit-667-g92e2d04 scribo/core/document.hh: Add new methods.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/scribo/core/document.hh | 31 +++++++++++++++++++++++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 240e6a5..3db5ad3 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/core/document.hh: Add new methods. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/io/xml/save.hh: Add conditions before saving elements and text. diff --git a/scribo/scribo/core/document.hh b/scribo/scribo/core/document.hh index 93d9348..daa0d7b 100644 --- a/scribo/scribo/core/document.hh +++ b/scribo/scribo/core/document.hh @@ -48,21 +48,24 @@ namespace scribo document(); document(const char *filename); + void open(); + const char * filename() const; + void set_filename(const char*name); bool is_valid() const; const line_set<L>& text() const; + bool has_text() const; void set_text(const line_set<L>& line); const component_set<L>& elements() const; + bool has_elements() const; void set_elements(const component_set<L>& elements); const mln::image2d<value::rgb8>& image() const; private: - void open(); - const char *filename_; mln::image2d<mln::value::rgb8> image_; @@ -99,6 +102,14 @@ namespace scribo template <typename L> void + document<L>::set_filename(const char *filename) + { + filename_ = filename; + } + + + template <typename L> + void document<L>::open() { mln::io::magick::load(image_, filename_); @@ -122,6 +133,14 @@ namespace scribo template <typename L> + bool + document<L>::has_text() const + { + return lines_.is_valid(); + } + + + template <typename L> void document<L>::set_text(const line_set<L>& line) { @@ -138,6 +157,14 @@ namespace scribo template <typename L> + bool + document<L>::has_elements() const + { + return elements_.is_valid(); + } + + + template <typename L> void document<L>::set_elements(const component_set<L>& elements) { -- 1.5.6.5

14 years, 2 months

last-svn-commit-667-gb36c24d scribo/io/xml/save.hh: Add conditions before saving elements and text.

by Guillaume Lazzara

--- scribo/ChangeLog | 5 ++ scribo/scribo/io/xml/save.hh | 126 ++++++++++++++++++++++-------------------- 2 files changed, 71 insertions(+), 60 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index cc15e8f..a576dc2 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/io/xml/save.hh: Add conditions before saving elements and + text. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/core/line_set.hh (is_valid()): New method. 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/io/xml/save.hh b/scribo/scribo/io/xml/save.hh index c6b416d..928db17 100644 --- a/scribo/scribo/io/xml/save.hh +++ b/scribo/scribo/io/xml/save.hh @@ -155,88 +155,94 @@ namespace scribo << "\" image_height=\"" << lines.components().labeled_image().nrows() << "\">" << std::endl; - for_all_lines(l, lines) + // Text + if (doc.has_text()) { - if (! lines(l).is_valid() - || lines(l).tag() != line::None - || lines(l).type() != line::Text) // Is NOT a text line. - continue; + for_all_lines(l, lines) { - file << " <text_region id=\"" << lines(l).id() - << "\" txt_orientation=\"" << lines(l).orientation() - << "\" txt_reading_orientation=\"" << lines(l).reading_orientation() - << "\" txt_reading_direction=\"" << lines(l).reading_direction() - << "\" txt_text_type=\"" << lines(l).type() - << "\" txt_reverse_video=\"" << (lines(l).reverse_video() ? "true" : "false") - << "\" txt_indented=\"" << (lines(l).indented() ? "true" : "false") - << "\" kerning=\"" << lines(l).char_space(); - - // EXTENSIONS - Not officially supported - if (extended_format) + if (! lines(l).is_valid() + || lines(l).tag() != line::None + || lines(l).type() != line::Text) // Is NOT a text line. + continue; { - file << "\" baseline=\"" << lines(l).baseline() - << "\" meanline=\"" << lines(l).meanline() - << "\" x_height=\"" << lines(l).x_height() - << "\" d_height=\"" << lines(l).d_height() - << "\" a_height=\"" << lines(l).a_height() - << "\" char_width=\"" << lines(l).char_width(); - } - // End of EXTENSIONS - file << "\">" - << std::endl; + file << " <text_region id=\"" << lines(l).id() + << "\" txt_orientation=\"" << lines(l).orientation() + << "\" txt_reading_orientation=\"" << lines(l).reading_orientation() + << "\" txt_reading_direction=\"" << lines(l).reading_direction() + << "\" txt_text_type=\"" << lines(l).type() + << "\" txt_reverse_video=\"" << (lines(l).reverse_video() ? "true" : "false") + << "\" txt_indented=\"" << (lines(l).indented() ? "true" : "false") + << "\" kerning=\"" << lines(l).char_space(); + + // EXTENSIONS - Not officially supported + if (extended_format) + { + file << "\" baseline=\"" << lines(l).baseline() + << "\" meanline=\"" << lines(l).meanline() + << "\" x_height=\"" << lines(l).x_height() + << "\" d_height=\"" << lines(l).d_height() + << "\" a_height=\"" << lines(l).a_height() + << "\" char_width=\"" << lines(l).char_width(); + } + // End of EXTENSIONS + file << "\">" + << std::endl; - internal::print_box_coords(file, lines(l).bbox(), " "); + internal::print_box_coords(file, lines(l).bbox(), " "); - if (extended_format) - { - file << " <paragraph>" << std::endl; + if (extended_format) + { + file << " <paragraph>" << std::endl; - internal::print_box_coords(file, lines(l).bbox(), " "); + internal::print_box_coords(file, lines(l).bbox(), " "); - if (lines(l).has_text()) - { - std::string tmp = lines(l).text(); - tmp = internal::html_markups_replace(tmp, html_map); + if (lines(l).has_text()) + { + std::string tmp = lines(l).text(); + tmp = internal::html_markups_replace(tmp, html_map); - file << " <line text=\"" - << tmp - << "\">" << std::endl; - } - else - file << " <line>" << std::endl; + file << " <line text=\"" + << tmp + << "\">" << std::endl; + } + else + file << " <line>" << std::endl; - internal::print_box_coords(file, lines(l).bbox(), " "); + internal::print_box_coords(file, lines(l).bbox(), " "); - file << " </line>" << std::endl; + file << " </line>" << std::endl; - file << " </paragraph>" << std::endl; - } + file << " </paragraph>" << std::endl; + } - file << " </text_region>" << std::endl; + file << " </text_region>" << std::endl; + } } } + // Page elements (Pictures, ...) + if (doc.has_elements()) + { + const component_set<L>& elts = doc.elements(); + for_all_comps(e, elts) + if (elts(e).is_valid()) + { + file << " <image_region id=\"ir" << elts(e).id() + << "\" img_colour_type=\"24_Bit_Colour\"" + << " img_orientation=\"0.000000\" " + << " img_emb_text=\"No\" " + << " img_bgcolour=\"White\">" << std::endl; - const component_set<L>& elts = doc.elements(); - for_all_comps(e, elts) - if (elts(e).is_valid()) - { - file << " <image_region id=\"ir" << elts(e).id() - << "\" img_colour_type=\"24_Bit_Colour\"" - << " img_orientation=\"0.000000\" " - << " img_emb_text=\"No\" " - << " img_bgcolour=\"White\">" << std::endl; + internal::print_box_coords(file, elts(e).bbox(), " "); - internal::print_box_coords(file, elts(e).bbox(), " "); + file << " </image_region>" << std::endl; + } + } - file << " </image_region>" << std::endl; - } file << " </page>" << std::endl; file << "</pcGts>" << std::endl; - - trace::exiting("scribo::io::xml::save_text_lines"); } -- 1.5.6.5

14 years, 2 months

last-svn-commit-666-g4c97de4 scribo/io/xml/save.hh: Add conditions before saving elements and text.

by Guillaume Lazzara

--- scribo/ChangeLog | 5 ++ scribo/scribo/io/xml/save.hh | 126 ++++++++++++++++++++++-------------------- 2 files changed, 71 insertions(+), 60 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index afa3d87..240e6a5 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/io/xml/save.hh: Add conditions before saving elements and + text. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/core/line_set.hh (is_valid()): New method. 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/io/xml/save.hh b/scribo/scribo/io/xml/save.hh index c6b416d..928db17 100644 --- a/scribo/scribo/io/xml/save.hh +++ b/scribo/scribo/io/xml/save.hh @@ -155,88 +155,94 @@ namespace scribo << "\" image_height=\"" << lines.components().labeled_image().nrows() << "\">" << std::endl; - for_all_lines(l, lines) + // Text + if (doc.has_text()) { - if (! lines(l).is_valid() - || lines(l).tag() != line::None - || lines(l).type() != line::Text) // Is NOT a text line. - continue; + for_all_lines(l, lines) { - file << " <text_region id=\"" << lines(l).id() - << "\" txt_orientation=\"" << lines(l).orientation() - << "\" txt_reading_orientation=\"" << lines(l).reading_orientation() - << "\" txt_reading_direction=\"" << lines(l).reading_direction() - << "\" txt_text_type=\"" << lines(l).type() - << "\" txt_reverse_video=\"" << (lines(l).reverse_video() ? "true" : "false") - << "\" txt_indented=\"" << (lines(l).indented() ? "true" : "false") - << "\" kerning=\"" << lines(l).char_space(); - - // EXTENSIONS - Not officially supported - if (extended_format) + if (! lines(l).is_valid() + || lines(l).tag() != line::None + || lines(l).type() != line::Text) // Is NOT a text line. + continue; { - file << "\" baseline=\"" << lines(l).baseline() - << "\" meanline=\"" << lines(l).meanline() - << "\" x_height=\"" << lines(l).x_height() - << "\" d_height=\"" << lines(l).d_height() - << "\" a_height=\"" << lines(l).a_height() - << "\" char_width=\"" << lines(l).char_width(); - } - // End of EXTENSIONS - file << "\">" - << std::endl; + file << " <text_region id=\"" << lines(l).id() + << "\" txt_orientation=\"" << lines(l).orientation() + << "\" txt_reading_orientation=\"" << lines(l).reading_orientation() + << "\" txt_reading_direction=\"" << lines(l).reading_direction() + << "\" txt_text_type=\"" << lines(l).type() + << "\" txt_reverse_video=\"" << (lines(l).reverse_video() ? "true" : "false") + << "\" txt_indented=\"" << (lines(l).indented() ? "true" : "false") + << "\" kerning=\"" << lines(l).char_space(); + + // EXTENSIONS - Not officially supported + if (extended_format) + { + file << "\" baseline=\"" << lines(l).baseline() + << "\" meanline=\"" << lines(l).meanline() + << "\" x_height=\"" << lines(l).x_height() + << "\" d_height=\"" << lines(l).d_height() + << "\" a_height=\"" << lines(l).a_height() + << "\" char_width=\"" << lines(l).char_width(); + } + // End of EXTENSIONS + file << "\">" + << std::endl; - internal::print_box_coords(file, lines(l).bbox(), " "); + internal::print_box_coords(file, lines(l).bbox(), " "); - if (extended_format) - { - file << " <paragraph>" << std::endl; + if (extended_format) + { + file << " <paragraph>" << std::endl; - internal::print_box_coords(file, lines(l).bbox(), " "); + internal::print_box_coords(file, lines(l).bbox(), " "); - if (lines(l).has_text()) - { - std::string tmp = lines(l).text(); - tmp = internal::html_markups_replace(tmp, html_map); + if (lines(l).has_text()) + { + std::string tmp = lines(l).text(); + tmp = internal::html_markups_replace(tmp, html_map); - file << " <line text=\"" - << tmp - << "\">" << std::endl; - } - else - file << " <line>" << std::endl; + file << " <line text=\"" + << tmp + << "\">" << std::endl; + } + else + file << " <line>" << std::endl; - internal::print_box_coords(file, lines(l).bbox(), " "); + internal::print_box_coords(file, lines(l).bbox(), " "); - file << " </line>" << std::endl; + file << " </line>" << std::endl; - file << " </paragraph>" << std::endl; - } + file << " </paragraph>" << std::endl; + } - file << " </text_region>" << std::endl; + file << " </text_region>" << std::endl; + } } } + // Page elements (Pictures, ...) + if (doc.has_elements()) + { + const component_set<L>& elts = doc.elements(); + for_all_comps(e, elts) + if (elts(e).is_valid()) + { + file << " <image_region id=\"ir" << elts(e).id() + << "\" img_colour_type=\"24_Bit_Colour\"" + << " img_orientation=\"0.000000\" " + << " img_emb_text=\"No\" " + << " img_bgcolour=\"White\">" << std::endl; - const component_set<L>& elts = doc.elements(); - for_all_comps(e, elts) - if (elts(e).is_valid()) - { - file << " <image_region id=\"ir" << elts(e).id() - << "\" img_colour_type=\"24_Bit_Colour\"" - << " img_orientation=\"0.000000\" " - << " img_emb_text=\"No\" " - << " img_bgcolour=\"White\">" << std::endl; + internal::print_box_coords(file, elts(e).bbox(), " "); - internal::print_box_coords(file, elts(e).bbox(), " "); + file << " </image_region>" << std::endl; + } + } - file << " </image_region>" << std::endl; - } file << " </page>" << std::endl; file << "</pcGts>" << std::endl; - - trace::exiting("scribo::io::xml::save_text_lines"); } -- 1.5.6.5

14 years, 2 months

last-svn-commit-666-g75906d4 scribo/core/line_set.hh (is_valid()): New method.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/scribo/core/line_set.hh | 11 +++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 69998c0..cc15e8f 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/core/line_set.hh (is_valid()): New method. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/group/from_double_link_any.hh: New. 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/core/line_set.hh b/scribo/scribo/core/line_set.hh index 6ef3294..29795b2 100644 --- a/scribo/scribo/core/line_set.hh +++ b/scribo/scribo/core/line_set.hh @@ -154,6 +154,9 @@ namespace scribo /// @} + + bool is_valid() const; + private: /// Duplicate the underlying image and create a new line_set. void init_(const line_set<L>& model); @@ -390,6 +393,14 @@ namespace scribo template <typename L> inline + bool + line_set<L>::is_valid() const + { + return data_->links_.is_valid() && data_->groups_.is_valid(); + } + + template <typename L> + inline void line_set<L>::init_(const line_set<L>& set) { -- 1.5.6.5

14 years, 2 months

last-svn-commit-665-g0b29bba scribo/core/line_set.hh (is_valid()): New method.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/scribo/core/line_set.hh | 11 +++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a7f2dc7..afa3d87 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/core/line_set.hh (is_valid()): New method. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/group/from_double_link_any.hh: New. 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/core/line_set.hh b/scribo/scribo/core/line_set.hh index 6ef3294..29795b2 100644 --- a/scribo/scribo/core/line_set.hh +++ b/scribo/scribo/core/line_set.hh @@ -154,6 +154,9 @@ namespace scribo /// @} + + bool is_valid() const; + private: /// Duplicate the underlying image and create a new line_set. void init_(const line_set<L>& model); @@ -390,6 +393,14 @@ namespace scribo template <typename L> inline + bool + line_set<L>::is_valid() const + { + return data_->links_.is_valid() && data_->groups_.is_valid(); + } + + template <typename L> + inline void line_set<L>::init_(const line_set<L>& set) { -- 1.5.6.5

14 years, 2 months

last-svn-commit-665-g0731c7c Regen mk files in Milena.

by Guillaume Lazzara

* headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 7 +++++++ milena/headers.mk | 7 ++++++- milena/tests/unit_test/unit-tests.mk | 10 +++++++++- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a56d47d..549ea7b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen mk files in Milena. + + * headers.mk, + * tests/unit_test/unit-tests.mk: Regen. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce world::rgb::invert. * mln/world/rgb/invert.hh, diff --git a/milena/headers.mk b/milena/headers.mk index f986150..3d897e3 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -49,6 +49,7 @@ mln/accu/site_set/rectangularity.hh \ mln/accu/stat/all.hh \ mln/accu/stat/deviation.hh \ mln/accu/stat/essential.hh \ +mln/accu/stat/histo3d_rgb.hh \ mln/accu/stat/max.hh \ mln/accu/stat/max_h.hh \ mln/accu/stat/mean.hh \ @@ -141,6 +142,7 @@ mln/canvas/morpho/all.hh \ mln/canvas/morpho/attribute_filter.hh \ mln/canvas/morpho/essential.hh \ mln/canvas/morpho/internal/find_root.hh \ +mln/clustering/kmean_rgb.hh \ mln/convert/all.hh \ mln/convert/essential.hh \ mln/convert/from_to.hh \ @@ -556,6 +558,7 @@ mln/fun/v2v/linear.hh \ mln/fun/v2v/norm.hh \ mln/fun/v2v/projection.hh \ mln/fun/v2v/qt_rgb_to_int_u.hh \ +mln/fun/v2v/rgb8_to_rgbn.hh \ mln/fun/v2v/rgb_to_int_u.hh \ mln/fun/v2v/saturate.hh \ mln/fun/v2v/wrap.hh \ @@ -1284,7 +1287,9 @@ mln/world/inter_pixel/immerse.hh \ mln/world/inter_pixel/is_pixel.hh \ mln/world/inter_pixel/is_separator.hh \ mln/world/inter_pixel/neighb2d.hh \ -mln/world/inter_pixel/separator_to_pixels.hh +mln/world/inter_pixel/separator_to_pixels.hh \ +mln/world/rgb/invert.hh \ +mln/world/rgb/invert.spe.hh #<<lrde nobase_include_HEADERS += \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index c5dba4c..5baced7 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -229,6 +229,7 @@ mln_canvas_morpho_all \ mln_canvas_morpho_attribute_filter \ mln_canvas_morpho_essential \ mln_canvas_morpho_internal_find_root \ +mln_clustering_kmean_rgb \ mln_convert_all \ mln_convert_essential \ mln_convert_from_to \ @@ -668,6 +669,7 @@ mln_fun_v2v_linear \ mln_fun_v2v_norm \ mln_fun_v2v_projection \ mln_fun_v2v_qt_rgb_to_int_u \ +mln_fun_v2v_rgb8_to_rgbn \ mln_fun_v2v_rgb_to_hsi \ mln_fun_v2v_rgb_to_hsl \ mln_fun_v2v_rgb_to_int_u \ @@ -1410,7 +1412,9 @@ mln_world_inter_pixel_immerse \ mln_world_inter_pixel_is_pixel \ mln_world_inter_pixel_is_separator \ mln_world_inter_pixel_neighb2d \ -mln_world_inter_pixel_separator_to_pixels +mln_world_inter_pixel_separator_to_pixels \ +mln_world_rgb_invert \ +mln_world_rgb_invert_spe mln_accu_all_SOURCES = mln_accu_all.cc mln_accu_center_SOURCES = mln_accu_center.cc @@ -1549,6 +1553,7 @@ mln_canvas_morpho_all_SOURCES = mln_canvas_morpho_all.cc mln_canvas_morpho_attribute_filter_SOURCES = mln_canvas_morpho_attribute_filter.cc mln_canvas_morpho_essential_SOURCES = mln_canvas_morpho_essential.cc mln_canvas_morpho_internal_find_root_SOURCES = mln_canvas_morpho_internal_find_root.cc +mln_clustering_kmean_rgb_SOURCES = mln_clustering_kmean_rgb.cc mln_convert_all_SOURCES = mln_convert_all.cc mln_convert_essential_SOURCES = mln_convert_essential.cc mln_convert_from_to_SOURCES = mln_convert_from_to.cc @@ -1988,6 +1993,7 @@ mln_fun_v2v_linear_SOURCES = mln_fun_v2v_linear.cc mln_fun_v2v_norm_SOURCES = mln_fun_v2v_norm.cc mln_fun_v2v_projection_SOURCES = mln_fun_v2v_projection.cc mln_fun_v2v_qt_rgb_to_int_u_SOURCES = mln_fun_v2v_qt_rgb_to_int_u.cc +mln_fun_v2v_rgb8_to_rgbn_SOURCES = mln_fun_v2v_rgb8_to_rgbn.cc mln_fun_v2v_rgb_to_hsi_SOURCES = mln_fun_v2v_rgb_to_hsi.cc mln_fun_v2v_rgb_to_hsl_SOURCES = mln_fun_v2v_rgb_to_hsl.cc mln_fun_v2v_rgb_to_int_u_SOURCES = mln_fun_v2v_rgb_to_int_u.cc @@ -2731,4 +2737,6 @@ mln_world_inter_pixel_is_pixel_SOURCES = mln_world_inter_pixel_is_pixel.cc mln_world_inter_pixel_is_separator_SOURCES = mln_world_inter_pixel_is_separator.cc mln_world_inter_pixel_neighb2d_SOURCES = mln_world_inter_pixel_neighb2d.cc mln_world_inter_pixel_separator_to_pixels_SOURCES = mln_world_inter_pixel_separator_to_pixels.cc +mln_world_rgb_invert_SOURCES = mln_world_rgb_invert.cc +mln_world_rgb_invert_spe_SOURCES = mln_world_rgb_invert_spe.cc -- 1.5.6.5

14 years, 2 months

last-svn-commit-664-gbc7c479 Regen mk files in Milena.

by Guillaume Lazzara

14 years, 2 months

last-svn-commit-664-g1ab4203 Introduce world::rgb::invert.

by Guillaume Lazzara

* mln/world/rgb/invert.hh, * mln/world/rgb/invert.spe.hh: New. --- milena/ChangeLog | 7 + milena/mln/world/rgb/invert.hh | 216 ++++++++++++++++++++++++++++++++++++ milena/mln/world/rgb/invert.spe.hh | 124 +++++++++++++++++++++ 3 files changed, 347 insertions(+), 0 deletions(-) create mode 100644 milena/mln/world/rgb/invert.hh create mode 100644 milena/mln/world/rgb/invert.spe.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index fcb0afe..a56d47d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Introduce world::rgb::invert. + + * mln/world/rgb/invert.hh, + * mln/world/rgb/invert.spe.hh: New. + +2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve dispatch in arith::revert routine. * mln/arith/revert.hh, diff --git a/milena/mln/world/rgb/invert.hh b/milena/mln/world/rgb/invert.hh new file mode 100644 index 0000000..62ee5bf --- /dev/null +++ b/milena/mln/world/rgb/invert.hh @@ -0,0 +1,216 @@ +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef MLN_WORLD_RGB_INVERT_HH +# define MLN_WORLD_RGB_INVERT_HH + +/// \file +/// +/// Point-wise invert (min -> max and max -> min) of RGB images. +/// +/// \fixme Move somewhere else? + +# include <mln/core/concept/image.hh> +# include <mln/trait/value_.hh> +# include <mln/value/rgb.hh> + +// Specializations are in: +# include <mln/world/rgb/invert.spe.hh> + + +namespace mln +{ + + namespace world + { + + namespace rgb + { + + /// Point-wise reversion of image \p input. + /*! + * \param[in] input the input image. + * \result The result image. + * + * \pre \p input.is_valid + * + * It performs: \n + * for all p of input.domain \n + * {\n + * output(p).red() = min(red) + (max(red) - input(p).red()) \n + * output(p).green() = min(green) + (max(green) - input(p).green()) \n + * output(p).blue() = min(blue) + (max(blue) - input(p).blue()) \n + * } + */ + template <typename I> + mln_concrete(I) invert(const Image& input); + + + /// Point-wise in-place reversion of image \p input. + /*! + * \param[in,out] input The target image. + * + * \pre \p input.is_valid + * + * It performs: \n + * for all p of input.domain \n + * {\n + * output(p).red() = min(red) + (max(red) - input(p).red()) \n + * output(p).green() = min(green) + (max(green) - input(p).green()) \n + * output(p).blue() = min(blue) + (max(blue) - input(p).blue()) \n + * } + */ + template <typename I> + void invert_inplace(Image& input); + + +# ifndef MLN_INCLUDE_ONLY + + namespace impl + { + + namespace generic + { + + template <typename I, typename O> + inline + void invert(const Image& input_, Image<O>& output_) + { + trace::entering("world::rgb::impl::generic::invert"); + + const I& input = exact(input_); + O& output = exact(output_); + + mln_precondition(input.is_valid()); + mln_precondition(output.is_valid()); + + typedef mln_value(I) V; + mln_piter(I) p(input.domain()); + for_all(p) + output(p) = mln_min(V) + (mln_max(V) - input(p)); + + trace::exiting("world::rgb::impl::generic::invert"); + } + + } // end of namespace mln::world::rgb::impl::generic + + + } // end of namespace mln::world::rgb::impl + + + + // Dispatch. + + namespace internal + { + + template <typename I, typename O> + inline + void + invert_dispatch(trait::image::speed::any, const mln_value(I)&, + const I& input, O& output) + { + // No implementation found. May be input is not a RGB image? + mlc_abort(I)::check(); + } + + + template <typename I, typename O, unsigned n> + inline + void + invert_dispatch(trait::image::speed::any, const value::rgb<n>&, + const I& input, O& output) + { + impl::invert_rgb(input, output); + } + + template <typename I, typename O, unsigned n> + inline + void + invert_dispatch(trait::image::speed::fastest, const value::rgb<n>&, + const I& input, O& output) + { + impl::invert_rgb_fastest(input, output); + } + + + template <typename I, typename O> + inline + void + invert_dispatch(const Image& input, Image<O>& output) + { + typedef mln_value(I) V; + invert_dispatch(mln_trait_image_speed(I)(), V(), + exact(input), exact(output)); + + } + + + } // end of namespace mln::world::rgb::internal + + + + + // Facades. + + template <typename I> + inline + mln_concrete(I) invert(const Image& input) + { + trace::entering("world::rgb::invert"); + + mln_precondition(exact(input).is_valid()); + + mln_concrete(I) output; + initialize(output, input); + internal::invert_dispatch(input, output); + + trace::exiting("world::rgb::invert"); + return output; + } + + template <typename I> + inline + void invert_inplace(Image& input) + { + trace::entering("world::rgb::invert_inplace"); + + mln_precondition(exact(input).is_valid()); + + internal::invert_dispatch(input, input); + + trace::exiting("world::rgb::invert_inplace"); + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::world::rgb + + } // end of namespace mln::world + +} // end of namespace mln + + +#endif // ! MLN_WORLD_RGB_INVERT_HH diff --git a/milena/mln/world/rgb/invert.spe.hh b/milena/mln/world/rgb/invert.spe.hh new file mode 100644 index 0000000..978563a --- /dev/null +++ b/milena/mln/world/rgb/invert.spe.hh @@ -0,0 +1,124 @@ +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef MLN_WORLD_RGB_INVERT_SPE_HH +# define MLN_WORLD_RGB_INVERT_SPE_HH + +/// \file +/// +/// Specializations for mln::world::rgb::invert. + +# ifndef MLN_WORLD_RGB_INVERT_HH +# error "Forbidden inclusion of *.spe.hh" +# endif // ! MLN_WORLD_RGB_INVERT_HH + +# include <mln/core/concept/image.hh> +# include <mln/trait/value_.hh> + + +# ifndef MLN_INCLUDE_ONLY + +namespace mln +{ + + namespace world + { + + namespace rgb + { + + namespace impl + { + + template <typename I, typename O> + inline + void invert_rgb_fastest(const Image& input_, Image<O>& output_) + { + trace::entering("world::rgb::impl::invert_rgb_fastest"); + + const I& input = exact(input_); + O& output = exact(output_); + + mln_precondition(input.is_valid()); + mln_precondition(output.is_valid()); + + typedef mln_value(I) V; + typedef typename V::red_t Red; + typedef typename V::green_t Green; + typedef typename V::blue_t Blue; + + mln_pixter(const I) ip(input); + mln_pixter(O) op(output); + for_all_2(ip, op) + { + op.val().red() = mln_min(Red) + (mln_max(Red) - ip.val().red()); + op.val().green() = mln_min(Green) + (mln_max(Green) - ip.val().green()); + op.val().blue() = mln_min(Blue) + (mln_max(Blue) - ip.val().blue()); + } + + trace::entering("world::rgb::impl::invert_rgb_fastest"); + } + + + template <typename I, typename O> + inline + void invert_rgb(const Image& input_, Image<O>& output_) + { + trace::entering("world::rgb::impl::invert_rgb"); + + const I& input = exact(input_); + O& output = exact(output_); + + mln_precondition(input.is_valid()); + mln_precondition(output.is_valid()); + + typedef mln_value(I) V; + typedef typename V::red_t Red; + typedef typename V::green_t Green; + typedef typename V::blue_t Blue; + + mln_piter(I) p(input.domain()); + for_all(p) + { + output(p).red() = mln_min(Red) + (mln_max(Red) - input(p).red()); + output(p).green() = mln_min(Green) + (mln_max(Green) - input(p).green()); + output(p).blue() = mln_min(Blue) + (mln_max(Blue) - input(p).blue()); + } + + trace::exiting("world::rgb::impl::invert_rgb"); + } + + + } // end of namespace mln::world::rgb::impl + + } // end of namespace mln::world::rgb + + } // end of namespace mln::world + +} // end of namespace mln + +# endif // ! MLN_INCLUDE_ONLY + +#endif // ! MLN_WORLD_RGB_INVERT_SPE_HH -- 1.5.6.5

14 years, 2 months

last-svn-commit-663-g0da3ec2 Introduce world::rgb::invert.

by Guillaume Lazzara

14 years, 2 months

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