December 2010 - Olena-patches

last-svn-commit-699-g3cc1d66 Fix missing inlines and MLN_WO_GLOBALS_VARS guards in Scribo.
by Guillaume Lazzara 10 Dec '10

10 Dec '10

* scribo/binarization/internal/first_pass_functor.hh, * scribo/binarization/sauvola_ms.hh, * scribo/core/component_info.hh, * scribo/core/init_integral_image.hh, * scribo/core/tag/component.hh, * scribo/core/tag/line.hh, * scribo/io/xml/save.hh, * scribo/make/debug_filename.hh, * scribo/preprocessing/deskew.hh, * scribo/preprocessing/split_bg_fg.hh, * scribo/primitive/extract/separators_nonvisible.hh, * scribo/primitive/link/internal/dmax_default.hh, * scribo/primitive/link/internal/dmax_width_and_height.hh, * scribo/primitive/link/internal/dmax_width_only.hh, * scribo/text/merging.hh, * scribo/text/recognition.hh: Here. --- scribo/ChangeLog | 21 +++ .../binarization/internal/first_pass_functor.hh | 142 +++++++++++--------- scribo/scribo/binarization/sauvola_ms.hh | 2 + scribo/scribo/core/component_info.hh | 17 +++- scribo/scribo/core/init_integral_image.hh | 16 ++- scribo/scribo/core/tag/component.hh | 2 + scribo/scribo/core/tag/line.hh | 3 + scribo/scribo/io/xml/save.hh | 3 + scribo/scribo/make/debug_filename.hh | 3 + scribo/scribo/preprocessing/deskew.hh | 5 + scribo/scribo/preprocessing/split_bg_fg.hh | 6 +- .../primitive/extract/separators_nonvisible.hh | 65 +++++----- .../scribo/primitive/link/internal/dmax_default.hh | 1 + .../link/internal/dmax_width_and_height.hh | 2 + .../primitive/link/internal/dmax_width_only.hh | 2 + scribo/scribo/text/merging.hh | 3 + scribo/scribo/text/recognition.hh | 2 - 17 files changed, 196 insertions(+), 99 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 579f31e..a1025f2 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,26 @@ 2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix missing inlines and MLN_WO_GLOBALS_VARS guards in Scribo. + + * scribo/binarization/internal/first_pass_functor.hh, + * scribo/binarization/sauvola_ms.hh, + * scribo/core/component_info.hh, + * scribo/core/init_integral_image.hh, + * scribo/core/tag/component.hh, + * scribo/core/tag/line.hh, + * scribo/io/xml/save.hh, + * scribo/make/debug_filename.hh, + * scribo/preprocessing/deskew.hh, + * scribo/preprocessing/split_bg_fg.hh, + * scribo/primitive/extract/separators_nonvisible.hh, + * scribo/primitive/link/internal/dmax_default.hh, + * scribo/primitive/link/internal/dmax_width_and_height.hh, + * scribo/primitive/link/internal/dmax_width_only.hh, + * scribo/text/merging.hh, + * scribo/text/recognition.hh: Here. + +2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix guards and license in xml2doc. * demo/xml2doc/image_crop.cc, diff --git a/scribo/scribo/binarization/internal/first_pass_functor.hh b/scribo/scribo/binarization/internal/first_pass_functor.hh index 637ff39..fb52be5 100644 --- a/scribo/scribo/binarization/internal/first_pass_functor.hh +++ b/scribo/scribo/binarization/internal/first_pass_functor.hh @@ -27,6 +27,10 @@ #ifndef SCRIBO_BINARIZATION_INTERNAL_FIRST_PASS_FUNCTOR_HH # define SCRIBO_BINARIZATION_INTERNAL_FIRST_PASS_FUNCTOR_HH +/// \file +/// +/// + # include <mln/core/image/image2d.hh> # include <mln/core/alias/neighb2d.hh> # include <mln/extension/fill.hh> @@ -48,15 +52,6 @@ namespace scribo using namespace mln; - unsigned my_find_root(image2d<unsigned>& parent, unsigned x) - { - if (parent.element(x) == x) - return x; - return parent.element(x) = my_find_root(parent, - parent.element(x)); - } - - template <typename I> struct first_pass_functor { @@ -73,74 +68,99 @@ namespace scribo double K_; - first_pass_functor(const I& input, double K) - : input(input), - pxl(input), - K_(K) - { - res = 0; - pxl.start(); + first_pass_functor(const I& input, double K); + + void exec(double mean, double stddev); + void finalize(); + }; + + +# ifndef MLN_INCLUDE_ONLY + + inline + unsigned my_find_root(image2d<unsigned>& parent, unsigned x) + { + if (parent.element(x) == x) + return x; + return parent.element(x) = my_find_root(parent, + parent.element(x)); + } + - initialize(t_sub, input); - initialize(parent, input); - initialize(msk, input); + template <typename I> + first_pass_functor::first_pass_functor(const I& input, double K) + : input(input), + pxl(input), + K_(K) + { + res = 0; + pxl.start(); + + initialize(t_sub, input); + initialize(parent, input); + initialize(msk, input); # ifdef SCRIBO_SAUVOLA_DEBUG - initialize(debug_mean, input); - initialize(debug_stddev, input); + initialize(debug_mean, input); + initialize(debug_stddev, input); # endif // ! SCRIBO_SAUVOLA_DEBUG - mln::extension::fill(msk, false); + mln::extension::fill(msk, false); - initialize(card, input); - data::fill(card, 1); + initialize(card, input); + data::fill(card, 1); - dp = negative_offsets_wrt(input, c4()); - n_nbhs = dp.nelements(); - } + dp = negative_offsets_wrt(input, c4()); + n_nbhs = dp.nelements(); + } - void exec(double mean, double stddev) - { - mln_precondition(pxl.is_valid()); - unsigned p = pxl.offset(); + template <typename I> + void + first_pass_functor::exec(double mean, double stddev) + { + mln_precondition(pxl.is_valid()); - value::int_u8 t_p; - mln::convert::from_to(sauvola_threshold_formula(mean, stddev, - K_, - SCRIBO_DEFAULT_SAUVOLA_R), - t_p); + unsigned p = pxl.offset(); - msk.element(p) = input.element(p) < t_p; - t_sub.element(p) = t_p; - if (! msk.element(p)) - { - pxl.next(); - return; - } - parent.element(p) = p; - for (unsigned i = 0; i < n_nbhs; ++i) - { - unsigned n = p + dp[i]; - if (! msk.element(n)) - continue; - unsigned r = my_find_root(parent, n); - if (r != p) - { - parent.element(r) = p; - card.element(p) += card.element(r); - } - } + value::int_u8 t_p; + mln::convert::from_to(sauvola_threshold_formula(mean, stddev, + K_, + SCRIBO_DEFAULT_SAUVOLA_R), + t_p); - pxl.next(); // next pixel + msk.element(p) = input.element(p) < t_p; + t_sub.element(p) = t_p; + if (! msk.element(p)) + { + pxl.next(); + return; } - - void finalize() + parent.element(p) = p; + for (unsigned i = 0; i < n_nbhs; ++i) { - mln_assertion(! pxl.is_valid()); + unsigned n = p + dp[i]; + if (! msk.element(n)) + continue; + unsigned r = my_find_root(parent, n); + if (r != p) + { + parent.element(r) = p; + card.element(p) += card.element(r); + } } - }; + pxl.next(); // next pixel + } + + + template <typename I> + void first_pass_functor::finalize() + { + mln_assertion(! pxl.is_valid()); + } + +#endif // ! MLN_INCLUDE_ONLY } // end of namespace scribo::binarization::internal diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index a6b3aba..1233d1c 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -132,6 +132,7 @@ namespace scribo } + inline image2d<int_u8> compute_t_n_and_e_2(const image2d<int_u8>& sub, image2d<int_u8>& e_2, unsigned lambda_min, unsigned lambda_max, @@ -746,6 +747,7 @@ namespace scribo + inline unsigned sub(unsigned nbr, unsigned down_scaling) { return (nbr + down_scaling - 1) / down_scaling; diff --git a/scribo/scribo/core/component_info.hh b/scribo/scribo/core/component_info.hh index 56f7799..8345266 100644 --- a/scribo/scribo/core/component_info.hh +++ b/scribo/scribo/core/component_info.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -94,6 +95,7 @@ namespace scribo # ifndef MLN_INCLUDE_ONLY + inline component_info::component_info() : id_(0), tag_(component::Ignored) { @@ -101,6 +103,7 @@ namespace scribo } + inline component_info::component_info(const component_id_t& id, const mln::box2d& bbox, const mln::point2d& mass_center, @@ -112,6 +115,7 @@ namespace scribo } + inline component_info::component_id_t component_info::id() const { @@ -119,6 +123,7 @@ namespace scribo } + inline const mln::box2d& component_info::bbox() const { @@ -126,12 +131,14 @@ namespace scribo } + inline const mln::point2d& component_info::mass_center() const { return mass_center_; } + inline unsigned component_info::card() const { @@ -139,6 +146,7 @@ namespace scribo } + inline component::Tag component_info::tag() const { @@ -146,6 +154,7 @@ namespace scribo } + inline void component_info::update_tag(component::Tag tag) { @@ -153,6 +162,7 @@ namespace scribo } + inline component::Type component_info::type() const { @@ -160,6 +170,7 @@ namespace scribo } + inline void component_info::update_type(component::Type type) { @@ -167,12 +178,15 @@ namespace scribo } + inline component_info::line_id_t component_info::line_id() const { return line_id_; } + + inline bool component_info::is_valid() const { @@ -180,6 +194,7 @@ namespace scribo } + inline std::ostream& operator<<(std::ostream& ostr, const component_info& info) { diff --git a/scribo/scribo/core/init_integral_image.hh b/scribo/scribo/core/init_integral_image.hh index ec19070..5bd88dc 100644 --- a/scribo/scribo/core/init_integral_image.hh +++ b/scribo/scribo/core/init_integral_image.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -37,15 +38,24 @@ namespace scribo using namespace mln; + template <typename I, typename F> + mln_ch_value(I,double) + init_integral_image(const Image& input_, F& func); + + +# ifndef MLN_INCLUDE_ONLY + namespace internal { + inline double square_(const double& val) { double v = static_cast<double>(val); return v * v; } + inline double identity_(const double& val) { return static_cast<double>(val); @@ -54,6 +64,8 @@ namespace scribo } // end of namespace scribo::internal + // Facade + template <typename I, typename F> mln_ch_value(I,double) init_integral_image(const Image& input_, F& func) @@ -91,6 +103,8 @@ namespace scribo return output; } +#endif // ! MLN_INCLUDE_ONLY + } // end of namespace scribo #endif // ! SCRIBO_CORE_INIT_INTEGRAL_IMAGE_HH diff --git a/scribo/scribo/core/tag/component.hh b/scribo/scribo/core/tag/component.hh index 5ed51fa..f2fb059 100644 --- a/scribo/scribo/core/tag/component.hh +++ b/scribo/scribo/core/tag/component.hh @@ -63,6 +63,7 @@ namespace scribo # ifndef MLN_INCLUDE_ONLY + inline std::ostream& operator<<(std::ostream& ostr, const Tag& tag) { @@ -82,6 +83,7 @@ namespace scribo } + inline std::ostream& operator<<(std::ostream& ostr, const Type& type) { diff --git a/scribo/scribo/core/tag/line.hh b/scribo/scribo/core/tag/line.hh index ccb8cd1..0444a11 100644 --- a/scribo/scribo/core/tag/line.hh +++ b/scribo/scribo/core/tag/line.hh @@ -101,6 +101,7 @@ namespace scribo # ifndef MLN_INCLUDE_ONLY + inline std::ostream& operator<<(std::ostream& ostr, const Tag& tag) { @@ -130,6 +131,7 @@ namespace scribo + inline std::ostream& operator<<(std::ostream& ostr, const ReadingDirection& direction) { @@ -155,6 +157,7 @@ namespace scribo } + inline std::ostream& operator<<(std::ostream& ostr, const Type& type) { diff --git a/scribo/scribo/io/xml/save.hh b/scribo/scribo/io/xml/save.hh index 3c182e7..d0c72e9 100644 --- a/scribo/scribo/io/xml/save.hh +++ b/scribo/scribo/io/xml/save.hh @@ -70,6 +70,8 @@ namespace scribo namespace internal { + + inline std::string& html_markups_replace(std::string& input, std::map<char, std::string>& map) @@ -87,6 +89,7 @@ namespace scribo } + inline void print_box_coords(std::ofstream& ostr, const box2d& b, const char *space) { diff --git a/scribo/scribo/make/debug_filename.hh b/scribo/scribo/make/debug_filename.hh index 0aadbfe..f3b4962 100644 --- a/scribo/scribo/make/debug_filename.hh +++ b/scribo/scribo/make/debug_filename.hh @@ -59,6 +59,7 @@ namespace scribo # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS namespace internal { @@ -67,6 +68,8 @@ namespace scribo } // end of namespace scribo::make::internal +# endif // ! MLN_WO_GLOBAL_VARS + inline std::string diff --git a/scribo/scribo/preprocessing/deskew.hh b/scribo/scribo/preprocessing/deskew.hh index 80ea351..12fd104 100644 --- a/scribo/scribo/preprocessing/deskew.hh +++ b/scribo/scribo/preprocessing/deskew.hh @@ -115,6 +115,7 @@ namespace scribo namespace internal { + inline bool QCompare::operator()(const s_angle& s1, const s_angle& s2) { @@ -122,6 +123,7 @@ namespace scribo } + inline Hough::Hough(int width, int height) : width_(width / 2), height_(height / 2), @@ -135,12 +137,14 @@ namespace scribo } + inline Hough::~Hough() { delete[] this->cos_; delete[] this->sin_; } + inline void Hough::look_up_table() { @@ -336,6 +340,7 @@ namespace scribo } + inline double perform_deskew(const image2d<value::int_u8>& gray) { diff --git a/scribo/scribo/preprocessing/split_bg_fg.hh b/scribo/scribo/preprocessing/split_bg_fg.hh index 5094f32..e1fae7d 100644 --- a/scribo/scribo/preprocessing/split_bg_fg.hh +++ b/scribo/scribo/preprocessing/split_bg_fg.hh @@ -189,7 +189,7 @@ namespace scribo } - + inline image2d< value::rgb8 > diff_abs(const image2d< value::rgb8 >& input1, const image2d< value::rgb8 >& input2) @@ -207,6 +207,7 @@ namespace scribo } + inline image2d< value::rgb8 > inverted_diff_abs(const image2d< value::rgb8 >& input1, const image2d< value::rgb8 >& input2) @@ -228,7 +229,7 @@ namespace scribo } - + inline unsigned dist(const rgb8& c1, const rgb8& c2) { unsigned d = 0; @@ -239,6 +240,7 @@ namespace scribo } + inline image2d<rgb8> background_analyze(const image2d<rgb8>& input, unsigned lambda, unsigned delta) diff --git a/scribo/scribo/primitive/extract/separators_nonvisible.hh b/scribo/scribo/primitive/extract/separators_nonvisible.hh index 8aaeeec..81ebd64 100644 --- a/scribo/scribo/primitive/extract/separators_nonvisible.hh +++ b/scribo/scribo/primitive/extract/separators_nonvisible.hh @@ -128,10 +128,6 @@ namespace scribo namespace internal { - // Enable debug. - bool _debug_; - - template <typename L> void filter_bad_groups(object_groups<L>& top_groups, object_groups<L>& bot_groups) @@ -223,13 +219,15 @@ namespace scribo unsigned dmax, float min_angle, float max_angle, - anchor::Type anchor_) + anchor::Type anchor_, + bool debug) : super_(components, anchor::Horizontal, dmax_default(dmax)), anchor(anchor_), debug_(data::convert(value::rgb8(), input)), - debug_angle_(data::convert(value::rgb8(), input)) + debug_angle_(data::convert(value::rgb8(), input)), + _debug_(debug) { min_alpha_rad = (min_angle / 180.0f) * math::pi; max_alpha_rad = (max_angle / 180.0f) * math::pi; @@ -372,6 +370,7 @@ namespace scribo mln_ch_value(L, value::rgb8) debug_; mln_ch_value(L, value::rgb8) debug_angle_; + bool _debug_; }; @@ -391,8 +390,9 @@ namespace scribo unsigned dmax, float min_angle, float max_angle, - anchor::Type anchor) - : super_(input, components, dmax, min_angle, max_angle, anchor) + anchor::Type anchor, + bool debug) + : super_(input, components, dmax, min_angle, max_angle, anchor, debug) { } @@ -425,8 +425,9 @@ namespace scribo unsigned dmax, float min_angle, float max_angle, - anchor::Type anchor) - : super_(input, components, dmax, min_angle, max_angle, anchor) + anchor::Type anchor, + bool debug) + : super_(input, components, dmax, min_angle, max_angle, anchor, debug) { } @@ -459,7 +460,7 @@ namespace scribo typedef mln_value(I) Vi; mlc_is(Vi,bool)::check(); - internal::_debug_ = false; + bool _debug_ = false; unsigned min_angle = 3, max_angle = 5, @@ -497,7 +498,7 @@ namespace scribo t_ = t; std::cout << "closing_structural - " << t_ << std::endl; - if (internal::_debug_) + if (_debug_) { // Restore input orientation. input = scribo::preprocessing::rotate_90(input, false); @@ -525,7 +526,7 @@ namespace scribo t_ = t; std::cout << "extract::components - " << t_ << std::endl; - if (internal::_debug_) + if (_debug_) io::pgm::save(data::convert(value::int_u8(), components.labeled_image()), "lbl.pgm"); @@ -542,14 +543,14 @@ namespace scribo { // Right internal::single_right_dmax_ratio_aligned_functor<L> - functor(input_clo, components, dmax, min_angle, max_angle, anchor::Top); + functor(input_clo, components, dmax, min_angle, max_angle, anchor::Top, _debug_); // top_right = primitive::link::impl::compute_fastest(functor, anchor::Top); top_right = primitive::link::compute(functor, anchor::Top); t.stop(); - if (internal::_debug_) + if (_debug_) { io::ppm::save(functor.debug_, "right_top.ppm"); io::ppm::save(functor.debug_angle_, "right_top_angle.ppm"); @@ -559,13 +560,13 @@ namespace scribo // Left internal::single_left_dmax_ratio_aligned_functor<L> - lfunctor(input_clo, components, dmax, min_angle, max_angle, anchor::Top); + lfunctor(input_clo, components, dmax, min_angle, max_angle, anchor::Top, _debug_); top_left = primitive::link::compute(lfunctor, anchor::Top); t.stop(); - if (internal::_debug_) + if (_debug_) { io::ppm::save(lfunctor.debug_, "left_top.ppm"); io::ppm::save(lfunctor.debug_angle_, "left_top_angle.ppm"); @@ -584,11 +585,11 @@ namespace scribo { // Right internal::single_right_dmax_ratio_aligned_functor<L> - functor(input_clo, components, dmax, min_angle, max_angle, anchor::Bottom); + functor(input_clo, components, dmax, min_angle, max_angle, anchor::Bottom, _debug_); bot_right = primitive::link::compute(functor, anchor::Bottom); t.stop(); - if (internal::_debug_) + if (_debug_) { io::ppm::save(functor.debug_, "right_bot.ppm"); io::ppm::save(functor.debug_angle_, "right_bot_angle.ppm"); @@ -598,17 +599,17 @@ namespace scribo // Left internal::single_left_dmax_ratio_aligned_functor<L> - lfunctor(input_clo, components, dmax, min_angle, max_angle, anchor::Bottom); + lfunctor(input_clo, components, dmax, min_angle, max_angle, anchor::Bottom, _debug_); bot_left = primitive::link::compute(lfunctor, anchor::Bottom); t.stop(); - if (internal::_debug_) + if (_debug_) { io::ppm::save(lfunctor.debug_, "left_bot.ppm"); io::ppm::save(lfunctor.debug_angle_, "left_bot_angle.ppm"); } - if (internal::_debug_) + if (_debug_) { mln_ch_value(I, value::rgb8) output = duplicate(functor.debug_); data::paste((lfunctor.debug_ | (pw::value(lfunctor.debug_) != pw::cst(literal::black))) | (pw::value(lfunctor.debug_) != pw::cst(literal::white)), output); @@ -648,7 +649,7 @@ namespace scribo - if (internal::_debug_) + if (_debug_) { mln_ch_value(I, value::rgb8) @@ -721,7 +722,7 @@ namespace scribo mln_ch_value(I, value::rgb8) both; - if (internal::_debug_) + if (_debug_) both = data::convert(value::rgb8(), input); @@ -733,7 +734,7 @@ namespace scribo { if (top_accu(d).is_valid()) { - if (internal::_debug_) + if (_debug_) mln::draw::line(both, top_accu(d).to_result().pmin(), point2d(top_accu(d).to_result().pmin().row(), @@ -747,7 +748,7 @@ namespace scribo true); } else - if (internal::_debug_ && btop_accu(d).is_valid()) + if (_debug_ && btop_accu(d).is_valid()) mln::draw::line(both, btop_accu(d).to_result().pmin(), point2d(btop_accu(d).to_result().pmin().row(), @@ -759,7 +760,7 @@ namespace scribo { if (bot_accu(d).is_valid()) { - if (internal::_debug_) + if (_debug_) mln::draw::line(both, point2d(bot_accu(d).to_result().pmax().row(), bot_accu(d).to_result().pmin().col()), @@ -773,7 +774,7 @@ namespace scribo true); } else - if (internal::_debug_ && bbot_accu(d).is_valid()) + if (_debug_ && bbot_accu(d).is_valid()) mln::draw::line(both, point2d(bbot_accu(d).to_result().pmax().row(), bbot_accu(d).to_result().pmin().col()), @@ -786,7 +787,7 @@ namespace scribo std::cout << "Drawing output image - " << t_ << std::endl; - if (internal::_debug_) + if (_debug_) { io::ppm::save(both, "both.ppm"); io::pbm::save(separators, "separators.pbm"); @@ -795,7 +796,7 @@ namespace scribo // Hit or miss { - if (internal::_debug_) + if (_debug_) { mln_concrete(I) input_with_seps = duplicate(input_clo); data::paste(separators | pw::value(separators), input_with_seps); @@ -821,7 +822,7 @@ namespace scribo t_ = t; std::cout << "* accu::transform_line - " << t_ << std::endl; - if (internal::_debug_) + if (_debug_) io::pgm::save(data::convert(value::int_u8(), tmp), "tmp.pgm"); @@ -869,7 +870,7 @@ namespace scribo mln_concrete(I) output = data::convert(bool(), sep_lbl); - if (internal::_debug_) + if (_debug_) { io::pbm::save(output, "separators_hom.pbm"); io::pbm::save(separators, "separators_filtered.pbm"); diff --git a/scribo/scribo/primitive/link/internal/dmax_default.hh b/scribo/scribo/primitive/link/internal/dmax_default.hh index 1444dfe..b4106a9 100644 --- a/scribo/scribo/primitive/link/internal/dmax_default.hh +++ b/scribo/scribo/primitive/link/internal/dmax_default.hh @@ -62,6 +62,7 @@ namespace scribo # ifndef MLN_INCLUDE_ONLY + inline dmax_default::dmax_default(const float& dmax_factor) : super_(dmax_factor) { diff --git a/scribo/scribo/primitive/link/internal/dmax_width_and_height.hh b/scribo/scribo/primitive/link/internal/dmax_width_and_height.hh index 3f19f1f..4c1d561 100644 --- a/scribo/scribo/primitive/link/internal/dmax_width_and_height.hh +++ b/scribo/scribo/primitive/link/internal/dmax_width_and_height.hh @@ -66,12 +66,14 @@ namespace scribo # ifndef MLN_INCLUDE_ONLY + inline dmax_width_and_height::dmax_width_and_height(const float& dmax_factor) : super_(dmax_factor) { } + inline float dmax_width_and_height::operator()(const box2d& b) const { diff --git a/scribo/scribo/primitive/link/internal/dmax_width_only.hh b/scribo/scribo/primitive/link/internal/dmax_width_only.hh index 034d40b..1d882ba 100644 --- a/scribo/scribo/primitive/link/internal/dmax_width_only.hh +++ b/scribo/scribo/primitive/link/internal/dmax_width_only.hh @@ -66,12 +66,14 @@ namespace scribo # ifndef MLN_INCLUDE_ONLY + inline dmax_width_only::dmax_width_only() : super_(0) { } + inline float dmax_width_only::operator()(const box2d& b) const { diff --git a/scribo/scribo/text/merging.hh b/scribo/scribo/text/merging.hh index ed48e57..3087465 100644 --- a/scribo/scribo/text/merging.hh +++ b/scribo/scribo/text/merging.hh @@ -150,6 +150,7 @@ namespace scribo + inline unsigned my_find_root(mln::util::array<unsigned>& parent, unsigned x) { if (parent[x] == x) @@ -158,6 +159,7 @@ namespace scribo } + inline void swap_ordering(unsigned l1, unsigned l2) { if (l2 > l1) @@ -211,6 +213,7 @@ namespace scribo + inline box2d enlarge(const box2d& b, int delta) { box2d b_(point2d(b.pmin().row(), b.pmin().col() - delta), diff --git a/scribo/scribo/text/recognition.hh b/scribo/scribo/text/recognition.hh index 07f585d..ab5e3e2 100644 --- a/scribo/scribo/text/recognition.hh +++ b/scribo/scribo/text/recognition.hh @@ -99,8 +99,6 @@ namespace scribo # ifndef MLN_INCLUDE_ONLY - unsigned debug_id = 0; - template <typename L> void -- 1.5.6.5

1 0

last-svn-commit-698-gc338ad5 Handle more global vars with MLN_WO_GLOBAL_VARS
by Guillaume Lazzara 10 Dec '10

10 Dec '10

* mln/canvas/browsing/depth_first_search.hh, * mln/debug/filename.hh, * mln/debug/quiet.hh, * mln/labeling/colorize.hh, * mln/math/pi.hh: Add missing MLN_WO_GLOBAL_VARS guards. --- milena/ChangeLog | 10 ++++++++++ milena/mln/canvas/browsing/depth_first_search.hh | 7 ++++++- milena/mln/debug/filename.hh | 15 ++++++++++++++- milena/mln/debug/quiet.hh | 7 ++++++- milena/mln/labeling/colorize.hh | 4 ++++ milena/mln/math/pi.hh | 7 ++++++- 6 files changed, 46 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8e43f9f..dd33710 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,13 @@ +2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + Handle more global vars with MLN_WO_GLOBAL_VARS + + * mln/canvas/browsing/depth_first_search.hh, + * mln/debug/filename.hh, + * mln/debug/quiet.hh, + * mln/labeling/colorize.hh, + * mln/math/pi.hh: Add missing MLN_WO_GLOBAL_VARS guards. + 2010-11-25 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/io/magick/save.hh: Fix a crash when using GraphicsMagick diff --git a/milena/mln/canvas/browsing/depth_first_search.hh b/milena/mln/canvas/browsing/depth_first_search.hh index 4b61d4d..3d76633 100644 --- a/milena/mln/canvas/browsing/depth_first_search.hh +++ b/milena/mln/canvas/browsing/depth_first_search.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -86,8 +87,12 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + const depth_first_search_t depth_first_search; +# endif // ! MLN_WO_GLOBAL_VARS + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::canvas::browsing diff --git a/milena/mln/debug/filename.hh b/milena/mln/debug/filename.hh index 85def95..1fc268b 100644 --- a/milena/mln/debug/filename.hh +++ b/milena/mln/debug/filename.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -58,8 +59,18 @@ namespace mln filename(const std::string& filename, int id); + namespace internal + { + + extern std::string filename_prefix; + + } // end of namespace mln::debug::internal + + # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + namespace internal { @@ -67,6 +78,8 @@ namespace mln } // end of namespace mln::debug::internal +# endif // ! MLN_WO_GLOBAL_VARS + inline std::string diff --git a/milena/mln/debug/quiet.hh b/milena/mln/debug/quiet.hh index a469e30..23c44dd 100644 --- a/milena/mln/debug/quiet.hh +++ b/milena/mln/debug/quiet.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -43,8 +44,12 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + bool quiet = false; +# endif // ! MLN_WO_GLOBAL_VARS + # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/labeling/colorize.hh b/milena/mln/labeling/colorize.hh index 673af27..af9585c 100644 --- a/milena/mln/labeling/colorize.hh +++ b/milena/mln/labeling/colorize.hh @@ -94,16 +94,20 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + namespace colorize_ { unsigned min_value = 20; unsigned max_value = 220; } +# endif // ! MLN_WO_GLOBAL_VARS namespace internal { + inline unsigned random_number() { unsigned last = colorize_::min_value + (colorize_::max_value - colorize_::min_value + 1) * rand(); diff --git a/milena/mln/math/pi.hh b/milena/mln/math/pi.hh index 054b004..8f6a4e2 100644 --- a/milena/mln/math/pi.hh +++ b/milena/mln/math/pi.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of Olena. // @@ -36,8 +37,12 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + const double pi = 3.1415926535897932385; +# endif // ! MLN_WO_GLOBAL_VARS + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::math -- 1.5.6.5

1 0

last-svn-commit-697-g4a28847 configure.ac: Configure scribo/demo/xml2doc directory.
by Guillaume Lazzara 10 Dec '10

10 Dec '10

--- ChangeLog | 4 ++++ configure.ac | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4f1cc96..a8f671e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + * configure.ac: Configure scribo/demo/xml2doc directory. + 2010-11-19 Guillaume Lazzara <z(a)lrde.epita.fr> * lrde-upload.sh: Upload tarball for branch next-build-test. diff --git a/configure.ac b/configure.ac index 6d0ce20..639313f 100644 --- a/configure.ac +++ b/configure.ac @@ -315,6 +315,7 @@ AC_CONFIG_FILES([ scribo/demo/Makefile scribo/demo/review/Makefile scribo/demo/viewer/Makefile + scribo/demo/xml2doc/Makefile scribo/src/Makefile scribo/src/binarization/Makefile scribo/src/contest/Makefile -- 1.5.6.5

1 0

last-svn-commit-696-gfa358e8 Fix guards and license in xml2doc.
by Guillaume Lazzara 10 Dec '10

10 Dec '10

* demo/xml2doc/image_crop.cc, * demo/xml2doc/image_crop.hh, * demo/xml2doc/loader.cc, * demo/xml2doc/loader.hh, * demo/xml2doc/xml_transform.cc, * demo/xml2doc/xml_transform.hh: Here. --- scribo/ChangeLog | 11 +++++++++++ scribo/demo/xml2doc/image_crop.cc | 9 --------- scribo/demo/xml2doc/image_crop.hh | 17 ++++------------- scribo/demo/xml2doc/loader.cc | 9 --------- scribo/demo/xml2doc/loader.hh | 15 +++------------ scribo/demo/xml2doc/xml_transform.cc | 9 --------- scribo/demo/xml2doc/xml_transform.hh | 17 ++++------------- 7 files changed, 22 insertions(+), 65 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 25eee44..579f31e 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,16 @@ 2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix guards and license in xml2doc. + + * demo/xml2doc/image_crop.cc, + * demo/xml2doc/image_crop.hh, + * demo/xml2doc/loader.cc, + * demo/xml2doc/loader.hh, + * demo/xml2doc/xml_transform.cc, + * demo/xml2doc/xml_transform.hh: Here. + +2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Get rid of xml_transform.sh and handle xsl files location after installation. diff --git a/scribo/demo/xml2doc/image_crop.cc b/scribo/demo/xml2doc/image_crop.cc index f439d8e..29a93d8 100644 --- a/scribo/demo/xml2doc/image_crop.cc +++ b/scribo/demo/xml2doc/image_crop.cc @@ -13,15 +13,6 @@ // // 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. #include <limits.h> diff --git a/scribo/demo/xml2doc/image_crop.hh b/scribo/demo/xml2doc/image_crop.hh index ec2f9a2..2856c35 100644 --- a/scribo/demo/xml2doc/image_crop.hh +++ b/scribo/demo/xml2doc/image_crop.hh @@ -13,18 +13,9 @@ // // 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 IMAGE_CROP_HH -# define IMAGE_CROP_HH + +#ifndef SCRIBO_DEMO_XML2DOC_IMAGE_CROP_HH +# define SCRIBO_DEMO_XML2DOC_IMAGE_CROP_HH # include <QDomDocument> # include <QtCore> @@ -60,4 +51,4 @@ private: mln::image2d<mln::value::rgb8> ima_; }; -#endif /* !IMAGE_CROP_HH */ +#endif // ! SCRIBO_DEMO_XML2DOC_IMAGE_CROP_HH diff --git a/scribo/demo/xml2doc/loader.cc b/scribo/demo/xml2doc/loader.cc index c5527fd..91caad6 100644 --- a/scribo/demo/xml2doc/loader.cc +++ b/scribo/demo/xml2doc/loader.cc @@ -13,15 +13,6 @@ // // 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. # include "loader.hh" diff --git a/scribo/demo/xml2doc/loader.hh b/scribo/demo/xml2doc/loader.hh index a66af2d..6547a0d 100644 --- a/scribo/demo/xml2doc/loader.hh +++ b/scribo/demo/xml2doc/loader.hh @@ -13,18 +13,9 @@ // // 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 LOADER_HH -# define LOADER_HH +#ifndef SCRIBO_DEMO_XML2DOC_LOADER_HH +# define SCRIBO_DEMO_XML2DOC_LOADER_HH # include <QtCore> # include <QDomDocument> @@ -48,4 +39,4 @@ class Loader : public QObject void add_html_templates(bool base64, const QString& output); }; -#endif /* !LOADER_HH */ +#endif // ! SCRIBO_DEMO_XML2DOC_LOADER_HH diff --git a/scribo/demo/xml2doc/xml_transform.cc b/scribo/demo/xml2doc/xml_transform.cc index be5c1e4..366b435 100644 --- a/scribo/demo/xml2doc/xml_transform.cc +++ b/scribo/demo/xml2doc/xml_transform.cc @@ -13,15 +13,6 @@ // // 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. # include "xml_transform.hh" # include "image_crop.hh" diff --git a/scribo/demo/xml2doc/xml_transform.hh b/scribo/demo/xml2doc/xml_transform.hh index fa22c07..2a73480 100644 --- a/scribo/demo/xml2doc/xml_transform.hh +++ b/scribo/demo/xml2doc/xml_transform.hh @@ -13,18 +13,9 @@ // // 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 XML_TRANFORM_HH -# define XML_TRANFORM_HH + +#ifndef SCRIBO_DEMO_XML2DOC_XML_TRANFORM_HH +# define SCRIBO_DEMO_XML2DOC_XML_TRANFORM_HH # include <QtCore> @@ -59,5 +50,5 @@ private: bool tmp_; }; -#endif // !XML_TRANFORM_HH +#endif // ! SCRIBO_DEMO_XML2DOC_XML_TRANFORM_HH -- 1.5.6.5

1 0

last-svn-commit-695-gce3d7a7 Get rid of xml_transform.sh and handle xsl files location after installation.
by Guillaume Lazzara 10 Dec '10

10 Dec '10

* demo/xml2doc/main.cc: Implement the effective code of xml_transform.sh. Guaranties that the xsl files will be always accessible. * demo/xml2doc/templates/ooconvert: Move... * demo/xml2doc/templates/bin/ooconvert: ... here. * demo/xml2doc/templates/xml_transform.sh: Remove. --- scribo/ChangeLog | 14 + scribo/demo/xml2doc/main.cc | 314 ++++++++++++++------- scribo/demo/xml2doc/templates/{ => bin}/ooconvert | 0 scribo/demo/xml2doc/templates/xml_transform.sh | 134 --------- 4 files changed, 224 insertions(+), 238 deletions(-) rename scribo/demo/xml2doc/templates/{ => bin}/ooconvert (100%) delete mode 100755 scribo/demo/xml2doc/templates/xml_transform.sh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 35791f8..25eee44 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,19 @@ 2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Get rid of xml_transform.sh and handle xsl files location after + installation. + + * demo/xml2doc/main.cc: Implement the effective code of + xml_transform.sh. Guaranties that the xsl files will be always + accessible. + + * demo/xml2doc/templates/ooconvert: Move... + * demo/xml2doc/templates/bin/ooconvert: ... here. + + * demo/xml2doc/templates/xml_transform.sh: Remove. + +2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Include xml2doc in build system. * demo/Makefile.am: Add xml2doc and libmagick++ dependency. diff --git a/scribo/demo/xml2doc/main.cc b/scribo/demo/xml2doc/main.cc index a580585..fa2a0f8 100644 --- a/scribo/demo/xml2doc/main.cc +++ b/scribo/demo/xml2doc/main.cc @@ -1,3 +1,19 @@ +// 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/>. + #include <iostream> #include <string> #include <string> @@ -6,15 +22,77 @@ #undef MLN_WO_GLOBAL_VARS #include <mln/core/image/image2d.hh> +#include <mln/trace/all.hh> #include "xml_transform.hh" +#include "datarootdir.hh" + + +void check_xsltproc() +{ + if (system("which xsltproc > /dev/null") == -1) + { + qDebug() << "FATAL ERROR: Conversion to HTML requires xsltproc to " + "be installed!"; + exit(1); + } +} + + +QString get_datarootdir(const QString& file) +{ + QFile f(SCRIBO_LOCAL_DATAROOTDIR "/templates/" + file); + if (f.exists()) + return SCRIBO_LOCAL_DATAROOTDIR "/templates/"; + + f.setFileName(SCRIBO_PREFIX_DATAROOTDIR "/templates/" + file); + if (f.exists()) + return SCRIBO_PREFIX_DATAROOTDIR "/templates/"; + + qDebug() << "FATAL ERROR: Can't locate file: " + file; + exit (1); + + return ""; +} + + + +int html_base64(const QString& xml, const QString& html) +{ + qDebug() << QString("HTML output : %1").arg(html); + QString datarootdir = get_datarootdir("html/main_base64.xsl"); + return system(QString("xsltproc \"%1/html/main_base64.xsl\" \"%2\" > %3") + .arg(datarootdir).arg(xml).arg(html).toAscii().constData()); +} + + +int pdf_base64(const QString& xml, const QString& pdf) +{ + qDebug() << QString("PDF output : %1").arg(pdf); + QString datarootdir = get_datarootdir("pdf/main.xsl"); + return system(QString("fop -xsl %1/pdf/main.xsl -xml %2 -pdf %3") + .arg(datarootdir).arg(xml).arg(pdf).toAscii().constData()); +} + + +int svg_base64(const QString& xml, const QString& svg) +{ + qDebug() << QString("SVG output : %1").arg(svg); + QString datarootdir = get_datarootdir("svg/main.xsl"); + return system(QString("fop -xsl %1/svg/main.xsl -xml %2 -svg %3") + .arg(datarootdir).arg(xml).arg(svg).toAscii().constData()); +} + + + + int main(int argc, char **argv) { Magick::InitializeMagick(argv[0]); - std::string man; - man = "xml_transform\n" + QString man = \ + "xml_transform\n" "OPTIONS:\n\n" "HTML output:\n" @@ -59,114 +137,142 @@ int main(int argc, char **argv) "SVG : trunk version of fop\n" "OpenDocument : ooconvert (included) and OpenOffice >= 3.xx"; + QString option(argv[1]); + + if (argc > 4) + { + if ("--html-full" == option) { - std::string html = "--html"; - std::string html_full = "--html-full"; - std::string open = "--oo-doc"; - std::string pdf = "--pdf"; - std::string svg = "--svg"; - std::string to_base64 = "--to-base64"; - std::string to_base64nocrop = "--to-base64-no-crop"; - - if (html_full.compare(argv[1]) == 0) - { - XmlTransform xmlt(argv[2], argv[3], argv[4]); - xmlt.createHTML(false); - - QString cmd = "sh templates/xml_transform.sh html " + xmlt.out() + "output.xml " + xmlt.out() + "output.html"; - return system (cmd.toAscii().constData()); - } - else if (html.compare(argv[1]) == 0) - { - QTemporaryFile tmp; - tmp.open(); - tmp.fileName(); - - XmlTransform xmlt(argv[2], argv[3], QString::Null(), tmp.fileName()); - xmlt.toBase64(false); - - QString cmd = "sh templates/xml_transform.sh html-base64 " + tmp.fileName() + " " + argv[4]; - return system (cmd.toAscii().constData()); - } - else if (pdf.compare(argv[1]) == 0) - { - QTemporaryFile tmp; - tmp.open(); - tmp.fileName(); - - XmlTransform xmlt(argv[2], argv[3], QString::Null(), tmp.fileName()); - xmlt.toBase64(false); - - QString cmd = "sh templates/xml_transform.sh pdf " + tmp.fileName() + " " + argv[4]; - return system (cmd.toAscii().constData()); - } - else if (svg.compare(argv[1]) == 0) - { - QTemporaryFile tmp; - tmp.open(); - tmp.fileName(); - - XmlTransform xmlt(argv[2], argv[3], QString::Null(), tmp.fileName()); - xmlt.toBase64(false); - - QString cmd = "sh templates/xml_transform.sh svg " + tmp.fileName() + " " + argv[4]; - return system (cmd.toAscii().constData()); - } - else if (open.compare(argv[1]) == 0) - { - QString dir = QDir::tempPath() + "/xml_transform." + argv[4]; - XmlTransform xmlt(argv[2], argv[3], dir); - xmlt.createOpen(); - - QString cmd = "sh templates/xml_transform.sh oo-doc " + dir + " " + argv[4]; - return system (cmd.toAscii().constData()); - } - else if (to_base64.compare(argv[1]) == 0) - { - XmlTransform xmlt(argv[2], argv[3], QString::Null(), argv[4]); - xmlt.toBase64(false); - } - else if (to_base64nocrop.compare(argv[1]) == 0) - { - XmlTransform xmlt(argv[2], argv[3], QString::Null(), argv[4]); - xmlt.toBase64(true); - } - else - std::cout << man << std::endl; + check_xsltproc(); + + XmlTransform xmlt(argv[2], argv[3], argv[4]); + xmlt.createHTML(false); + + + QString output = xmlt.out() + "output.html"; + qDebug() << QString("HTML output : %1").arg(output); + QString datarootdir = get_datarootdir("html/main.xsl"); + int ret = system(QString("xsltproc \"%1/html/main.xsl\" \"%2/output.xml\" > %3") + .arg(datarootdir) + .arg(xmlt.out()) + .arg(output).toAscii().constData()); + + QFile::remove(xmlt.out() + "output.xml"); + return ret; } + else if ("--html" == option) + { + QTemporaryFile tmp; + tmp.open(); + tmp.fileName(); + + XmlTransform xmlt(argv[2], argv[3], QString::Null(), tmp.fileName()); + xmlt.toBase64(false); + + return html_base64(tmp.fileName(), argv[4]); + } + else if ("--pdf" == option) + { + QTemporaryFile tmp; + tmp.open(); + tmp.fileName(); + + XmlTransform xmlt(argv[2], argv[3], QString::Null(), tmp.fileName()); + xmlt.toBase64(false); + + return pdf_base64(tmp.fileName(), argv[4]); + } + else if ("--svg" == option) + { + QTemporaryFile tmp; + tmp.open(); + tmp.fileName(); + + XmlTransform xmlt(argv[2], argv[3], QString::Null(), tmp.fileName()); + xmlt.toBase64(false); + + return svg_base64(tmp.fileName(), argv[4]); + } + else if ("--oo-doc" == option) + { + QString dir = QDir::tempPath() + "/xml_transform." + argv[4]; + XmlTransform xmlt(argv[2], argv[3], dir); + xmlt.createOpen(); + + QString datarootdir = get_datarootdir("html/main.xsl"); + system(QString("xsltproc \"%1/html/main.xsl\" \"%2/output.xml\" > %2/out.html") + .arg(datarootdir).arg(dir).toAscii().constData()); + + qDebug() << QString("Open Document output : %1").arg(argv[4]); + + datarootdir = get_datarootdir("bin/ooconvert"); + system(QString(" \"%1/bin/ooconvert\" \"%2/out.html\" \"%2/out.odt\" > /dev/null") + .arg(datarootdir).arg(dir).toAscii().constData()); + + QString cur_dir = QDir::currentPath(); + QString tmp_dir = dir + "/oo_tmp"; + + QDir d; + d.mkdir(tmp_dir); + qDebug() << "unzip %1/out.odt -d %2 > /dev/null" << dir << tmp_dir; + system(QString("unzip %1/out.odt -d %2 > /dev/null") + .arg(dir).arg(tmp_dir).toAscii().constData()); + + system(QString("cat %1/content.xml | sed -re 's!\\.\\./([a-zA-Z0-9])!Pictures/\\1!g' " + ">> %1/tmp.xml").arg(tmp_dir).toAscii().constData()); + + d.mkdir(tmp_dir + "/Pictures"); + d.rename(dir + "/*.png", tmp_dir + "/Pictures/"); + d.rename(tmp_dir + "/tmp.xml", tmp_dir + "/content.xml"); + + d.cd(tmp_dir); + qDebug() << "zip zip.odt -r * > /dev/null"; + system("zip zip.odt -r * > /dev/null"); + + QFile::copy("zip.odt", argv[4]); + d.cd(cur_dir); + + d.rmdir(dir); + + return 0; + } + else if ("--to-base64" == option) + { + XmlTransform xmlt(argv[2], argv[3], QString::Null(), argv[4]); + xmlt.toBase64(false); + return 0; + } + else if ("--to-base64-no-crop" == option) + { + XmlTransform xmlt(argv[2], argv[3], QString::Null(), argv[4]); + xmlt.toBase64(true); + return 0; + } + } else if (argc > 3) + { + if ("--svg-base64" == option) + { + return svg_base64(argv[2], argv[3]); + } + else if ("--pdf-base64" == option) + { + return pdf_base64(argv[2], argv[3]); + } + else if ("--html-base64" == option) + { + return html_base64(argv[2], argv[3]); + } + else if ("--from-base64" == option) { - std::string pdf_base64 = "--pdf-base64"; - std::string svg_base64 = "--svg-base64"; - std::string html_base64 = "--html-base64"; - std::string from_base64 = "--from-base64"; - - if (svg_base64.compare(argv[1]) == 0) - { - QString cmd = "sh templates/xml_transform.sh svg " + QString(argv[2]) + " " + QString(argv[3]); - return system (cmd.toAscii().constData()); - } - else if (pdf_base64.compare(argv[1]) == 0) - { - QString cmd = "sh templates/xml_transform.sh pdf " + QString(argv[2]) + " " + QString(argv[3]); - return system (cmd.toAscii().constData()); - } - else if (html_base64.compare(argv[1]) == 0) - { - QString cmd = "sh templates/xml_transform.sh html-base64 " + QString(argv[2]) + " " + QString(argv[3]); - return system (cmd.toAscii().constData()); - } - else if (from_base64.compare(argv[1]) == 0) - { - XmlTransform xmlt(argv[2], QString::Null(), argv[3]); - xmlt.fromBase64(); - } - else - std::cout << man << std::endl; + XmlTransform xmlt(argv[2], QString::Null(), argv[3]); + xmlt.fromBase64(); + return 0; } - else - std::cout << man << std::endl; + } + + qDebug() << man; return 0; } diff --git a/scribo/demo/xml2doc/templates/ooconvert b/scribo/demo/xml2doc/templates/bin/ooconvert similarity index 100% rename from scribo/demo/xml2doc/templates/ooconvert rename to scribo/demo/xml2doc/templates/bin/ooconvert diff --git a/scribo/demo/xml2doc/templates/xml_transform.sh b/scribo/demo/xml2doc/templates/xml_transform.sh deleted file mode 100755 index 05e9569..0000000 --- a/scribo/demo/xml2doc/templates/xml_transform.sh +++ /dev/null @@ -1,134 +0,0 @@ -#!/bin/sh - -SRC_DIR=`dirname $0`; - -if [ -z "$1" ] -then - echo "Please give an output type !" -else - if [ -z "$2" ] - then - echo "Please give input XML file !" - else - -# HTML - if [ "$1" = "html" ] - then - which xsltproc > /dev/null; - if [ $? -eq 0 ] - then - out="$3"; - if [ -z "$out" ] - then - out="output.html" - fi - out=`readlink -f $out` - - echo "HTML output : $out" - xsltproc "$SRC_DIR/html/main.xsl" "$2" > "$out" - - rm -f $2; - fi -# HTML BASE 64 - elif [ "$1" = "html-base64" ] - then - which xsltproc > /dev/null; - if [ $? -eq 0 ] - then - out="$3"; - if [ -z "$out" ] - then - out="output.html" - fi - out=`readlink -f $out` - - echo "HTML output : $out" - xsltproc "$SRC_DIR/html/main_base64.xsl" "$2" > "$out" - fi - -# PDF/SVG - elif [ -n "`echo $1 | grep -E 'pdf(\-base64)?|svg'`" ] - then - which fop > /dev/null; - if [ $? -eq 0 ] - then - out="$3"; - -# PDF - if [ "$1" = "pdf" ] - then - if [ -z "$out" ] - then - out="output.pdf" - fi - out=`readlink -f $out` - - echo "PDF output : $out" - fop -xsl "$SRC_DIR/pdf/main.xsl" -xml "$2" -pdf "$out"; - -# SVG - elif [ "$1" = "svg" ] - then - if [ -z "$out" ] - then - out="output.svg" - fi - out=`readlink -f $out` - - echo "SVG output : $out" - fop -xsl "$SRC_DIR/svg/main.xsl" -xml "$2" -svg "$out" - else - echo "Wrong output format !"; - fi - else - echo "fop >= 0.95 required !" - fi - -# Open Document - elif [ "$1" = "oo-doc" ] - then - which xsltproc > /dev/null; - if [ $? -eq 0 ] - then - - out="$3"; - if [ -z "$out" ] - then - out="output.odt" - fi - out=`readlink -f $out` - - xsltproc "$SRC_DIR/html/main.xsl" "$2/output.xml" > "$2/out.html" - - echo "Open Document output : $out" - "$SRC_DIR/ooconvert" "$2/out.html" "$2/out.odt" > /dev/null - - cur_dir=`pwd`; - tmp_dir="$2/oo_tmp" - - mkdir $tmp_dir - unzip $tmp_dir/../out.odt -d $tmp_dir > /dev/null - - cat $tmp_dir/content.xml | sed -re 's!\.\./([a-zA-Z0-9])!Pictures/\1!g' >> $tmp_dir/tmp.xml - - mkdir $tmp_dir/Pictures - - mv $2/*.png $tmp_dir/Pictures/ - - mv $tmp_dir/tmp.xml $tmp_dir/content.xml - - cd $tmp_dir - zip zip.odt -r * > /dev/null - cp zip.odt "$out" - cd $cur_dir; - - rm -r $2; - else - echo "xsltproc required !" - fi - - else - echo "Wrong output format !"; - fi - fi -fi \ No newline at end of file -- 1.5.6.5

1 0

last-svn-commit-694-g56ca0bc Include xml2doc in build system.
by Guillaume Lazzara 10 Dec '10

10 Dec '10

* demo/Makefile.am: Add xml2doc and libmagick++ dependency. * demo/xml2doc/Makefile.am: New. * demo/xml2doc/datarootdir.hh.in: New. Will store few useful variables. * demo/xml2doc/xml_transform.pro: Remove. --- scribo/ChangeLog | 13 ++++ scribo/demo/Makefile.am | 22 ++++++- scribo/demo/xml2doc/Makefile.am | 69 ++++++++++++++++++++ .../help_dialog.hh => xml2doc/datarootdir.hh.in} | 18 ++---- scribo/demo/xml2doc/xml_transform.pro | 17 ----- 5 files changed, 108 insertions(+), 31 deletions(-) create mode 100644 scribo/demo/xml2doc/Makefile.am copy scribo/demo/{viewer/help_dialog.hh => xml2doc/datarootdir.hh.in} (83%) delete mode 100644 scribo/demo/xml2doc/xml_transform.pro diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4c8c615..35791f8 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,18 @@ 2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Include xml2doc in build system. + + * demo/Makefile.am: Add xml2doc and libmagick++ dependency. + + * demo/xml2doc/Makefile.am: New. + + * demo/xml2doc/datarootdir.hh.in: New. Will store few useful + variables. + + * demo/xml2doc/xml_transform.pro: Remove. + +2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr> + Import xml_transform from Arthur's sandbox to demo/xml2doc. * sandbox/arthur/xml_transform/README, diff --git a/scribo/demo/Makefile.am b/scribo/demo/Makefile.am index b1d3c5b..2d55093 100644 --- a/scribo/demo/Makefile.am +++ b/scribo/demo/Makefile.am @@ -17,7 +17,27 @@ if HAVE_QT -SUBDIRS = review viewer +SUBDIRS = review + + + +if HAVE_MAGICKXX + +SUBDIRS = viewer + +endif HAVE_MAGICKXX + + + + +# FIXME: Add more dependencies (fop, xsltproc) +if HAVE_MAGICKXX + +SUBDIRS += xml2doc + +endif HAVE_MAGICKXX + + endif HAVE_QT diff --git a/scribo/demo/xml2doc/Makefile.am b/scribo/demo/xml2doc/Makefile.am new file mode 100644 index 0000000..f6ab232 --- /dev/null +++ b/scribo/demo/xml2doc/Makefile.am @@ -0,0 +1,69 @@ +# 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/>. + +include $(top_srcdir)/build-aux/autotroll.mk + + +bin_PROGRAMS = scribo-xml2doc +scribo_xml2doc_SOURCES = $(BUILT_SOURCES) \ + common.cc \ + image_crop.cc \ + loader.cc \ + main.cc \ + xml_transform.cc + +scribo_xml2doc_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) \ + $(MAGICKXX_CPPFLAGS) \ + -I$(top_srcdir)/milena \ + -I$(top_srcdir)/scribo \ + -DNDEBUG -DMLN_WO_GLOBAL_VARS +scribo_xml2doc_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) -O3 +scribo_xml2doc_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS) $(MAGICKXX_LDFLAGS) +scribo_xml2doc_LDADD = $(QT_LIBS) $(LDADD) + +BUILT_SOURCES = common.moc.cc \ + image_crop.moc.cc \ + loader.moc.cc \ + xml_transform.moc.cc + + +noinst_HEADERS = common.hh \ + image_crop.hh \ + loader.hh \ + xml_transform.hh + +# Generated files +noinst_gen_files = datarootdir.hh +noinst_HEADERS += $(noinst_gen_files) + +do_subst = sed \ + -e 's|@datarootdir[@]|$(datarootdir)|g' \ + -e 's|@abs_srcdir[@]|$(abs_srcdir)|g' + +datarootdir.hh: $(srcdir)/datarootdir.hh.in Makefile + rm -f $@ $@.tmp + srcdir=''; \ + test -f ./$@.in || srcdir=$(srcdir)/; \ + $(do_subst) $${srcdir}$@.in >$@.tmp + chmod a-w $@.tmp + mv $@.tmp $@ + +CLEANFILES = $(noinst_gen_files) $(BUILT_SOURCES) + +EXTRA_DIST = \ + README \ + datarootdir.hh.in + diff --git a/scribo/demo/viewer/help_dialog.hh b/scribo/demo/xml2doc/datarootdir.hh.in similarity index 83% copy from scribo/demo/viewer/help_dialog.hh copy to scribo/demo/xml2doc/datarootdir.hh.in index 2b4adcf..88371f9 100644 --- a/scribo/demo/viewer/help_dialog.hh +++ b/scribo/demo/xml2doc/datarootdir.hh.in @@ -23,21 +23,13 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef HELP_DIALOG_HH_ -# define HELP_DIALOG_HH_ +#ifndef SCRIBO_DEMO_XML2DOC_DATAROOTDIR_HH +# define SCRIBO_DEMO_XML2DOC_DATAROOTDIR_HH -# include <QtGui> -class HelpDialog - : public QDialog -{ - Q_OBJECT +# define SCRIBO_PREFIX_DATAROOTDIR "@datarootdir@/scribo" -public: - HelpDialog(); +# define SCRIBO_LOCAL_DATAROOTDIR "@abs_srcdir@" -public slots: - void done(); -}; -#endif /* !HELP_DIALOG_HH_ */ +#endif // !SCRIBO_DEMO_XML2DOC_DATAROOTDIR_HH diff --git a/scribo/demo/xml2doc/xml_transform.pro b/scribo/demo/xml2doc/xml_transform.pro deleted file mode 100644 index 918f0d6..0000000 --- a/scribo/demo/xml2doc/xml_transform.pro +++ /dev/null @@ -1,17 +0,0 @@ -###################################################################### -# Automatically generated by qmake (2.01a) jeu. juil. 15 13:47:38 2010 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . -QMAKE_CXXFLAGS += -I../../../../milena -I../../../../scribo -DEFINES += NDEBUG MLN_WO_GLOBAL_VARS -QT += xml -LIBS += `Magick++-config --libs` - - -# Input -HEADERS += common.hh image_crop.hh loader.hh xml_transform.hh -SOURCES += common.cc image_crop.cc loader.cc main.cc xml_transform.cc -- 1.5.6.5

1 0

last-svn-commit-693-ga0df2e7 Import xml_transform from Arthur's sandbox to demo/xml2doc.
by Guillaume Lazzara 10 Dec '10

10 Dec '10

* sandbox/arthur/xml_transform/README, * sandbox/arthur/xml_transform/common.cc, * sandbox/arthur/xml_transform/common.hh, * sandbox/arthur/xml_transform/image_crop.cc, * sandbox/arthur/xml_transform/image_crop.hh, * sandbox/arthur/xml_transform/loader.cc, * sandbox/arthur/xml_transform/loader.hh, * sandbox/arthur/xml_transform/main.cc, * sandbox/arthur/xml_transform/templates/html/css.css, * sandbox/arthur/xml_transform/templates/html/main.xsl, * sandbox/arthur/xml_transform/templates/html/main_base64.xsl, * sandbox/arthur/xml_transform/templates/ooconvert, * sandbox/arthur/xml_transform/templates/opendoc/css.css, * sandbox/arthur/xml_transform/templates/opendoc/xsl.xsl, * sandbox/arthur/xml_transform/templates/pdf/line.xsl, * sandbox/arthur/xml_transform/templates/pdf/main.xsl, * sandbox/arthur/xml_transform/templates/pdf/regions.xsl, * sandbox/arthur/xml_transform/templates/svg/line.xsl, * sandbox/arthur/xml_transform/templates/svg/main.xsl, * sandbox/arthur/xml_transform/templates/svg/regions.xsl, * sandbox/arthur/xml_transform/templates/xml_transform.sh, * sandbox/arthur/xml_transform/xml_transform.cc, * sandbox/arthur/xml_transform/xml_transform.hh, * sandbox/arthur/xml_transform/xml_transform.pro: Move... * demo/xml2doc/README, * demo/xml2doc/common.cc, * demo/xml2doc/common.hh, * demo/xml2doc/image_crop.cc, * demo/xml2doc/image_crop.hh, * demo/xml2doc/loader.cc, * demo/xml2doc/loader.hh, * demo/xml2doc/main.cc, * demo/xml2doc/templates/html/css.css, * demo/xml2doc/templates/html/main.xsl, * demo/xml2doc/templates/html/main_base64.xsl, * demo/xml2doc/templates/ooconvert, * demo/xml2doc/templates/opendoc/css.css, * demo/xml2doc/templates/opendoc/xsl.xsl, * demo/xml2doc/templates/pdf/line.xsl, * demo/xml2doc/templates/pdf/main.xsl, * demo/xml2doc/templates/pdf/regions.xsl, * demo/xml2doc/templates/svg/line.xsl, * demo/xml2doc/templates/svg/main.xsl, * demo/xml2doc/templates/svg/regions.xsl, * demo/xml2doc/templates/xml_transform.sh, * demo/xml2doc/xml_transform.cc, * demo/xml2doc/xml_transform.hh, * demo/xml2doc/xml_transform.pro: ... here. --- scribo/ChangeLog | 54 ++++++++++++++++++++ .../arthur/xml_transform => demo/xml2doc}/README | 0 .../xml_transform => demo/xml2doc}/common.cc | 0 .../xml_transform => demo/xml2doc}/common.hh | 0 .../xml_transform => demo/xml2doc}/image_crop.cc | 0 .../xml_transform => demo/xml2doc}/image_crop.hh | 0 .../xml_transform => demo/xml2doc}/loader.cc | 0 .../xml_transform => demo/xml2doc}/loader.hh | 0 .../arthur/xml_transform => demo/xml2doc}/main.cc | 0 .../xml2doc}/templates/html/css.css | 0 .../xml2doc}/templates/html/main.xsl | 0 .../xml2doc}/templates/html/main_base64.xsl | 0 .../xml2doc}/templates/ooconvert | 0 .../xml2doc}/templates/opendoc/css.css | 0 .../xml2doc}/templates/opendoc/xsl.xsl | 0 .../xml2doc}/templates/pdf/line.xsl | 0 .../xml2doc}/templates/pdf/main.xsl | 0 .../xml2doc}/templates/pdf/regions.xsl | 0 .../xml2doc}/templates/svg/line.xsl | 0 .../xml2doc}/templates/svg/main.xsl | 0 .../xml2doc}/templates/svg/regions.xsl | 0 .../xml2doc}/templates/xml_transform.sh | 0 .../xml2doc}/xml_transform.cc | 0 .../xml2doc}/xml_transform.hh | 0 .../xml2doc}/xml_transform.pro | 0 25 files changed, 54 insertions(+), 0 deletions(-) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/README (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/common.cc (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/common.hh (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/image_crop.cc (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/image_crop.hh (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/loader.cc (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/loader.hh (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/main.cc (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/html/css.css (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/html/main.xsl (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/html/main_base64.xsl (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/ooconvert (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/opendoc/css.css (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/opendoc/xsl.xsl (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/pdf/line.xsl (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/pdf/main.xsl (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/pdf/regions.xsl (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/svg/line.xsl (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/svg/main.xsl (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/svg/regions.xsl (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/templates/xml_transform.sh (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/xml_transform.cc (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/xml_transform.hh (100%) rename scribo/{sandbox/arthur/xml_transform => demo/xml2doc}/xml_transform.pro (100%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 47708cf..4c8c615 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,57 @@ +2010-12-10 Guillaume Lazzara <z(a)lrde.epita.fr> + + Import xml_transform from Arthur's sandbox to demo/xml2doc. + + * sandbox/arthur/xml_transform/README, + * sandbox/arthur/xml_transform/common.cc, + * sandbox/arthur/xml_transform/common.hh, + * sandbox/arthur/xml_transform/image_crop.cc, + * sandbox/arthur/xml_transform/image_crop.hh, + * sandbox/arthur/xml_transform/loader.cc, + * sandbox/arthur/xml_transform/loader.hh, + * sandbox/arthur/xml_transform/main.cc, + * sandbox/arthur/xml_transform/templates/html/css.css, + * sandbox/arthur/xml_transform/templates/html/main.xsl, + * sandbox/arthur/xml_transform/templates/html/main_base64.xsl, + * sandbox/arthur/xml_transform/templates/ooconvert, + * sandbox/arthur/xml_transform/templates/opendoc/css.css, + * sandbox/arthur/xml_transform/templates/opendoc/xsl.xsl, + * sandbox/arthur/xml_transform/templates/pdf/line.xsl, + * sandbox/arthur/xml_transform/templates/pdf/main.xsl, + * sandbox/arthur/xml_transform/templates/pdf/regions.xsl, + * sandbox/arthur/xml_transform/templates/svg/line.xsl, + * sandbox/arthur/xml_transform/templates/svg/main.xsl, + * sandbox/arthur/xml_transform/templates/svg/regions.xsl, + * sandbox/arthur/xml_transform/templates/xml_transform.sh, + * sandbox/arthur/xml_transform/xml_transform.cc, + * sandbox/arthur/xml_transform/xml_transform.hh, + * sandbox/arthur/xml_transform/xml_transform.pro: Move... + + * demo/xml2doc/README, + * demo/xml2doc/common.cc, + * demo/xml2doc/common.hh, + * demo/xml2doc/image_crop.cc, + * demo/xml2doc/image_crop.hh, + * demo/xml2doc/loader.cc, + * demo/xml2doc/loader.hh, + * demo/xml2doc/main.cc, + * demo/xml2doc/templates/html/css.css, + * demo/xml2doc/templates/html/main.xsl, + * demo/xml2doc/templates/html/main_base64.xsl, + * demo/xml2doc/templates/ooconvert, + * demo/xml2doc/templates/opendoc/css.css, + * demo/xml2doc/templates/opendoc/xsl.xsl, + * demo/xml2doc/templates/pdf/line.xsl, + * demo/xml2doc/templates/pdf/main.xsl, + * demo/xml2doc/templates/pdf/regions.xsl, + * demo/xml2doc/templates/svg/line.xsl, + * demo/xml2doc/templates/svg/main.xsl, + * demo/xml2doc/templates/svg/regions.xsl, + * demo/xml2doc/templates/xml_transform.sh, + * demo/xml2doc/xml_transform.cc, + * demo/xml2doc/xml_transform.hh, + * demo/xml2doc/xml_transform.pro: ... here. + 2010-11-29 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/toolchain/text_in_doc.hh: Set english as default diff --git a/scribo/sandbox/arthur/xml_transform/README b/scribo/demo/xml2doc/README similarity index 100% rename from scribo/sandbox/arthur/xml_transform/README rename to scribo/demo/xml2doc/README diff --git a/scribo/sandbox/arthur/xml_transform/common.cc b/scribo/demo/xml2doc/common.cc similarity index 100% rename from scribo/sandbox/arthur/xml_transform/common.cc rename to scribo/demo/xml2doc/common.cc diff --git a/scribo/sandbox/arthur/xml_transform/common.hh b/scribo/demo/xml2doc/common.hh similarity index 100% rename from scribo/sandbox/arthur/xml_transform/common.hh rename to scribo/demo/xml2doc/common.hh diff --git a/scribo/sandbox/arthur/xml_transform/image_crop.cc b/scribo/demo/xml2doc/image_crop.cc similarity index 100% rename from scribo/sandbox/arthur/xml_transform/image_crop.cc rename to scribo/demo/xml2doc/image_crop.cc diff --git a/scribo/sandbox/arthur/xml_transform/image_crop.hh b/scribo/demo/xml2doc/image_crop.hh similarity index 100% rename from scribo/sandbox/arthur/xml_transform/image_crop.hh rename to scribo/demo/xml2doc/image_crop.hh diff --git a/scribo/sandbox/arthur/xml_transform/loader.cc b/scribo/demo/xml2doc/loader.cc similarity index 100% rename from scribo/sandbox/arthur/xml_transform/loader.cc rename to scribo/demo/xml2doc/loader.cc diff --git a/scribo/sandbox/arthur/xml_transform/loader.hh b/scribo/demo/xml2doc/loader.hh similarity index 100% rename from scribo/sandbox/arthur/xml_transform/loader.hh rename to scribo/demo/xml2doc/loader.hh diff --git a/scribo/sandbox/arthur/xml_transform/main.cc b/scribo/demo/xml2doc/main.cc similarity index 100% rename from scribo/sandbox/arthur/xml_transform/main.cc rename to scribo/demo/xml2doc/main.cc diff --git a/scribo/sandbox/arthur/xml_transform/templates/html/css.css b/scribo/demo/xml2doc/templates/html/css.css similarity index 100% rename from scribo/sandbox/arthur/xml_transform/templates/html/css.css rename to scribo/demo/xml2doc/templates/html/css.css diff --git a/scribo/sandbox/arthur/xml_transform/templates/html/main.xsl b/scribo/demo/xml2doc/templates/html/main.xsl similarity index 100% rename from scribo/sandbox/arthur/xml_transform/templates/html/main.xsl rename to scribo/demo/xml2doc/templates/html/main.xsl diff --git a/scribo/sandbox/arthur/xml_transform/templates/html/main_base64.xsl b/scribo/demo/xml2doc/templates/html/main_base64.xsl similarity index 100% rename from scribo/sandbox/arthur/xml_transform/templates/html/main_base64.xsl rename to scribo/demo/xml2doc/templates/html/main_base64.xsl diff --git a/scribo/sandbox/arthur/xml_transform/templates/ooconvert b/scribo/demo/xml2doc/templates/ooconvert similarity index 100% rename from scribo/sandbox/arthur/xml_transform/templates/ooconvert rename to scribo/demo/xml2doc/templates/ooconvert diff --git a/scribo/sandbox/arthur/xml_transform/templates/opendoc/css.css b/scribo/demo/xml2doc/templates/opendoc/css.css similarity index 100% rename from scribo/sandbox/arthur/xml_transform/templates/opendoc/css.css rename to scribo/demo/xml2doc/templates/opendoc/css.css diff --git a/scribo/sandbox/arthur/xml_transform/templates/opendoc/xsl.xsl b/scribo/demo/xml2doc/templates/opendoc/xsl.xsl similarity index 100% rename from scribo/sandbox/arthur/xml_transform/templates/opendoc/xsl.xsl rename to scribo/demo/xml2doc/templates/opendoc/xsl.xsl diff --git a/scribo/sandbox/arthur/xml_transform/templates/pdf/line.xsl b/scribo/demo/xml2doc/templates/pdf/line.xsl similarity index 100% rename from scribo/sandbox/arthur/xml_transform/templates/pdf/line.xsl rename to scribo/demo/xml2doc/templates/pdf/line.xsl diff --git a/scribo/sandbox/arthur/xml_transform/templates/pdf/main.xsl b/scribo/demo/xml2doc/templates/pdf/main.xsl similarity index 100% rename from scribo/sandbox/arthur/xml_transform/templates/pdf/main.xsl rename to scribo/demo/xml2doc/templates/pdf/main.xsl diff --git a/scribo/sandbox/arthur/xml_transform/templates/pdf/regions.xsl b/scribo/demo/xml2doc/templates/pdf/regions.xsl similarity index 100% rename from scribo/sandbox/arthur/xml_transform/templates/pdf/regions.xsl rename to scribo/demo/xml2doc/templates/pdf/regions.xsl diff --git a/scribo/sandbox/arthur/xml_transform/templates/svg/line.xsl b/scribo/demo/xml2doc/templates/svg/line.xsl similarity index 100% rename from scribo/sandbox/arthur/xml_transform/templates/svg/line.xsl rename to scribo/demo/xml2doc/templates/svg/line.xsl diff --git a/scribo/sandbox/arthur/xml_transform/templates/svg/main.xsl b/scribo/demo/xml2doc/templates/svg/main.xsl similarity index 100% rename from scribo/sandbox/arthur/xml_transform/templates/svg/main.xsl rename to scribo/demo/xml2doc/templates/svg/main.xsl diff --git a/scribo/sandbox/arthur/xml_transform/templates/svg/regions.xsl b/scribo/demo/xml2doc/templates/svg/regions.xsl similarity index 100% rename from scribo/sandbox/arthur/xml_transform/templates/svg/regions.xsl rename to scribo/demo/xml2doc/templates/svg/regions.xsl diff --git a/scribo/sandbox/arthur/xml_transform/templates/xml_transform.sh b/scribo/demo/xml2doc/templates/xml_transform.sh similarity index 100% rename from scribo/sandbox/arthur/xml_transform/templates/xml_transform.sh rename to scribo/demo/xml2doc/templates/xml_transform.sh diff --git a/scribo/sandbox/arthur/xml_transform/xml_transform.cc b/scribo/demo/xml2doc/xml_transform.cc similarity index 100% rename from scribo/sandbox/arthur/xml_transform/xml_transform.cc rename to scribo/demo/xml2doc/xml_transform.cc diff --git a/scribo/sandbox/arthur/xml_transform/xml_transform.hh b/scribo/demo/xml2doc/xml_transform.hh similarity index 100% rename from scribo/sandbox/arthur/xml_transform/xml_transform.hh rename to scribo/demo/xml2doc/xml_transform.hh diff --git a/scribo/sandbox/arthur/xml_transform/xml_transform.pro b/scribo/demo/xml2doc/xml_transform.pro similarity index 100% rename from scribo/sandbox/arthur/xml_transform/xml_transform.pro rename to scribo/demo/xml2doc/xml_transform.pro -- 1.5.6.5

1 0

[Olena] #240: Use the installcheck target to run post-installation tests
by Olena Trac 03 Dec '10

03 Dec '10

#240: Use the installcheck target to run post-installation tests -------------------------+-------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: enhancement | Status: new Priority: major | Milestone: Olena 1.1 Component: Olena | Version: 1.0 Keywords: | -------------------------+-------------------------------------------------- Automake's `installcheck` target runs install tests (to be executed after the `install` target). See http://www.gnu.org/software/automake/manual/html_node/Install-Tests.html. Such tests are useful, and maybe more relevant than `check` tests, since they exercise the package in its ''installed'' form, that is, the one seen by end users. We should adjust the test suite so that the `installcheck` target runs the same tests as the `check` target (where applicable), and possibly extra tests. Every component of Olena should be updated. -- Ticket URL: <https://trac.lrde.org/olena/ticket/240> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 1

last-svn-commit-536-gdb3466e Clean up Swilena Makefiles.
by Roland Levillain 03 Dec '10

03 Dec '10

* Makefile.am: Here. * python/Makefile.am: Likewise. (python_PYTHON): Move data.py... (EXTRA_DIST): ...here. --- swilena/ChangeLog | 9 +++++++++ swilena/python/Makefile.am | 12 +++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 6d31d60..c5aed82 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,12 @@ +2009-10-27 Roland Levillain <roland(a)lrde.epita.fr> + + Clean up Swilena Makefiles. + + * Makefile.am: Here. + * python/Makefile.am: Likewise. + (python_PYTHON): Move data.py... + (EXTRA_DIST): ...here. + 2010-10-25 Roland Levillain <roland(a)lrde.epita.fr> Fix Swilena's dependency tracking. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 531880f..e522233 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -15,6 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. + ## ------------------ ## ## Generic material. ## ## ------------------ ## @@ -26,11 +27,11 @@ AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/milena TOOLS_CXXFLAGS = @TOOLS_CXXFLAGS@ AM_CXXFLAGS = $(TOOLS_CXXFLAGS) AM_SWIGFLAGS = -Wall -c++ -python -I$(top_srcdir)/milena -## We build modules, not plain libs. +# We build modules, not plain libs. AM_LDFLAGS = -avoid-version -module -shared -## Run Swig to create the C++ wrapper files, the Python interface -## files, and the dependency Makefile snippets. +# Run Swig to create the C++ wrapper files, the Python interface +# files, and the dependency Makefile snippets. %-wrap.cc %.py: $(top_srcdir)/swilena/%.i @AMDEP_TRUE@ if $(SWIG) $(AM_SWIGFLAGS) $(SWIGFLAGS) -MD -MF "$(DEPDIR)/$*-wrap.Tcc" -o $@ $<; then \ @AMDEP_TRUE@ mv -f "$(DEPDIR)/$*-wrap.Tcc" "$(DEPDIR)/$*-wrap.Pcc";\ @@ -44,8 +45,9 @@ AM_LDFLAGS = -avoid-version -module -shared python_PYTHON = ltihooks.py # swilena.py: The whole Swilena suite. python_PYTHON += swilena.py + # data.py: Access to the data of the distribution (images, meshes, etc.) -python_PYTHON += data.py +EXTRA_DIST = data.py ## ----------------- ## @@ -217,7 +219,7 @@ $(TESTS): $(srcdir)/run.stamp # The dependency is on `run.in' and not `run', since `run' is # regenerated at distribution time, and voids the time stamps (which # we don't want!). -EXTRA_DIST = $(srcdir)/run.stamp +EXTRA_DIST += $(srcdir)/run.stamp $(srcdir)/run.stamp: $(RUN_IN) @rm -f $@ @rm -f $@.tmp -- 1.5.6.5

1 0

branch next updated: last-svn-commit-536-gdb3466e
by git＠lrde.epita.fr 03 Dec '10

03 Dec '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via db3466e6f12fca8d9c92ae661ae0b5d053b8e4ba (commit) from 47737dc394d2bb22742e7bd2f964bed0cd950648 (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 ----------------------------------------------------------------- db3466e Clean up Swilena Makefiles. ----------------------------------------------------------------------- Summary of changes: swilena/ChangeLog | 9 +++++++++ swilena/python/Makefile.am | 12 +++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0