[magics] 30/63: Merge tag 'upstream/2.29.4' into debian/master
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Mar 24 10:41:51 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository magics.
commit 4f3791d4a903cf1e6e71e8783d4f7b69cb5ee1b5
Merge: 5e78134 31aa23d
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Sep 14 23:11:53 2016 +0100
Merge tag 'upstream/2.29.4' into debian/master
CMakeLists.txt | 5 +-
VERSION.cmake | 4 +-
bin/ecbuild | 60 ++++++-----
bin/magjsonx | Bin 0 -> 39201 bytes
bin/magmlx | Bin 0 -> 38585 bytes
bin/metgramx | Bin 0 -> 66389 bytes
cmake/VERSION.cmake | 4 +-
cmake/ecbuild_add_c_flags.cmake | 12 ++-
cmake/ecbuild_add_cxx_flags.cmake | 12 ++-
cmake/ecbuild_add_fortran_flags.cmake | 12 ++-
cmake/ecbuild_add_option.cmake | 3 +-
cmake/ecbuild_check_functions.cmake | 2 +
cmake/ecbuild_check_os.cmake | 56 ++++++-----
cmake/ecbuild_config.h.in | 2 +
cmake/ecbuild_find_lexyacc.cmake | 5 +-
cmake/ecbuild_find_python.cmake | 2 +-
share/magics/epsg.json | 10 ++
share/magics/table_128.xml | 7 --
src/basic/FortranMagics.cc | 3 +-
src/basic/LegendVisitor.cc | 110 +++++++--------------
src/basic/LegendVisitor.h | 23 +----
src/common/Arrow.h | 26 +++--
src/common/ArrowProperties.cc | 26 +++--
src/common/ArrowProperties.h | 26 +++--
src/common/AutoLock.h | 26 +++--
src/common/AutoLocker.cc | 26 +++--
src/common/AutomaticPlotManager.cc | 26 +++--
src/common/AutomaticPlotManager.h | 26 +++--
src/common/BackgroundColour.h | 26 +++--
src/common/BaseParameter.cc | 26 +++--
src/common/BaseParameter.h | 26 +++--
src/common/BasePointsHandler.cc | 26 +++--
src/common/BasePointsHandler.h | 26 +++--
src/common/CartesianTransformation.cc | 26 +++--
src/common/CartesianTransformation.h | 28 ++++--
src/common/Clipper.h | 26 +++--
src/common/Colour.cc | 26 +++--
src/common/Colour.h | 28 ++++--
src/common/ColourTable.cc | 26 +++--
src/common/ColourTable.h | 26 +++--
src/common/ColourTableDefinition.h | 26 +++--
src/common/ColourTableDefinitionCompute.cc | 26 +++--
src/common/ColourTableDefinitionCompute.h | 26 +++--
src/common/ColourTableDefinitionComputeInterface.h | 26 +++--
src/common/ColourTableDefinitionList.cc | 26 +++--
src/common/ColourTableDefinitionList.h | 26 +++--
src/common/ColourTableDefinitionListInterface.h | 26 +++--
src/common/Coordinate.cc | 26 +++--
src/common/Coordinate.h | 26 +++--
src/common/CustomisedPoint.h | 26 +++--
src/common/Data.cc | 26 +++--
src/common/Data.h | 26 +++--
src/common/DataStats.cc | 26 +++--
src/common/DataStats.h | 27 +++--
src/common/Decoder.h | 26 +++--
src/common/Dimension.cc | 26 +++--
src/common/Dimension.h | 26 +++--
src/common/DriverStatic.cc | 26 +++--
src/common/DriverStatic.h | 26 +++--
src/common/Factory.cc | 26 +++--
src/common/Factory.h | 26 +++--
src/common/Flag.cc | 26 +++--
src/common/Flag.h | 26 +++--
src/common/Frame.cc | 26 +++--
src/common/Frame.h | 26 +++--
src/common/FrameBase.cc | 26 +++--
src/common/FrameBase.h | 26 +++--
src/common/FullPaperPoint.h | 26 +++--
src/common/GeoPoint.h | 26 +++--
src/common/GeoRectangularProjection.cc | 37 ++++---
src/common/GeoRectangularProjection.h | 30 ++++--
src/common/GribInterpretor.h | 28 ++++--
src/common/HeightTableDefinition.h | 26 +++--
src/common/Image.h | 26 +++--
src/common/ImageProperties.h | 26 +++--
src/common/ImportObject.cc | 26 +++--
src/common/ImportObject.h | 26 +++--
src/common/InteractiveSet.cc | 26 +++--
src/common/InteractiveSet.h | 26 +++--
src/common/IntervalMap.h | 26 +++--
src/common/Label.cc | 26 +++--
src/common/Label.h | 26 +++--
src/common/Layout.cc | 26 +++--
src/common/Layout.h | 26 +++--
src/common/LevelTableDefinition.h | 26 +++--
src/common/LogoPlotting.cc | 26 +++--
src/common/LogoPlotting.h | 26 +++--
src/common/LogoPlottingBase.h | 26 +++--
src/common/MagException.cc | 26 +++--
src/common/MagException.h | 26 +++--
src/common/MagExceptions.cc | 26 +++--
src/common/MagExceptions.h | 26 +++--
src/common/MagFont.cc | 26 +++--
src/common/MagFont.h | 26 +++--
src/common/MagLog.cc | 26 +++--
src/common/MagLog.h | 26 +++--
src/common/MagTranslator.h | 26 +++--
src/common/MagicsCalls.cc | 26 +++--
src/common/MagicsFormat.cc | 26 +++--
src/common/MagicsFormat.h | 33 ++++---
src/common/MagicsParameter.cc | 26 +++--
src/common/MagicsParameter.h | 26 +++--
src/common/MagicsSingleton.h | 27 +++--
src/common/MagicsThreads.cc | 26 +++--
src/common/MagicsThreads.h | 26 +++--
src/common/Matrix.cc | 28 ++++--
src/common/Matrix.h | 26 +++--
src/common/MatrixHandler.h | 26 +++--
src/common/MetaData.cc | 26 +++--
src/common/MetaData.h | 26 +++--
src/common/Mutex.cc | 26 +++--
src/common/Mutex.h | 26 +++--
src/common/MutexCond.cc | 26 +++--
src/common/MutexCond.h | 42 ++++++--
src/common/Node.cc | 26 +++--
src/common/Node.h | 26 +++--
src/common/OutputFactory.cc | 26 +++--
src/common/OutputFactory.h | 26 +++--
src/common/OutputHandler.cc | 26 +++--
src/common/OutputHandler.h | 26 +++--
src/common/PageID.cc | 26 +++--
src/common/PageID.h | 26 +++--
src/common/PageIDBase.h | 26 +++--
src/common/PaperDimension.h | 26 +++--
src/common/PaperPoint.h | 26 +++--
src/common/ParameterManager.cc | 26 +++--
src/common/ParameterManager.h | 26 +++--
src/common/Path.h | 26 +++--
src/common/PlotManager.cc | 26 +++--
src/common/PlotManager.h | 26 +++--
src/common/PointsHandler.cc | 26 +++--
src/common/PointsHandler.h | 26 +++--
src/common/PolarStereographicProjection.cc | 31 ++++--
src/common/PolarStereographicProjection.h | 30 ++++--
src/common/PolyCoast.h | 27 +++--
src/common/Polyline.cc | 45 ++++++---
src/common/Polyline.h | 26 +++--
src/common/ProgressObject.cc | 26 +++--
src/common/ProgressObject.h | 26 +++--
src/common/ProgressTask.cc | 26 +++--
src/common/ProgressTask.h | 26 +++--
src/common/Proj4Projection.cc | 74 +++++++++++---
src/common/Proj4Projection.h | 35 +++++--
src/common/RasterData.cc | 26 +++--
src/common/RasterData.h | 26 +++--
src/common/SciMethods.cc | 28 ++++--
src/common/SciMethods.h | 28 ++++--
src/common/Seconds.cc | 29 ++++--
src/common/Seconds.h | 26 +++--
src/common/Static.cc | 26 +++--
src/common/Static.h | 26 +++--
src/common/Symbol.cc | 26 +++--
src/common/Symbol.h | 26 +++--
src/common/TableDefinition.h | 26 +++--
src/common/TableDefinitionCompute.cc | 26 +++--
src/common/TableDefinitionCompute.h | 26 +++--
src/common/TableDefinitionComputeInterface.h | 26 +++--
src/common/TableDefinitionList.cc | 26 +++--
src/common/TableDefinitionList.h | 26 +++--
src/common/TableDefinitionListInterface.h | 26 +++--
src/common/Task.cc | 26 +++--
src/common/Task.h | 26 +++--
src/common/TaylorProjection.cc | 28 ++++--
src/common/TaylorProjection.h | 28 ++++--
src/common/Tephigram.cc | 28 ++++--
src/common/Tephigram.h | 28 ++++--
src/common/Text.cc | 26 +++--
src/common/Text.h | 26 +++--
src/common/Thread.cc | 26 +++--
src/common/Thread.h | 26 +++--
src/common/ThreadControler.cc | 26 +++--
src/common/ThreadControler.h | 26 +++--
src/common/ThreadSingleton.cc | 26 +++--
src/common/ThreadSingleton.h | 26 +++--
src/common/Timer.cc | 26 +++--
src/common/Timer.h | 26 +++--
src/common/Tokenizer.cc | 26 +++--
src/common/Tokenizer.h | 26 +++--
src/common/Transformation.cc | 19 ++++
src/common/Transformation.h | 30 +++---
src/common/UserPoint.h | 26 +++--
src/common/Visualiser.h | 26 +++--
src/common/XCoordinate.h | 26 +++--
src/common/XmlNode.cc | 26 +++--
src/common/XmlNode.h | 26 +++--
src/common/XmlReader.cc | 26 +++--
src/common/XmlReader.h | 26 +++--
src/common/XmlTree.cc | 26 +++--
src/common/XmlTree.h | 26 +++--
src/common/YCoordinate.h | 26 +++--
src/common/aix.h | 26 +++--
src/common/linux.h | 26 +++--
src/common/magics_api.h | 26 +++--
src/common/marsmachine.h | 26 +++--
src/decoders/InputMatrixInterpretor.cc | 7 +-
src/drivers/CairoDriver.cc | 26 ++++-
src/params/CMakeLists.txt | 1 +
src/params/FortranViewNode.xml | 2 +-
src/params/Proj4Mercator.xml | 12 +++
src/params/XmlViewNode.xml | 2 +-
src/visualisers/Akima474.cc | 26 +++--
src/visualisers/Akima474Method.h | 26 +++--
src/visualisers/Akima760.cc | 26 +++--
src/visualisers/Akima760Method.cc | 26 +++--
src/visualisers/Akima760Method.h | 26 +++--
src/visualisers/Akima761.cc | 26 +++--
src/visualisers/Akima761Method.cc | 26 +++--
src/visualisers/Akima761Method.h | 26 +++--
src/visualisers/ArrowPlotting.cc | 26 +++--
src/visualisers/ArrowPlotting.h | 26 +++--
src/visualisers/AutomaticContourMethod.h | 26 +++--
src/visualisers/Axis.cc | 30 +++---
src/visualisers/Axis.h | 26 +++--
src/visualisers/AxisControl.cc | 26 +++--
src/visualisers/AxisControl.h | 26 +++--
src/visualisers/AxisGrid.cc | 26 +++--
src/visualisers/AxisGrid.h | 26 +++--
src/visualisers/AxisItem.cc | 26 +++--
src/visualisers/AxisItem.h | 26 +++--
src/visualisers/AxisLine.cc | 26 +++--
src/visualisers/AxisLine.h | 26 +++--
src/visualisers/AxisMethod.cc | 26 +++--
src/visualisers/AxisMethod.h | 26 +++--
src/visualisers/AxisMinorTick.cc | 26 +++--
src/visualisers/AxisMinorTick.h | 26 +++--
src/visualisers/AxisTick.cc | 26 +++--
src/visualisers/AxisTick.h | 26 +++--
src/visualisers/AxisTickLabelType.cc | 26 +++--
src/visualisers/AxisTickLabelType.h | 26 +++--
src/visualisers/AxisType.cc | 26 +++--
src/visualisers/AxisType.h | 26 +++--
src/visualisers/Bar.cc | 26 +++--
src/visualisers/Bar.h | 26 +++--
src/visualisers/BothValuePlotMethod.h | 26 +++--
src/visualisers/Boundaries.cc | 28 ++++--
src/visualisers/Boundaries.h | 26 +++--
src/visualisers/BoxPlotBasicItem.h | 26 +++--
src/visualisers/BoxPlotItem.cc | 26 +++--
src/visualisers/BoxPlotItem.h | 26 +++--
src/visualisers/BoxPlotVisualiser.cc | 26 +++--
src/visualisers/BoxPlotVisualiser.h | 26 +++--
src/visualisers/CalculateColourTechnique.cc | 26 +++--
src/visualisers/CalculateColourTechnique.h | 26 +++--
src/visualisers/CalmIndicator.h | 26 +++--
src/visualisers/CellShading.cc | 75 ++++++--------
src/visualisers/CellShading.h | 27 +++--
src/visualisers/Cities.cc | 26 +++--
src/visualisers/Cities.h | 26 +++--
src/visualisers/CoastPlotting.cc | 26 +++--
src/visualisers/CoastPlotting.h | 26 +++--
src/visualisers/Coastlines.cc | 26 +++--
src/visualisers/Coastlines.h | 26 +++--
src/visualisers/ColourSelection.cc | 26 +++--
src/visualisers/ColourSelection.h | 26 +++--
src/visualisers/ColourSelectionCount.cc | 26 +++--
src/visualisers/ColourSelectionCount.h | 26 +++--
src/visualisers/ColourSelectionList.cc | 26 +++--
src/visualisers/ColourSelectionList.h | 26 +++--
src/visualisers/ColourTechnique.cc | 26 +++--
src/visualisers/ColourTechnique.h | 26 +++--
src/visualisers/Contour.cc | 26 +++--
src/visualisers/Contour.h | 26 +++--
src/visualisers/ContourMethod.h | 26 +++--
src/visualisers/CountSelectionType.cc | 26 +++--
src/visualisers/CountSelectionType.h | 26 +++--
src/visualisers/Curve.cc | 26 +++--
src/visualisers/Curve.h | 26 +++--
src/visualisers/DateAxis.cc | 26 +++--
src/visualisers/DateAxis.h | 26 +++--
src/visualisers/DefinitionTable.h | 26 +++--
src/visualisers/DefinitionTable.hcc | 26 +++--
src/visualisers/DotPolyShadingMethod.h | 26 +++--
src/visualisers/EpsForecastPlot.h | 26 +++--
src/visualisers/EpsGraph.cc | 27 +++--
src/visualisers/EpsGraph.h | 26 +++--
src/visualisers/EquidistantTableMode.cc | 26 +++--
src/visualisers/EquidistantTableMode.h | 26 +++--
src/visualisers/Filter.cc | 26 +++--
src/visualisers/Filter.h | 26 +++--
src/visualisers/FlagPlotting.cc | 26 +++--
src/visualisers/FlagPlotting.h | 26 +++--
src/visualisers/FloatSelection.cc | 26 +++--
src/visualisers/FloatSelection.h | 26 +++--
src/visualisers/Graph.h | 26 +++--
src/visualisers/GraphPlotting.cc | 26 +++--
src/visualisers/GraphPlotting.h | 26 +++--
src/visualisers/GraphShade.cc | 26 +++--
src/visualisers/GraphShade.h | 26 +++--
src/visualisers/GraphShadeStyle.cc | 26 +++--
src/visualisers/GraphShadeStyle.h | 26 +++--
src/visualisers/GribTables.h | 26 +++--
src/visualisers/GridPlotting.cc | 26 +++--
src/visualisers/GridPlotting.h | 26 +++--
src/visualisers/HatchPolyShadingMethod.h | 26 +++--
src/visualisers/HeightSelection.cc | 26 +++--
src/visualisers/HeightSelection.h | 26 +++--
src/visualisers/HeightSelectionCount.h | 26 +++--
src/visualisers/HeightSelectionList.h | 26 +++--
src/visualisers/HeightTechnique.cc | 26 +++--
src/visualisers/HeightTechnique.h | 26 +++--
src/visualisers/HiLo.cc | 26 +++--
src/visualisers/HiLo.h | 26 +++--
src/visualisers/HiLoBase.h | 26 +++--
src/visualisers/HiLoBoth.h | 26 +++--
src/visualisers/HiLoMarker.h | 26 +++--
src/visualisers/HiLoMarkerBase.h | 26 +++--
src/visualisers/HiLoNumber.h | 26 +++--
src/visualisers/HiLoTechnique.h | 26 +++--
src/visualisers/HiLoText.h | 26 +++--
src/visualisers/HistoIndividualMode.h | 26 +++--
src/visualisers/HistoMode.h | 26 +++--
src/visualisers/HistoTableMode.h | 26 +++--
src/visualisers/Histogram.cc | 26 +++--
src/visualisers/Histogram.h | 26 +++--
src/visualisers/ImageCalculateColourTechnique.h | 26 +++--
src/visualisers/ImageListColourTechnique.h | 26 +++--
src/visualisers/ImportPlot.h | 26 +++--
src/visualisers/IntervalSelectionType.cc | 26 +++--
src/visualisers/IntervalSelectionType.h | 26 +++--
src/visualisers/Intervals.h | 26 +++--
src/visualisers/IsoHighlight.h | 26 +++--
src/visualisers/IsoLabel.cc | 26 +++--
src/visualisers/IsoLabel.h | 26 +++--
src/visualisers/IsoPlot.cc | 59 +++++------
src/visualisers/IsoPlot.h | 26 +++--
src/visualisers/IsoShading.cc | 26 +++--
src/visualisers/IsoShading.h | 26 +++--
src/visualisers/LabelPlotting.cc | 26 +++--
src/visualisers/LabelPlotting.h | 26 +++--
src/visualisers/LabelPlottingBase.h | 26 +++--
src/visualisers/LegendMethod.cc | 48 +++++----
src/visualisers/LegendMethod.h | 26 +++--
src/visualisers/LevelListSelectionType.cc | 26 +++--
src/visualisers/LevelListSelectionType.h | 26 +++--
src/visualisers/LevelSelection.cc | 26 +++--
src/visualisers/LevelSelection.h | 26 +++--
src/visualisers/LinearTableMode.cc | 26 +++--
src/visualisers/LinearTableMode.h | 26 +++--
src/visualisers/ListColourTechnique.cc | 26 +++--
src/visualisers/ListColourTechnique.h | 26 +++--
src/visualisers/LookupTableMode.cc | 26 +++--
src/visualisers/LookupTableMode.h | 26 +++--
src/visualisers/MarkerSelection.h | 26 +++--
src/visualisers/MarkerSelectionCount.h | 26 +++--
src/visualisers/MarkerSelectionList.h | 26 +++--
src/visualisers/MarkerShadingTechnique.cc | 26 +++--
src/visualisers/MarkerShadingTechnique.h | 26 +++--
src/visualisers/MarkerValuePlotMethod.h | 26 +++--
src/visualisers/MetgramGraph.cc | 26 +++--
src/visualisers/MetgramGraph.h | 26 +++--
src/visualisers/MetgramStyle.cc | 26 +++--
src/visualisers/MetgramStyle.h | 26 +++--
src/visualisers/NormalTableMode.cc | 26 +++--
src/visualisers/NormalTableMode.h | 26 +++--
src/visualisers/ObsItem.h | 26 +++--
src/visualisers/ObsItemFamily.cc | 26 +++--
src/visualisers/ObsItemFamily.h | 26 +++--
src/visualisers/ObsPlotting.cc | 26 +++--
src/visualisers/ObsPlotting.h | 26 +++--
src/visualisers/ObsTable.cc | 26 +++--
src/visualisers/ObsTable.h | 26 +++--
src/visualisers/OriginMarker.h | 26 +++--
src/visualisers/OutLayerTechnique.cc | 26 +++--
src/visualisers/OutLayerTechnique.h | 26 +++--
src/visualisers/PolyShadingMethod.cc | 26 +++--
src/visualisers/PolyShadingMethod.h | 26 +++--
src/visualisers/PolyShadingTechnique.cc | 26 +++--
src/visualisers/PolyShadingTechnique.h | 26 +++--
src/visualisers/ShadingTechnique.h | 26 +++--
src/visualisers/SimplePolylineVisualiser.cc | 26 +++--
src/visualisers/SimplePolylineVisualiser.h | 26 +++--
src/visualisers/Streamlines.cc | 28 ++++--
src/visualisers/Streamlines.h | 26 +++--
src/visualisers/SymbolAdvancedTableMode.cc | 26 +++--
src/visualisers/SymbolAdvancedTableMode.h | 26 +++--
src/visualisers/SymbolMode.cc | 26 +++--
src/visualisers/SymbolMode.h | 30 +++---
src/visualisers/SymbolPlotting.cc | 26 +++--
src/visualisers/SymbolPlotting.h | 26 +++--
src/visualisers/TaylorGrid.cc | 26 +++--
src/visualisers/TaylorGrid.h | 26 +++--
src/visualisers/TephiGrid.cc | 26 +++--
src/visualisers/TephiGrid.h | 26 +++--
src/visualisers/TextOrientation.cc | 26 +++--
src/visualisers/TextOrientation.h | 26 +++--
src/visualisers/UserDate.cc | 26 +++--
src/visualisers/UserDate.h | 26 +++--
src/visualisers/ValuePlot.cc | 26 +++--
src/visualisers/ValuePlot.h | 26 +++--
src/visualisers/ValuePlotBase.h | 26 +++--
src/visualisers/ValuePlotMethod.h | 26 +++--
src/visualisers/VisDefInfo.h | 26 +++--
src/visualisers/Wind.cc | 28 ++++--
src/visualisers/Wind.h | 26 +++--
src/visualisers/WindPlotting.cc | 26 +++--
src/visualisers/WindPlotting.h | 26 +++--
396 files changed, 6644 insertions(+), 3598 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