Olena-patches September 2013

olena-patches@lrde.epita.fr

5 participants
103 discussions

Start a nNew thread

olena: branch master updated: olena-2.0-809-gc87f745

by git＠lrde.epita.fr

11 years, 3 months

[Olena] #284: Improve compiler flag discovery in configure.ac

by Olena Trac

#284: Improve compiler flag discovery in configure.ac ---------------------------+------------------------ Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: minor | Milestone: Olena 2.2 Component: Olena | Version: 2.0 Keywords: configuration | ---------------------------+------------------------ We should test whether the selected C++ compiler supports a given flag (e.g. `-O3`) rather than encode a set of flags for a specific compiler (e.g. in `CXXFLAGS`) and try to guess which compiler are we using (`g++`, `clang++`, `icpc`, etc.). -- Ticket URL: <https://trac.lrde.epita.fr/olena/ticket/284> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient image processing platform

11 years, 3 months

olena: branch fixes updated: olena-2.0-809-gc87f745

by git＠lrde.epita.fr

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 fixes has been updated via c87f745edb085dd243d41ec5983446faa2a77c3f (commit) via 83c98751f5df213f459c68d32758e3147466b31b (commit) via 62d3b9d153aa23af955748d6384658e8dd293649 (commit) via a7557b64b4078331815438644a57f4aeb8215d8c (commit) via 3607d434c40c5fb167249dcee4fbb1ac5bf36e92 (commit) via 28316a4e3eb3b1db62743f2df00d74f930eeeafd (commit) from cefdb20740324455e08d9a5da037c9f3024e1909 (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 ----------------------------------------------------------------- c87f745 Scribo: Define flags in proper Makefile helpers. 83c9875 Milena: Factor Makefiles a bit more using file inclusion. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 33 ++++++++++++++++ milena/{tests/tests.mk => apps/apps.mk} | 15 +++----- milena/apps/constrained-connectivity/Makefile.am | 9 +---- milena/apps/generic-skel/Makefile.am | 9 +---- milena/apps/graph-morpho/Makefile.am | 9 +---- milena/apps/mesh-segm-skel/Makefile.am | 16 ++------ milena/apps/morphers/Makefile.am | 9 +---- milena/apps/papers/levillain.09.ismm/Makefile.am | 9 +---- milena/common.mk | 5 ++- milena/demos/inter_pixel/inter_pixel.cc | 27 ++++++++++++- milena/doc/Makefile.am | 3 +- milena/tests/io/plot/load.cc | 4 +- milena/tests/tests.mk | 2 - milena/tools/Makefile.am | 5 ++- milena/tools/tools.mk | 23 ----------- scribo/ChangeLog | 40 ++++++++++++++++++++ scribo/common.mk | 6 +-- scribo/doc/Makefile.am | 4 +- scribo/src/text_in_picture.cc | 2 - scribo/src/text_recognition_in_picture.cc | 2 - scribo/tests/Makefile.am | 1 + scribo/tests/binarization/Makefile.am | 6 +++ .../binarization/{otsu.cc => sauvola_ms_tiff.cc} | 24 ++++++------ ...{sauvola_ms.ref.pbm => sauvola_ms_tiff.ref.pbm} | Bin 32884 -> 32885 bytes scribo/tests/convert/base64.cc | 5 +-- scribo/tests/estim/font_boldness.cc | 4 +- scribo/tests/estim/font_color.cc | 4 +- scribo/tests/img/lena.tiff | Bin 0 -> 262674 bytes scribo/tests/tests.mk | 3 ++ scribo/tests/toolchain/nepomuk/text_extraction.cc | 2 - scribo/tests/util/component_precise_outline.cc | 4 +- 31 files changed, 151 insertions(+), 134 deletions(-) copy milena/{tests/tests.mk => apps/apps.mk} (72%) delete mode 100644 milena/tools/tools.mk copy scribo/tests/binarization/{otsu.cc => sauvola_ms_tiff.cc} (75%) copy scribo/tests/binarization/{sauvola_ms.ref.pbm => sauvola_ms_tiff.ref.pbm} (99%) create mode 100644 scribo/tests/img/lena.tiff hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 3 months

olena: olena-2.0-809-gc87f745 Scribo: Define flags in proper Makefile helpers.

by Roland Levillain

* common.mk (AM_CPPFLAGS): Remove -I$(top_builddir)/scribo and I$(top_builddir)/milena. Include this file... * doc/Makefile.am: ...here. (AM_CPPFLAGS): Remove. * tests/tests.mk (AM_CPPFLAGS): Add -I$(top_builddir)/scribo. --- scribo/ChangeLog | 11 +++++++++++ scribo/common.mk | 6 ++---- scribo/doc/Makefile.am | 4 +--- scribo/tests/tests.mk | 3 +++ 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 78069ac..7f4e150 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,14 @@ +2013-09-13 Roland Levillain <roland(a)lrde.epita.fr> + + Scribo: Define flags in proper Makefile helpers. + + * common.mk (AM_CPPFLAGS): Remove -I$(top_builddir)/scribo and + I$(top_builddir)/milena. + Include this file... + * doc/Makefile.am: ...here. + (AM_CPPFLAGS): Remove. + * tests/tests.mk (AM_CPPFLAGS): Add -I$(top_builddir)/scribo. + 2013-09-12 Roland Levillain <roland(a)lrde.epita.fr> Scribo: Remove `return 0;' statements at end of main(). diff --git a/scribo/common.mk b/scribo/common.mk index 9350738..5e821be 100644 --- a/scribo/common.mk +++ b/scribo/common.mk @@ -22,7 +22,5 @@ # C++ sources. AM_DEFAULT_SOURCE_EXT = .cc -# Add paths to Scribo's and Milena's headers. -AM_CPPFLAGS = \ - -I$(top_srcdir)/scribo -I$(top_builddir)/scribo \ - -I$(top_srcdir)/milena -I$(top_builddir)/milena +# Find Scribo and Milena headers. +AM_CPPFLAGS = -I$(top_srcdir)/scribo -I$(top_srcdir)/milena diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index 18df048..ea60133 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -15,9 +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/>. - -# Find Scribo headers. -AM_CPPFLAGS = -I$(top_srcdir)/scribo +include $(top_srcdir)/scribo/common.mk DOXYGEN = doxygen diff --git a/scribo/tests/tests.mk b/scribo/tests/tests.mk index 2e876a6..3250dae 100644 --- a/scribo/tests/tests.mk +++ b/scribo/tests/tests.mk @@ -21,6 +21,9 @@ include $(top_srcdir)/scribo/common.mk +# Find test/data.hh (generated header). +AM_CPPFLAGS += -I$(top_builddir)/scribo + AM_CXXFLAGS = $(SCRIBO_TESTS_CXXFLAGS) # Inject rules to compile tests (recursively), without running them. -- 1.7.10.4

11 years, 3 months

olena: olena-2.0-808-g83c9875 Milena: Factor Makefiles a bit more using file inclusion.

by Roland Levillain

* tests/tests.mk (AM_CPPFLAGS): Move general flags... * common.mk (AM_CPPFLAGS): ...here. Include it... * doc/Makefile.am: ...here, to factor common parts. * milena/apps/apps.mk: New file. Include it... * apps/constrained-connectivity/Makefile.am, * apps/generic-skel/Makefile.am, * apps/graph-morpho/Makefile.am, * apps/morphers/Makefile.am, * apps/papers/levillain.09.ismm/Makefile.am: ...here, to factor common parts. * apps/mesh-segm-skel/Makefile.am: Likewise. (noinst_HEADERS): Add save_bin_alt.hh. (mesh_complex_skel_SOURCES) (mesh_complex_max_curv_skel_SOURCES) (mesh_complex_pinv_curv_skel_SOURCES): Remove. * tools/tools.mk: Remove this file and move its contents... * tools/Makefile.am: ...here. --- milena/ChangeLog | 25 ++++++++++++++++++++++ milena/{tests/tests.mk => apps/apps.mk} | 15 ++++++------- milena/apps/constrained-connectivity/Makefile.am | 9 +------- milena/apps/generic-skel/Makefile.am | 9 +------- milena/apps/graph-morpho/Makefile.am | 9 +------- milena/apps/mesh-segm-skel/Makefile.am | 16 +++----------- milena/apps/morphers/Makefile.am | 9 +------- milena/apps/papers/levillain.09.ismm/Makefile.am | 9 +------- milena/common.mk | 5 ++++- milena/doc/Makefile.am | 3 +-- milena/tests/tests.mk | 2 -- milena/tools/Makefile.am | 5 ++++- milena/tools/tools.mk | 23 -------------------- 13 files changed, 48 insertions(+), 91 deletions(-) copy milena/{tests/tests.mk => apps/apps.mk} (72%) delete mode 100644 milena/tools/tools.mk diff --git a/milena/ChangeLog b/milena/ChangeLog index f9b9cec..7e3593b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,28 @@ +2013-09-13 Roland Levillain <roland(a)lrde.epita.fr> + + Milena: Factor Makefiles a bit more using file inclusion. + + * tests/tests.mk (AM_CPPFLAGS): Move general flags... + * common.mk (AM_CPPFLAGS): ...here. + Include it... + * doc/Makefile.am: ...here, to factor common parts. + * milena/apps/apps.mk: New file. + Include it... + * apps/constrained-connectivity/Makefile.am, + * apps/generic-skel/Makefile.am, + * apps/graph-morpho/Makefile.am, + * apps/morphers/Makefile.am, + * apps/papers/levillain.09.ismm/Makefile.am: + ...here, to factor common parts. + * apps/mesh-segm-skel/Makefile.am: Likewise. + (noinst_HEADERS): Add save_bin_alt.hh. + (mesh_complex_skel_SOURCES) + (mesh_complex_max_curv_skel_SOURCES) + (mesh_complex_pinv_curv_skel_SOURCES): + Remove. + * tools/tools.mk: Remove this file and move its contents... + * tools/Makefile.am: ...here. + 2013-09-12 Roland Levillain <roland(a)lrde.epita.fr> Milena: Remove `return 0;' statements at end of main(). diff --git a/milena/tests/tests.mk b/milena/apps/apps.mk similarity index 72% copy from milena/tests/tests.mk copy to milena/apps/apps.mk index dc6e80d..22a4e6c 100644 --- a/milena/tests/tests.mk +++ b/milena/apps/apps.mk @@ -1,9 +1,8 @@ -## tests.mk -*- Makefile-Automake -*- +## apps.mk -*- Makefile-Automake -*- -## Shared configuration for tests. +## Shared configuration for apps. -## Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and Development -## Laboratory (LRDE) +## Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) ## ## This file is part of Olena. ## @@ -21,12 +20,10 @@ include $(top_srcdir)/milena/common.mk -# Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -# Find test/data.hh (generated header). +# Find apps/data.hh (generated header). AM_CPPFLAGS += -I$(top_builddir)/milena - -AM_CXXFLAGS = $(TESTS_CXXFLAGS) +# Produce fast code. +AM_CXXFLAGS = $(APPS_CXXFLAGS) # Inject rules to compile tests (recursively), without running them. include $(top_srcdir)/build-aux/tests-recursive.mk diff --git a/milena/apps/constrained-connectivity/Makefile.am b/milena/apps/constrained-connectivity/Makefile.am index 0ccb4c9..20d1619 100644 --- a/milena/apps/constrained-connectivity/Makefile.am +++ b/milena/apps/constrained-connectivity/Makefile.am @@ -15,14 +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/>. -include $(top_srcdir)/milena/common.mk - -# Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -# Find apps/data.hh (generated header). -AM_CPPFLAGS += -I$(top_builddir)/milena -# Produce fast code. -AM_CXXFLAGS = $(APPS_CXXFLAGS) +include $(top_srcdir)/milena/apps/apps.mk noinst_PROGRAMS = constrained-connectivity constrained_connectivity_CXXFLAGS = $(AM_CXXFLAGS) $(STRICT_ALIASING_CXXFLAGS) diff --git a/milena/apps/generic-skel/Makefile.am b/milena/apps/generic-skel/Makefile.am index 7736788..3e2743a 100644 --- a/milena/apps/generic-skel/Makefile.am +++ b/milena/apps/generic-skel/Makefile.am @@ -14,14 +14,7 @@ # 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)/milena/common.mk - -# Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -# Find apps/data.hh (generated header). -AM_CPPFLAGS += -I$(top_builddir)/milena -# Produce fast code. -AM_CXXFLAGS = $(APPS_CXXFLAGS) +include $(top_srcdir)/milena/apps/apps.mk generated_checked_tests = generated_tests = $(generated_checked_tests) diff --git a/milena/apps/graph-morpho/Makefile.am b/milena/apps/graph-morpho/Makefile.am index bc725aa..91a5076 100644 --- a/milena/apps/graph-morpho/Makefile.am +++ b/milena/apps/graph-morpho/Makefile.am @@ -15,14 +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/>. -include $(top_srcdir)/milena/common.mk - -# Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -# Find apps/data.hh (generated header). -AM_CPPFLAGS += -I$(top_builddir)/milena -# Produce fast code. -AM_CXXFLAGS = $(APPS_CXXFLAGS) +include $(top_srcdir)/milena/apps/apps.mk noinst_HEADERS = convert.hh debug.hh make.hh morpho.hh make_complex2d.hh diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index 7c58008..72f610a 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -15,14 +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/>. -include $(top_srcdir)/milena/common.mk - -# Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -# Find apps/data.hh (generated header). -AM_CPPFLAGS += -I$(top_builddir)/milena -# Produce fast code. -AM_CXXFLAGS = $(APPS_CXXFLAGS) +include $(top_srcdir)/milena/apps/apps.mk noinst_PROGRAMS = generated_checked_tests = @@ -170,9 +163,10 @@ MOSTLYCLEANFILES += \ ## More complex skeletonization chains. ## ------------------------------------ +noinst_HEADERS += save_bin_alt.hh + # Skeletonization program working on precomputed meshes with curvatures data. noinst_PROGRAMS += mesh-complex-skel -mesh_complex_skel_SOURCES = mesh-complex-skel.cc save_bin_alt.hh TESTS += test-mesh-complex-skel MOSTLYCLEANFILES += \ socket-max-curv-skel.off \ @@ -181,8 +175,6 @@ MOSTLYCLEANFILES += \ bunny-holefilled-pinv-curv-skel.off noinst_PROGRAMS += mesh-complex-max-curv-skel -mesh_complex_max_curv_skel_SOURCES = \ - mesh-complex-max-curv-skel.cc save_bin_alt.hh TESTS += test-mesh-complex-max-curv-skel MOSTLYCLEANFILES += \ socket-complex-max-curv-skel.off \ @@ -190,8 +182,6 @@ MOSTLYCLEANFILES += \ bunny-holefilled-complex-max-curv-skel.off noinst_PROGRAMS += mesh-complex-pinv-curv-skel -mesh_complex_pinv_curv_skel_SOURCES = \ - mesh-complex-pinv-curv-skel.cc save_bin_alt.hh TESTS += test-mesh-complex-pinv-curv-skel MOSTLYCLEANFILES += \ socket-complex-pinv-curv-skel.off \ diff --git a/milena/apps/morphers/Makefile.am b/milena/apps/morphers/Makefile.am index 989ee59..bdff9c1 100644 --- a/milena/apps/morphers/Makefile.am +++ b/milena/apps/morphers/Makefile.am @@ -17,14 +17,7 @@ # Illustrations of morphers. -include $(top_srcdir)/milena/common.mk - -# Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -# Find apps/data.hh (generated header). -AM_CPPFLAGS += -I$(top_builddir)/milena -# Produce fast code. -AM_CXXFLAGS = $(APPS_CXXFLAGS) +include $(top_srcdir)/milena/apps/apps.mk noinst_PROGRAMS = \ mask+channel \ diff --git a/milena/apps/papers/levillain.09.ismm/Makefile.am b/milena/apps/papers/levillain.09.ismm/Makefile.am index db9ce42..db94f24 100644 --- a/milena/apps/papers/levillain.09.ismm/Makefile.am +++ b/milena/apps/papers/levillain.09.ismm/Makefile.am @@ -17,14 +17,7 @@ # Illustrations from the ISMM 2009 paper and presentation (slides). -include $(top_srcdir)/milena/common.mk - -# Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -# Find apps/data.hh (generated header). -AM_CPPFLAGS += -I$(top_builddir)/milena -# Produce fast code. -AM_CXXFLAGS = $(APPS_CXXFLAGS) +include $(top_srcdir)/milena/apps/apps.mk noinst_HEADERS = chain.hh io.hh influence_zones.hh diff --git a/milena/common.mk b/milena/common.mk index 3623290..0cb8c07 100644 --- a/milena/common.mk +++ b/milena/common.mk @@ -2,7 +2,7 @@ ## Common Automake parameters. -## Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +## Copyright (C) 2010, 2013 EPITA Research and Development Laboratory (LRDE). ## ## This file is part of Olena. ## @@ -20,3 +20,6 @@ # C++ sources. AM_DEFAULT_SOURCE_EXT = .cc + +# Find Milena headers. +AM_CPPFLAGS = -I$(top_srcdir)/milena diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index f0532a2..fbb6d5f 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -15,9 +15,8 @@ # 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)/milena/common.mk -# Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena # Find tests/data.hh and doc/tools/data.hh (generated headers). AM_CPPFLAGS += -I$(top_builddir)/milena diff --git a/milena/tests/tests.mk b/milena/tests/tests.mk index dc6e80d..bfff07a 100644 --- a/milena/tests/tests.mk +++ b/milena/tests/tests.mk @@ -21,8 +21,6 @@ include $(top_srcdir)/milena/common.mk -# Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena # Find test/data.hh (generated header). AM_CPPFLAGS += -I$(top_builddir)/milena diff --git a/milena/tools/Makefile.am b/milena/tools/Makefile.am index 0cbe661..bb7a35f 100644 --- a/milena/tools/Makefile.am +++ b/milena/tools/Makefile.am @@ -15,7 +15,10 @@ # 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)/milena/tools/tools.mk +include $(top_srcdir)/milena/common.mk + +# Produce fast code. +AM_CXXFLAGS = $(TOOLS_CXXFLAGS) # FIXME: Add some tests for these tools. bin_PROGRAMS = \ diff --git a/milena/tools/tools.mk b/milena/tools/tools.mk deleted file mode 100644 index a60f4d0..0000000 --- a/milena/tools/tools.mk +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (C) 2009, 2010, 2011, 2013 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)/milena/common.mk - -# Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena - -AM_CXXFLAGS = $(TOOLS_CXXFLAGS) -- 1.7.10.4

11 years, 3 months

olena: branch master updated: olena-2.0-807-g62d3b9d

by git＠lrde.epita.fr

11 years, 3 months

olena: olena-2.0-807-g62d3b9d Add a missing copyright header.

by Roland Levillain

--- milena/demos/inter_pixel/inter_pixel.cc | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/milena/demos/inter_pixel/inter_pixel.cc b/milena/demos/inter_pixel/inter_pixel.cc index bf69cbc..2d3061f 100644 --- a/milena/demos/inter_pixel/inter_pixel.cc +++ b/milena/demos/inter_pixel/inter_pixel.cc @@ -1,3 +1,28 @@ +// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/var.hh> -- 1.7.10.4

11 years, 3 months

olena: olena-2.0-806-ga7557b6 Scribo: Remove `return 0; ' statements at end of main().

by Roland Levillain

* src/text_in_picture.cc, * src/text_recognition_in_picture.cc, * tests/convert/base64.cc, * tests/estim/font_boldness.cc, * tests/estim/font_color.cc, * tests/toolchain/nepomuk/text_extraction.cc, * tests/util/component_precise_outline.cc: Here. --- scribo/ChangeLog | 13 +++++++++++++ scribo/src/text_in_picture.cc | 2 -- scribo/src/text_recognition_in_picture.cc | 2 -- scribo/tests/convert/base64.cc | 5 +---- scribo/tests/estim/font_boldness.cc | 4 +--- scribo/tests/estim/font_color.cc | 4 +--- scribo/tests/toolchain/nepomuk/text_extraction.cc | 2 -- scribo/tests/util/component_precise_outline.cc | 4 +--- 8 files changed, 17 insertions(+), 19 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 0a54632..78069ac 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,16 @@ +2013-09-12 Roland Levillain <roland(a)lrde.epita.fr> + + Scribo: Remove `return 0;' statements at end of main(). + + * src/text_in_picture.cc, + * src/text_recognition_in_picture.cc, + * tests/convert/base64.cc, + * tests/estim/font_boldness.cc, + * tests/estim/font_color.cc, + * tests/toolchain/nepomuk/text_extraction.cc, + * tests/util/component_precise_outline.cc: + Here. + 2013-09-05 Roland Levillain <roland(a)lrde.epita.fr> Exercise the multi-scale Sauvola binarization with a TIFF image. diff --git a/scribo/src/text_in_picture.cc b/scribo/src/text_in_picture.cc index eb3b65a..52c0a49 100644 --- a/scribo/src/text_in_picture.cc +++ b/scribo/src/text_in_picture.cc @@ -114,6 +114,4 @@ int main(int argc, char* argv[]) comps.labeled_image(), comps.nelements()), options.arg("output.ppm")); - - return 0; } diff --git a/scribo/src/text_recognition_in_picture.cc b/scribo/src/text_recognition_in_picture.cc index 0a4b62c..6d711bc 100644 --- a/scribo/src/text_recognition_in_picture.cc +++ b/scribo/src/text_recognition_in_picture.cc @@ -213,6 +213,4 @@ int main(int argc, char* argv[]) if (verbose) std::cout << output.nelements() << " text lines found." << std::endl; - - return 0; } diff --git a/scribo/tests/convert/base64.cc b/scribo/tests/convert/base64.cc index 18d08d9..0f7a493 100644 --- a/scribo/tests/convert/base64.cc +++ b/scribo/tests/convert/base64.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE). +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -83,7 +83,4 @@ int main() mln_assertion(outbin == ima); } - - - return 0; } diff --git a/scribo/tests/estim/font_boldness.cc b/scribo/tests/estim/font_boldness.cc index bc42054..8604036 100644 --- a/scribo/tests/estim/font_boldness.cc +++ b/scribo/tests/estim/font_boldness.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE). +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -43,6 +43,4 @@ int main() volatile float ref = 18.44f; mln_assertion(val == ref); - - return 0; } diff --git a/scribo/tests/estim/font_color.cc b/scribo/tests/estim/font_color.cc index 45c453d..afc0ee2 100644 --- a/scribo/tests/estim/font_color.cc +++ b/scribo/tests/estim/font_color.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE). +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -43,6 +43,4 @@ int main() value::rgb8 val = scribo::estim::font_color(input_rgb, input_bin); mln_assertion(val == value::rgb8(77, 146, 140)); - - return 0; } diff --git a/scribo/tests/toolchain/nepomuk/text_extraction.cc b/scribo/tests/toolchain/nepomuk/text_extraction.cc index 6aa6205..a29ae8e 100644 --- a/scribo/tests/toolchain/nepomuk/text_extraction.cc +++ b/scribo/tests/toolchain/nepomuk/text_extraction.cc @@ -42,6 +42,4 @@ int main() mln_assertion(words.size() == 1); QString word = words.toList().at(0).toLower(); mln_assertion(word == "wildly"); - - return 0; } diff --git a/scribo/tests/util/component_precise_outline.cc b/scribo/tests/util/component_precise_outline.cc index af219f3..9f78f7e 100644 --- a/scribo/tests/util/component_precise_outline.cc +++ b/scribo/tests/util/component_precise_outline.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -136,6 +136,4 @@ int main() for (unsigned i = 0; i < par.nsites(); ++i) mln_assertion(par[i] == ref_lbl_compress[i]); } - - return 0; } -- 1.7.10.4

11 years, 3 months

olena: olena-2.0-805-g3607d43 Milena: Remove `return 0; ' statements at end of main().

by Roland Levillain

* demos/inter_pixel/inter_pixel.cc, * tests/io/plot/load.cc: Here. --- milena/ChangeLog | 8 ++++++++ milena/demos/inter_pixel/inter_pixel.cc | 2 -- milena/tests/io/plot/load.cc | 4 +--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3536810..f9b9cec 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2013-09-12 Roland Levillain <roland(a)lrde.epita.fr> + + Milena: Remove `return 0;' statements at end of main(). + + * demos/inter_pixel/inter_pixel.cc, + * tests/io/plot/load.cc: + Here. + 2013-09-11 Roland Levillain <roland(a)lrde.epita.fr> Regen Milena's unit-tests.mk. diff --git a/milena/demos/inter_pixel/inter_pixel.cc b/milena/demos/inter_pixel/inter_pixel.cc index 61ba33f..bf69cbc 100644 --- a/milena/demos/inter_pixel/inter_pixel.cc +++ b/milena/demos/inter_pixel/inter_pixel.cc @@ -125,6 +125,4 @@ int main(int argc, char* argv[]) mln_VAR(edge_clo, morpho::closing::volume(edges, world::inter_pixel::e2e(), 25)); mln_VAR(edge_wst, morpho::watershed::flooding(edge_clo, world::inter_pixel::e2e(), nbasins)); io::ppm::save(world::inter_pixel::display_region(input, edge_wst.unmorph_(), literal::red), "edge_watershed.ppm"); - - return 0; } diff --git a/milena/tests/io/plot/load.cc b/milena/tests/io/plot/load.cc index 9a88e96..2aa5211 100644 --- a/milena/tests/io/plot/load.cc +++ b/milena/tests/io/plot/load.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2009, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -37,6 +37,4 @@ int main(int argc, char* argv[]) for (unsigned i = 0; i < arr.nelements(); ++i) std::cout << arr[i] << std::endl; - - return 0; } -- 1.7.10.4

11 years, 3 months

[Olena] #283: Simplify the build system under scribo/doc/

by Olena Trac

#283: Simplify the build system under scribo/doc/ -------------------------+------------------------ Reporter: levill_r | Owner: Olena Team Type: enhancement | Status: new Priority: minor | Milestone: Olena 2.2 Component: Scribo | Version: 2.0 Keywords: cleanup | -------------------------+------------------------ This build system (see source:scribo/doc/Makefile.am and related files) features the same complex rules and generators as source:milena/doc/Makefile.am but they don't seem to be really used. We shall simplify this. -- Ticket URL: <https://trac.lrde.epita.fr/olena/ticket/283> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient image processing platform

11 years, 3 months

← Newer
1
2
3
4
5
6
7
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches September 2013