[magics] 02/07: Merge tag 'upstream/3.0.0' into debian/master
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Jan 3 12:58:13 UTC 2018
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository magics.
commit 8e907f6e9d9204d0a4719794e1166158000723af
Merge: a7555c9 81a9288
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Dec 26 09:23:35 2017 +0000
Merge tag 'upstream/3.0.0' into debian/master
CMakeLists.txt | 47 +-
VERSION.cmake | 3 +-
cmake/FindAIO.cmake | 52 +-
cmake/FindGd.cmake | 59 +
cmake/FindPangoCairo.cmake | 25 +-
cmake/VERSION.cmake | 4 +-
cmake/contrib/FindNetCDF4.cmake | 4 +-
.../contrib/GreatCMakeCookOff/AddCPP11Flags.cmake | 48 +-
cmake/ecbuild_add_library.cmake | 62 +-
cmake/ecbuild_add_test.cmake | 48 +-
cmake/ecbuild_define_options.cmake | 6 +
cmake/ecbuild_policies.cmake | 10 +-
magics.sublime-project | 2 +-
notebook/WCS.ipynb | 156 -
notebook/epsgrams.ipynb | 304 -
python/CMakeLists.txt | 13 +-
python/Magics.i.in | 69 -
python/Magics.py.in | 500 ++
python/Magics/macro.py | 210 +-
python/Magics/metgram.py | 47 +-
python/Magics/toolbox.py | 475 +-
python/Magics_interface.cc | 255 -
python/numpy.i | 1634 -----
python/setup.py.in | 18 -
python/test_for_ctypes/array.py | 57 +
python/test_for_ctypes/test_ctypes.py | 28 +
python/test_for_ctypes/test_ctypes_graph.py | 58 +
share/ecbuild/toolchains/ecmwf-XC30-Cray.cmake | 18 +-
share/ecbuild/toolchains/ecmwf-XC30-GNU.cmake | 6 +
share/ecbuild/toolchains/ecmwf-XC30-Intel.cmake | 6 +
share/magics/cream/coastlines.json | 98 +-
share/magics/dark/coastlines.json | 211 +-
share/magics/dark/contours.json | 165 +-
share/magics/epsg.json | 3 +-
share/magics/netcdf-convention.json | 18 +
share/magics/palettes.json | 6719 ++++++++++++++++++++
share/magics/table_128.xml | 36 -
.../ObsCloud.xml => share/magics/table_228.xml | 17 +-
share/projections.json | 214 +
src/CMakeLists.txt | 97 +-
src/basic/BasicGraphicsObject.h | 9 +-
src/basic/FortranMagics.cc | 45 +-
src/basic/FortranMagics.h | 2 +-
src/basic/Layer.cc | 98 +-
src/basic/Layer.h | 31 +-
src/basic/LegendVisitor.cc | 71 +-
src/basic/LegendVisitor.h | 9 +-
src/basic/MagicsEvent.h | 37 +-
src/basic/ViewNode.cc | 58 +-
src/basic/ViewNode.h | 5 +-
src/basic/VisualAction.cc | 14 +-
src/boost/range/adaptor/adjacent_filtered.hpp | 238 -
src/boost/range/adaptor/argument_fwd.hpp | 80 -
src/boost/range/adaptor/copied.hpp | 58 -
src/boost/range/adaptor/define_adaptor.hpp | 109 -
src/boost/range/adaptor/filtered.hpp | 101 -
src/boost/range/adaptor/indexed.hpp | 156 -
src/boost/range/adaptor/indirected.hpp | 88 -
src/boost/range/adaptor/map.hpp | 187 -
src/boost/range/adaptor/replaced.hpp | 134 -
src/boost/range/adaptor/replaced_if.hpp | 136 -
src/boost/range/adaptor/reversed.hpp | 90 -
src/boost/range/adaptor/sliced.hpp | 82 -
src/boost/range/adaptor/strided.hpp | 350 -
src/boost/range/adaptor/tokenized.hpp | 137 -
src/boost/range/adaptor/transformed.hpp | 104 -
src/boost/range/adaptor/type_erased.hpp | 184 -
src/boost/range/adaptor/uniqued.hpp | 90 -
src/boost/range/adaptors.hpp | 30 -
src/boost/range/algorithm.hpp | 104 -
src/boost/range/algorithm/adjacent_find.hpp | 125 -
src/boost/range/algorithm/binary_search.hpp | 49 -
src/boost/range/algorithm/copy.hpp | 41 -
src/boost/range/algorithm/copy_backward.hpp | 43 -
src/boost/range/algorithm/count.hpp | 50 -
src/boost/range/algorithm/count_if.hpp | 51 -
src/boost/range/algorithm/equal.hpp | 198 -
src/boost/range/algorithm/equal_range.hpp | 80 -
src/boost/range/algorithm/fill.hpp | 49 -
src/boost/range/algorithm/fill_n.hpp | 53 -
src/boost/range/algorithm/find.hpp | 80 -
src/boost/range/algorithm/find_end.hpp | 152 -
src/boost/range/algorithm/find_first_of.hpp | 155 -
src/boost/range/algorithm/find_if.hpp | 81 -
src/boost/range/algorithm/for_each.hpp | 109 -
src/boost/range/algorithm/generate.hpp | 49 -
src/boost/range/algorithm/heap_algorithm.hpp | 194 -
src/boost/range/algorithm/inplace_merge.hpp | 74 -
.../range/algorithm/lexicographical_compare.hpp | 58 -
src/boost/range/algorithm/lower_bound.hpp | 124 -
src/boost/range/algorithm/max_element.hpp | 115 -
src/boost/range/algorithm/merge.hpp | 61 -
src/boost/range/algorithm/min_element.hpp | 115 -
src/boost/range/algorithm/mismatch.hpp | 195 -
src/boost/range/algorithm/nth_element.hpp | 74 -
src/boost/range/algorithm/partial_sort.hpp | 76 -
src/boost/range/algorithm/partial_sort_copy.hpp | 82 -
src/boost/range/algorithm/partition.hpp | 74 -
src/boost/range/algorithm/permutation.hpp | 108 -
src/boost/range/algorithm/random_shuffle.hpp | 68 -
src/boost/range/algorithm/remove.hpp | 74 -
src/boost/range/algorithm/remove_copy.hpp | 44 -
src/boost/range/algorithm/remove_copy_if.hpp | 38 -
src/boost/range/algorithm/remove_if.hpp | 75 -
src/boost/range/algorithm/replace.hpp | 53 -
src/boost/range/algorithm/replace_copy.hpp | 42 -
src/boost/range/algorithm/replace_copy_if.hpp | 46 -
src/boost/range/algorithm/replace_if.hpp | 54 -
src/boost/range/algorithm/reverse.hpp | 50 -
src/boost/range/algorithm/reverse_copy.hpp | 40 -
src/boost/range/algorithm/rotate.hpp | 51 -
src/boost/range/algorithm/rotate_copy.hpp | 44 -
src/boost/range/algorithm/search.hpp | 134 -
src/boost/range/algorithm/search_n.hpp | 360 --
src/boost/range/algorithm/set_algorithm.hpp | 198 -
src/boost/range/algorithm/sort.hpp | 68 -
src/boost/range/algorithm/stable_partition.hpp | 73 -
src/boost/range/algorithm/stable_sort.hpp | 68 -
src/boost/range/algorithm/swap_ranges.hpp | 132 -
src/boost/range/algorithm/transform.hpp | 97 -
src/boost/range/algorithm/unique.hpp | 107 -
src/boost/range/algorithm/unique_copy.hpp | 51 -
src/boost/range/algorithm/upper_bound.hpp | 127 -
src/boost/range/algorithm_ext.hpp | 28 -
src/boost/range/algorithm_ext/copy_n.hpp | 53 -
src/boost/range/algorithm_ext/erase.hpp | 61 -
src/boost/range/algorithm_ext/for_each.hpp | 86 -
src/boost/range/algorithm_ext/insert.hpp | 42 -
src/boost/range/algorithm_ext/iota.hpp | 54 -
src/boost/range/algorithm_ext/is_sorted.hpp | 57 -
src/boost/range/algorithm_ext/overwrite.hpp | 84 -
src/boost/range/algorithm_ext/push_back.hpp | 40 -
src/boost/range/algorithm_ext/push_front.hpp | 40 -
src/boost/range/any_range.hpp | 205 -
src/boost/range/as_array.hpp | 45 -
src/boost/range/as_literal.hpp | 127 -
src/boost/range/atl.hpp | 733 ---
src/boost/range/begin.hpp | 143 -
src/boost/range/category.hpp | 29 -
src/boost/range/combine.hpp | 304 -
src/boost/range/concepts.hpp | 366 --
src/boost/range/config.hpp | 54 -
src/boost/range/const_iterator.hpp | 67 -
src/boost/range/const_reverse_iterator.hpp | 32 -
src/boost/range/counting_range.hpp | 66 -
src/boost/range/detail/any_iterator.hpp | 586 --
src/boost/range/detail/any_iterator_buffer.hpp | 117 -
src/boost/range/detail/any_iterator_interface.hpp | 258 -
src/boost/range/detail/any_iterator_wrapper.hpp | 590 --
src/boost/range/detail/as_literal.hpp | 33 -
src/boost/range/detail/begin.hpp | 94 -
src/boost/range/detail/collection_traits.hpp | 266 -
.../range/detail/collection_traits_detail.hpp | 621 --
src/boost/range/detail/common.hpp | 117 -
src/boost/range/detail/const_iterator.hpp | 71 -
.../range/detail/demote_iterator_traversal_tag.hpp | 91 -
src/boost/range/detail/detail_str.hpp | 376 --
src/boost/range/detail/difference_type.hpp | 121 -
src/boost/range/detail/empty.hpp | 120 -
src/boost/range/detail/end.hpp | 101 -
src/boost/range/detail/extract_optional_type.hpp | 52 -
src/boost/range/detail/implementation_help.hpp | 103 -
src/boost/range/detail/iterator.hpp | 78 -
src/boost/range/detail/join_iterator.hpp | 344 -
src/boost/range/detail/microsoft.hpp | 931 ---
src/boost/range/detail/misc_concept.hpp | 33 -
src/boost/range/detail/range_return.hpp | 180 -
src/boost/range/detail/remove_extent.hpp | 157 -
src/boost/range/detail/safe_bool.hpp | 72 -
src/boost/range/detail/sfinae.hpp | 77 -
src/boost/range/detail/size.hpp | 159 -
src/boost/range/detail/size_type.hpp | 55 -
src/boost/range/detail/sizer.hpp | 35 -
src/boost/range/detail/str_types.hpp | 38 -
src/boost/range/detail/value_type.hpp | 72 -
src/boost/range/detail/vc6/end.hpp | 170 -
src/boost/range/detail/vc6/size.hpp | 166 -
src/boost/range/difference_type.hpp | 29 -
src/boost/range/distance.hpp | 34 -
src/boost/range/empty.hpp | 34 -
src/boost/range/end.hpp | 136 -
src/boost/range/functions.hpp | 27 -
src/boost/range/has_range_iterator.hpp | 62 -
src/boost/range/irange.hpp | 230 -
src/boost/range/istream_range.hpp | 37 -
src/boost/range/iterator.hpp | 72 -
src/boost/range/iterator_range.hpp | 16 -
src/boost/range/iterator_range_core.hpp | 650 --
src/boost/range/iterator_range_io.hpp | 93 -
src/boost/range/join.hpp | 91 -
src/boost/range/metafunctions.hpp | 31 -
src/boost/range/mfc.hpp | 984 ---
src/boost/range/mutable_iterator.hpp | 67 -
src/boost/range/numeric.hpp | 118 -
src/boost/range/pointer.hpp | 29 -
src/boost/range/rbegin.hpp | 65 -
src/boost/range/reference.hpp | 29 -
src/boost/range/rend.hpp | 65 -
src/boost/range/result_iterator.hpp | 33 -
src/boost/range/reverse_iterator.hpp | 40 -
src/boost/range/reverse_result_iterator.hpp | 32 -
src/boost/range/size.hpp | 52 -
src/boost/range/size_type.hpp | 89 -
src/boost/range/sub_range.hpp | 182 -
src/boost/range/value_type.hpp | 34 -
src/clipper/CMakeLists.txt | 9 +
src/clipper/License.txt | 24 +
src/clipper/README | 413 ++
src/clipper/clipper.cpp | 4629 ++++++++++++++
src/clipper/clipper.hpp | 406 ++
src/common/Colour.cc | 2 +-
src/common/ColourTableDefinition.h | 2 +-
src/common/ColourTableDefinitionCompute.cc | 7 +-
src/common/Coordinate.h | 19 +-
src/common/Data.h | 2 +-
src/common/GeoRectangularProjection.cc | 3 +-
src/common/Layout.cc | 8 +-
src/common/Layout.h | 17 +-
src/common/MagicsCalls.cc | 46 +-
src/common/MagicsFormat.cc | 31 +
src/common/Matrix.cc | 31 +-
src/common/Matrix.h | 4 +-
src/common/MatrixHandler.h | 138 +-
src/common/ParameterManager.h | 10 +-
src/common/PointsHandler.cc | 1 +
src/common/Proj4Projection.cc | 66 +-
src/common/Proj4Projection.h | 10 +-
src/common/Symbol.h | 2 +-
src/common/Transformation.cc | 40 +-
src/common/magics_api.h | 2 +-
src/decoders/CMakeLists.txt | 4 +-
src/decoders/GribDecoder.cc | 22 +-
src/decoders/GribDecoder.h | 5 +-
src/decoders/GribRegularInterpretor.cc | 41 +-
src/decoders/InputMatrix.cc | 4 +-
src/decoders/InputMatrixInterpretor.cc | 7 +
src/decoders/Netcdf.cc | 321 -
src/decoders/NetcdfData.cc | 433 ++
src/decoders/{Netcdf.h => NetcdfData.h} | 292 +-
src/decoders/NetcdfDecoder.cc | 16 +-
src/decoders/NetcdfDecoder.h | 3 +
src/decoders/NetcdfGeoMatrixInterpretor.cc | 71 +-
src/decoders/NetcdfGeoMatrixInterpretor.h | 21 +-
src/decoders/NetcdfGeopointsInterpretor.cc | 11 +-
src/decoders/NetcdfGeopointsInterpretor.h | 30 +-
src/decoders/NetcdfInterpretor.cc | 119 +-
src/decoders/NetcdfInterpretor.h | 70 +
src/decoders/NetcdfMatrixInterpretor.cc | 74 +-
src/decoders/NetcdfMatrixInterpretor.h | 24 +-
src/decoders/NetcdfOrcaInterpretor.cc | 10 +-
src/decoders/NetcdfOrcaInterpretor.h | 12 +-
src/decoders/NetcdfVectorInterpretor.cc | 34 +-
src/decoders/NetcdfVectorInterpretor.h | 63 +-
src/decoders/ShapeDecoder.cc | 59 +-
src/drivers/BaseDriver.cc | 89 +-
src/drivers/CMakeLists.txt | 19 +-
src/drivers/CairoDriver.cc | 111 +-
src/drivers/CairoDriver.h | 8 +-
src/drivers/GDDriver.cc | 54 +-
src/drivers/GDDriver.h | 9 +-
src/drivers/GeoJsonDriver.cc | 11 +-
src/drivers/KMLDriver.cc | 6 +-
src/drivers/MgQ/MgQLayerItem.cc | 3 +
src/drivers/MgQ/MgQPlotScene.cc | 6 +-
src/drivers/MgQ/MgQSceneItem.cc | 11 +-
src/drivers/PostScriptDriver.cc | 72 +-
src/drivers/QtDriver.cc | 43 +-
src/drivers/SVGDriver.cc | 6 +-
src/drivers/libimagequant/CHANGELOG | 130 -
src/drivers/libimagequant/COPYRIGHT | 36 -
src/drivers/libimagequant/MANUAL.md | 511 --
src/drivers/libimagequant/Makefile | 63 -
src/drivers/libimagequant/blur.c | 119 -
src/drivers/libimagequant/blur.h | 4 -
src/drivers/libimagequant/configure | 216 -
src/drivers/libimagequant/libimagequant.c | 1752 -----
src/drivers/libimagequant/libimagequant.h | 118 -
src/drivers/libimagequant/mediancut.c | 507 --
src/drivers/libimagequant/mediancut.h | 2 -
src/drivers/libimagequant/mempool.c | 68 -
src/drivers/libimagequant/mempool.h | 13 -
src/drivers/libimagequant/nearest.c | 193 -
src/drivers/libimagequant/nearest.h | 8 -
src/drivers/libimagequant/pam.c | 273 -
src/drivers/libimagequant/pam.h | 273 -
src/drivers/libimagequant/pngquant.c | 295 -
src/drivers/libimagequant/pngquant.h | 71 -
src/drivers/libimagequant/rwpng.c | 620 --
src/drivers/libimagequant/rwpng.h | 125 -
src/drivers/libimagequant/viter.c | 96 -
src/drivers/libimagequant/viter.h | 19 -
src/libMagWrapper/MagPlus.cc | 101 +-
src/libMagWrapper/MagPlus.h | 8 +
src/params/AdvancedColourTechnique.xml | 30 +
src/params/Akima474Method.xml | 3 +-
src/params/ArrowPlotting.xml | 3 +
src/params/Axis.xml | 2 +-
src/params/Bar.xml | 2 +-
src/params/BothValuePlotMethod.xml | 5 +
src/params/Boundaries.xml | 2 +-
src/params/CMakeLists.txt | 22 +-
src/params/Cities.xml | 4 +
src/params/FortranRootSceneNode.xml | 2 +-
src/params/FortranSceneNode.xml | 4 +-
src/params/GradientsColourTechnique.xml | 11 +-
src/params/IsoPlot.xml | 6 +-
src/params/IsoShading.xml | 3 +-
src/params/NetcdfDecoder.xml | 5 +-
src/params/NetcdfGeoMatrixInterpretor.xml | 38 +-
src/params/NetcdfGeoPolarMatrixInterpretor.xml | 17 +-
src/params/NetcdfGeoVectorInterpretor.xml | 21 +-
src/params/NetcdfGeopointsInterpretor.xml | 11 +-
.../{ObsCloud.xml => NetcdfGuessInterpretor.xml} | 7 +-
src/params/NetcdfInterpretor.xml | 149 +-
src/params/NetcdfMatrixInterpretor.xml | 31 +-
src/params/NetcdfOrcaInterpretor.xml | 25 +-
src/params/NetcdfVectorInterpretor.xml | 20 +-
src/params/NetcdfXYpointsInterpretor.xml | 24 +-
src/params/ObsCloud.xml | 1 -
src/params/PaletteColourTechnique.xml | 37 +
src/params/ValuePlotMethod.xml | 9 +
src/visualisers/ArrowPlotting.cc | 7 +
src/visualisers/AutomaticContourMethod.h | 11 +-
src/visualisers/Axis.cc | 6 +-
src/visualisers/Bar.cc | 4 +-
src/visualisers/BothValuePlotMethod.h | 16 +-
src/visualisers/CalcStreamlines.cc | 75 +-
src/visualisers/CalmIndicator.h | 2 +-
src/visualisers/CellShading.cc | 28 +-
src/visualisers/Cities.cc | 21 +-
src/visualisers/Coastlines.cc | 10 +-
src/visualisers/ColourTechnique.cc | 27 +
src/visualisers/ColourTechnique.h | 45 +-
src/visualisers/Contour.cc | 30 +-
src/visualisers/ContourLibrary.cc | 11 +-
src/visualisers/ContourLibrary.h | 2 +-
src/visualisers/EpsGraph.cc | 3 +-
src/visualisers/FlagPlotting.cc | 2 +
src/visualisers/GradientsColourTechnique.cc | 184 +-
src/visualisers/IsoPlot.cc | 143 +-
src/visualisers/IsoShading.cc | 2 +-
src/visualisers/IsoShading.h | 21 +-
src/visualisers/LevelListSelectionType.cc | 1 +
src/visualisers/LevelListSelectionType.h | 1 +
src/visualisers/OriginMarker.h | 10 +-
src/visualisers/PolyShadingTechnique.cc | 7 +-
src/visualisers/ShadingTechnique.h | 4 +-
src/visualisers/Streamlines.cc | 208 +-
src/visualisers/SymbolAdvancedTableMode.cc | 14 +-
src/visualisers/SymbolAdvancedTableMode.h | 20 +-
src/visualisers/SymbolMode.cc | 5 +
src/visualisers/SymbolMode.h | 8 +-
src/visualisers/SymbolPlotting.cc | 9 +-
src/visualisers/ValuePlotMethod.h | 16 +-
src/web/GeoJSon.cc | 89 +-
src/web/MagConfig.cc | 180 +-
src/web/MagConfig.h | 97 +-
test/bufr.py | 2 +-
test/cairo.py | 2 +-
test/grib.py | 7 +-
tools/RPM_build_specs/EmosLib.spec | 118 -
tools/RPM_build_specs/emoslib/EmosLib.spec | 155 -
tools/RPM_build_specs/emoslib/generateRPM.sh | 55 -
tools/RPM_build_specs/grib_api/rpms/grib_api.spec | 96 -
tools/docs.json | 6421 +++++++++++++++++++
tools/docs.template | 161 +
tools/header.template | 81 +
tools/source.template | 162 +
tools/x | 1 -
tools/xml2cc.py | 186 +
tools/xml2docs.py | 73 +
tools/xml2milana.json | 7 +
tools/xml2milana.py | 11 +
tools/xml2mv.py | 40 +-
374 files changed, 24476 insertions(+), 30461 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git
More information about the debian-science-commits
mailing list