[magics] 02/10: Merge tag 'upstream/2.26.2' into debian/master
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sun Jan 10 15:59:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository magics.
commit 6836fb41266e42f28973cb9e1b5fde6b1a359b39
Merge: dd801e8 d848ba5
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Jan 4 05:35:22 2016 +0000
Merge tag 'upstream/2.26.2' into debian/master
CMakeLists.txt | 414 +--
INSTALL | 229 +-
NOTICE | 63 +
VERSION.cmake | 7 +-
apps/MagMLInterpretor/CMakeLists.txt | 4 +-
apps/metgram/CMakeLists.txt | 13 +-
apps/metgram/metgram.py | 130 +
bin/CMakeLists.txt | 3 +
bin/ecbuild | 422 +++
cmake/CheckFortranSourceCompiles.cmake | 2 +-
cmake/FindAEC.cmake | 2 -
cmake/FindArmadillo.cmake | 33 +-
cmake/FindEMOS.cmake | 2 -
cmake/FindEcLib.cmake | 49 -
cmake/FindEcregrid.cmake | 48 -
cmake/FindLibIFort.cmake | 47 +
cmake/FindMKL.cmake | 77 +
cmake/FindNetCDF.cmake | 145 +-
cmake/FindNetCDF3.cmake | 65 +-
cmake/FindOpenCL.cmake | 67 +
cmake/FindOpenJPEG.cmake | 3 +-
cmake/FindPango.cmake | 2 -
cmake/FindPangoCairo.cmake | 13 +-
cmake/FindProj4.cmake | 10 +-
cmake/FindSZip.cmake | 2 -
cmake/FindScin.cmake | 48 -
cmake/FindTrilinos.cmake | 3 -
cmake/FindViennaCL.cmake | 38 +
cmake/Findgrib_api.cmake | 2 -
cmake/Findodb_api.cmake | 2 -
cmake/Findspot.cmake | 2 -
cmake/VERSION.cmake | 4 +-
cmake/contrib/FindEigen3.cmake | 10 +-
cmake/contrib/FindFFTW.cmake | 52 +-
cmake/contrib/FindNetCDF4.cmake | 30 +-
cmake/ecbuild_add_c_flags.cmake | 79 +
cmake/ecbuild_add_cxx11_flags.cmake | 20 +-
cmake/ecbuild_add_cxx_flags.cmake | 79 +
cmake/ecbuild_add_executable.cmake | 433 ++-
cmake/ecbuild_add_extra_search_paths.cmake | 23 +-
cmake/ecbuild_add_fortran_flags.cmake | 85 +
cmake/ecbuild_add_library.cmake | 737 ++--
cmake/ecbuild_add_option.cmake | 193 +-
cmake/ecbuild_add_persistent.cmake | 92 +-
cmake/ecbuild_add_resources.cmake | 95 +-
cmake/ecbuild_add_test.cmake | 610 ++--
cmake/ecbuild_append_to_rpath.cmake | 35 +-
cmake/ecbuild_bundle.cmake | 338 +-
cmake/ecbuild_cache.cmake | 34 +-
...e.cmake => ecbuild_check_c_source_return.cmake} | 93 +-
cmake/ecbuild_check_compiler.cmake | 44 +-
cmake/ecbuild_check_cxx11.cmake | 76 +-
...cmake => ecbuild_check_cxx_source_return.cmake} | 87 +-
...e => ecbuild_check_fortran_source_return.cmake} | 86 +-
cmake/ecbuild_check_functions.cmake | 65 +-
cmake/ecbuild_check_os.cmake | 80 +-
cmake/ecbuild_config.h.in | 25 +
cmake/ecbuild_debug_var.cmake | 12 +
cmake/ecbuild_declare_project.cmake | 242 +-
cmake/ecbuild_define_build_types.cmake | 43 +-
cmake/ecbuild_define_options.cmake | 10 +-
cmake/ecbuild_define_uninstall.cmake | 7 +
cmake/ecbuild_dont_pack.cmake | 82 +
cmake/ecbuild_download_resource.cmake | 47 +
cmake/ecbuild_echo_targets.cmake | 67 +-
cmake/ecbuild_enable_fortran.cmake | 80 +-
cmake/ecbuild_features.cmake | 121 +
cmake/ecbuild_find_fortranlibs.cmake | 210 +-
cmake/ecbuild_find_lexyacc.cmake | 96 +-
cmake/ecbuild_find_mpi.cmake | 126 +-
cmake/ecbuild_find_omp.cmake | 72 +-
cmake/ecbuild_find_package.cmake | 399 ++-
cmake/ecbuild_find_perl.cmake | 76 +-
cmake/ecbuild_find_python.cmake | 74 +-
cmake/ecbuild_generate_config_headers.cmake | 62 +-
cmake/ecbuild_generate_rpc.cmake | 31 +-
cmake/ecbuild_generate_yy.cmake | 226 +-
cmake/ecbuild_get_cxx11_flags.cmake | 71 +
cmake/ecbuild_get_date.cmake | 28 +-
cmake/ecbuild_get_test_data.cmake | 248 +-
cmake/ecbuild_git.cmake | 307 ++
...package.cmake => ecbuild_install_project.cmake} | 175 +-
cmake/ecbuild_list_extra_search_paths.cmake | 53 +-
cmake/ecbuild_list_macros.cmake | 33 +
cmake/ecbuild_log.cmake | 129 +
cmake/ecbuild_pkgconfig.cmake | 176 +-
cmake/ecbuild_policies.cmake | 63 +
cmake/ecbuild_print_summary.cmake | 177 +-
cmake/ecbuild_project_files.cmake | 60 +-
cmake/ecbuild_requires_macro_version.cmake | 12 +
cmake/ecbuild_separate_sources.cmake | 32 +-
cmake/ecbuild_setup_test_framework.cmake | 47 +-
cmake/ecbuild_system.cmake | 381 +--
cmake/ecbuild_uninstall.cmake.in | 21 +
cmake/ecbuild_use_package.cmake | 352 +-
cmake/ecbuild_warn_unused_files.cmake | 29 +-
cmake/pkg-config.pc.in | 8 +-
cmake/project-config.cmake.in | 18 +-
cmake/pymain.c | 5 +
magics-config.in | 323 --
magics-import.cmake.in | 5 +
project_summary.cmake | 6 +-
python/Magics/CMakeLists.txt | 18 +-
python/Magics/Magics_interface.cc | 3 +
python/Magics/macro.py | 2 +
share/ecbuild/toolchains/ecmwf-XC30-Cray.cmake | 81 +
share/ecbuild/toolchains/ecmwf-XC30-GNU.cmake | 73 +
share/ecbuild/toolchains/ecmwf-XC30-Intel.cmake | 76 +
share/magics/Fonts.dat | 8 +-
share/magics/obs.xml | 2 +-
share/magics/symbols.svg | 1543 +++++----
share/magics/title_template.xml | 4 +
src/CMakeLists.txt | 88 +-
src/basic/BasicGraphicsObject.cc | 1 -
src/basic/BasicGraphicsObject.h | 21 +-
src/basic/BasicSceneObject.cc | 2 +-
src/basic/BasicSceneObject.h | 40 +-
src/basic/CMakeLists.txt | 2 +-
src/basic/FortranMagics.cc | 205 +-
src/basic/FortranMagics.h | 2 +-
src/basic/Layer.cc | 22 +-
src/basic/Layer.h | 2 +-
src/basic/LegendVisitor.cc | 7 +-
src/basic/LegendVisitor.h | 10 +-
src/basic/MagnifierVisitor.cc | 2 +-
src/basic/MultiVisdef.cc | 2 +-
src/basic/RootSceneNode.cc | 4 +-
src/basic/SceneNode.cc | 5 +-
src/basic/SceneVisitor.cc | 16 +-
src/basic/SceneVisitor.h | 47 +-
src/basic/TagHandler.cc | 3 +-
src/basic/TextVisitor.cc | 11 +-
src/basic/ViewNode.cc | 53 +-
src/basic/ViewNode.h | 15 +-
src/basic/Visdef.h | 2 +-
src/basic/VisualAction.cc | 2 +-
src/basic/VisualAction.h | 2 +-
src/basic/XmlMagics.cc | 177 +-
src/basic/XmlMagics.h | 2 +-
src/common/AnimationRules.cc | 2 +-
src/common/AutoLocker.cc | 24 +-
src/common/BaseParameter.h | 18 +-
src/common/BasePointsHandler.h | 9 +-
src/common/CMakeLists.txt | 4 +-
src/common/Coordinate.h | 12 +-
src/common/Data.h | 7 +-
src/common/Factory.cc | 2 +-
src/common/GeoRectangularProjection.cc | 6 +-
src/common/{Matrix.cc => GribInterpretor.h} | 9 +-
src/common/Layout.cc | 45 +-
src/common/Layout.h | 8 +-
src/common/MagException.h | 30 +-
src/common/MagExceptions.h | 16 +-
src/common/MagTranslator.h | 37 +-
src/common/MagicsCalls.cc | 32 +-
src/common/MagicsSingleton.h | 6 +-
src/common/Matrix.cc | 8 +-
src/common/Matrix.h | 2 +-
src/common/MatrixHandler.h | 7 +-
src/common/Node.cc | 2 +-
src/common/OutputFactory.cc | 15 +-
src/common/OutputFactory.h | 15 +-
src/common/OutputHandler.cc | 11 +-
src/common/ParameterManager.h | 33 +-
src/common/PolarStereographicProjection.cc | 10 +-
src/common/PolarStereographicProjection.h | 1 +
src/common/Proj4Projection.cc | 11 +-
src/common/Proj4Projection.h | 1 +
src/common/TableDefinition.h | 14 +-
src/common/TaylorProjection.cc | 2 +-
src/common/ThreadControler.cc | 2 +-
src/common/Transformation.h | 17 +-
src/common/UserPoint.h | 26 +-
src/common/magics_api.h | 2 +-
src/decoders/BinningObject.cc | 2 +-
src/decoders/BoxPlotDecoder.h | 2 +-
src/decoders/CMakeLists.txt | 10 +-
src/decoders/ClassicMtgDecoder.cc | 2 +-
src/decoders/ClassicMtgDecoder.h | 2 +-
src/decoders/EpsXmlInput.h | 2 +-
src/decoders/EpsgramDecoder.cc | 2 +-
src/decoders/EpsgramDecoder.h | 2 +-
src/decoders/GeoPointsDecoder.cc | 33 +-
src/decoders/GribAddressMode.h | 30 +-
src/decoders/GribDecoder.cc | 3562 ++++++++++----------
src/decoders/GribDecoder.h | 133 +-
src/decoders/GribInterpretor.h | 31 +
src/decoders/GribRegularInterpretor.cc | 3230 ++++++++++--------
src/decoders/GribRegularInterpretor.h | 6 +
src/decoders/GribSatelliteInterpretor.cc | 12 +-
src/decoders/ImportAction.h | 2 +-
src/decoders/InputData.cc | 21 +-
src/decoders/InputMatrix.cc | 12 +-
src/decoders/InputMatrix.h | 3 +-
src/decoders/InputMatrixInterpretor.cc | 23 +-
src/decoders/LandgramDecoder.cc | 2 +-
src/decoders/MatrixTestDecoder.cc | 2 +-
src/decoders/MatrixTestDecoder.h | 27 +-
src/decoders/Netcdf.cc | 4 +-
src/decoders/NetcdfDecoder.h | 3 +-
src/decoders/NetcdfGeoMatrixInterpretor.cc | 8 +-
src/decoders/NetcdfGeoMatrixInterpretor.h | 2 +-
src/decoders/NetcdfGeopointsInterpretor.cc | 2 +-
src/decoders/NetcdfGeopointsInterpretor.h | 80 +-
src/decoders/NetcdfInterpretor.cc | 18 +-
src/decoders/NetcdfInterpretor.h | 2 +-
src/decoders/NetcdfMatrixInterpretor.cc | 35 +-
src/decoders/NetcdfMatrixInterpretor.h | 1 +
src/decoders/NetcdfOrcaInterpretor.cc | 36 +-
src/decoders/NetcdfOrcaInterpretor.h | 3 +-
src/decoders/NetcdfVectorInterpretor.cc | 62 +-
src/decoders/NetcdfVectorInterpretor.h | 4 +-
src/decoders/ObsDecoder.cc | 2 +-
src/decoders/ShapeDecoder.h | 23 +-
src/decoders/TitleTemplate.h | 2 +-
src/drivers/BaseDriver.cc | 233 +-
src/drivers/BaseDriverSymbols.h | 89 +-
src/drivers/BaseDriverWind.h | 32 +-
src/drivers/BinaryDriver.cc | 2 +-
src/drivers/CMakeLists.txt | 108 +-
src/drivers/CairoDriver.cc | 222 +-
src/drivers/CairoDriver.h | 7 +-
src/drivers/GeoJsonDriver.cc | 654 ++++
src/drivers/GeoJsonDriver.h | 142 +
src/drivers/KMLDriver.cc | 8 +-
src/drivers/MgQ/MgQLayoutItem.cc | 15 +-
src/drivers/MgQ/MgQLayoutItem.h | 5 +-
src/drivers/MgQ/MgQPolylineSetItem.cc | 2 +-
src/drivers/MgQ/MgQScene.cc | 33 +-
src/drivers/MgQ/MgQSceneItem.cc | 2 +-
src/drivers/PostScriptDriver.cc | 8 +-
src/drivers/QtDriver.cc | 134 +-
src/drivers/SVGDriver.cc | 49 +-
src/drivers/libimagequant/COPYRIGHT | 36 +
src/drivers/libimagequant/MANUAL.md | 478 +++
src/drivers/libimagequant/Makefile | 65 +
src/drivers/libimagequant/blur.c | 112 +
src/drivers/libimagequant/blur.h | 4 +
src/drivers/libimagequant/configure | 205 ++
src/drivers/libimagequant/libimagequant.c | 1648 +++++++++
src/drivers/libimagequant/libimagequant.h | 109 +
src/drivers/libimagequant/mediancut.c | 507 +++
src/drivers/libimagequant/mediancut.h | 2 +
src/drivers/libimagequant/mempool.c | 63 +
src/drivers/libimagequant/mempool.h | 13 +
src/drivers/libimagequant/nearest.c | 241 ++
src/drivers/libimagequant/nearest.h | 8 +
src/drivers/libimagequant/pam.c | 278 ++
src/drivers/libimagequant/pam.h | 290 ++
src/drivers/libimagequant/pngquant.c | 295 ++
src/drivers/libimagequant/pngquant.h | 71 +
src/drivers/libimagequant/rwpng.c | 615 ++++
src/drivers/libimagequant/rwpng.h | 124 +
src/drivers/libimagequant/viter.c | 89 +
src/drivers/libimagequant/viter.h | 19 +
src/drivers/minizip/zip.c | 4 +-
src/eckit_readers/CMakeLists.txt | 2 +-
src/eckit_readers/TableReader.cc | 2 +-
src/libMagWrapper/MagPlus.cc | 427 ++-
src/libMagWrapper/MagPlus.h | 6 +-
src/libMagWrapper/MagRequest.h | 4 +-
src/magics.h | 7 +-
src/magics.pc.in | 13 -
src/magics_config.h.in | 20 +-
src/oda/OdaDecoder.cc | 14 +-
src/params/BaseDriver.xml | 20 +-
src/params/CMakeLists.txt | 12 +-
src/params/CairoDriver.xml | 8 +-
src/params/FortranViewNode.xml | 4 +
src/params/GeoJSon.xml | 15 +
src/params/GeoJsonDriver.xml | 28 +
src/params/GeoPointsDecoder.xml | 3 +
src/params/GribDecoder.xml | 8 +-
src/params/GribLoop.xml | 19 +-
src/params/InputMatrix.xml | 4 +
src/params/LabelPlotting.xml | 19 +-
src/params/LegendVisitor.xml | 6 +-
src/params/MarkerShadingTechnique.xml | 13 +-
src/params/NetcdfInterpretor.xml | 8 +-
src/params/ObsPlotting.xml | 6 +-
src/params/OutputHandler.xml | 8 +-
src/params/SVGDriver.xml | 4 +-
src/params/Streamlines.xml | 38 +-
src/params/SymbolAdvancedTableMode.xml | 5 +-
src/params/SymbolIndividualMode.xml | 4 +-
src/params/SymbolPlotting.xml | 23 +-
src/params/WrepJSon.xml | 5 +-
src/visualisers/AxisMethod.h | 2 +-
src/visualisers/CMakeLists.txt | 2 +-
src/visualisers/CalcStreamlines.cc | 12 +-
src/visualisers/CalcStreamlines.h | 2 +
src/visualisers/Coastlines.cc | 2 +-
src/visualisers/Contour.cc | 3 +
src/visualisers/ContourLibrary.cc | 30 +-
src/visualisers/ContourLibrary.h | 18 +-
src/visualisers/CountSelectionType.cc | 13 +-
src/visualisers/EpsGraph.cc | 64 +-
src/visualisers/Filter.h | 20 +-
src/visualisers/HeightTechnique.cc | 2 +-
src/visualisers/Histogram.h | 2 +-
src/visualisers/IsoHelper.cc | 2 +-
src/visualisers/IsoHighlight.h | 2 +-
src/visualisers/IsoPlot.cc | 104 +-
src/visualisers/IsoPlot.h | 4 +-
src/visualisers/LabelPlotting.h | 5 +-
src/visualisers/LevelSelection.cc | 11 +-
src/visualisers/MarkerShadingTechnique.cc | 22 +-
src/visualisers/ObsItem.h | 22 +-
src/visualisers/ObsItemFamily.cc | 365 +-
src/visualisers/ObsItemFamily.h | 34 +-
src/visualisers/ObsPlotting.cc | 3 +
src/visualisers/ObsTable.cc | 3 +-
src/visualisers/SegmentJoiner.cc | 4 +-
src/visualisers/SegmentJoiner.h | 3 +-
src/visualisers/ShadingTechnique.h | 2 +-
src/visualisers/Streamlines.cc | 93 +-
src/visualisers/SymbolAdvancedTableMode.cc | 44 +-
src/visualisers/SymbolMode.cc | 5 +-
src/visualisers/SymbolPlotting.cc | 6 +-
src/visualisers/SymbolPlotting.h | 2 +-
src/visualisers/Wind.cc | 4 +-
src/visualisers/WindPlotting.h | 4 +-
src/web/CMakeLists.txt | 1 +
src/web/GeoJSon.cc | 135 +
src/{decoders/BoxPlotDecoder.h => web/GeoJSon.h} | 73 +-
src/web/MagJSon.cc | 54 +-
src/web/MagJSon.h | 11 +
src/web/ObsJSon.cc | 8 +-
src/web/ObsJSon.h | 2 +-
src/web/WrepJSon.cc | 99 +-
src/web/WrepJSon.h | 9 +-
test/CMakeLists.txt | 160 +-
test/Testing/Temporary/CTestCostData.txt | 1 -
tools/xml2cc_new.pl | 5 +-
tools/xml2mv.pl | 3 +
335 files changed, 20546 insertions(+), 9442 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