[qmapshack] 02/05: Merge tag 'upstream/1.8.1'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository qmapshack.

commit 09e73cb88e94c0d3b21e9de9aca9e3deb53436ea
Merge: 1eb90ff 7067510
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun May 14 13:20:39 2017 +0200

    Merge tag 'upstream/1.8.1'
    
    Upstream version 1.8.1

 CMakeLists.txt                                     |    7 +-
 CMakeLists.txt.user                                |    4 +-
 README.md                                          |   13 +-
 changelog.txt                                      |    9 +
 cmake/Modules/FindQuaZip.cmake                     |    3 +
 src/CMakeLists.txt                                 |   29 +-
 src/canvas/CCanvas.cpp                             |   34 +
 src/canvas/CCanvas.h                               |    3 +
 src/canvas/IDrawContext.h                          |    6 +
 src/canvas/IDrawObject.cpp                         |   14 +-
 src/dem/IDem.cpp                                   |    2 +-
 src/dem/IDem.h                                     |    2 +-
 src/gis/IGisItem.cpp                               |   10 +-
 src/gis/IGisItem.h                                 |    7 +-
 src/gis/fit/CFitProject.cpp                        |   10 +-
 src/gis/fit/decoder/CFitByteDataTransformer.cpp    |   29 +-
 src/gis/fit/decoder/CFitByteDataTransformer.h      |    6 +-
 src/gis/fit/decoder/CFitDecoder.cpp                |   26 +-
 src/gis/fit/decoder/CFitDefinitionMessage.cpp      |   44 +-
 src/gis/fit/decoder/CFitDefinitionMessage.h        |   13 +-
 src/gis/fit/decoder/CFitDevFieldDefinition.cpp     |   54 +
 ...itFieldDataState.h => CFitDevFieldDefinition.h} |   32 +-
 ...onState.cpp => CFitDevFieldDefinitionState.cpp} |   29 +-
 ...ldDataState.h => CFitDevFieldDefinitionState.h} |   24 +-
 src/gis/fit/decoder/CFitField.cpp                  |    3 +-
 src/gis/fit/decoder/CFitFieldBuilder.cpp           |   13 +-
 src/gis/fit/decoder/CFitFieldBuilder.h             |    2 +
 src/gis/fit/decoder/CFitFieldDataState.cpp         |  209 +++-
 src/gis/fit/decoder/CFitFieldDataState.h           |    6 +
 src/gis/fit/decoder/CFitFieldDefinition.cpp        |   12 +-
 src/gis/fit/decoder/CFitFieldDefinition.h          |    2 +
 src/gis/fit/decoder/CFitFieldDefinitionState.cpp   |    7 +-
 src/gis/fit/decoder/CFitHeaderState.cpp            |    2 +-
 src/gis/fit/decoder/CFitMessage.cpp                |   35 +-
 src/gis/fit/decoder/CFitMessage.h                  |    1 +
 src/gis/fit/decoder/CFitRecordContentState.cpp     |   24 +-
 src/gis/fit/decoder/CFitRecordHeaderState.cpp      |   10 +-
 src/gis/fit/decoder/IFitDecoderState.cpp           |   46 +-
 src/gis/fit/decoder/IFitDecoderState.h             |   19 +-
 src/gis/fit/defs/CFitBaseType.cpp                  |   20 +-
 src/gis/fit/defs/CFitBaseType.h                    |    9 +
 src/gis/fit/defs/CFitFieldProfile.cpp              |   34 +-
 src/gis/fit/defs/CFitFieldProfile.h                |   22 +-
 src/gis/fit/defs/CFitProfile.cpp                   |    6 +-
 src/gis/fit/defs/CFitProfile.h                     |    6 +-
 src/gis/fit/defs/CFitProfileLookup.cpp             |  362 ++++++-
 src/gis/fit/defs/HowToFitGenerator.txt             |    4 +-
 src/gis/fit/defs/fit_enums.h                       | 1049 ++++++++++++++++----
 src/gis/fit/defs/fit_fields.h                      |  418 +++++---
 src/gis/fit/defs/profiles.py                       |  267 +++++
 src/gis/fit/defs/profiles.sh                       |  316 ------
 src/gis/fit/serialization.cpp                      |    2 +-
 .../rte/router/brouter/CRouterBRouterSetupPage.cpp |   10 -
 .../router/brouter/CRouterBRouterSetupWizard.cpp   |   22 +-
 .../rte/router/brouter/CRouterBRouterSetupWizard.h |    4 +-
 .../router/brouter/CRouterBRouterTilesSelect.cpp   |   41 +-
 .../rte/router/brouter/CRouterBRouterToolShell.cpp |   12 +-
 .../rte/router/brouter/CRouterBRouterToolShell.h   |    6 +
 .../router/brouter/IRouterBRouterSetupWizard.ui    |   16 +-
 src/icons/32x32/CutHistory.png                     |  Bin 1014 -> 0 bytes
 src/icons/32x32/CutHistoryAfter.png                |  Bin 0 -> 1451 bytes
 src/icons/32x32/CutHistoryBefore.png               |  Bin 0 -> 1316 bytes
 src/icons/48x48/CutHistory.png                     |  Bin 1558 -> 0 bytes
 src/icons/48x48/CutHistoryAfter.png                |  Bin 0 -> 2318 bytes
 src/icons/48x48/CutHistoryBefore.png               |  Bin 0 -> 2211 bytes
 src/icons/{CutHistory.svg => CutHistoryAfter.svg}  |   40 +-
 src/icons/{CutHistory.svg => CutHistoryBefore.svg} |   36 +-
 src/locale/qmapshack.ts                            |   81 +-
 src/locale/qmapshack_cs.ts                         |   85 +-
 src/locale/qmapshack_de.ts                         |   85 +-
 src/locale/qmapshack_es.ts                         |   83 +-
 src/locale/qmapshack_fr.ts                         |   85 +-
 src/locale/qmapshack_nl.ts                         |   85 +-
 src/locale/qmapshack_ru.desktop                    |    4 +-
 src/locale/qmapshack_ru.ts                         |   85 +-
 src/resources.qrc                                  |    6 +-
 src/widgets/CHistoryListWidget.cpp                 |   52 +-
 src/widgets/CHistoryListWidget.h                   |    6 +-
 78 files changed, 3034 insertions(+), 1126 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git