* 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
* 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
#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.
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
---
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