Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

olena: branch exp/deb-packages deleted: olena-2.0-63-g8664d5d

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 exp/deb-packages has been deleted was 8664d5df364c97421c33351379e99187696590e4 ----------------------------------------------------------------------- 8664d5df364c97421c33351379e99187696590e4 Fix last warnings with Lintian. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

9 years, 10 months

olena: branch next updated: olena-2.0-937-g01d0f09

by git＠lrde.epita.fr

9 years, 10 months

olena: olena-2.0-937-g01d0f09 Update texi2dvi from upstream.

by Roland Levillain

* build-aux/texi2dvi: Update from Subversion Texinfo. --- ChangeLog | 6 +++++ build-aux/texi2dvi | 72 ++++++++++++++++++++++++++++++---------------------- 2 files changed, 47 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92e5243..45dbc13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-07-01 Roland Levillain <roland(a)lrde.epita.fr> + + Update texi2dvi from upstream. + + * build-aux/texi2dvi: Update from Subversion Texinfo. + 2012-06-07 Guillaume Lazzara <z(a)lrde.epita.fr> Fix last warnings with Lintian. diff --git a/build-aux/texi2dvi b/build-aux/texi2dvi index 6bddb06..33d6a72 100755 --- a/build-aux/texi2dvi +++ b/build-aux/texi2dvi @@ -1,9 +1,9 @@ #! /bin/sh # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources. -# $Id: texi2dvi,v 1.173 2012/04/20 18:52:48 karl Exp $ +# $Id: texi2dvi 5649 2014-06-08 22:02:26Z karl $ # # Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 # Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -34,7 +34,7 @@ unset RUNNING_KSH set -e # This string is expanded automatically when this file is checked out. -rcs_revision='$Revision: 1.173 $' +rcs_revision='$Revision: 5649 $' rcs_version=`set - $rcs_revision; echo $2` program=`echo $0 | sed -e 's!.*/!!'` @@ -52,7 +52,7 @@ escape="\\" expand=false # true for expansion via makeinfo includes= line_error=true # pass --file-line-error to TeX -max_iters=-1 # keep going forever +max_iters=7 # when to quit oname= # --output out_lang=dvi quiet=false # let the tools' message be displayed @@ -358,7 +358,7 @@ Build modes: defaults to TEXI2DVI_BUILD_DIRECTORY [$build_dir] --mostly-clean remove the auxiliary files and directories but not the output - --max-iterations=N don't process files more than N times + --max-iterations=N don't process files more than N times [$max_iters] The MODE specifies where the TeX compilation takes place, and, as a consequence, how auxiliary files are treated. The build mode @@ -391,8 +391,8 @@ directory, occasionally TeX won't be able to find some files (e.g., when using \\graphicspath): in that case, use -I to specify the additional directories to consider. -The values of the BIBTEX, DVIPDF, DVIPS, HEVEA, LATEX, MAKEINDEX, -MAKEINFO, PDFLATEX, PDFTEX, T4HT, TEX, TEX4HT, TEXINDEX, and THUMBPDF +The values of the BIBER, BIBTEX, DVIPDF, DVIPS, HEVEA, LATEX, MAKEINDEX, +MAKEINFO, PDFLATEX, PDFTEX, T4HT, TEX, TEX4HT, TEXINDEX, and THUMBPDF_CMD environment variables are used to run those commands, if they are set. Regarding --dvipdf, if DVIPDF is not set in the environment, the @@ -428,9 +428,9 @@ verbose () version () { cat <<EOF -texi2dvi (GNU Texinfo 4.13+dev) $rcs_version +texi2dvi (GNU Texinfo 5.2) $rcs_version -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2014 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. @@ -709,7 +709,7 @@ move_to_dest () false:*) destfile=$oname destdir=`dirname "$destfile"`;; esac - + # We want to compare the source location and the output location, # and if they are different, do the move. But if they are the # same, we must preserve the source. Since we can't assume @@ -899,9 +899,13 @@ xref_files_changed () if grep "Rerun to get" "$in_noext.log" >&6 2>&1; then return 0 fi + # biblatex report of whether rerunning is needed. + if grep "biblatex.*(re)run" "$in_noext.log" >&6 2>&1; then + return 0 + fi - # If old and new lists don't at least have the same file list, - # then one file or another has definitely changed. + # If old and new lists don't have the same file list, + # then something has definitely changed. xref_files_new=`generated_files_get "$in_noext" xref_file_p` verbose "Original xref files = $xref_files_orig" verbose "New xref files = $xref_files_new" @@ -1073,20 +1077,19 @@ run_tex () # run_bibtex () # ------------- -# Run bibtex on current file. +# Run bibtex on (or biber) current file. # - If its input (AUX) exists. # - If some citations are missing (LOG contains `Citation'). # or the LOG complains of a missing .bbl # # Don't try to be too smart: -# # 1. Running bibtex only if the bbl file exists and is older than # the LaTeX file is wrong, since the document might include files # that have changed. # # 3. Because there can be several AUX (if there are \include's), # but a single LOG, looking for missing citations in LOG is -# easier, though we take the risk to match false messages. +# easier, though we take the risk of matching false messages. run_bibtex () { case $in_lang in @@ -1100,18 +1103,24 @@ run_bibtex () # bibtex would never be run. if test -r "$in_noext.aux" \ && test -r "$in_noext.log" \ - && ((grep 'Warning:.*Citation.*undefined' "$in_noext.log" \ + && ( (grep 'Warning:.*Citation.*undefined' "$in_noext.log" \ || grep '.*Undefined citation' "$in_noext.log" \ || grep 'No file .*\.bbl\.' "$in_noext.log") \ || (grep 'No \.aux file' "$in_noext.log" \ - && grep '^\\bibdata' "$in_noext.aux")) \ + && grep '^\\bibdata' "$in_noext.aux") ) \ >&6 2>&1; \ then - for f in `generated_files_get "$in_noext" bibaux_file_p` - do + bibtex_aux=`generated_files_get "$in_noext" bibaux_file_p` + for f in $bibtex_aux; do run $bibtex "$f" done fi + + # biber(+biblatex) check. + if test -r "$in_noext.bcf" \ + && grep '</bcf:controlfile>' "$in_noext.bcf" >/dev/null; then + run ${BIBER:-biber} "$in_noext" + fi } # run_index () @@ -1191,7 +1200,7 @@ run_thumbpdf () && test -r "$in_noext.log" \ && grep 'thumbpdf\.sty' "$in_noext.log" >&6 2>&1; \ then - thumbpdf=${THUMBPDF:-thumbpdf} + thumbpdf=${THUMBPDF_CMD:-thumbpdf} thumbcmd="$thumbpdf $in_dir/$in_noext" verbose "Running $thumbcmd ..." if $thumbcmd >&5; then @@ -1253,9 +1262,9 @@ run_tex_suite () xref_files_save - # We run bibtex first, because I can see reasons for the indexes - # to change after bibtex is run, but I see no reason for the - # converse. + # We run bibtex first, because it's more likely for the indexes + # to change after bibtex is run than the reverse, though either + # would be rare. run_bibtex run_index run_core_conversion @@ -1360,7 +1369,10 @@ run_makeinfo () # close stdin. $TEX txiversion.tex </dev/null >txiversion.out 2>txiversion.err ); then :; else - report "texinfo.tex appears to be broken:" + report "texinfo.tex appears to be broken. +This may be due to the environment variable TEX set to something +other than (plain) tex, a corrupt texinfo.tex file, or +to tex itself simply not working." cat "$version_test_dir/txiversion.out" cat "$version_test_dir/txiversion.err" >&2 error 1 "quitting." @@ -1685,7 +1697,6 @@ while test x"$1" != x"$arg_sep"; do ;; esac - # This recognizes --quark as --quiet. Oh well. case "$1" in -@ ) escape=@;; -~ ) catcode_special=false;; @@ -1717,7 +1728,7 @@ while test x"$1" != x"$arg_sep"; do -r | --recode) recode=true;; --recode-from) shift; recode=true; recode_from="$1";; --src-specials) src_specials=--src-specials;; - --shell-escape) shell_escape=--shell-escape;; + --shell-escape) shell_escape=--shell-escape;; --tex4ht) latex2html=tex4ht;; -t | --texinfo | --command ) shift; textra="$textra\\ "`echo "$1" | sed 's/\\\\/\\\\\\\\/g'`;; @@ -1775,9 +1786,8 @@ this script, you'll need to install TeX (if you don't have it) or change your PATH or TEX environment variable (if you do). See the --help output for more details. -For information about obtaining TeX, please see http://www.tug.org. If -you happen to be using Debian, you can get it with this command: - apt-get install tetex-bin +For information about obtaining TeX, please see http://tug.org/texlive, +or do a web search for TeX and your operating system or distro. EOM exit 1 fi @@ -1819,12 +1829,12 @@ fi # Enable tracing, and auxiliary tools output. -# +# # This fd should be used where you'd typically use /dev/null to throw # output away. But sometimes it is convenient to see that output (e.g., # from a grep) to aid debugging. Especially debugging at distance, via # the user. -# +# if $debug; then exec 6>&1 set -vx -- 1.7.10.4

9 years, 10 months

olena: olena-2.0-936-g6cd5348 Update .gitignore files.

by Roland Levillain

--- .gitignore | 22 +- milena/.gitignore | 147 ++++++++++ milena/doc/.gitignore | 23 -- milena/tests/.gitignore | 699 +++++++++++++++++++++++++++++++++++++++++++++++ scribo/.gitignore | 131 +++++++++ scribo/doc/.gitignore | 7 - scribo/tests/.gitignore | 81 ++++++ swilena/.gitignore | 25 ++ 8 files changed, 1101 insertions(+), 34 deletions(-) create mode 100644 milena/.gitignore delete mode 100644 milena/doc/.gitignore create mode 100644 milena/tests/.gitignore create mode 100644 scribo/.gitignore delete mode 100644 scribo/doc/.gitignore create mode 100644 scribo/tests/.gitignore create mode 100644 swilena/.gitignore diff --git a/.gitignore b/.gitignore index f8fa5b5..82de41e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,20 @@ # Global. -*~ *.dSYM +*.la +*.lo +*.log +*.moc.cc +*.o *.pyc +*.qrc.cc *.stamp +*.ui.h +*~ .deps -Makefile.in +.dirstamp +.libs Makefile +Makefile.in # Local. /*-stamp @@ -17,15 +26,20 @@ Makefile /_build* /_inst* /autom4te.cache* -/autoscan.log /config /config.cache* /config.h /config.h?in* /config.hin -/config.log* /config.status* /configure /configure.scan /diffs.patch +/libtool /stamp-h1 + +/doc/contributors.html +/doc/lrde_olena.bib +/doc/lrde_olena.cite +/doc/lrde_olena.html +/doc/lrde_olena_bib.html diff --git a/milena/.gitignore b/milena/.gitignore new file mode 100644 index 0000000..495375d --- /dev/null +++ b/milena/.gitignore @@ -0,0 +1,147 @@ +/apps/bench/dilation-lena +/apps/bench/dilation-lena-bench-fast +/apps/bench/dilation-lena-bench-fast_static +/apps/bench/dilation-lena-bench-gen +/apps/bench/dilation-lena-bench-nongen +/apps/bench/dilation-lena-bench-nongen_2ptr +/apps/bench/dilation-lena-table +/apps/bench/gradient-lena +/apps/bench/gradient-spe-lena +/apps/bench/test-dilation-lena-bench +/apps/constrained-connectivity/constrained-connectivity +/apps/constrained-connectivity/test-constrained-connectivity +/apps/data.hh +/apps/generic-skel/*.pbm +/apps/generic-skel/*.raw +/apps/generic-skel/*.vtk +/apps/generic-skel/image2d-skel-unconstrained +/apps/generic-skel/image2d-skel-with-end-points +/apps/generic-skel/image3d-skel-unconstrained +/apps/generic-skel/image3d-skel-with-1d-isthmuses +/apps/generic-skel/image3d-skel-with-end-points +/apps/generic-skel/test-image2d-skel-unconstrained +/apps/generic-skel/test-image2d-skel-with-end-points +/apps/graph-morpho/asf-complex1d +/apps/graph-morpho/asf-image2d +/apps/graph-morpho/samples-complex1d +/apps/graph-morpho/samples-image2d +/apps/mesh-segm-skel/*.off +/apps/mesh-segm-skel/*.vtk +/apps/mesh-segm-skel/mesh-complex-2-collapse +/apps/mesh-segm-skel/mesh-complex-max-curv +/apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse +/apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse +/apps/mesh-segm-skel/mesh-complex-max-curv-extrema +/apps/mesh-segm-skel/mesh-complex-max-curv-segm +/apps/mesh-segm-skel/mesh-complex-max-curv-skel +/apps/mesh-segm-skel/mesh-complex-pinv-curv-segm +/apps/mesh-segm-skel/mesh-complex-pinv-curv-skel +/apps/mesh-segm-skel/mesh-complex-segm +/apps/mesh-segm-skel/mesh-complex-skel +/apps/mesh-segm-skel/off-to-vtk-bin +/apps/mesh-segm-skel/test-mesh-complex-2-collapse +/apps/mesh-segm-skel/test-mesh-complex-max-curv +/apps/mesh-segm-skel/test-mesh-complex-max-curv-1-collapse +/apps/mesh-segm-skel/test-mesh-complex-max-curv-2-collapse +/apps/mesh-segm-skel/test-mesh-complex-max-curv-extrema +/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm +/apps/mesh-segm-skel/test-mesh-complex-max-curv-skel +/apps/mesh-segm-skel/test-mesh-complex-pinv-curv-segm +/apps/mesh-segm-skel/test-mesh-complex-pinv-curv-skel +/apps/mesh-segm-skel/test-mesh-complex-segm +/apps/mesh-segm-skel/test-mesh-complex-skel +/apps/morphers/iz +/apps/morphers/lazy_recorder +/apps/morphers/mask+channel +/apps/morphers/mask+recorder +/apps/morphers/recorder +/apps/morphers/recorder-bft +/apps/morphers/recorder-wst +/apps/papers/levillain.09.ismm/classif-1complex +/apps/papers/levillain.09.ismm/classif-graph +/apps/papers/levillain.09.ismm/classwst-1complex.ppm +/apps/papers/levillain.09.ismm/classwst-graph.ppm +/apps/papers/levillain.09.ismm/complex +/apps/papers/levillain.09.ismm/graph +/apps/papers/levillain.09.ismm/graph-s.neato +/apps/papers/levillain.09.ismm/graph-s.png +/apps/papers/levillain.09.ismm/image2d +/apps/papers/levillain.09.ismm/lena-s.ppm +/apps/papers/levillain.09.ismm/m283-s.off + +/doc/Doxyfile_devel +/doc/Doxyfile_user +/doc/accu-right-instantiation +/doc/borderthickness +/doc/box2d-bbox +/doc/devel-refman +/doc/devel-refman.pdf +/doc/domain-display +/doc/dpoint-1 +/doc/estim-sites +/doc/extend +/doc/extension-ignore +/doc/figures/*.png +/doc/fill +/doc/fill-call-1 +/doc/fill-imageif-cfun +/doc/fill-part-image +/doc/fill-subdomain +/doc/fill-subdomain-shorter +/doc/forall-piter +/doc/fun-p2v-1 +/doc/graph-data +/doc/graph-iter +/doc/ima-has +/doc/ima-load +/doc/ima-save +/doc/ima-size +/doc/ima2d-1 +/doc/ima2d-2 +/doc/ima2d-3 +/doc/ima2d-4 +/doc/ima2d-5 +/doc/ima2d-6-clone +/doc/ima2d-7 +/doc/ima2d-rot +/doc/labeling-compute +/doc/logical-not +/doc/milena.tag +/doc/mln_var +/doc/parray-append +/doc/parray-bbox +/doc/paste +/doc/paste-call-1 +/doc/point-1 +/doc/predicate-1 +/doc/ref-guide.dox +/doc/ref-guide.pdf +/doc/ref-guide/ +/doc/technical.pdf +/doc/technical/ +/doc/tmp.t2d +/doc/tools/data.hh +/doc/tuto2_first_image +/doc/tuto3_colorize +/doc/tuto3_first_routine +/doc/tuto3_println +/doc/tuto3_rw_image +/doc/tuto3_trace +/doc/tuto4_genericity_and_algorithms +/doc/tuto4_image +/doc/tuto4_point2d +/doc/tuto4_site_set_create +/doc/tutorial.dox +/doc/tutorial.pdf +/doc/tutorial/ +/doc/user-refman +/doc/user-refman.pdf +/doc/white-paper.pdf +/doc/white-paper/ +/doc/win-create-1 +/doc/win-create-2 + +/tools/area_flooding +/tools/compute_local_configurations +/tools/connectivity_numbers_3d +/tools/seed2tiling diff --git a/milena/doc/.gitignore b/milena/doc/.gitignore deleted file mode 100644 index 6010cc6..0000000 --- a/milena/doc/.gitignore +++ /dev/null @@ -1,23 +0,0 @@ -/Doxyfile_user -/user-refman -/user-refman.pdf - -/Doxyfile_devel -/devel-refman -/devel-refman.pdf - -/figures/*.png - -/ref-guide.dox -/ref-guide.pdf -/ref-guide/ - -/technical.pdf -/technical/ - -/tutorial.dox -/tutorial.pdf -/tutorial/ - -/white-paper.pdf -/white-paper/ diff --git a/milena/tests/.gitignore b/milena/tests/.gitignore new file mode 100644 index 0000000..842b91a --- /dev/null +++ b/milena/tests/.gitignore @@ -0,0 +1,699 @@ +/accu/all_accus +/accu/compute +/accu/histo +/accu/image/init +/accu/image/set_value +/accu/image/take +/accu/image/take_as_init +/accu/image/take_n_times +/accu/image/to_result +/accu/image/untake +/accu/line +/accu/math/count +/accu/max_site +/accu/nil +/accu/pair +/accu/shape/bbox +/accu/site_set/rectangularity +/accu/stat/deviation +/accu/stat/max +/accu/stat/max_h +/accu/stat/mean +/accu/stat/median_h +/accu/stat/min +/accu/stat/min_h +/accu/stat/min_max +/accu/stat/rank +/accu/stat/var +/accu/transform +/accu/transform_diagonal +/accu/transform_directional +/accu/transform_line +/accu/transform_snake +/accu/tuple + +/algebra/h_mat +/algebra/h_vec +/algebra/mat +/algebra/mat2 +/algebra/quat +/algebra/vec +/algebra/vec2 + +/all_headers + +/arith/diff_abs +/arith/minus +/arith/plus +/arith/revert +/arith/times + +/binarization/threshold +/binarization/threshold-out1.pgm +/binarization/threshold-out2.pgm + +/border/adjust +/border/duplicate +/border/equalize +/border/fill +/border/fill_0 +/border/find +/border/get +/border/mirror +/border/mirror_full +/border/resize +/border/resize_equal +/border/resize_image1d_1 +/border/resize_image1d_2 +/border/resize_image1d_3 +/border/resize_image2d_1 +/border/resize_image2d_2 +/border/resize_image2d_3 +/border/resize_image3d_1 +/border/resize_image3d_2 +/border/resize_image3d_3 +/border/resize_image_if +/border/resize_sub_image + +/canvas/browsing/breadth_first_search +/canvas/browsing/depth_first_search +/canvas/browsing/dir_struct_elt_incr_update +/canvas/browsing/fwd +/canvas/browsing/hyper_directional +/canvas/browsing/snake_fwd +/canvas/browsing/snake_vert +/canvas/chamfer +/canvas/morpho/attribute_filter + +/convert/impl/from_site_set_to_image +/convert/to_image +/convert/to_p_array +/convert/to_p_set +/convert/to_qimage +/convert/to_qimage_nocopy +/convert/to_rgb +/convert/to_window + +/core/alias/box1d +/core/alias/box2d +/core/alias/box3d +/core/alias/dpoint1d +/core/alias/dpoint2d +/core/alias/dpoint3d +/core/alias/neighb2d +/core/alias/point1d +/core/alias/point2d +/core/alias/point3d +/core/alias/w_window1d_int +/core/alias/w_window2d_int +/core/alias/w_window3d_int +/core/alias/window1d +/core/alias/window2d +/core/alias/window3d +/core/image/complex_image +/core/image/dmorph/hexa +/core/image/dmorph/image2d_h +/core/image/dmorph/image_if +/core/image/dmorph/p2p_image +/core/image/dmorph/slice_image +/core/image/dmorph/sub_image +/core/image/dmorph/transformed_image +/core/image/dmorph/unproject_image +/core/image/edge_image +/core/image/flat_image +/core/image/graph_image +/core/image/image1d +/core/image/image2d +/core/image/image3d +/core/image/imorph/decorated_image +/core/image/imorph/interpolated +/core/image/imorph/interpolated-tr_image-composed +/core/image/imorph/interpolated-tr_image-rotation +/core/image/imorph/labeled_image +/core/image/imorph/safe_image +/core/image/imorph/tr_image +/core/image/line_graph_image +/core/image/vertex_and_edge_image +/core/image/vertex_image +/core/image/vmorph/cast_image +/core/image/vmorph/fun_image +/core/image/vmorph/fun_image_rgb +/core/other/box_runend_piter +/core/other/box_runstart_piter +/core/other/category +/core/other/dpoints_pixter +/core/other/graph_elt_neighborhood +/core/other/graph_elt_neighborhood_if +/core/other/graph_elt_window +/core/other/graph_elt_window_if +/core/other/neighb +/core/other/pixel +/core/other/pixter1d +/core/other/pixter1d_more +/core/other/pixter2d +/core/other/pixter2d_more +/core/other/pixter3d +/core/other/pixter3d_more +/core/other/point_set_compatibility +/core/other/var +/core/other/w_window +/core/routine/duplicate +/core/routine/exact +/core/routine/extend +/core/routine/initialize +/core/routine/primary +/core/site_set/box +/core/site_set/operators +/core/site_set/p_array +/core/site_set/p_complex +/core/site_set/p_edges +/core/site_set/p_if +/core/site_set/p_image +/core/site_set/p_priority_queue +/core/site_set/p_queue +/core/site_set/p_queue_fast +/core/site_set/p_set +/core/site_set/p_transformed +/core/site_set/p_vaccess +/core/site_set/p_vertices + +/data.hh + +/data/abs +/data/apply +/data/approx/median +/data/approx/median-out_oct.pgm +/data/approx/median-out_rec.pgm +/data/compare +/data/compute +/data/compute_in_window +/data/convert +/data/fill +/data/fill_with_image +/data/fill_with_value +/data/median +/data/median-out_line.pgm +/data/median-out_rect.pgm +/data/median_fast +/data/median_fast-out.pgm +/data/memcpy_ +/data/memset_ +/data/naive/median +/data/naive/median-out.pgm +/data/paste +/data/paste_without_localization +/data/saturate +/data/sort_psites +/data/split +/data/stretch +/data/transform +/data/transform_inplace +/data/update + +/debug/iota +/debug/println +/debug/println_with_border +/debug/slices_2d + +/draw/dashed_line +/draw/graph +/draw/line + +/essential_headers + +/estim/mean +/estim/min_max + +/extension/fill + +/fun/i2v/all_to +/fun/i2v/array +/fun/i2v/value_at_index +/fun/ops +/fun/p2p/fold +/fun/p2p/translation +/fun/stat/mahalanobis +/fun/v2i/index_of_value +/fun/v2v/hsl_to_rgb +/fun/v2v/norm +/fun/v2v/projection +/fun/v2v/qt_rgb_to_int_u +/fun/v2v/rgb_to_hsl +/fun/v2v/wrap +/fun/vv2v/max +/fun/vv2v/min +/fun/x2x/composed +/fun/x2x/rotation +/fun/x2x/translation + +/geom/bbox +/geom/horizontal_symmetry +/geom/max_col +/geom/max_ind +/geom/max_row +/geom/max_sli +/geom/min_col +/geom/min_ind +/geom/min_row +/geom/min_sli +/geom/ncols +/geom/ninds +/geom/nrows +/geom/nsites +/geom/nslis +/geom/pmin_pmax +/geom/rotate +/geom/seed2tiling +/geom/seed2tiling_roundness +/geom/translate +/geom/vertical_symmetry + +/global_vars + +/graph/attribute/card +/graph/attribute/representative +/graph/labeling + +/histo/compute +/histo/point_from_value +/histo/to_image1d + +/io/dump/dump +/io/dump/dump-bool-3d.dump +/io/dump/dump-bool.dump +/io/dump/dump-double.dump +/io/dump/dump-float.dump +/io/dump/dump-int_u8.dump +/io/dump/dump-rgb8.dump +/io/dump/dump-unsigned.dump +/io/fits/fits +/io/fits/fits-out.pfm +/io/fits/fits-out2.pfm +/io/fld/fld1d +/io/fld/fld2d +/io/fld/fld3d +/io/magick/load +/io/magick/save +/io/magick/save-tiny-temp.pbm +/io/magick/save-tiny-temp.pgm +/io/magick/save-tiny-temp.png +/io/magick/save-tiny.pbm +/io/magick/save-tiny.pgm +/io/magick/save-tiny.ppm +/io/off/load_bin +/io/off/load_float +/io/off/load_save_bin +/io/off/load_save_bin-out.off +/io/pbm/pbm +/io/pbm/pbm-out.pbm +/io/pbm/pbm_ascii +/io/pbm/pbm_ascii-out.pbm +/io/pbms/load +/io/pbms/pbms-out.pbm +/io/pdf/load +/io/pgm/pgm +/io/pgm/pgm-out.pgm +/io/pgm/pgm-out2.pgm +/io/pgm/pgm16 +/io/pgm/pgm16-out16.pgm +/io/pgm/pgm16-out8.pgm +/io/pgm/pgm19 +/io/pgm/pgm19-out19.pgm +/io/pgm/pgm19-out8.pgm +/io/pgm/pgm27 +/io/pgm/pgm27-out27.pgm +/io/pgm/pgm27-out8.pgm +/io/pgm/pgm_ascii +/io/pgm/pgm_ascii-out.pgm +/io/pgm/pgm_ascii-out2.pgm +/io/pgms/load +/io/pgms/pgms-out.pgm +/io/ppm/ppm +/io/ppm/ppm-out.ppm +/io/ppm/ppm16 +/io/ppm/ppm16-out16.ppm +/io/ppm/ppm16-out8.ppm +/io/ppm/ppm23 +/io/ppm/ppm23-out23.ppm +/io/ppm/ppm23-out8.ppm +/io/ppm/ppm_ascii +/io/ppms/load +/io/ppms/load-out.ppm +/io/tiff/load +/io/vtk/load_bin +/io/vtk/load_save_bin +/io/vtk/load_save_bin-out.vtk +/io/vtk/save +/io/vtk/save-tetrahedron-bool.vtk +/io/vtk/save-tetrahedron-float.vtk +/io/vtk/save-tetrahedron-int_u8.vtk +/io/vtk/save-tetrahedron-rgb8.vtk +/io/vtk/save-tetrahedron-unsigned.vtk + +/labeling/background +/labeling/blobs +/labeling/blobs_and_compute +/labeling/compute +/labeling/fill_holes +/labeling/flat_zones +/labeling/foreground +/labeling/mean_values +/labeling/n_max +/labeling/pack +/labeling/regional_maxima +/labeling/regional_minima +/labeling/relabel +/labeling/value +/labeling/wrap + +/linear/convolve +/linear/convolve-out.pgm +/linear/convolve_2x1d +/linear/convolve_2x1d-out.pgm +/linear/convolve_directional +/linear/convolve_directional-out.pgm +/linear/gaussian-out.pgm +/linear/gaussian_ +/linear/lap +/linear/lap-out.pgm +/linear/local/convolve +/linear/log +/linear/log-out.pgm +/linear/sobel_2d +/linear/sobel_2d-out.pgm +/literal/black +/literal/colors +/literal/identity +/literal/max +/literal/medium_gray +/literal/min +/literal/one +/literal/origin +/literal/white +/literal/zero + +/logical/and +/logical/and_not +/logical/not +/logical/or +/logical/xor + +/make/attachment +/make/detachment +/make/dual_neighb +/make/dummy_p_edges +/make/dummy_p_vertices +/make/h_mat +/make/image2d +/make/image3d +/make/influence_zone_adjacency_graph +/make/mat +/make/p_edges_with_mass_centers +/make/p_vertices_with_mass_centers +/make/rag_and_labeled_wsl +/make/region_adjacency_graph +/make/w_window +/make/w_window_directional + +/metal/converts_to +/metal/is +/metal/math/pow +/metal/math/root +/metal/unconst + +/morpho/Rd +/morpho/approx/dilation +/morpho/approx/dilation-out.pbm +/morpho/approx/dilation-ref.pbm +/morpho/approx/erosion +/morpho/approx/erosion-out.pbm +/morpho/approx/erosion-ref.pbm +/morpho/artificial_line_graph_image_wst +/morpho/artificial_line_graph_image_wst-out.ppm +/morpho/attribute/card +/morpho/attribute/height +/morpho/attribute/sum +/morpho/attribute/volume +/morpho/closing/algebraic +/morpho/closing/algebraic-out.pgm +/morpho/closing/approx/structural +/morpho/closing/approx/structural-out.pbm +/morpho/closing/approx/structural-ref.pbm +/morpho/closing/area +/morpho/closing/area_on_vertices +/morpho/closing/height +/morpho/closing/height-out.pgm +/morpho/closing/leveling +/morpho/closing/leveling-out.pgm +/morpho/closing/structural +/morpho/closing/structural-out.pgm +/morpho/closing/sum +/morpho/closing/sum-out.pgm +/morpho/closing/volume +/morpho/closing/volume-out.pgm +/morpho/closing/volume-ref.pgm +/morpho/complex_image_morpho +/morpho/complex_image_wst +/morpho/complex_image_wst-wst.neato +/morpho/constrast-out.pgm +/morpho/contrast +/morpho/dilation +/morpho/dilation-out1.pgm +/morpho/dilation-out2.pgm +/morpho/dilation-out3.pgm +/morpho/elementary/closing +/morpho/elementary/dilation +/morpho/elementary/erosion +/morpho/elementary/gradient +/morpho/elementary/gradient_external +/morpho/elementary/gradient_internal +/morpho/elementary/laplacian +/morpho/elementary/opening +/morpho/elementary/top_hat +/morpho/erosion +/morpho/general +/morpho/gradient +/morpho/gradient-out.pgm +/morpho/graph_image_morpho +/morpho/graph_image_wst +/morpho/hit_or_miss +/morpho/hit_or_miss-out.pbm +/morpho/laplacian +/morpho/laplacian-out.pgm +/morpho/lena_line_graph_image_wst1 +/morpho/lena_line_graph_image_wst1-out.ppm +/morpho/lena_line_graph_image_wst2 +/morpho/lena_line_graph_image_wst2-out.ppm +/morpho/line_graph_image_morpho +/morpho/line_graph_image_wst +/morpho/opening/algebraic +/morpho/opening/algebraic-out.pgm +/morpho/opening/approx/structural +/morpho/opening/approx/structural-out.pbm +/morpho/opening/approx/structural-ref.pbm +/morpho/opening/area +/morpho/opening/area-out.pgm +/morpho/opening/area_on_vertices +/morpho/opening/height +/morpho/opening/height-out.pgm +/morpho/opening/leveling +/morpho/opening/leveling-out.pgm +/morpho/opening/structural +/morpho/opening/structural-out.pgm +/morpho/opening/sum +/morpho/opening/sum-out.pgm +/morpho/opening/volume +/morpho/opening/volume-out.pgm +/morpho/rank_filter +/morpho/reconstruction/by_dilation/union_find_on_functions +/morpho/reconstruction/by_dilation/union_find_on_sets +/morpho/reconstruction/by_erosion/union_find_on_functions +/morpho/reconstruction/by_erosion/union_find_on_sets +/morpho/skeleton_constrained +/morpho/thinning +/morpho/thinning-out.pbm +/morpho/top_hat +/morpho/tree/compute_attribute_image +/morpho/tree/compute_parent +/morpho/tree/data +/morpho/tree/dual_input_tree +/morpho/tree/filter/filter +/morpho/tree/max +/morpho/watershed/flooding +/morpho/watershed/flooding-tmp_out.pgm +/morpho/watershed/flooding-tmp_ref.pgm +/morpho/watershed/superpose +/morpho/watershed/topological +/morpho/watershed/topological-out.pgm + +/norm/l1 +/norm/l2 +/norm/linfty + +/opt/at + +/pw/bind +/pw/image +/pw/value + +/set/card +/set/compute +/set/compute_with_weights +/set/diff +/set/inter +/set/sym_diff +/set/uni +/set/unique + +/test/positive + +/topo/complex +/topo/connectivity_numbers_2d +/topo/detach_pair +/topo/detach_pair-out.vtk +/topo/is_facet +/topo/is_simple_pair +/topo/skeleton/breadth_first_thinning +/topo/skeleton/breadth_first_thinning-small.pbm +/topo/skeleton/breadth_first_thinning_constrained +/topo/skeleton/breadth_first_thinning_constrained-small.pbm +/topo/skeleton/crest +/topo/skeleton/is_simple_point +/topo/skeleton/priority_driven_thinning +/topo/skeleton/priority_driven_thinning-small.pbm +/topo/skeleton/priority_driven_thinning_constrained +/topo/skeleton/priority_driven_thinning_constrained-small.pbm + +/trait/ch_value +/trait/image/images +/trait/op/plus +/trait/op/uminus +/trait/super +/trait/value/comp +/trait/value/values + +/transform/bench_closest_point_geodesic +/transform/distance_and_closest_point_geodesic +/transform/distance_front +/transform/distance_geodesic +/transform/fft +/transform/fft.pgm +/transform/fft_copy.pgm +/transform/fft_low_pass.pgm +/transform/fft_trans_clipped.pgm +/transform/fft_trans_cropped.pgm +/transform/fft_trans_log.pgm +/transform/hough +/transform/influence_zone_front +/transform/influence_zone_geodesic +/transform/influence_zone_geodesic_saturated + +/unit_test/mln_accu_* +/unit_test/mln_algebra_* +/unit_test/mln_all +/unit_test/mln_arith_* +/unit_test/mln_binarization_* +/unit_test/mln_border_* +/unit_test/mln_canvas_* +/unit_test/mln_clustering_kmean_* +/unit_test/mln_convert_* +/unit_test/mln_core_* +/unit_test/mln_data_* +/unit_test/mln_debug_* +/unit_test/mln_display_* +/unit_test/mln_draw_* +/unit_test/mln_essential_* +/unit_test/mln_estim_* +/unit_test/mln_extension_* +/unit_test/mln_fun_* +/unit_test/mln_geom_* +/unit_test/mln_graph_* +/unit_test/mln_histo_* +/unit_test/mln_io_* +/unit_test/mln_labeling_* +/unit_test/mln_linear_* +/unit_test/mln_literal_* +/unit_test/mln_logical_* +/unit_test/mln_make_* +/unit_test/mln_math_* +/unit_test/mln_metal_* +/unit_test/mln_morpho_* +/unit_test/mln_norm_* +/unit_test/mln_opt_* +/unit_test/mln_pw_* +/unit_test/mln_registration_* +/unit_test/mln_set_* +/unit_test/mln_subsampling_* +/unit_test/mln_tag_* +/unit_test/mln_test_* +/unit_test/mln_topo_* +/unit_test/mln_trait_* +/unit_test/mln_transform_* +/unit_test/mln_upscaling_* +/unit_test/mln_util_* +/unit_test/mln_value_* +/unit_test/mln_version +/unit_test/mln_win_* +/unit_test/mln_world_* + +/upscaling/art/scale2x +/upscaling/art/scale3x + +/util/adjacency_matrix +/util/branch_iter +/util/branch_iter_ind +/util/eat +/util/fibonacci_heap +/util/graph +/util/lazy_set +/util/lemmings +/util/line_graph +/util/ord +/util/ord_pair +/util/set +/util/soft_heap +/util/tree +/util/tree_fast +/util/tree_to_fast + +/value/bool +/value/builtin/builtin +/value/builtin/floatings +/value/equiv +/value/graylevel +/value/int_s +/value/int_s16 +/value/int_u8 +/value/label +/value/proxy +/value/rgb8 +/value/set +/value/sign + +/win/backdiag2d +/win/ball +/win/cube3d +/win/cuboid3d +/win/diag2d +/win/diff +/win/disk2d +/win/hline2d +/win/inter +/win/octagon2d +/win/rectangle2d +/win/segment1d +/win/shift +/win/sphere3d +/win/sym +/win/vline2d + +/world/binary_2d/enlarge +/world/binary_2d/subsample +/world/binary_2d/subsample-small.pgm +/world/inter_pixel/compute +/world/inter_pixel/dim2/make_edge_image +/world/inter_pixel/display_edge +/world/inter_pixel/immerse +/world/inter_pixel/is_pixel +/world/inter_pixel/is_separator +/world/inter_pixel/separator_to_pixels diff --git a/scribo/.gitignore b/scribo/.gitignore new file mode 100644 index 0000000..f82c704 --- /dev/null +++ b/scribo/.gitignore @@ -0,0 +1,131 @@ +/demo/viewer/demodir.hh +/demo/viewer/scribo-viewer +/demo/xml2doc/datarootdir.hh +/demo/xml2doc/scribo-xml2doc + +/doc/Doxyfile_devel +/doc/Doxyfile_user +/doc/devel-refman +/doc/devel-refman.pdf +/doc/scribo.tag +/doc/user-refman +/doc/user-refman.pdf + +/src/binarization/global_threshold +/src/binarization/kim +/src/binarization/niblack +/src/binarization/otsu +/src/binarization/pgm_global_threshold_auto +/src/binarization/sauvola +/src/binarization/sauvola_debug +/src/binarization/sauvola_ms +/src/binarization/sauvola_ms_debug +/src/binarization/sauvola_ms_fg +/src/binarization/sauvola_ms_split +/src/binarization/singh +/src/binarization/wolf +/src/content_in_doc +/src/content_in_hdoc +/src/contest/DAE-2011/content_in_doc_dae +/src/contest/DAE-2011/content_in_hdoc_dae +/src/contest/hbr-2013/content_in_hdoc_hbr +/src/contest/hdibco-2010/sauvola_ms_hdibco +/src/contest/hdlac-2011/content_in_hdoc_hdlac +/src/contest/hnla-2013/content_in_hdoc_hnla +/src/debug/highlight_text_area +/src/debug/show_components_bboxes +/src/debug/show_components_boldness +/src/debug/show_components_color +/src/debug/show_groups_bboxes +/src/debug/show_groups_bboxes_filtered +/src/debug/show_info_median_inter_characters +/src/debug/show_info_x_height +/src/debug/show_lines_boldness +/src/debug/show_links_bbox_h_ratio +/src/debug/show_links_bbox_overlap +/src/debug/show_links_bottom_aligned +/src/debug/show_links_bottom_aligned_2angles +/src/debug/show_links_center_aligned +/src/debug/show_links_left_right_links_validation +/src/debug/show_links_non_h_aligned +/src/debug/show_links_several_right_overlap +/src/debug/show_links_single_down +/src/debug/show_links_single_down_left_aligned +/src/debug/show_links_single_down_right_aligned +/src/debug/show_links_single_left +/src/debug/show_links_single_left_dmax_ratio +/src/debug/show_links_single_right +/src/debug/show_links_single_right_dmax_ratio +/src/debug/show_links_single_up +/src/debug/show_links_single_up_left_aligned +/src/debug/show_links_single_up_right_aligned +/src/debug/show_links_top_aligned +/src/debug/show_links_top_aligned_2angles +/src/debug/show_objects_large +/src/debug/show_objects_large_small +/src/debug/show_objects_small +/src/debug/show_objects_thick +/src/debug/show_objects_thin +/src/debug/show_paragraph_blocks +/src/debug/show_separators +/src/debug/show_stoppers +/src/debug/show_text_lines +/src/debug/show_text_lines_wo_seps +/src/filter/objects_large +/src/filter/objects_small +/src/filter/objects_thick +/src/filter/objects_thin +/src/filter/objects_with_holes +/src/filter/objects_with_holes_pgm +/src/misc/closure_rectangle +/src/misc/dmap +/src/misc/morpho +/src/misc/negate +/src/misc/rectangularity +/src/misc/superpose +/src/non_text_components +/src/pbm_text_in_doc +/src/postprocessing/fill_object_holes +/src/preprocessing/denoise_bg +/src/preprocessing/denoise_fg +/src/preprocessing/homogeneous_contrast +/src/preprocessing/preprocess +/src/preprocessing/rotate +/src/preprocessing/rotate_90 +/src/preprocessing/split_bg_fg +/src/preprocessing/subsample +/src/preprocessing/to_pgm +/src/preprocessing/unskew +/src/primitive/extract/alignments +/src/primitive/extract/discontinued_hlines +/src/primitive/extract/discontinued_lines +/src/primitive/extract/discontinued_vlines +/src/primitive/extract/lines_h_thick_and_thin +/src/primitive/extract/lines_pattern +/src/primitive/extract/lines_thick_and_thin +/src/primitive/extract/separators_nonvisible +/src/primitive/extract/thick_hlines +/src/primitive/extract/thick_vlines +/src/primitive/find/find_discontinued_lines +/src/primitive/find/find_pattern_lines +/src/primitive/find/find_single_lines +/src/primitive/find/find_thick_and_single_lines +/src/primitive/find/find_thick_lines +/src/primitive/group/group_from_double_link +/src/primitive/group/group_from_double_several_links +/src/primitive/group/group_from_rag +/src/primitive/group/group_from_several_left_links +/src/primitive/group/group_from_single_link +/src/primitive/remove/separators +/src/scribo-cli +/src/text/cleantxt +/src/text/pbm_lines_recognition +/src/text/pbm_recognition +/src/text_in_doc_preprocess +/src/text_in_picture +/src/text_in_picture_dual +/src/text_recognition_in_picture +/src/toolchain/nepomuk/text_extraction +/src/util/component_precise_outline + +/tests/data.hh diff --git a/scribo/doc/.gitignore b/scribo/doc/.gitignore deleted file mode 100644 index f3ffa9c..0000000 --- a/scribo/doc/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/Doxyfile_user -/user-refman -/user-refman.pdf - -/Doxyfile_devel -/devel-refman -/devel-refman.pdf diff --git a/scribo/tests/.gitignore b/scribo/tests/.gitignore new file mode 100644 index 0000000..77c018b --- /dev/null +++ b/scribo/tests/.gitignore @@ -0,0 +1,81 @@ +/binarization/global_threshold +/binarization/kim +/binarization/local_threshold +/binarization/niblack +/binarization/niblack_fast +/binarization/otsu +/binarization/sauvola +/binarization/sauvola_ms +/binarization/sauvola_ms_tiff +/binarization/wolf +/binarization/wolf_fast + +/convert/base64 + +/core/line_info +/core/object_groups + +/estim/font_boldness +/estim/font_color + +/filter/components_large +/filter/components_small +/filter/object_groups_mean_width +/filter/object_groups_size_ratio +/filter/object_groups_small +/filter/object_groups_with_holes +/filter/object_links_bbox_h_ratio +/filter/object_links_bbox_overlap +/filter/object_links_bbox_w_ratio +/filter/object_links_bottom_aligned +/filter/object_links_center_aligned +/filter/object_links_left_aligned +/filter/object_links_right_aligned +/filter/object_links_top_aligned +/filter/objects_on_border +/filter/objects_with_holes + +/layout/xy_cut + +/preprocessing/crop +/preprocessing/crop_without_localization +/preprocessing/deskew +/preprocessing/rotate_90 + +/primitive/extract/alignments +/primitive/extract/lines_discontinued +/primitive/extract/lines_h_discontinued +/primitive/extract/lines_h_pattern +/primitive/extract/lines_v_discontinued +/primitive/extract/lines_v_pattern +/primitive/link/merge_double_link + +/toolchain/nepomuk/text_extraction + +/unit_test/scribo_afp_* +/unit_test/scribo_all +/unit_test/scribo_binarization_* +/unit_test/scribo_canvas_* +/unit_test/scribo_convert_* +/unit_test/scribo_core_* +/unit_test/scribo_debug_* +/unit_test/scribo_draw_* +/unit_test/scribo_estim_* +/unit_test/scribo_filter_* +/unit_test/scribo_fun_* +/unit_test/scribo_io_* +/unit_test/scribo_layout_* +/unit_test/scribo_make_* +/unit_test/scribo_postprocessing_* +/unit_test/scribo_preprocessing_* +/unit_test/scribo_primitive_* +/unit_test/scribo_subsampling_* +/unit_test/scribo_table_* +/unit_test/scribo_text_* +/unit_test/scribo_toolchain_* +/unit_test/scribo_upsampling_* +/unit_test/scribo_util_* + +/util/color_to_hex +/util/component_precise_outline +/util/hex_to_color diff --git a/swilena/.gitignore b/swilena/.gitignore new file mode 100644 index 0000000..4b138cb --- /dev/null +++ b/swilena/.gitignore @@ -0,0 +1,25 @@ +/python/*-wrap.cc +/python/box2d.py +/python/box2d_piter.py +/python/complex2.py +/python/config.py +/python/data.py +/python/dpoint2d.py +/python/dynamic_image2d-wrap.h +/python/dynamic_image2d.py +/python/image2d_int.py +/python/image2d_int_u8.py +/python/image2d_point2d.py +/python/image2d_rgb8.py +/python/int_u24.py +/python/int_u8.py +/python/morpho-fun-*.pgm +/python/morpho-segm-*.pgm +/python/neighb2d.py +/python/point2d.py +/python/rgb8.py +/python/sps +/python/sps-gdb-local +/python/sps-local +/python/window2d.py +/run -- 1.7.10.4

9 years, 10 months

olena: branch next updated: olena-2.0-935-g88bdb19

by git＠lrde.epita.fr

9 years, 10 months

olena: branch master updated: olena-2.0-899-gd92a1e5

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 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

9 years, 10 months

olena: branch next updated: olena-2.0-899-gd92a1e5

by git＠lrde.epita.fr

9 years, 10 months

olena: olena-2.0-899-gd92a1e5 Address compiler warnings in Scribo.

by Roland Levillain

* 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

9 years, 10 months

olena: olena-2.0-898-g405e0aa Add warning flags to Scribo compiler flags.

by Roland Levillain

* 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

9 years, 10 months

olena: olena-2.0-897-gd335296 Fix the construction of mln::io::pdf::pdf_header.

by Roland Levillain

* 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

9 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches