November 2010 - Olena-patches

last-svn-commit-533-gac6d6f3 Fix forward declarations in complex piters.
by Roland Levillain 29 Nov '10

29 Nov '10

* mln/core/site_set/p_complex_piter.hh, * mln/core/site_set/p_n_faces_piter.hh: Here. --- milena/ChangeLog | 8 ++++++++ milena/mln/core/site_set/p_complex_piter.hh | 6 ++---- milena/mln/core/site_set/p_n_faces_piter.hh | 4 ++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8aaea83..4141442 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> + Fix forward declarations in complex piters. + + * mln/core/site_set/p_complex_piter.hh, + * mln/core/site_set/p_n_faces_piter.hh: + Here. + +2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> + Rename parameter `P' as `G' (geometry) in p_n_faces_piters. * mln/core/site_set/p_complex_piter.hh: Here. diff --git a/milena/mln/core/site_set/p_complex_piter.hh b/milena/mln/core/site_set/p_complex_piter.hh index 8a34309..9fa2282 100644 --- a/milena/mln/core/site_set/p_complex_piter.hh +++ b/milena/mln/core/site_set/p_complex_piter.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. // @@ -42,9 +43,6 @@ namespace mln // Forward declarations. template <unsigned D, typename G> class p_complex; - template <unsigned D> class complex_fwd_iter_; - template <unsigned D> class complex_bkd_iter_; - /*-----------------------------. | p_complex_fwd_piter_<D, G>. | diff --git a/milena/mln/core/site_set/p_n_faces_piter.hh b/milena/mln/core/site_set/p_n_faces_piter.hh index cd71282..3282be8 100644 --- a/milena/mln/core/site_set/p_n_faces_piter.hh +++ b/milena/mln/core/site_set/p_n_faces_piter.hh @@ -42,6 +42,10 @@ namespace mln { + // Forward declarations. + template <unsigned D, typename G> class p_complex; + + /*----------------------------. | p_n_faces_fwd_piter<D, G>. | `----------------------------*/ -- 1.5.6.5

1 0

last-svn-commit-532-g93da222 Rename parameter `P' as `G' (geometry) in p_n_faces_piters.
by Roland Levillain 29 Nov '10

29 Nov '10

* mln/core/site_set/p_complex_piter.hh: Here. --- milena/ChangeLog | 6 ++ milena/mln/core/site_set/p_n_faces_piter.hh | 76 +++++++++++++------------- 2 files changed, 44 insertions(+), 38 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8df9b80..8aaea83 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> + Rename parameter `P' as `G' (geometry) in p_n_faces_piters. + + * mln/core/site_set/p_complex_piter.hh: Here. + +2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> + Fix the type of the underlying site of p_n_faces_piters. * mln/core/site_set/p_n_faces_piter.hh diff --git a/milena/mln/core/site_set/p_n_faces_piter.hh b/milena/mln/core/site_set/p_n_faces_piter.hh index de5653d..cd71282 100644 --- a/milena/mln/core/site_set/p_n_faces_piter.hh +++ b/milena/mln/core/site_set/p_n_faces_piter.hh @@ -43,29 +43,29 @@ namespace mln { /*----------------------------. - | p_n_faces_fwd_piter<D, P>. | + | p_n_faces_fwd_piter<D, G>. | `----------------------------*/ /// \brief Forward iterator on the n-faces sites of an - /// mln::p_complex<D, P>. - template <unsigned D, typename P> + /// mln::p_complex<D, G>. + template <unsigned D, typename G> class p_n_faces_fwd_piter : public internal::p_complex_piter_base_< topo::n_face_fwd_iter<D>, - p_complex<D, P>, - mln_site(P), - p_n_faces_fwd_piter<D, P> > + p_complex<D, G>, + mln_site(G), + p_n_faces_fwd_piter<D, G> > { - typedef p_n_faces_fwd_piter<D, P> self_; + typedef p_n_faces_fwd_piter<D, G> self_; typedef internal::p_complex_piter_base_< topo::n_face_fwd_iter<D>, - p_complex<D, P>, - mln_site(P), + p_complex<D, G>, + mln_site(G), self_ > super_; public: /// Construction and assignment. /// \{ p_n_faces_fwd_piter(); - p_n_faces_fwd_piter(const p_complex<D, P>& pc, unsigned n); + p_n_faces_fwd_piter(const p_complex<D, G>& pc, unsigned n); /// \} /// \brief Accessors. @@ -79,31 +79,31 @@ namespace mln /*----------------------------. - | p_n_faces_bkd_piter<D, P>. | + | p_n_faces_bkd_piter<D, G>. | `----------------------------*/ /// \brief Backward iterator on the n-faces sites of an - /// mln::p_complex<D, P>. - template <unsigned D, typename P> + /// mln::p_complex<D, G>. + template <unsigned D, typename G> class p_n_faces_bkd_piter /* FIXME: Rename internal::p_complex_piter_base_ to something else, as it is also used for p_faces piters! */ : public internal::p_complex_piter_base_< topo::n_face_bkd_iter<D>, - p_complex<D, P>, - mln_site(P), - p_n_faces_bkd_piter<D, P> > + p_complex<D, G>, + mln_site(G), + p_n_faces_bkd_piter<D, G> > { - typedef p_n_faces_bkd_piter<D, P> self_; + typedef p_n_faces_bkd_piter<D, G> self_; typedef internal::p_complex_piter_base_< topo::n_face_bkd_iter<D>, - p_complex<D, P>, - mln_site(P), + p_complex<D, G>, + mln_site(G), self_ > super_; public: /// Construction and assignment. /// \{ p_n_faces_bkd_piter(); - p_n_faces_bkd_piter(const p_complex<D, P>& pc, unsigned n); + p_n_faces_bkd_piter(const p_complex<D, G>& pc, unsigned n); /// \} /// \brief Accessors. @@ -120,18 +120,18 @@ namespace mln # ifndef MLN_INCLUDE_ONLY /*----------------------------. - | p_n_faces_fwd_piter<D, P>. | + | p_n_faces_fwd_piter<D, G>. | `----------------------------*/ - template <unsigned D, typename P> + template <unsigned D, typename G> inline - p_n_faces_fwd_piter<D, P>::p_n_faces_fwd_piter() + p_n_faces_fwd_piter<D, G>::p_n_faces_fwd_piter() { } - template <unsigned D, typename P> + template <unsigned D, typename G> inline - p_n_faces_fwd_piter<D, P>::p_n_faces_fwd_piter(const p_complex<D, P>& pc, + p_n_faces_fwd_piter<D, G>::p_n_faces_fwd_piter(const p_complex<D, G>& pc, unsigned n) : super_(pc) { @@ -139,36 +139,36 @@ namespace mln set_n(n); } - template <unsigned D, typename P> + template <unsigned D, typename G> inline unsigned - p_n_faces_fwd_piter<D, P>::n() const + p_n_faces_fwd_piter<D, G>::n() const { return this->iter_.n(); } - template <unsigned D, typename P> + template <unsigned D, typename G> inline void - p_n_faces_fwd_piter<D, P>::set_n (unsigned n) + p_n_faces_fwd_piter<D, G>::set_n (unsigned n) { this->iter_.set_n(n); } /*----------------------------. - | p_n_faces_bkd_piter<D, P>. | + | p_n_faces_bkd_piter<D, G>. | `----------------------------*/ - template <unsigned D, typename P> + template <unsigned D, typename G> inline - p_n_faces_bkd_piter<D, P>::p_n_faces_bkd_piter() + p_n_faces_bkd_piter<D, G>::p_n_faces_bkd_piter() { } - template <unsigned D, typename P> + template <unsigned D, typename G> inline - p_n_faces_bkd_piter<D, P>::p_n_faces_bkd_piter(const p_complex<D, P>& pc, + p_n_faces_bkd_piter<D, G>::p_n_faces_bkd_piter(const p_complex<D, G>& pc, unsigned n) : super_(pc) { @@ -176,18 +176,18 @@ namespace mln set_n(n); } - template <unsigned D, typename P> + template <unsigned D, typename G> inline unsigned - p_n_faces_bkd_piter<D, P>::n() const + p_n_faces_bkd_piter<D, G>::n() const { return this->iter_.n(); } - template <unsigned D, typename P> + template <unsigned D, typename G> inline void - p_n_faces_bkd_piter<D, P>::set_n (unsigned n) + p_n_faces_bkd_piter<D, G>::set_n (unsigned n) { this->iter_.set_n(n); } -- 1.5.6.5

1 0

last-svn-commit-531-g6a4e9c5 Fix the type of the underlying site of p_n_faces_piters.
by Roland Levillain 29 Nov '10

29 Nov '10

* mln/core/site_set/p_n_faces_piter.hh (mln::p_n_faces_fwd_piter, mln::p_n_faces_bkd_piter): Change the third parameter of the base class from `P' to `mln_site(P)'. --- milena/ChangeLog | 9 +++++++++ milena/mln/core/site_set/p_n_faces_piter.hh | 11 ++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 20a3967..8df9b80 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the type of the underlying site of p_n_faces_piters. + + * mln/core/site_set/p_n_faces_piter.hh + (mln::p_n_faces_fwd_piter, mln::p_n_faces_bkd_piter): + Change the third parameter of the base class from `P' to + `mln_site(P)'. + 2010-07-29 Roland Levillain <roland(a)lrde.epita.fr> Fix output streams uses. diff --git a/milena/mln/core/site_set/p_n_faces_piter.hh b/milena/mln/core/site_set/p_n_faces_piter.hh index 599f49d..de5653d 100644 --- a/milena/mln/core/site_set/p_n_faces_piter.hh +++ b/milena/mln/core/site_set/p_n_faces_piter.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. // @@ -51,13 +52,13 @@ namespace mln class p_n_faces_fwd_piter : public internal::p_complex_piter_base_< topo::n_face_fwd_iter<D>, p_complex<D, P>, - P, + mln_site(P), p_n_faces_fwd_piter<D, P> > { typedef p_n_faces_fwd_piter<D, P> self_; typedef internal::p_complex_piter_base_< topo::n_face_fwd_iter<D>, p_complex<D, P>, - P, + mln_site(P), self_ > super_; public: @@ -89,13 +90,13 @@ namespace mln as it is also used for p_faces piters! */ : public internal::p_complex_piter_base_< topo::n_face_bkd_iter<D>, p_complex<D, P>, - P, + mln_site(P), p_n_faces_bkd_piter<D, P> > { typedef p_n_faces_bkd_piter<D, P> self_; typedef internal::p_complex_piter_base_< topo::n_face_bkd_iter<D>, p_complex<D, P>, - P, + mln_site(P), self_ > super_; public: -- 1.5.6.5

1 0

last-svn-commit-534-g626d241 Honor `--without-qt' in configure.
by Roland Levillain 29 Nov '10

29 Nov '10

* m4/autotroll.m4: Here. --- ChangeLog | 6 ++++++ m4/autotroll.m4 | 3 +++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 98d3a41..b63a9a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> + + Honor `--without-qt' in configure. + + * m4/autotroll.m4: Here. + 2010-11-05 Roland Levillain <roland(a)lrde.epita.fr> * AUTHORS: Clean up whitespace. diff --git a/m4/autotroll.m4 b/m4/autotroll.m4 index 2a382d4..0fae85e 100644 --- a/m4/autotroll.m4 +++ b/m4/autotroll.m4 @@ -143,6 +143,9 @@ dnl Memo: AC_ARG_WITH(package, help-string, [if-given], [if-not-given]) # this is a hack to get decent flow control with 'break' for _qt_ignored in once; do + # Stop here if Qt is disabled. + if test "x$with_qt" = xno; then break; fi + # Find Qt. AC_ARG_VAR([QT_PATH], [Path to the Qt installation]) if test -d /usr/local/Trolltech; then -- 1.5.6.5

1 0

[Olena] #241: Have Qmake honor CXX and adjust its parameters according to the compiler's abilities
by Olena Trac 29 Nov '10

29 Nov '10

#241: Have Qmake honor CXX and adjust its parameters according to the compiler's abilities ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Component: Olena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- Context: qmake is used by `configure` to set flags like `QT_CXXFLAGS`, `QT_LDFLAGS`, etc. (thanks to `autotroll.m4`). Qmake does not set compiler/linker flags based on tests on the tools themselves; instead, it queries the environment and sets variables according to some recipe (the « `spec` »). This is annoying on Mac OS X, since the `spec` detected and used by Qmake on this OS (`macx-g++`) adds Apple-specific flags to `QT_CXXFLAGS`, `QT_LDFLAGS`, etc., namely « `-arch x86_64 -Xarch_x86_64` » on Intel64 hosts. This prevents Qt-dependent components from being built with a non Apple compiler (e.g., `g++` 4.5 from the !MacPorts). We cannot really solve this problem entirely because it implies patching qmake. We can however write some workaround in `autotroll.m4` for known cases (like this one). In the current case, if non-standard flags `-arch` and/or `-Xarch` are detected in the `Makefile` generated by qmake, we should try to run `make` in the `conftest.dir` directory with CXX set to the value found ealier by `configure`. If this fails, try again with `-arch` and/or `-Xarch` removed from `QT_CXXFLAGS`, `QT_LDFLAGS`, etc. -- Ticket URL: <https://trac.lrde.org/olena/ticket/241> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

last-svn-commit-535-g47737dc Work around g++ 4.5 deficiencies to compile Milena.
by Roland Levillain 29 Nov '10

29 Nov '10

* mln/core/concept/proxy.hxx (internal::helper_unproxy_rec< P, true >::P_) (internal::helper_unproxy_rec< const P, true >::P_): Remove these intermediate typedefs... (internal::helper_unproxy_rec< P, true >::ret) (internal::helper_unproxy_rec< const P, true >::ret): ...to inline these definitions. * mln/util/array.hh (internal::subject_impl<util::array<T>&, E>::operator()) (internal::subject_impl<util::array<T>&, E>::operator[]) (internal::subject_impl<const util::array<T>&, E>::operator() const) (internal::subject_impl<const util::array<T>&, E>::operator[] const): * mln/core/site_set/p_graph_piter.hh (internal::subject_impl< const p_graph_piter<S,I>&, E >::graph): Use the exact same return type as in the declaration. --- milena/ChangeLog | 20 ++++++++++++++++++++ milena/mln/core/concept/proxy.hxx | 6 ++---- milena/mln/core/site_set/p_graph_piter.hh | 2 +- milena/mln/util/array.hh | 8 ++++---- 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4141442..9f07662 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,25 @@ 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> + Work around g++ 4.5 deficiencies to compile Milena. + + * mln/core/concept/proxy.hxx + (internal::helper_unproxy_rec< P, true >::P_) + (internal::helper_unproxy_rec< const P, true >::P_): + Remove these intermediate typedefs... + (internal::helper_unproxy_rec< P, true >::ret) + (internal::helper_unproxy_rec< const P, true >::ret): + ...to inline these definitions. + * mln/util/array.hh + (internal::subject_impl<util::array<T>&, E>::operator()) + (internal::subject_impl<util::array<T>&, E>::operator[]) + (internal::subject_impl<const util::array<T>&, E>::operator() const) + (internal::subject_impl<const util::array<T>&, E>::operator[] const): + * mln/core/site_set/p_graph_piter.hh + (internal::subject_impl< const p_graph_piter<S,I>&, E >::graph): + Use the exact same return type as in the declaration. + +2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> + Fix forward declarations in complex piters. * mln/core/site_set/p_complex_piter.hh, diff --git a/milena/mln/core/concept/proxy.hxx b/milena/mln/core/concept/proxy.hxx index d50b3aa..2f77cec 100644 --- a/milena/mln/core/concept/proxy.hxx +++ b/milena/mln/core/concept/proxy.hxx @@ -92,16 +92,14 @@ namespace mln template <typename P> struct helper_unproxy_rec< P, true > { - typedef mln_exact(P) P_; - typedef typename P_::HOT_actual_subject ret; + typedef mln_exact(P)::HOT_actual_subject ret; static ret on(P& p); }; template <typename P> struct helper_unproxy_rec< const P, true > { - typedef mln_exact(P) P_; - typedef mlc_const(typename P_::HOT_actual_subject) ret; + typedef mlc_const(mln_exact(P)::HOT_actual_subject) ret; static ret on(const P& p); }; diff --git a/milena/mln/core/site_set/p_graph_piter.hh b/milena/mln/core/site_set/p_graph_piter.hh index ec082a6..12b7e0d 100644 --- a/milena/mln/core/site_set/p_graph_piter.hh +++ b/milena/mln/core/site_set/p_graph_piter.hh @@ -257,7 +257,7 @@ namespace mln template <typename S, typename I, typename E> inline - const typename S::graph_t& + const typename subject_impl< const p_graph_piter<S,I>&, E >::graph_t& subject_impl< const p_graph_piter<S,I>&, E >::graph() const { return exact_().get_subject().graph(); diff --git a/milena/mln/util/array.hh b/milena/mln/util/array.hh index b64511e..0fe34e7 100644 --- a/milena/mln/util/array.hh +++ b/milena/mln/util/array.hh @@ -846,7 +846,7 @@ namespace mln template <typename T, typename E> inline - typename util::array<T>::mutable_result + typename subject_impl<util::array<T>&, E>::mutable_result subject_impl<util::array<T>&, E>::operator()(unsigned i) { return exact_().get_subject()(i); @@ -854,7 +854,7 @@ namespace mln template <typename T, typename E> inline - typename util::array<T>::mutable_result + typename subject_impl<util::array<T>&, E>::mutable_result subject_impl<util::array<T>&, E>::operator[](unsigned i) { return exact_().get_subject()[i]; @@ -919,7 +919,7 @@ namespace mln template <typename T, typename E> inline - typename util::array<T>::ro_result + typename subject_impl<const util::array<T>&, E>::ro_result subject_impl<const util::array<T>&, E>::operator()(unsigned i) const { return exact_().get_subject()(i); @@ -927,7 +927,7 @@ namespace mln template <typename T, typename E> inline - typename util::array<T>::ro_result + typename subject_impl<const util::array<T>&, E>::ro_result subject_impl<const util::array<T>&, E>::operator[](unsigned i) const { return exact_().get_subject()[i]; -- 1.5.6.5

1 0

last-svn-commit-692-g911aaa7 scribo/toolchain/text_in_doc.hh: Set english as default recognized language.
by Guillaume Lazzara 29 Nov '10

29 Nov '10

--- scribo/ChangeLog | 5 +++++ scribo/scribo/toolchain/text_in_doc.hh | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 3bfaebe..47708cf 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,10 @@ 2010-11-29 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/toolchain/text_in_doc.hh: Set english as default + recognized language. + +2010-11-29 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/content_in_doc.cc: Add missing ImageMagick initialization. 2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/scribo/toolchain/text_in_doc.hh b/scribo/scribo/toolchain/text_in_doc.hh index 279ac13..82094d4 100644 --- a/scribo/scribo/toolchain/text_in_doc.hh +++ b/scribo/scribo/toolchain/text_in_doc.hh @@ -287,7 +287,7 @@ namespace scribo - scribo::text::recognition(lines, "fra"); + scribo::text::recognition(lines, "eng"); return lines; } -- 1.5.6.5

1 0

last-svn-commit-691-g680fbed Add missing ImageMagick initialization.
by Guillaume Lazzara 29 Nov '10

29 Nov '10

--- scribo/ChangeLog | 4 ++++ scribo/src/content_in_doc.cc | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 9f7bc9b..3bfaebe 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2010-11-29 Guillaume Lazzara <z(a)lrde.epita.fr> + + * src/content_in_doc.cc: Add missing ImageMagick initialization. + 2010-11-18 Guillaume Lazzara <z(a)lrde.epita.fr> Distribute more files with Scribo. diff --git a/scribo/src/content_in_doc.cc b/scribo/src/content_in_doc.cc index fe3eacf..6613e22 100644 --- a/scribo/src/content_in_doc.cc +++ b/scribo/src/content_in_doc.cc @@ -100,6 +100,8 @@ int main(int argc, char* argv[]) trace::entering("main"); + Magick::InitializeMagick(*argv); + typedef image2d<scribo::def::lbl_type> L; scribo::document<L> doc(argv[1]); -- 1.5.6.5

1 0

branch next-build-test updated: last-svn-commit-690-g3d16fd3
by lazzara＠lrde.epita.fr 25 Nov '10

25 Nov '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-build-test has been updated via 3d16fd32fef9d30de88637605ed81a83c0d2f778 (commit) via 4183f619f4bc24a7c292421508affe58e08c3270 (commit) from d58738a0e23770f8795a83ca5912d167fcd541af (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 ----------------------------------------------------------------- 3d16fd3 mln/io/magick/save.hh: Fix a crash when using GraphicsMagick instead of ImageMagick. 4183f61 Fix encoding issues in xml_transform. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 5 +++++ milena/mln/io/magick/save.hh | 15 ++++++++++++--- scribo/sandbox/ChangeLog | 7 +++++++ scribo/sandbox/arthur/xml_transform/image_crop.cc | 2 ++ scribo/sandbox/arthur/xml_transform/loader.cc | 2 ++ 5 files changed, 28 insertions(+), 3 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-690-g3d16fd3 mln/io/magick/save.hh: Fix a crash when using GraphicsMagick instead of ImageMagick.
by Guillaume Lazzara 25 Nov '10

25 Nov '10

--- milena/ChangeLog | 5 +++++ milena/mln/io/magick/save.hh | 15 ++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f853179..8e43f9f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2010-11-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/io/magick/save.hh: Fix a crash when using GraphicsMagick + instead of ImageMagick. + 2010-11-19 Guillaume Lazzara <z(a)lrde.epita.fr> Add a fastest implementation in io::magick. diff --git a/milena/mln/io/magick/save.hh b/milena/mln/io/magick/save.hh index 7282414..2ea2957 100644 --- a/milena/mln/io/magick/save.hh +++ b/milena/mln/io/magick/save.hh @@ -158,12 +158,21 @@ namespace mln ncols = geom::ncols(ima), nrows = geom::nrows(ima); - - Magick::Image magick_ima; // In the construction of a Geometry object, the width (i.e. // `ncols') comes first, then the height (i.e. `nrows') // follows. - magick_ima.size(Magick::Geometry(ncols, nrows)); + // + // FIXME: Default pixel value is set to "white". If the image is + // declared with the default constructor, without specifying a + // default value, no data seems to be allocated and the Pixel view + // declared further fails and segfault... + Magick::Image magick_ima(Magick::Geometry(ncols, nrows), "white"); + + magick_ima.type(Magick::TrueColorType); + + // Ensure that there is only one reference to underlying image + // If this is not done, then image pixels will not be modified. + magick_ima.modifyImage(); Magick::Pixels view(magick_ima); // As above, `ncols' is passed before `nrows'. -- 1.5.6.5

1 0