June 2014 - Olena-patches

olena: branch next updated: olena-2.0-935-g88bdb19
by git＠lrde.epita.fr 30 Jun '14

30 Jun '14

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 88bdb19597253049668ec90d474b5e05e6201a5d (commit) via 348a757b085daeb92219bcb2f5c906b20c207195 (commit) via 82f1ef0a4bdf3282803b69d217bc1175b4fd1358 (commit) via b927febc6143a64c9bd720d26d91984bccb604fe (commit) via 8e3da2c2dd87f0056e02438e4f081016beb5ad94 (commit) via fc1620e5c7a05fffa97f67331b100a3253a28dc2 (commit) via 1c21239dce655ad69bddf84190135bb054e1fe5f (commit) via b51a66c6cc07569a38c65b8649f32be9d0d6126e (commit) via eb850acb2e8ceaf0fff6d7be9498a4ddaea2e442 (commit) via 1e8671c18e570c1b3b1c1b7dfce5fecbe91b1757 (commit) via fd14047a35d4f39548c865f81f03c2d50b4fd2c8 (commit) via ff4fcfe1a1a38a07e06dfdd9a69735f70790442c (commit) via d1befb9143d40a2e5fcd204a234995366a27f691 (commit) via 798879eacf83998eb7e1b8c102e246b9ba75abfb (commit) via 9f8eeb0506f7030fc3b59854f2706bb0cacd6775 (commit) via 741423755b28fa8aaf98b5e749fcd237a79bdaf8 (commit) via c551ece5a2905f4b726958980df92fc382fcc869 (commit) via 99c728ed8467dad63156c497ad92134a07ad86ab (commit) via cf0832bc7ebcf1ec341948b3c8e3c452c1e2312f (commit) via 2686238db6bfd1daae1e4811d01dfa3b3478eb4e (commit) via 073c30c35cd7a1414c443b2a596bf0bf12589ef9 (commit) via 0191adf2e7ff1ee5adaa3a442c6fe1c7ebf80519 (commit) via b15179957a5d8d22e12e7f86ad7fe1ae4baa0c30 (commit) via 46bdb02415b7aab16cd1154eaf8422ba5a1e5001 (commit) via 8a887c76aa9d164c2380b6ba68799b50b623999b (commit) via d6e17c8ac85d31216b114dda83169d97d9e45787 (commit) via d4473b024c8e43cf4d7ef5753c3328d2225813e8 (commit) via 04ed8ff200be431a67cc4de4be70edb4c3105199 (commit) via 8f8f0dca11a431c8781eba9e08e498447438082d (commit) via 9292d203323c128c081c83a7ecc07ee61255078e (commit) via c143839a4cc52859c7b271f8ab1584812a76f8ec (commit) via b0a77592910bd09877101282f5e27a81b1023182 (commit) via 1b6941fbe0ec206a804c824a29cffee9b3568e2c (commit) via beb71cd3db5bb57adf28ed25688ff6ac03b693cf (commit) via d5d6227fe3c46e2309f3ab757484122b251479f6 (commit) via fc17971396f17d4a134e1436e6ccfef8931e9e63 (commit) from d92a1e5263f60d449cf9dfc777e051e0200247df (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 ----------------------------------------------------------------- 88bdb19 Fix last warnings with Lintian. 348a757 debian/rules: Cleanup. 82f1ef0 debian/source/lintian-overrides: New. b927feb debian/rules: Limit simultaneous compilations. 8e3da2c debian/rules: Remove empty directories in package. fc1620e debian/HOWTO: update. 1c21239 debian/changelog: Close ITP bug. b51a66c debian/control: Improve descriptions and update Git browser URL. eb850ac demo/xml2doc/Makefile.am: Fix installation of ooconvert. 1e8671c debian/control: Fix file. Remove comments. fd14047 debian/rules: Add hardening flags according to Debian policy. ff4fcfe debian/compat: Upgrade to debhelper 9. d1befb9 debian/olena-bin.install: Add shared files in olena-bin. 798879e Fix access to xsl templates. 9f8eeb0 debian/changelog: Change distribution. 7414237 demo/viewer/runner.cc: Fix libexec path. c551ece debian/control: Update maintainer name. 99c728e debian/copyright: Update commiter name. cf0832b debian/control: Set packages as optional. 2686238 debian/rules: Handles '-j' option for make. 073c30c debian/control: Update Standards-Version. 0191adf debian/rules: Update deprecated dh_clean -k command. b151799 debian/rules: Add missing required rules. 46bdb02 demo/viewer/runner.cc: Make xml2doc binary lookup more robust. 8a887c7 Add missing description in manpages. d6e17c8 Fix Lintian warnings. d4473b0 Add options for dpkg-source. 04ed8ff debian/control: Add dependencies. 8f8f0dc debian/HOWTO: Add more details. 9292d20 Makefile.am: Add 'deb' rule. c143839 debian/copyright: Set copyright. b0a7759 Create first draft of manpages for distributed binaries. 1b6941f Update Debian package configuration. beb71cd demo/viewer/runner.cc: Make detection of scribo-xml2doc more robust. d5d6227 debian/HOWTO: How to make .deb package. fc17971 Add package description files for .deb generation. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 205 +++++++++++++++++++++++ Makefile.am | 38 +++++ debian/HOWTO | 27 +++ debian/README.Debian | 6 + debian/changelog | 5 + debian/compat | 1 + debian/control | 87 ++++++++++ debian/copyright | 2 + debian/gbp.conf | 7 + debian/olena-bin.desktop | 11 ++ debian/olena-bin.install | 4 + debian/olena-bin.manpages | 2 + debian/olena-bin.menu | 3 + debian/olena-dev.doc-base | 9 + debian/olena-dev.docs | 4 + debian/olena-dev.install | 3 + debian/olena.1 | 12 ++ debian/olena.install | 1 + debian/olena.manpages | 1 + debian/olena.xpm | 294 +++++++++++++++++++++++++++++++++ debian/rules | 12 ++ debian/scribo-cli.1 | 12 ++ debian/scribo-viewer.1 | 12 ++ debian/source/format | 3 + debian/source/lintian-overrides | 1 + debian/source/local-options | 4 + debian/source/options | 8 + debian/watch | 5 + scribo/ChangeLog | 25 +++ scribo/demo/viewer/runner.cc | 23 ++- scribo/demo/xml2doc/Makefile.am | 19 ++- scribo/demo/xml2doc/datarootdir.hh.in | 2 +- 32 files changed, 841 insertions(+), 7 deletions(-) create mode 100644 debian/HOWTO create mode 100644 debian/README.Debian create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/gbp.conf create mode 100644 debian/olena-bin.desktop create mode 100644 debian/olena-bin.install create mode 100644 debian/olena-bin.manpages create mode 100644 debian/olena-bin.menu create mode 100644 debian/olena-dev.doc-base create mode 100644 debian/olena-dev.docs create mode 100644 debian/olena-dev.install create mode 100644 debian/olena.1 create mode 100644 debian/olena.install create mode 100644 debian/olena.manpages create mode 100644 debian/olena.xpm create mode 100755 debian/rules create mode 100644 debian/scribo-cli.1 create mode 100644 debian/scribo-viewer.1 create mode 100644 debian/source/format create mode 100644 debian/source/lintian-overrides create mode 100644 debian/source/local-options create mode 100644 debian/source/options create mode 100644 debian/watch hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch master updated: olena-2.0-899-gd92a1e5
by git＠lrde.epita.fr 30 Jun '14

30 Jun '14

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 master has been updated via d92a1e5263f60d449cf9dfc777e051e0200247df (commit) via 405e0aabb3c91e61b754c090a90880a04a3e03ea (commit) via d3352969fd22b03fa0e5e9d3004a22c29664793a (commit) via 484dc65d123502b47588e650193296d32e73abfd (commit) via 0774ab7c60fe5ffcfcc7188f5211118dd0f258c4 (commit) via c12d92c7a38e95c12cff2d234913c350887a3c20 (commit) via 5ec622732f36db381fd3cead7f88c448e0119359 (commit) via 84106cfffb04189d1e3bbdd527c06e93b6c24d14 (commit) via 96938fc1c582b4003ad92cdc0fcacd91c6b72b50 (commit) via c2ba187b43551cac9e4e90fdab2d7458dae649df (commit) via e0131fc77551bcfe8cef82b1ce5470efc9124ef2 (commit) via 45bcbda3991f1aae4eb682ce8247fb6928918741 (commit) via 28832f9ecdedeb3797c5e01040cbe8bb95660bd0 (commit) via ec75045a8c8c682f4dbb1981670b5348d8e834cd (commit) via e7bfdf7cccbd73ddc40b91dde465aba1c75bdf8b (commit) via 4c2812937c8dde4a8d7d2c15c9ae70cd71fb778a (commit) via 0a4c6e4b702fec0f7d98a43e78d95a7fa3a60ff9 (commit) via b8febd14830bc4059f57bc9d388eb291324a0986 (commit) via 600b8e3d2024a064ab408c4c30cae1a63ce01bdd (commit) via 3c1bf651a333bc132cf27bcdcc600039b44cee6e (commit) via aebe860fafe2287a9dbe9052d716e9be25e59163 (commit) via 98e25c56df3d4caf91345dbb595de76eb56f5704 (commit) via eefb756c8da46bf9de4aa2e08d4ee2d1c521ab00 (commit) via 26ad0e38de1b65426c4dd46441c079ba5cb7957e (commit) via 112dabb2b97148f79ac811459e9f9c95a44372aa (commit) via 14be913d040a216aac41080b548dbf06afe4e59c (commit) via 6ff853df7844d30132e70fc4542cc8e8cd545001 (commit) via 2957d5177ec84984b5d540b582327b7b09f93300 (commit) via d5d24ad356ba486742b03faea73a8e78f560eae9 (commit) via 5ea13e376a63f9c8835f1df3a2c2a33515e179ee (commit) via f13d23b02d4e54978969dce1192832f37de16d65 (commit) via f303e006f68ec7eac3c965ba912e63d3a813389f (commit) via 967c5779e0bfbdbcb05e0320438cd897f05309ae (commit) via 8e605358885e0d3ce27f219cdc7fc885bd580190 (commit) via 43a7295dcff9ca8b4d01e50eb71d1b9a8d2b1733 (commit) via d7ef07c626eb19db38a1f7aa74be6dc44575a965 (commit) via 8654505b53fd6f71b56629bd21c54f971d995633 (commit) via d03982de37343a3bf4f3541e1e8f1a50793185d1 (commit) via fc7d59183b9701bb0ab4f857175f7c17bc0878f7 (commit) from c2f9c9a9f7acd631d9c3c4fb6419ff825aabad6a (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 ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: AUTHORS | 85 ++-- ChangeLog | 77 +++- HACKING | 27 +- README | 85 ++-- bootstrap | 5 +- configure.ac | 47 +- doc/Doxyfile.in | 2 +- doc/Makefile.am | 16 +- dynamic-use-of-static-c++/ChangeLog | 18 + dynamic-use-of-static-c++/data/Makefile.am | 7 +- dynamic-use-of-static-c++/swig/run.in | 2 +- m4/ax_check_compile_flag.m4 | 74 +++ milena/ChangeLog | 240 +++++++++- milena/Makefile.am | 8 +- milena/apps/bench/Makefile.am | 7 +- .../constrained-connectivity.cc | 33 +- milena/apps/morphers/Makefile.am | 4 +- milena/apps/morphers/iz.cc | 4 +- milena/apps/papers/levillain.09.ismm/Makefile.am | 24 +- milena/doc/Doxyfile.in | 4 +- milena/doc/Makefile.am | 53 +-- milena/doc/examples-outputs.mk | 204 ++++----- milena/doc/examples.mk | 31 -- milena/doc/examples/trash/accu.cc | 20 - milena/doc/examples/trash/box.cc | 36 -- milena/doc/examples/trash/cpp_issue.cc | 29 -- milena/doc/examples/trash/erosion.cc | 106 ----- milena/doc/examples/trash/for_Z.cc | 224 --------- milena/doc/examples/trash/graph.cc | 159 ------- milena/doc/examples/trash/image2d.cc | 82 ---- milena/doc/examples/trash/image_flat.cc | 12 - milena/doc/examples/trash/image_if.cc | 93 ---- milena/doc/examples/trash/image_plain.cc | 42 -- milena/doc/examples/trash/image_safe.cc | 24 - milena/doc/examples/trash/labeling_algo.cc | 80 ---- milena/doc/examples/trash/mk_graph.cc | 91 ---- milena/doc/examples/trash/p_array.2.cc | 93 ---- milena/doc/examples/trash/p_array.cc | 103 ----- milena/doc/examples/trash/p_image.cc | 52 --- milena/doc/examples/trash/p_key.2.cc | 34 -- milena/doc/examples/trash/p_key.cc | 96 ---- milena/doc/examples/trash/p_line2d.cc | 34 -- milena/doc/examples/trash/p_mutable_array_of.cc | 60 --- milena/doc/examples/trash/p_queue.cc | 93 ---- milena/doc/examples/trash/p_run.cc | 48 -- milena/doc/examples/trash/p_vaccess.cc | 157 ------- milena/doc/examples/trash/proxy.cc | 105 ----- milena/doc/examples/trash/sub_image.cc | 29 -- milena/doc/examples/trash/sub_image_if.cc | 101 ----- milena/doc/examples/trash/tuto_bis.cc | 273 ----------- milena/doc/examples/trash/tuto_one.cc | 128 ------ milena/doc/examples/trash/vec.cc | 14 - milena/doc/examples/trash/win_multiple.cc | 65 --- milena/doc/examples/trash/window.cc | 92 ---- milena/doc/figures.mk | 48 +- milena/doc/gen-examples-outputs-mk | 6 +- milena/doc/gen-figures-mk | 12 +- milena/doc/gen-split-examples-mk | 8 +- milena/doc/gen-split-outputs-mk | 9 +- milena/doc/oldies/2007__tour.cc | 2 +- milena/doc/split-examples.mk | 300 ++++++------ milena/doc/split-outputs.mk | 18 +- milena/doc/tutorial.old/slides.tex | 2 +- milena/img/fly_ascii.ppm | 9 + milena/mln/accu/shape/volume.hh | 2 +- milena/mln/core/concept/point_site.hh | 4 +- milena/mln/io/pdf/get_header.hh | 6 +- milena/mln/io/pnm/load.hh | 51 ++- milena/mln/morpho/watershed/flooding.hh | 2 +- milena/mln/topo/skeleton/breadth_first_thinning.hh | 4 +- .../mln/topo/skeleton/priority_driven_thinning.hh | 4 +- milena/tests/core/image/complex_image.cc | 2 +- milena/tests/core/image/complex_image.hh | 2 +- .../tests/core/image/dmorph/transformed_image.cc | 9 +- milena/tests/core/image/dmorph/unproject_image.cc | 8 +- milena/tests/core/image/graph_image.cc | 8 +- milena/tests/core/routine/extend.cc | 5 +- milena/tests/core/site_set/p_complex.cc | 2 +- milena/tests/io/ppm/Makefile.am | 3 +- .../tests/io/{dicom/dicom.cc => ppm/ppm_ascii.cc} | 16 +- milena/tests/labeling/foreground.cc | 5 +- milena/tests/linear/sobel_2d.cc | 5 +- milena/tests/make/attachment.cc | 2 +- milena/tests/make/detachment.cc | 2 +- milena/tests/morpho/complex_image_morpho.cc | 2 +- milena/tests/morpho/elementary/gradient.cc | 4 +- .../tests/morpho/elementary/gradient_external.cc | 4 +- .../tests/morpho/elementary/gradient_internal.cc | 4 +- milena/tests/morpho/elementary/laplacian.cc | 4 +- milena/tests/morpho/skeleton_constrained.cc | 5 +- .../tests/morpho/tree/compute_attribute_image.cc | 4 +- milena/tests/morpho/tree/compute_parent.cc | 4 +- milena/tests/morpho/tree/filter/filter.cc | 7 +- milena/tests/pw/image.cc | 4 +- milena/tests/topo/complex.cc | 8 +- milena/tests/topo/is_facet.cc | 2 +- milena/tests/unit_test/Makefile.am | 5 +- milena/tests/value/Makefile.am | 5 +- milena/tests/value/interop.cc | 107 ----- milena/tests/world/inter_pixel/Makefile.am | 4 +- milena/tests/world/inter_pixel/compute.cc | 6 +- milena/tests/world/inter_pixel/display_edge.cc | 27 +- milena/tests/world/inter_pixel/immerse.cc | 3 +- milena/tools/Makefile.am | 11 +- milena/tools/area_flooding.cc | 3 +- milena/trash/bgraph_image.cc | 105 ----- milena/trash/bgraph_image.hh | 288 ------------ milena/trash/bgraph_psite.hh | 176 -------- milena/trash/boost_graph.cc | 114 ----- milena/trash/boost_graph.hh | 218 --------- milena/trash/boost_graph_access.hh | 292 ------------ milena/trash/boost_graph_property.hh | 170 ------- milena/trash/boost_graph_structure.hh | 288 ------------ milena/trash/clock_neighb.hh | 168 ------- milena/trash/clock_neighb2d.cc | 90 ---- milena/trash/clock_neighb2d.hh | 199 -------- milena/trash/clock_neighb2d_bis.cc | 199 -------- milena/trash/display_color_pretty.cc | 90 ---- milena/trash/display_color_pretty.hh | 221 --------- milena/trash/display_remove.hh | 90 ---- milena/trash/display_save.hh | 132 ------ milena/trash/display_save_and_show.hh | 97 ---- milena/trash/display_show.cc | 86 ---- milena/trash/display_show.hh | 131 ------ milena/trash/fi_adaptor.cc | 87 ---- milena/trash/fi_adaptor.hh | 476 -------------------- milena/trash/freeimageplus.mk | 9 - milena/trash/graph_image.hh | 300 ------------ milena/trash/line_graph_image.hh | 344 -------------- milena/trash/mono_obased_rle_encode.hh | 120 ----- milena/trash/mono_obased_rle_image.cc | 78 ---- milena/trash/mono_obased_rle_image.hh | 266 ----------- milena/trash/mono_rle_encode.hh | 108 ----- milena/trash/mono_rle_image.cc | 84 ---- milena/trash/mono_rle_image.hh | 254 ----------- milena/trash/neighb_get.hh | 190 -------- milena/trash/neighb_image.cc | 57 --- milena/trash/neighb_image.hh | 255 ----------- milena/trash/obased_rle_encode.hh | 120 ----- milena/trash/obased_rle_image.cc | 78 ---- milena/trash/obased_rle_image.hh | 289 ------------ milena/trash/p_bgraph.cc | 85 ---- milena/trash/p_bgraph.hh | 220 --------- milena/trash/p_bgraph_piter.hh | 245 ---------- milena/trash/rle_encode.hh | 113 ----- milena/trash/rle_image.cc | 78 ---- milena/trash/rle_image.hh | 230 ---------- milena/trash/save_and_show.cc | 79 ---- milena/trash/sparse_encode.hh | 118 ----- milena/trash/sparse_image.cc | 79 ---- milena/trash/sparse_image.hh | 261 ----------- milena/trash/t_image.cc | 53 --- milena/trash/t_image.hh | 304 ------------- milena/trash/to_tiles.cc | 88 ---- milena/trash/to_tiles.hh | 98 ---- milena/trash/translate_image.cc | 74 --- milena/trash/translate_image.hh | 209 --------- milena/trash/value_enc_image.cc | 155 ------- milena/trash/value_enc_image.hh | 254 ----------- milena/trash/value_encode.hh | 113 ----- scribo/ChangeLog | 110 ++++- scribo/Makefile.am | 5 +- scribo/README | 17 +- scribo/demo/xml2doc/main.cc | 27 +- scribo/doc/.gitignore | 6 - scribo/doc/Doxyfile.in | 2 +- scribo/doc/Makefile.am | 33 +- scribo/doc/doxyfuns.sty | 234 ---------- scribo/doc/examples.mk | 4 - scribo/doc/gen-examples-outputs-mk | 71 --- scribo/doc/gen-figures-mk | 192 -------- scribo/doc/gen-make-variable | 52 --- scribo/doc/gen-split-examples-mk | 136 ------ scribo/doc/gen-split-outputs-mk | 140 ------ scribo/doc/graphicx.hva | 19 - scribo/doc/mainpage.dox | 4 +- scribo/doc/outputs.mk | 4 - scribo/doc/scribo.sty | 155 ------- scribo/doc/tools/todoxygen.sh | 51 --- scribo/scribo/debug/logger.hh | 8 +- scribo/scribo/debug/text_areas_image.hh | 8 +- scribo/scribo/filter/objects_with_holes.hh | 3 +- scribo/scribo/layout/xy_cut.hh | 10 +- scribo/scribo/preprocessing/rotate_90.hh | 14 +- scribo/scribo/table/internal/repair_lines.hh | 7 +- scribo/src/misc/dmap.cc | 12 +- scribo/src/misc/morpho.cc | 11 +- scribo/src/misc/rectangularity.cc | 8 +- scribo/src/primitive/group/Makefile.am | 9 +- scribo/src/primitive/group/group_from_rag.cc | 52 ++- scribo/src/text_recognition_in_picture.cc | 5 +- scribo/tests/binarization/global_threshold.cc | 6 +- scribo/tests/core/object_groups.cc | 16 +- scribo/tests/layout/xy_cut.cc | 4 +- scribo/tests/unit_test/Makefile.am | 5 +- swilena/ChangeLog | 18 +- swilena/box2d_piter.i | 2 +- swilena/complex.ixx | 2 +- swilena/dynamic_image2d.i | 2 +- swilena/python/Makefile.am | 8 +- swilena/python/complex2-misc.py | 13 +- 201 files changed, 1368 insertions(+), 13653 deletions(-) create mode 100644 m4/ax_check_compile_flag.m4 delete mode 100644 milena/doc/examples/trash/accu.cc delete mode 100644 milena/doc/examples/trash/box.cc delete mode 100644 milena/doc/examples/trash/cpp_issue.cc delete mode 100644 milena/doc/examples/trash/erosion.cc delete mode 100644 milena/doc/examples/trash/for_Z.cc delete mode 100644 milena/doc/examples/trash/graph.cc delete mode 100644 milena/doc/examples/trash/image2d.cc delete mode 100644 milena/doc/examples/trash/image_flat.cc delete mode 100644 milena/doc/examples/trash/image_if.cc delete mode 100644 milena/doc/examples/trash/image_plain.cc delete mode 100644 milena/doc/examples/trash/image_safe.cc delete mode 100644 milena/doc/examples/trash/labeling_algo.cc delete mode 100644 milena/doc/examples/trash/mk_graph.cc delete mode 100644 milena/doc/examples/trash/p_array.2.cc delete mode 100644 milena/doc/examples/trash/p_array.cc delete mode 100644 milena/doc/examples/trash/p_image.cc delete mode 100644 milena/doc/examples/trash/p_key.2.cc delete mode 100644 milena/doc/examples/trash/p_key.cc delete mode 100644 milena/doc/examples/trash/p_line2d.cc delete mode 100644 milena/doc/examples/trash/p_mutable_array_of.cc delete mode 100644 milena/doc/examples/trash/p_queue.cc delete mode 100644 milena/doc/examples/trash/p_run.cc delete mode 100644 milena/doc/examples/trash/p_vaccess.cc delete mode 100644 milena/doc/examples/trash/proxy.cc delete mode 100644 milena/doc/examples/trash/sub_image.cc delete mode 100644 milena/doc/examples/trash/sub_image_if.cc delete mode 100644 milena/doc/examples/trash/tuto_bis.cc delete mode 100644 milena/doc/examples/trash/tuto_one.cc delete mode 100644 milena/doc/examples/trash/vec.cc delete mode 100644 milena/doc/examples/trash/win_multiple.cc delete mode 100644 milena/doc/examples/trash/window.cc create mode 100644 milena/img/fly_ascii.ppm copy milena/tests/io/{dicom/dicom.cc => ppm/ppm_ascii.cc} (80%) delete mode 100644 milena/tests/value/interop.cc delete mode 100644 milena/trash/bgraph_image.cc delete mode 100644 milena/trash/bgraph_image.hh delete mode 100644 milena/trash/bgraph_psite.hh delete mode 100644 milena/trash/boost_graph.cc delete mode 100644 milena/trash/boost_graph.hh delete mode 100644 milena/trash/boost_graph_access.hh delete mode 100644 milena/trash/boost_graph_property.hh delete mode 100644 milena/trash/boost_graph_structure.hh delete mode 100644 milena/trash/clock_neighb.hh delete mode 100644 milena/trash/clock_neighb2d.cc delete mode 100644 milena/trash/clock_neighb2d.hh delete mode 100644 milena/trash/clock_neighb2d_bis.cc delete mode 100644 milena/trash/display_color_pretty.cc delete mode 100644 milena/trash/display_color_pretty.hh delete mode 100644 milena/trash/display_remove.hh delete mode 100644 milena/trash/display_save.hh delete mode 100644 milena/trash/display_save_and_show.hh delete mode 100644 milena/trash/display_show.cc delete mode 100644 milena/trash/display_show.hh delete mode 100644 milena/trash/fi_adaptor.cc delete mode 100644 milena/trash/fi_adaptor.hh delete mode 100644 milena/trash/freeimageplus.mk delete mode 100644 milena/trash/graph_image.hh delete mode 100644 milena/trash/line_graph_image.hh delete mode 100644 milena/trash/mono_obased_rle_encode.hh delete mode 100644 milena/trash/mono_obased_rle_image.cc delete mode 100644 milena/trash/mono_obased_rle_image.hh delete mode 100644 milena/trash/mono_rle_encode.hh delete mode 100644 milena/trash/mono_rle_image.cc delete mode 100644 milena/trash/mono_rle_image.hh delete mode 100644 milena/trash/neighb_get.hh delete mode 100644 milena/trash/neighb_image.cc delete mode 100644 milena/trash/neighb_image.hh delete mode 100644 milena/trash/obased_rle_encode.hh delete mode 100644 milena/trash/obased_rle_image.cc delete mode 100644 milena/trash/obased_rle_image.hh delete mode 100644 milena/trash/p_bgraph.cc delete mode 100644 milena/trash/p_bgraph.hh delete mode 100644 milena/trash/p_bgraph_piter.hh delete mode 100644 milena/trash/rle_encode.hh delete mode 100644 milena/trash/rle_image.cc delete mode 100644 milena/trash/rle_image.hh delete mode 100644 milena/trash/save_and_show.cc delete mode 100644 milena/trash/sparse_encode.hh delete mode 100644 milena/trash/sparse_image.cc delete mode 100644 milena/trash/sparse_image.hh delete mode 100644 milena/trash/t_image.cc delete mode 100644 milena/trash/t_image.hh delete mode 100644 milena/trash/to_tiles.cc delete mode 100644 milena/trash/to_tiles.hh delete mode 100644 milena/trash/translate_image.cc delete mode 100644 milena/trash/translate_image.hh delete mode 100644 milena/trash/value_enc_image.cc delete mode 100644 milena/trash/value_enc_image.hh delete mode 100644 milena/trash/value_encode.hh delete mode 100644 scribo/doc/doxyfuns.sty delete mode 100644 scribo/doc/examples-outputs.mk delete mode 100644 scribo/doc/examples.mk delete mode 100644 scribo/doc/examples/dummy.cc delete mode 100644 scribo/doc/figures.mk delete mode 100755 scribo/doc/gen-examples-outputs-mk delete mode 100755 scribo/doc/gen-figures-mk delete mode 100755 scribo/doc/gen-make-variable delete mode 100755 scribo/doc/gen-split-examples-mk delete mode 100755 scribo/doc/gen-split-outputs-mk delete mode 100644 scribo/doc/graphicx.hva delete mode 100644 scribo/doc/outputs.mk delete mode 100644 scribo/doc/outputs/dummy.txt delete mode 100644 scribo/doc/programs-examples.mk delete mode 100644 scribo/doc/scribo.sty delete mode 100644 scribo/doc/split-examples.mk delete mode 100644 scribo/doc/split-outputs.mk delete mode 100755 scribo/doc/tools/todoxygen.sh delete mode 100644 scribo/doc/tutorial.tex hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch next updated: olena-2.0-899-gd92a1e5
by git＠lrde.epita.fr 27 Jun '14

27 Jun '14

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 d92a1e5263f60d449cf9dfc777e051e0200247df (commit) via 405e0aabb3c91e61b754c090a90880a04a3e03ea (commit) via d3352969fd22b03fa0e5e9d3004a22c29664793a (commit) via 484dc65d123502b47588e650193296d32e73abfd (commit) via 0774ab7c60fe5ffcfcc7188f5211118dd0f258c4 (commit) via c12d92c7a38e95c12cff2d234913c350887a3c20 (commit) from 5ec622732f36db381fd3cead7f88c448e0119359 (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 ----------------------------------------------------------------- d92a1e5 Address compiler warnings in Scribo. 405e0aa Add warning flags to Scribo compiler flags. d335296 Fix the construction of mln::io::pdf::pdf_header. 484dc65 configure.ac: Aesthetic changes. 0774ab7 Use AX_CHECK_COMPILE_FLAG to check compiler support for `-pipe'. c12d92c Avoid warnings about unused local typedefs. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 28 ++++++++++ configure.ac | 47 +++++++++------- m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++ milena/ChangeLog | 7 +++ milena/mln/io/pdf/get_header.hh | 4 +- scribo/ChangeLog | 20 +++++++ scribo/scribo/debug/logger.hh | 8 ++- scribo/scribo/layout/xy_cut.hh | 10 ++-- scribo/src/misc/rectangularity.cc | 2 +- scribo/tests/binarization/global_threshold.cc | 6 +- scribo/tests/core/object_groups.cc | 16 +++--- scribo/tests/layout/xy_cut.cc | 4 +- 12 files changed, 183 insertions(+), 43 deletions(-) create mode 100644 m4/ax_check_compile_flag.m4 hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-899-gd92a1e5 Address compiler warnings in Scribo.
by Roland Levillain 27 Jun '14

27 Jun '14

* scribo/debug/logger.hh (scribo::debug::internal::logger_::log) [!SCRIBO_NDEBUG]: Avoid warnings about unused arguments in non-debug mode. * scribo/layout/xy_cut.hh (scribo::layout::internal::compute_hist_info_h) (scribo::layout::internal::compute_hist_info_v): Use `def::coord' instead of `int' as coordinate type, to avoid comparisons between signed and unsigned values. * src/misc/rectangularity.cc (main) * tests/binarization/global_threshold.cc (main) * tests/layout/xy_cut.cc (main): Avoid warnings about unused arguments. * tests/core/object_groups.cc (main): Likewise. Use `unsigned' instead of `int' as count/id type, to avoid comparisons between signed and unsigned values. --- scribo/ChangeLog | 20 ++++++++++++++++++++ scribo/scribo/debug/logger.hh | 8 ++++++-- scribo/scribo/layout/xy_cut.hh | 10 +++++----- scribo/src/misc/rectangularity.cc | 2 +- scribo/tests/binarization/global_threshold.cc | 6 +++--- scribo/tests/core/object_groups.cc | 16 +++++++++------- scribo/tests/layout/xy_cut.cc | 4 ++-- 7 files changed, 46 insertions(+), 20 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index cdcb6c0..5b70ce7 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,23 @@ +2014-06-27 Roland Levillain <roland(a)lrde.epita.fr> + + Address compiler warnings in Scribo. + + * scribo/debug/logger.hh + (scribo::debug::internal::logger_::log) [!SCRIBO_NDEBUG]: + Avoid warnings about unused arguments in non-debug mode. + * scribo/layout/xy_cut.hh + (scribo::layout::internal::compute_hist_info_h) + (scribo::layout::internal::compute_hist_info_v): + Use `def::coord' instead of `int' as coordinate type, to avoid + comparisons between signed and unsigned values. + * src/misc/rectangularity.cc (main) + * tests/binarization/global_threshold.cc (main) + * tests/layout/xy_cut.cc (main): + Avoid warnings about unused arguments. + * tests/core/object_groups.cc (main): Likewise. + Use `unsigned' instead of `int' as count/id type, to avoid + comparisons between signed and unsigned values. + 2014-06-26 Roland Levillain <roland(a)lrde.epita.fr> Make Scribo more compatible with BSD Make. diff --git a/scribo/scribo/debug/logger.hh b/scribo/scribo/debug/logger.hh index ab283c3..25e5ade 100644 --- a/scribo/scribo/debug/logger.hh +++ b/scribo/scribo/debug/logger.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2011, 2012, 2013 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2011, 2012, 2013, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -334,6 +334,10 @@ namespace scribo void logger_::log(VerboseMode mode, const std::string& text) { + // Avoid warnings about unused arguments in non-debug mode. + (void) mode; + (void) text; + # ifndef SCRIBO_NDEBUG if (verbose_mode_ < mode) return; diff --git a/scribo/scribo/layout/xy_cut.hh b/scribo/scribo/layout/xy_cut.hh index b55d51c..75a3d00 100644 --- a/scribo/scribo/layout/xy_cut.hh +++ b/scribo/scribo/layout/xy_cut.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2013, 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -92,10 +92,10 @@ namespace scribo unsigned accumulator = 0; - for (unsigned i = geom::min_row(input); i <= geom::max_row(input); ++i) + for (def::coord i = geom::min_row(input); i <= geom::max_row(input); ++i) { accumulator = 0; - for (unsigned j = geom::min_col(input); j <= geom::max_col(input); ++j) + for (def::coord j = geom::min_col(input); j <= geom::max_col(input); ++j) { if (input.at_(i, j)) ++accumulator; @@ -124,10 +124,10 @@ namespace scribo unsigned accumulator = 0; - for (unsigned j = geom::min_col(input); j <= geom::max_col(input); ++j) + for (def::coord j = geom::min_col(input); j <= geom::max_col(input); ++j) { accumulator = 0; - for (unsigned i = geom::min_row(input); i <= geom::max_row(input); ++i) + for (def::coord i = geom::min_row(input); i <= geom::max_row(input); ++i) { if (input.at_(i, j)) ++accumulator; diff --git a/scribo/src/misc/rectangularity.cc b/scribo/src/misc/rectangularity.cc index 016f687..84a1c8c 100644 --- a/scribo/src/misc/rectangularity.cc +++ b/scribo/src/misc/rectangularity.cc @@ -50,7 +50,7 @@ #include <scribo/make/debug_filename.hh> -int main(int argc, char *argv[]) +int main(int /* argc */, char *argv[]) { using namespace mln; diff --git a/scribo/tests/binarization/global_threshold.cc b/scribo/tests/binarization/global_threshold.cc index 879ee95..7da4a73 100644 --- a/scribo/tests/binarization/global_threshold.cc +++ b/scribo/tests/binarization/global_threshold.cc @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010, 2011, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -32,7 +32,7 @@ #include <scribo/binarization/global_threshold.hh> -int main(int argc, char *argv[]) +int main() { using namespace mln; diff --git a/scribo/tests/core/object_groups.cc b/scribo/tests/core/object_groups.cc index 33e408f..90fa09f 100644 --- a/scribo/tests/core/object_groups.cc +++ b/scribo/tests/core/object_groups.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2011, 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -38,15 +38,16 @@ #include "tests/data.hh" -int main(int argc, char *argv[]) +int main() { using namespace mln; using namespace scribo; std::string img = SCRIBO_IMG_DIR "/the_valleys.pbm"; - static const int comp_to_group_ref[] = { 0, 1, 4, 2, 3, 2, 2, 4, 4, 2, 2, 2, 2 }; - static const int pixel_area_ref[] = { 0, 3, 973, 39, 426 }; + static const unsigned comp_to_group_ref[] = + { 0, 1, 4, 2, 3, 2, 2, 4, 4, 2, 2, 2, 2 }; + static const unsigned pixel_area_ref[] = { 0, 3, 973, 39, 426 }; static const box2d bbox_ref[] = { box2d(), make::box2d(0,91, 1,92), @@ -55,7 +56,7 @@ int main(int argc, char *argv[]) make::box2d(9,12, 36,64) }; - static const int comp_ids_count_ref[] = { 0, 1, 7, 1, 3 }; + static const unsigned comp_ids_count_ref[] = { 0, 1, 7, 1, 3 }; static const int comp_ids_ref[][7] = { { 0, 0, 0, 0, 0, 0, 0 }, { 1, 0, 0, 0, 0, 0, 0 }, @@ -81,7 +82,7 @@ int main(int argc, char *argv[]) mln_assertion(group.comp_to_group().nelements() == 13); // Checking comp_to_group() - for (int i = 0; i < group.comp_to_group().nelements(); ++i) + for (unsigned i = 0; i < group.comp_to_group().nelements(); ++i) mln_assertion(group.comp_to_group()[i] == comp_to_group_ref[i]); // Checking group info data. @@ -91,7 +92,8 @@ int main(int argc, char *argv[]) mln_assertion(group(g).is_valid()); mln_assertion(group(g).pixel_area() == pixel_area_ref[g]); mln_assertion(group(g).bbox() == bbox_ref[g]); - mln_assertion(group(g).component_ids().nelements() == comp_ids_count_ref[g]); + mln_assertion(group(g).component_ids().nelements() + == comp_ids_count_ref[g]); for_all_elements(e, group(g).component_ids()) mln_assertion(group(g).component_ids()[e] == comp_ids_ref[g][e]); diff --git a/scribo/tests/layout/xy_cut.cc b/scribo/tests/layout/xy_cut.cc index 3601d64..1ae94c5 100644 --- a/scribo/tests/layout/xy_cut.cc +++ b/scribo/tests/layout/xy_cut.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2013, 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -34,7 +34,7 @@ using namespace mln; -int main(int argc, char** argv) +int main() { image2d<bool> input; -- 1.7.10.4

1 0

olena: olena-2.0-898-g405e0aa Add warning flags to Scribo compiler flags.
by Roland Levillain 27 Jun '14

27 Jun '14

* configure.ac (SCRIBO_CXXFLAGS, SCRIBO_TESTS_CXXFLAGS): Add $WARNINGS_CXXFLAGS. --- ChangeLog | 7 +++++++ configure.ac | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 262744c..9894dce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2014-06-27 Roland Levillain <roland(a)lrde.epita.fr> + Add warning flags to Scribo compiler flags. + + * configure.ac (SCRIBO_CXXFLAGS, SCRIBO_TESTS_CXXFLAGS): + Add $WARNINGS_CXXFLAGS. + +2014-06-27 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac: Aesthetic changes. 2014-06-27 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/configure.ac b/configure.ac index e5b8417..f007fe0 100644 --- a/configure.ac +++ b/configure.ac @@ -429,9 +429,9 @@ AC_CONFIG_FILES([ AC_ARG_VAR([SCRIBO_CXXFLAGS], [C++ compiler flags for Scribo binaries]) AC_ARG_VAR([SCRIBO_TESTS_CXXFLAGS], [C++ compiler flags for Scribo tests]) if test "$GXX" = yes || test "$ICPC" = yes; then - test -z "$SCRIBO_CXXFLAGS" && SCRIBO_CXXFLAGS="-DNDEBUG -O2" + test -z "$SCRIBO_CXXFLAGS" && SCRIBO_CXXFLAGS="-DNDEBUG -O2 $WARNINGS_CXXFLAGS" # FIXME: We might want to use -ggdb when g++ is used. - test -z "$SCRIBO_TESTS_CXXFLAGS" && SCRIBO_TESTS_CXXFLAGS="-g -O0" + test -z "$SCRIBO_TESTS_CXXFLAGS" && SCRIBO_TESTS_CXXFLAGS="-g -O0 $WARNINGS_CXXFLAGS" fi ## --------------- ## -- 1.7.10.4

1 0

olena: olena-2.0-897-gd335296 Fix the construction of mln::io::pdf::pdf_header.
by Roland Levillain 27 Jun '14

27 Jun '14

* mln/io/pdf/get_header.hh (mln::io::pdf::pdf_header::pdf_header::metadata): Fix type. --- milena/ChangeLog | 7 +++++++ milena/mln/io/pdf/get_header.hh | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 932b1b5..569658d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2014-06-27 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the construction of mln::io::pdf::pdf_header. + + * mln/io/pdf/get_header.hh + (mln::io::pdf::pdf_header::pdf_header::metadata): Fix type. + 2014-06-26 Roland Levillain <roland(a)lrde.epita.fr> Regen Milena's Makefile bits in doc/. diff --git a/milena/mln/io/pdf/get_header.hh b/milena/mln/io/pdf/get_header.hh index e3b3c41..298bc8c 100644 --- a/milena/mln/io/pdf/get_header.hh +++ b/milena/mln/io/pdf/get_header.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2013 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2013, 2014 EPITA Research and Development Laboratory (LRDE). // // This file is part of Olena. // @@ -65,7 +65,7 @@ namespace mln bool is_encrypted; bool is_linearized; bool is_locked; - std::string metadata; + std::vector<char> metadata; }; -- 1.7.10.4

1 0

olena: olena-2.0-896-g484dc65 configure.ac: Aesthetic changes.
by Roland Levillain 27 Jun '14

27 Jun '14

--- ChangeLog | 4 ++++ configure.ac | 27 ++++++++++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab7be69..262744c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2014-06-27 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac: Aesthetic changes. + +2014-06-27 Roland Levillain <roland(a)lrde.epita.fr> + Use AX_CHECK_COMPILE_FLAG to check compiler support for `-pipe'. * configure.ac: Here. diff --git a/configure.ac b/configure.ac index be32513..e5b8417 100644 --- a/configure.ac +++ b/configure.ac @@ -78,21 +78,18 @@ test $CXX --version 2>/dev/null | grep '\bICC\b' >/dev/null 2>&1 && ICPC=yes # Try to use pipes between compiler stages to speed the compilation up. AX_CHECK_COMPILE_FLAG([-pipe], [CXXFLAGS="$CXXFLAGS -pipe"]) -# GNU C++ compiler setup. -if test "$GXX" = yes; then - - # The code generated for mln::data::impl::memcpy__() by g++ 4.2 with - # a high optimization level (`-O3') and without - # `-fno-strict-aliasing' might be wrong, at least with Debian's g++ - # 4.2 on IA-32 (see also milena/mln/memcpy_.hh). We observed this - # behavior with e.g. milena/apps/graph-morpho/samples-image2d.cc. - # Note that Debian's g++ 4.0, 4.1, 4.3 and 4.4 are fine. - # - # So, when the C++ compiler is g++ 4.2, set STRICT_ALIASING_CXXFLAGS - # to `-fno-strict-aliasing'. - if $CXX --version | head -n 1 | grep '\b4\.2' >/dev/null 2>&1; then - STRICT_ALIASING_CXXFLAGS=-fno-strict-aliasing - fi +# The code generated for mln::data::impl::memcpy__() by g++ 4.2 with a +# high optimization level (`-O3') and without `-fno-strict-aliasing' +# might be wrong, at least with Debian's g++ 4.2 on IA-32 (see also +# milena/mln/data/memcpy_.hh). We observed this behavior with +# e.g. milena/apps/graph-morpho/samples-image2d.cc. Note that +# Debian's g++ 4.0, 4.1, 4.3 and 4.4 are fine. +# +# So, when the C++ compiler is g++ 4.2, set STRICT_ALIASING_CXXFLAGS +# to `-fno-strict-aliasing'. +if test "$GXX" = yes \ + && $CXX --version | head -n 1 | grep '\b4\.2' >/dev/null 2>&1; then + STRICT_ALIASING_CXXFLAGS=-fno-strict-aliasing fi AC_SUBST([STRICT_ALIASING_CXXFLAGS]) -- 1.7.10.4

1 0

olena: olena-2.0-895-g0774ab7 Use AX_CHECK_COMPILE_FLAG to check compiler support for `-pipe'.
by Roland Levillain 27 Jun '14

27 Jun '14

* configure.ac: Here. --- ChangeLog | 6 ++++++ configure.ac | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee0aacd..ab7be69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2014-06-27 Roland Levillain <roland(a)lrde.epita.fr> + Use AX_CHECK_COMPILE_FLAG to check compiler support for `-pipe'. + + * configure.ac: Here. + +2014-06-27 Roland Levillain <roland(a)lrde.epita.fr> + Avoid warnings about unused local typedefs. * m4/ax_check_compile_flag.m4: New. diff --git a/configure.ac b/configure.ac index 6dadbea..be32513 100644 --- a/configure.ac +++ b/configure.ac @@ -75,10 +75,11 @@ AC_PROG_CXX # Set `ICPC' to `yes' if the Intel C++ compiler is used. test $CXX --version 2>/dev/null | grep '\bICC\b' >/dev/null 2>&1 && ICPC=yes +# Try to use pipes between compiler stages to speed the compilation up. +AX_CHECK_COMPILE_FLAG([-pipe], [CXXFLAGS="$CXXFLAGS -pipe"]) + # GNU C++ compiler setup. if test "$GXX" = yes; then - # Speed up compiling times. - CXXFLAGS="$CXXFLAGS -pipe" # The code generated for mln::data::impl::memcpy__() by g++ 4.2 with # a high optimization level (`-O3') and without -- 1.7.10.4

1 0

olena: olena-2.0-894-gc12d92c Avoid warnings about unused local typedefs.
by Roland Levillain 27 Jun '14

27 Jun '14

* m4/ax_check_compile_flag.m4: New. Imported from http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html. * configure.ac: Ensure AX_* macros are expanded. (WARNINGS_CXXFLAGS): Add `-Wno-unused-local-typedefs' if the C++ compiler supports this flag. --- ChangeLog | 11 +++++++ configure.ac | 11 +++++-- m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 m4/ax_check_compile_flag.m4 diff --git a/ChangeLog b/ChangeLog index c8c159b..ee0aacd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2014-06-27 Roland Levillain <roland(a)lrde.epita.fr> + + Avoid warnings about unused local typedefs. + + * m4/ax_check_compile_flag.m4: New. + Imported from + http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html. + * configure.ac: Ensure AX_* macros are expanded. + (WARNINGS_CXXFLAGS): Add `-Wno-unused-local-typedefs' if the C++ + compiler supports this flag. + 2014-06-26 Roland Levillain <roland(a)lrde.epita.fr> Make Olena more compatible with BSD Make. diff --git a/configure.ac b/configure.ac index a9c59e5..6dadbea 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 EPITA +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 EPITA # Research and Development Laboratory (LRDE). # # This file is part of Olena. @@ -15,7 +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/>. -m4_pattern_forbid([^OLN_]) +dnl Catch macros that are not expanded. +m4_pattern_forbid([^(AX|OLN)_]) AC_PREREQ([2.61]) @@ -107,6 +108,12 @@ case "$CXX" in ;; esac +# Avoid warnings about unused local typedefs, which are used as a +# concept checking means in Milena (`-Wunused-local-typedefs' is +# enabled by `-Wall' in GCC since version 4.8). +AX_CHECK_COMPILE_FLAG([-Wno-unused-local-typedefs], + [WARNINGS_CXXFLAGS="$WARNINGS_CXXFLAGS -Wno-unused-local-typedefs"]) + # ------------------------------ # # C++ compiler flags for tests. # diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 new file mode 100644 index 0000000..51df0c0 --- /dev/null +++ b/m4/ax_check_compile_flag.m4 @@ -0,0 +1,74 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's compiler +# or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim <guidod(a)gmx.de> +# Copyright (c) 2011 Maarten Bosmans <mkbosmans(a)gmail.com> +# +# This program 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, either version 3 of the License, or (at your +# option) any later version. +# +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 3 + +AC_DEFUN([AX_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) +AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS -- 1.7.10.4

1 0

olena: branch next updated: olena-2.0-893-g5ec6227
by git＠lrde.epita.fr 27 Jun '14

27 Jun '14

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 discards 974162bb578fd0e49dadd6be3007a0f81b0231d2 (commit) discards f5f0cfb89d8d6e4c4c4dba01333d548ddda44675 (commit) via 5ec622732f36db381fd3cead7f88c448e0119359 (commit) via 84106cfffb04189d1e3bbdd527c06e93b6c24d14 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (974162bb578fd0e49dadd6be3007a0f81b0231d2) \ N -- N -- N (5ec622732f36db381fd3cead7f88c448e0119359) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 ----------------------------------------------------------------- 5ec6227 Make dynamic-use-of-static-c++ more compatible with BSD Make. 84106cf Make Swilena more compatible with BSD Make. ----------------------------------------------------------------------- Summary of changes: swilena/python/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0