[ossim] 02/04: Merge tag 'upstream/2.2.2'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository ossim.

commit 58698806858818b045f0cb4e4dcd94ac4ac55829
Merge: 4d85af5 851b6bc
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Feb 7 18:41:05 2018 +0100

    Merge tag 'upstream/2.2.2'
    
    Upstream version 2.2.2

 CMakeLists.txt                                     |  10 +
 cmake/CMakeLists.txt                               |  10 +-
 cmake/scripts/ossim-cmake-config.sh                |  17 +-
 include/ossim/base/JsonInterface.h                 |  31 +
 include/ossim/base/ossimKeywordlist.h              |  27 +-
 include/ossim/imaging/ossimWriter.h                | 111 ++-
 include/ossim/init/JsonConfig.h                    | 184 +++++
 include/ossim/projection/ossimImageViewTransform.h |   8 +-
 include/ossim/projection/ossimRpcSolver.h          |   7 +-
 include/ossim/projection/ossimSensorModel.h        |   2 +-
 include/ossim/projection/ossimSensorModelTuple.h   |   2 +-
 include/ossim/reg/GroundControlPoint.h             |  83 +++
 include/ossim/reg/Image.h                          |  85 +++
 include/ossim/reg/PhotoBlock.h                     |  99 +++
 include/ossim/reg/TiePoint.h                       | 126 ++++
 include/ossim/util/ossimTool.h                     |  16 +-
 scripts/archive.sh                                 |   2 +-
 scripts/build.sh                                   |   7 +-
 scripts/env.sh                                     |   2 +-
 scripts/install.sh                                 |   2 +-
 share/ossim/templates/ossim_preferences_template   |   5 +-
 src/CMakeLists.txt                                 |   9 +-
 src/base/ossimKeywordlist.cpp                      | 425 +++++++++++-
 src/imaging/ossimImageRenderer.cpp                 |  27 +-
 src/imaging/ossimImageWriterFactory.cpp            |   5 +-
 src/imaging/ossimWriter.cpp                        | 746 +++++++++++++++------
 src/init/JsonConfig.cpp                            | 467 +++++++++++++
 src/projection/ossimImageViewTransform.cpp         |  15 +
 src/projection/ossimRpcModel.cpp                   |   3 +-
 src/projection/ossimSensorModel.cpp                |   4 +-
 src/projection/ossimSensorModelTuple.cpp           | 197 +++---
 src/reg/GroundControlPoint.cpp                     | 121 ++++
 src/reg/Image.cpp                                  | 115 ++++
 src/reg/PhotoBlock.cpp                             | 183 +++++
 src/reg/TiePoint.cpp                               | 243 +++++++
 src/support_data/ossimQuickbirdRpcHeader.cpp       |  12 +
 src/util/ossimTool.cpp                             |   5 -
 37 files changed, 3051 insertions(+), 362 deletions(-)

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