[libvigraimpex] 02/07: Merge tag 'upstream/0.10.0+git20160120.803d5d4'

Daniel Stender danstender-guest at moszumanska.debian.org
Mon Jan 25 22:11:40 UTC 2016


This is an automated email from the git hooks/post-receive script.

danstender-guest pushed a commit to branch master
in repository libvigraimpex.

commit fa7a0f1eb864010ba900c329df61729064b61694
Merge: c90602a 1adbfc9
Author: Daniel Stender <debian at danielstender.com>
Date:   Mon Jan 25 17:13:19 2016 +0100

    Merge tag 'upstream/0.10.0+git20160120.803d5d4'
    
    Upstream version 0.10.0+git20160120.803d5d4

 CMakeLists.txt                                     |  151 +-
 README.md                                          |    9 +-
 config/FindHDF5.cmake                              |   54 +-
 config/FindVIGRANUMPY_DEPENDENCIES.cmake           |    4 +-
 config/VIGRA_ADD_NUMPY_MODULE.cmake                |   59 +-
 config/VigraAddTest.cmake                          |  116 +-
 config/VigraConfigureThreading.cmake               |   32 +
 config/VigraDetectCppVersion.cmake                 |   21 +
 config/VigraDetectThreading.cmake                  |   53 +
 config/VigraFindPackage.cmake                      |   10 +-
 config/VigraSetDefaults.cmake                      |    4 +
 config/checkTemplateDepth.cxx                      |   16 +
 config/check_std_thread.cxx                        |    3 +
 config/nuget/vigra.nuspec                          |   29 +
 config/nuget/vigra.redist.nuspec                   |   22 +
 config/nuget/vigra.redist.targets                  |    6 +
 config/nuget/vigra.targets                         |   11 +
 config/output_cplusplus_version.cxx                |   19 +
 config/run_test.bat.in                             |    8 +-
 config/run_test.sh.in                              |    2 +-
 config/testdebug.vcxproj.user.in                   |   17 +
 docsrc/Doxyfile.in                                 | 1156 +--
 docsrc/credits_changelog.dxx                       |  567 +-
 docsrc/examples.dxx                                |   66 +-
 docsrc/image_processing.dxx                        |    2 +-
 docsrc/index.dxx                                   |   51 +-
 docsrc/makeFunctionIndex.py                        |   70 +-
 docsrc/post.py                                     |   13 +-
 docsrc/tutorial.dxx                                |   64 +-
 include/vigra/accessor.hxx                         |   78 +-
 include/vigra/accumulator-grammar.hxx              |   26 +
 include/vigra/accumulator.hxx                      | 2562 +++---
 include/vigra/adjacency_list_graph.hxx             | 1165 +++
 include/vigra/affine_registration.hxx              |  362 +-
 include/vigra/affine_registration_fft.hxx          |  754 ++
 include/vigra/algorithm.hxx                        |   84 +-
 include/vigra/any.hxx                              |  407 +
 include/vigra/applywindowfunction.hxx              | 1010 +++
 include/vigra/array_vector.hxx                     |  109 +-
 include/vigra/axistags.hxx                         |   74 +-
 include/vigra/basicimage.hxx                       |   68 +-
 include/vigra/basicimageview.hxx                   |   36 +-
 include/vigra/blockify.hxx                         |  121 +
 include/vigra/blockwise_convolution.hxx            |  140 +
 include/vigra/blockwise_labeling.hxx               |  502 ++
 include/vigra/blockwise_watersheds.hxx             |  258 +
 include/vigra/box.hxx                              |   27 +-
 include/vigra/bucket_queue.hxx                     |  362 +-
 include/vigra/combineimages.hxx                    |    4 +-
 .../vigra/compression.hxx                          |   61 +-
 include/vigra/config.hxx                           |   76 +-
 .../{configVersion.hxx => config_version.hxx}      |    0
 include/vigra/convolution.hxx                      |  176 +-
 include/vigra/coordinate_iterator.hxx              |    3 +-
 include/vigra/correlation.hxx                      |  718 ++
 include/vigra/counting_iterator.hxx                |  407 +
 include/vigra/delegate/delegate.hxx                |   47 +
 include/vigra/delegate/detail/delegate_list.hxx    |  189 +
 .../vigra/delegate/detail/delegate_template.hxx    |  169 +
 include/vigra/eccentricitytransform.hxx            |  293 +
 include/vigra/edgedetection.hxx                    |   27 +-
 include/vigra/eigensystem.hxx                      |  186 +-
 include/vigra/fftw.hxx                             |   21 +
 include/vigra/fftw3.hxx                            |   28 +-
 include/vigra/fixedpoint.hxx                       |    2 +-
 include/vigra/graph_algorithms.hxx                 | 1566 ++++
 include/vigra/graph_generalization.hxx             |  252 +
 include/vigra/graph_item_impl.hxx                  |  575 ++
 include/vigra/graph_maps.hxx                       |  399 +
 include/vigra/graph_rag_project_back.hxx           |  193 +
 include/vigra/graphs.hxx                           |  155 +-
 include/vigra/hdf5impex.hxx                        | 1369 +++-
 include/vigra/hierarchical_clustering.hxx          |  797 ++
 include/vigra/histogram.hxx                        |   32 +-
 include/vigra/imagecontainer.hxx                   |    9 +-
 include/vigra/imageinfo.hxx                        |    5 +-
 include/vigra/imageiterator.hxx                    |   58 +-
 include/vigra/impex.hxx                            |    3 +-
 include/vigra/impexalpha.hxx                       |    2 +-
 include/vigra/impexbase.hxx                        |    6 +-
 include/vigra/integral_image.hxx                   |  219 +
 include/vigra/iteratoradapter.hxx                  |   24 +-
 include/vigra/iteratorfacade.hxx                   |  174 +
 include/vigra/iteratortraits.hxx                   |    2 +-
 include/vigra/labelimage.hxx                       |   80 +-
 include/vigra/labelvolume.hxx                      |  135 +-
 include/vigra/linear_solve.hxx                     |   39 +-
 include/vigra/mathutil.hxx                         |  373 +-
 include/vigra/matrix.hxx                           |   32 +-
 include/vigra/medianfilter.hxx                     |  193 +
 include/vigra/memory.hxx                           |  132 +-
 include/vigra/merge_graph_adaptor.hxx              | 1454 ++++
 include/vigra/metaprogramming.hxx                  |   64 +-
 include/vigra/metrics.hxx                          |  277 +
 include/vigra/multi_array.hxx                      |  150 +-
 include/vigra/multi_array_chunked.hxx              | 3477 ++++++++
 include/vigra/multi_array_chunked_hdf5.hxx         |  463 ++
 include/vigra/multi_blocking.hxx                   |  345 +
 include/vigra/multi_blockwise.hxx                  |  463 ++
 include/vigra/multi_convolution.hxx                |  505 +-
 include/vigra/multi_distance.hxx                   |  354 +-
 include/vigra/multi_fft.hxx                        |  300 +-
 include/vigra/multi_fwd.hxx                        |  223 +
 include/vigra/multi_gridgraph.hxx                  |  367 +-
 include/vigra/multi_handle.hxx                     | 1103 +++
 include/vigra/multi_hierarchical_iterator.hxx      |  631 ++
 include/vigra/multi_histogram.hxx                  |  332 +
 include/vigra/multi_impex.hxx                      |  135 +-
 include/vigra/multi_iterator.hxx                   |   54 +-
 include/vigra/multi_iterator_coupled.hxx           |  797 +-
 include/vigra/multi_labeling.hxx                   |  393 +-
 include/vigra/multi_localminmax.hxx                |   36 +-
 include/vigra/multi_morphology.hxx                 |    2 +-
 include/vigra/multi_pointoperators.hxx             |   67 +-
 include/vigra/multi_shape.hxx                      |  133 +-
 include/vigra/multi_watersheds.hxx                 |  273 +-
 include/vigra/non_local_mean.hxx                   |  952 +++
 include/vigra/numerictraits.hxx                    |    4 -
 include/vigra/numpy_array.hxx                      |  116 +-
 include/vigra/numpy_array_converters.hxx           |   87 +-
 include/vigra/numpy_array_taggedshape.hxx          |   91 +-
 include/vigra/numpy_array_traits.hxx               |    2 +-
 include/vigra/overlapped_blocks.hxx                |  213 +
 include/vigra/pixelneighborhood.hxx                |    4 +-
 include/vigra/polygon.hxx                          | 1825 ++++-
 include/vigra/polynomial_registration.hxx          |  278 +
 .../vigra/print_backtrace.hxx                      |   82 +-
 .../vigra/{bucket_queue.hxx => priority_queue.hxx} |  202 +-
 include/vigra/project2ellipse.hxx                  |    6 +-
 include/vigra/projective_registration.hxx          |  245 +
 include/vigra/python_graph.hxx                     |  839 ++
 include/vigra/python_utility.hxx                   |   10 +-
 include/vigra/quadprog.hxx                         |   38 +-
 include/vigra/random.hxx                           |   28 +-
 include/vigra/random_access_set.hxx                |  635 ++
 include/vigra/random_forest.hxx                    |   18 +-
 include/vigra/random_forest/rf_algorithm.hxx       |   13 +-
 include/vigra/random_forest/rf_common.hxx          |    4 +-
 include/vigra/random_forest/rf_earlystopping.hxx   |   51 +-
 include/vigra/random_forest/rf_preprocessing.hxx   |   19 +-
 include/vigra/random_forest/rf_region.hxx          |    2 +-
 include/vigra/random_forest/rf_ridge_split.hxx     |    4 +-
 include/vigra/random_forest/rf_split.hxx           |   10 +-
 include/vigra/random_forest/rf_visitors.hxx        |   47 +-
 include/vigra/random_forest_hdf5_impex.hxx         |   55 +
 include/vigra/rbf_registration.hxx                 |  312 +
 include/vigra/recursiveconvolution.hxx             |    2 +-
 .../vigra/region_shrinking.hxx                     |   83 +-
 include/vigra/regression.hxx                       |   59 +-
 include/vigra/resampling_convolution.hxx           |  171 +-
 include/vigra/resizeimage.hxx                      |    7 +-
 include/vigra/rgbvalue.hxx                         |    1 -
 include/vigra/sampling.hxx                         |   16 +-
 include/vigra/seededregiongrowing.hxx              |    2 +-
 .../vigra/seg_to_seeds.hxx                         |   83 +-
 include/vigra/separableconvolution.hxx             |  222 +-
 include/vigra/shockfilter.hxx                      |  312 +
 include/vigra/singular_value_decomposition.hxx     |   10 +-
 include/vigra/skeleton.hxx                         |  974 +++
 include/vigra/slanted_edge_mtf.hxx                 |  225 +-
 include/vigra/slic.hxx                             |    6 +-
 include/vigra/specklefilters.hxx                   | 1197 +++
 include/vigra/stdconvolution.hxx                   |   33 +-
 include/vigra/threading.hxx                        |  381 +
 include/vigra/threadpool.hxx                       |  665 ++
 include/vigra/tinyvector.hxx                       |  407 +-
 include/vigra/transform_iterator.hxx               |  192 +
 include/vigra/transformimage.hxx                   |    4 +-
 include/vigra/tv_filter.hxx                        |  242 +-
 include/vigra/union_find.hxx                       |  260 +-
 include/vigra/unittest.hxx                         |   17 +-
 include/vigra/unsupervised_decomposition.hxx       |  122 +-
 include/vigra/utilities.hxx                        |   94 +-
 include/vigra/vector_distance.hxx                  |  534 ++
 include/vigra/visit_border.hxx                     |  179 +
 include/vigra/watersheds.hxx                       |   14 +-
 include/vigra/watersheds3d.hxx                     |   17 +-
 include/vigra/windows.h                            |    6 +
 src/examples/CMakeLists.txt                        |    1 +
 src/examples/nnlsq.cxx                             |   55 +
 src/impex/CMakeLists.txt                           |   25 +-
 src/impex/bmp.cxx                                  |    2 +-
 src/impex/compression.cxx                          |  204 +
 src/impex/gif.cxx                                  |   14 +-
 src/impex/hdf5impex.cxx                            |   22 +-
 src/impex/imageinfo.cxx                            |    6 +-
 src/impex/lz4.c                                    |  865 ++
 src/impex/lz4.h                                    |  249 +
 src/impex/png.cxx                                  |    2 +-
 src/impex/pnm.cxx                                  |    2 +-
 src/impex/tiff.cxx                                 |   74 +-
 test/CMakeLists.txt                                |   56 +-
 test/adjacency_list_graph/CMakeLists.txt           |    1 +
 test/adjacency_list_graph/test.cxx                 | 1549 ++++
 test/blockwisealgorithms/CMakeLists.txt            |   14 +
 test/blockwisealgorithms/test_convolution.cxx      |  129 +
 test/blockwisealgorithms/test_labeling.cxx         |  310 +
 test/blockwisealgorithms/test_watersheds.cxx       |  227 +
 .../blockwisealgorithms/utils.hxx                  |   70 +-
 test/classifier/data/CMakeLists.txt                |    2 +-
 test/classifier/data/bare.hdf5                     |  Bin 0 -> 1832 bytes
 test/classifier/data/empty.hdf5                    |    0
 test/classifier/test.cxx                           |  104 +-
 test/correlation/CMakeLists.txt                    |    9 +
 test/correlation/test.cxx                          |  317 +
 test/counting_iterator/CMakeLists.txt              |    1 +
 test/counting_iterator/test.cxx                    |  281 +
 test/delegates/CMakeLists.txt                      |    1 +
 .../vigra/memory.hxx => test/delegates/test.cxx    |  149 +-
 test/filters/CMakeLists.txt                        |    1 +
 test/filters/test.cxx                              |  477 ++
 test/fourier/CMakeLists.txt                        |    4 +-
 test/graph_algorithm/CMakeLists.txt                |    1 +
 test/graph_algorithm/test.cxx                      |  575 ++
 test/gridgraph/test.cxx                            |   46 +-
 test/hdf5impex/test.cxx                            |   54 +-
 test/impex/CMakeLists.txt                          |    2 +-
 test/impex/bilevel.tiff                            |  Bin 0 -> 15218 bytes
 test/impex/test.cxx                                |   67 +
 test/integral_image/CMakeLists.txt                 |    2 +
 test/integral_image/test.cxx                       |  255 +
 test/math/test.cxx                                 |  200 +-
 test/merge_graph_adaptor/CMakeLists.txt            |    2 +
 test/merge_graph_adaptor/test.cxx                  | 1732 ++++
 test/multiarray/CMakeLists.txt                     |   44 +-
 test/multiarray/compression-ratio-benchmark.xlsx   |  Bin 0 -> 18944 bytes
 test/multiarray/test.cxx                           |  291 +-
 test/multiarray/test_chunked.cxx                   | 1618 ++++
 test/multidistance/CMakeLists.txt                  |   21 +-
 test/multidistance/blatt.xv                        |  Bin 0 -> 263168 bytes
 test/multidistance/raw_skeleton.xv                 |  Bin 0 -> 263168 bytes
 test/multidistance/skeleton_length.xv              |  Bin 0 -> 1049600 bytes
 test/multidistance/skeleton_length_greater_100.xv  |  Bin 0 -> 263168 bytes
 .../skeleton_length_greater_50_percent.xv          |  Bin 0 -> 263168 bytes
 test/multidistance/skeleton_salience.xv            |  Bin 0 -> 1049600 bytes
 test/multidistance/skeleton_salience_greater_10.xv |  Bin 0 -> 263168 bytes
 .../skeleton_salience_greater_60_percent.xv        |  Bin 0 -> 263168 bytes
 test/multidistance/skeleton_topology.xv            |  Bin 0 -> 263168 bytes
 .../skeleton_topology_without_center.xv            |  Bin 0 -> 263168 bytes
 test/multidistance/test.cxx                        | 1563 ++--
 test/multidistance/test_data.hxx                   | 8498 ++++++++++++++++++++
 test/multimorphology/test.cxx                      |   97 +-
 test/objectfeatures/CMakeLists.txt                 |    2 +-
 .../objectfeatures/stand_alone_acc_chain.cxx       |  102 +-
 test/objectfeatures/test.cxx                       |  133 +-
 test/pixeltypes/test.cxx                           |   57 +-
 test/polygon/CMakeLists.txt                        |    2 +
 test/{math => polygon}/convex_hull_test.hxx        |   30 +-
 test/polygon/test.cxx                              |  902 +++
 test/registration/CMakeLists.txt                   |   14 +
 test/registration/nuernberg-1991.png               |  Bin 0 -> 365414 bytes
 test/registration/nuernberg-1995.png               |  Bin 0 -> 547291 bytes
 test/registration/test.cxx                         |  839 ++
 test/sampler/test.cxx                              |    4 +-
 test/simpleanalysis/test.cxx                       |  351 +-
 test/slic2d/slic.xv                                |  Bin 62464 -> 62464 bytes
 test/slic2d/test.cxx                               |    4 +-
 test/threadpool/CMakeLists.txt                     |    2 +
 test/threadpool/test.cxx                           |  257 +
 test/unsupervised/test.cxx                         |    8 +-
 test/utilities/CMakeLists.txt                      |    8 +-
 test/utilities/test.cxx                            | 1153 ++-
 test/volumelabeling/test.cxx                       |   12 +-
 test/watersheds3d/test.cxx                         |   88 +-
 vigranumpy/CMakeLists.txt                          |   50 +-
 vigranumpy/docsrc/CMakeLists.txt                   |   38 +-
 .../docsrc/{conf.py.in => conf.py.cmake2.in}       |    2 +-
 vigranumpy/docsrc/conf.py.in                       |    8 +-
 vigranumpy/docsrc/index.rst                        |   56 +-
 vigranumpy/examples/100075.jpg                     |  Bin 0 -> 30857 bytes
 vigranumpy/examples/12003.jpg                      |  Bin 0 -> 85164 bytes
 vigranumpy/examples/12074.jpg                      |  Bin 0 -> 60437 bytes
 vigranumpy/examples/69015.jpg                      |  Bin 0 -> 66924 bytes
 vigranumpy/examples/VigraGraphs.ipynb              |  309 +
 vigranumpy/examples/blocking.py                    |   34 +
 vigranumpy/examples/eccentricity_transform.py      |   26 +
 vigranumpy/examples/gaussian_rank.py               |   17 +
 vigranumpy/examples/graph_3cycles.py               |   49 +
 .../examples/graph_agglomerative_clustering.py     |   69 +
 vigranumpy/examples/graph_felzenszwalb.py          |   43 +
 vigranumpy/examples/graph_smoothing.py             |   20 +
 vigranumpy/examples/graph_watersheds.py            |   61 +
 vigranumpy/examples/grid_graph_shortestpath.py     |  150 +
 vigranumpy/examples/islands.png                    |  Bin 0 -> 19987 bytes
 vigranumpy/examples/merge_graph.py                 |   68 +
 vigranumpy/examples/non_local_mean_2d_color.py     |   19 +
 vigranumpy/examples/rag_features.py                |   19 +
 vigranumpy/examples/shock_filter.py                |   25 +
 vigranumpy/lib/__init__.py                         | 2359 +++++-
 vigranumpy/lib/arraytypes.py                       |  882 +-
 vigranumpy/lib/pyqt/imagewindow.py                 |    2 +-
 vigranumpy/{setup.py.in => setup.py.cmake2.in}     |    6 +-
 vigranumpy/setup.py.in                             |    8 +-
 vigranumpy/src/core/CMakeLists.txt                 |   54 +-
 .../src/core/accumulator-region-singleband.cxx     |  351 +
 .../{vigranumpycore.cxx => adjacencyListGraph.cxx} |   89 +-
 vigranumpy/src/core/axistags.cxx                   |   52 +-
 vigranumpy/src/core/blockwise.cxx                  |  300 +
 .../core/{vigranumpycore.cxx => clustering.cxx}    |   43 +-
 vigranumpy/src/core/colors.cxx                     |   59 +-
 ...ranumpycore.cxx => construct_custodian_for.hpp} |   82 +-
 vigranumpy/src/core/converters.cxx                 |    5 +
 vigranumpy/src/core/convolution.cxx                |  239 +-
 .../src/core/export_graph_algorithm_visitor.hxx    | 1100 +++
 ...xport_graph_hierarchical_clustering_visitor.hxx |  477 ++
 vigranumpy/src/core/export_graph_rag_visitor.hxx   |  950 +++
 .../core/export_graph_shortest_path_visitor.hxx    |  348 +
 vigranumpy/src/core/export_graph_visitor.hxx       |  590 ++
 vigranumpy/src/core/filters.cxx                    |  135 +-
 .../src/core/{vigranumpycore.cxx => graphs.cxx}    |   75 +-
 .../core/{vigranumpycore.cxx => gridGraph2d.cxx}   |  103 +-
 .../core/{vigranumpycore.cxx => gridGraph3d.cxx}   |  102 +-
 vigranumpy/src/core/gridGraphNd.cxx                |  131 +
 .../core/{vigranumpycore.cxx => gridGraphNd.hxx}   |  100 +-
 .../src/core/grid_graph_implicit_edge_maps.cxx     |  136 +
 vigranumpy/src/core/histogram.cxx                  |  210 +
 vigranumpy/src/core/impex.cxx                      |    5 +-
 vigranumpy/src/core/learning.cxx                   |   30 +-
 ...ator-region-singleband.cxx => minindexedpq.cxx} |   70 +-
 vigranumpy/src/core/morphology.cxx                 |  450 +-
 vigranumpy/src/core/multi_array_chunked.cxx        |  804 ++
 vigranumpy/src/core/non_local_mean.cxx             |  182 +
 vigranumpy/src/core/pythonaccumulator.hxx          |    1 +
 vigranumpy/src/core/random_forest.cxx              |   69 +-
 vigranumpy/src/core/sampling.cxx                   |  118 +-
 vigranumpy/src/core/segmentation.cxx               |  843 +-
 .../src/core/{vigranumpycore.cxx => utilities.cxx} |   75 +-
 vigranumpy/src/core/vigranumpycore.cxx             |    2 +
 vigranumpy/src/fourier/CMakeLists.txt              |    2 +
 vigranumpy/test/CMakeLists.txt                     |  106 +-
 vigranumpy/test/set_paths.py.cmake2.in             |   45 +
 vigranumpy/test/set_paths.py.in                    |   75 +-
 vigranumpy/test/test4.py                           |  287 +
 vigranumpy/test/test_arraytypes.py                 |  652 +-
 vigranumpy/test/test_rf.py                         |   22 +
 vigranumpy/test/test_segmentation.py               |   37 +
 336 files changed, 74459 insertions(+), 8864 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libvigraimpex.git



More information about the debian-science-commits mailing list