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 swilena has been created
at 4ecf262f4ba4de5707563fe2c8de9d2217546be6 (commit)
- Log -----------------------------------------------------------------
4ecf262 Add a Swilena wrapper for mln::image2d<mln::value::rgb8>.
b97f6e3 Add a Swilena meta-wrapper for PPM I/O.
2cf95fd Add a setter in the mln::image2d<T> meta-wrapper.
43118cb Add a Swilena wrapper for mln::value::rgb8.
8408837 Add a Swilena meta-wrapper for mln::value::rgb<n>.
1276c8a Improve dependency management in Swilena/Python.
59a68eb python/morpho-segm.py: Remove a superfluous semi-colon.
32444d9 Clean up Swilena Makefiles.
-----------------------------------------------------------------------
hooks/post-receive
--
Olena, a generic and efficient image processing platform
#226: make clean does not work properly
--------------------------------+-------------------------------------------
Reporter: jonathan | Owner: Olena Team
Type: defect | Status: new
Priority: major | Milestone:
Component: Milena | Version: 1.0
Keywords: compilation, build |
--------------------------------+-------------------------------------------
The make clean does not work properly (tested only on the version from git
repository). If you use ''make clean'', any other call to ''make'' will
fail (''make clean'' seems to remove too much things...).
--
Ticket URL: <https://trac.lrde.org/olena/ticket/226>
Olena <http://olena.lrde.epita.fr>
Olena, a generic and efficient C++ image processing library.
* Makefile.am: Here.
* python/Makefile.am: Likewise.
(python_PYTHON): Move data.py...
(EXTRA_DIST): ...here.
---
swilena/ChangeLog | 9 +++++++++
swilena/Makefile.am | 3 ---
swilena/python/Makefile.am | 13 ++++++-------
3 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/swilena/ChangeLog b/swilena/ChangeLog
index efa4e9b..3232f15 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.
+
2009-09-12 Roland Levillain <roland(a)lrde.epita.fr>
* neighb2d.i: Aesthetic changes.
diff --git a/swilena/Makefile.am b/swilena/Makefile.am
index c6fd023..109fb2e 100644
--- a/swilena/Makefile.am
+++ b/swilena/Makefile.am
@@ -14,9 +14,6 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-
-## Process this file through Automake to produce Makefile.in.
-
SUBDIRS = python
# Meta-wrappers (templates), not generating a module, but factoring
diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am
index aec8a05..0ad96da 100644
--- a/swilena/python/Makefile.am
+++ b/swilena/python/Makefile.am
@@ -13,9 +13,7 @@
#
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-#
-## Process this file through Automake to produce Makefile.in.
## ------------------ ##
## Generic material. ##
@@ -28,11 +26,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
if $(SWIG) $(AM_SWIGFLAGS) $(SWIGFLAGS) -MD -MF "$(DEPDIR)/$*-wrap.Tcc" -o $@ $<; then \
mv -f "$(DEPDIR)/$*-wrap.Tcc" "$(DEPDIR)/$*-wrap.Pcc";\
@@ -45,8 +43,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
## ----------------- ##
@@ -218,7 +217,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
* image2d.ixx (mln::image2d<T>::set): New method (extension).
---
swilena/ChangeLog | 6 ++++++
swilena/image2d.ixx | 23 +++++++++++++++++++++--
2 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/swilena/ChangeLog b/swilena/ChangeLog
index 9b948f7..ac6fcdf 100644
--- a/swilena/ChangeLog
+++ b/swilena/ChangeLog
@@ -1,5 +1,11 @@
2010-02-08 Roland Levillain <roland(a)lrde.epita.fr>
+ Add a setter in the mln::image2d<T> meta-wrapper.
+
+ * image2d.ixx (mln::image2d<T>::set): New method (extension).
+
+2010-02-08 Roland Levillain <roland(a)lrde.epita.fr>
+
Add a Swilena wrapper for mln::value::rgb8.
* rgb8.i: New file.
diff --git a/swilena/image2d.ixx b/swilena/image2d.ixx
index 90532bc..702bc74 100644
--- a/swilena/image2d.ixx
+++ b/swilena/image2d.ixx
@@ -1,5 +1,6 @@
// -*- C++ -*-
-// 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.
//
@@ -63,6 +64,24 @@
// FIXME: Doc.
%define instantiate_image2d(I, T)
+ /* Add a setter, since Python does not seem to allow writings like
+
+ ima(p) = 1
+
+ and will complain with this message:
+
+ SyntaxError: can't assign to function call
+
+ which is a real pain. How about adding an operator `[]'? Or a
+ method , like `at'? */
+ %extend mln::image2d< T >
+ {
+ void set(const point2d& p, const T& v)
+ {
+ (*$self)(p) = v;
+ }
+ }
+
// Instantiate base classes of mln::image2d<T> so that Swig knows it
// derives from mln::Image.
%template() mln::internal::image_primary< T, mln::box2d, mln::image2d< T > >;
@@ -70,4 +89,4 @@
%template() mln::internal::image_checked_< mln::image2d< T > >;
// Instantiate mln::image2d<T>
%template(I) mln::image2d< T >;
-%enddef
+%enddef // !instantiate_image2d
--
1.5.6.5