[geographiclib] 02/08: Merge tag 'upstream/1.42'

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri May 1 11:17:29 UTC 2015


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

sebastic pushed a commit to branch master
in repository geographiclib.

commit 11538c50368e145428c88d82ef253926ba6a31a7
Merge: d1f82d6 25126b8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri May 1 12:31:08 2015 +0200

    Merge tag 'upstream/1.42'
    
    Upstream version 1.42

 00README.txt                                       |  30 +-
 AUTHORS                                            |   1 +
 CMakeLists.txt                                     |  90 ++--
 Makefile.in                                        |  19 +-
 NEWS                                               |  66 ++-
 aclocal.m4                                         | 134 +++++-
 cmake/CMakeLists.txt                               |   2 +-
 cmake/Makefile.in                                  |   2 +-
 compile                                            | 347 +++++++++++++++
 configure                                          | 169 +++++++-
 configure.ac                                       |  28 +-
 doc/GeographicLib.dox.in                           | 479 +++++++++++----------
 doc/Makefile.in                                    |   2 +-
 doc/NETGeographicLib.dox                           |   2 +-
 doc/doxyfile-c.in                                  |  12 -
 doc/doxyfile-for.in                                |  12 -
 doc/doxyfile-net.in                                |  12 -
 doc/doxyfile.in                                    |  18 +-
 doc/geodesic-c.dox                                 |  16 +-
 doc/geodesic-for.dox                               |  16 +-
 dotnet/Projections/Projections-vs13.csproj         |  10 +-
 examples/JacobiConformal.hpp                       |  51 ++-
 examples/Makefile.in                               |   2 +-
 include/GeographicLib/CassiniSoldner.hpp           |  21 +-
 include/GeographicLib/Config.h                     |   4 +-
 include/GeographicLib/Constants.hpp                |  29 +-
 include/GeographicLib/DMS.hpp                      |  79 ++--
 include/GeographicLib/Ellipsoid.hpp                |  14 +-
 include/GeographicLib/GeoCoords.hpp                |  17 +-
 include/GeographicLib/Geodesic.hpp                 |  20 +-
 include/GeographicLib/GeodesicExact.hpp            |  20 +-
 include/GeographicLib/Geoid.hpp                    |  20 +-
 include/GeographicLib/LambertConformalConic.hpp    |  14 +-
 include/GeographicLib/MGRS.hpp                     |   2 +-
 include/GeographicLib/Math.hpp                     | 167 ++++++-
 include/GeographicLib/PolarStereographic.hpp       |  28 +-
 include/GeographicLib/Rhumb.hpp                    |  38 +-
 include/GeographicLib/TransverseMercator.hpp       |  29 +-
 include/GeographicLib/TransverseMercatorExact.hpp  |  16 +-
 include/GeographicLib/UTMUPS.hpp                   |   2 +-
 include/GeographicLib/Utility.hpp                  |  21 +-
 include/Makefile.in                                |   2 +-
 include/Makefile.mk                                |   8 +-
 java/direct/pom.xml                                |   6 +-
 java/inverse/pom.xml                               |   6 +-
 java/planimeter/pom.xml                            |   6 +-
 java/pom.xml                                       | 131 ++++--
 .../main/java/net/sf/geographiclib/Geodesic.java   |   7 +-
 .../java/net/sf/geographiclib/GeodesicLine.java    |   7 +-
 .../java/net/sf/geographiclib/PolygonArea.java     |   7 +-
 .../java/net/sf/geographiclib/package-info.java    |  87 ++--
 legacy/C/geodesic.c                                |   2 +-
 legacy/C/geodesic.h                                |  27 +-
 legacy/Fortran/geoddirect.for                      |   5 +-
 legacy/Fortran/geodesic.for                        |   2 +-
 legacy/Fortran/geodinverse.for                     |   5 +-
 man/CartConvert.1                                  |   4 +-
 man/CartConvert.usage                              |   2 +-
 man/ConicProj.1                                    |   4 +-
 man/ConicProj.usage                                |   2 +-
 man/GeoConvert.1                                   |  35 +-
 man/GeoConvert.1.html                              |  23 +
 man/GeoConvert.pod                                 |  27 ++
 man/GeoConvert.usage                               |  30 +-
 man/GeodSolve.1                                    |   4 +-
 man/GeodSolve.usage                                |   2 +-
 man/GeodesicProj.1                                 |   4 +-
 man/GeodesicProj.usage                             |   2 +-
 man/GeoidEval.1                                    |   7 +-
 man/GeoidEval.1.html                               |   2 +-
 man/GeoidEval.pod                                  |   3 +-
 man/GeoidEval.usage                                |   3 +-
 man/Gravity.1                                      |   4 +-
 man/Gravity.usage                                  |   2 +-
 man/MagneticField.1                                |   4 +-
 man/MagneticField.usage                            |   2 +-
 man/Makefile.in                                    |   2 +-
 man/Planimeter.1                                   |   4 +-
 man/Planimeter.usage                               |   2 +-
 man/RhumbSolve.1                                   |   4 +-
 man/RhumbSolve.usage                               |   2 +-
 man/TransverseMercatorProj.1                       |   4 +-
 man/TransverseMercatorProj.usage                   |   2 +-
 man/dummy.1.in                                     |  15 +-
 man/script.8.in                                    |  24 +-
 matlab/CMakeLists.txt                              |  98 +----
 matlab/Makefile.am                                 | 184 ++++----
 matlab/Makefile.in                                 | 192 +++++----
 matlab/Makefile.mk                                 |  34 +-
 matlab/cassini_inv.m                               |  46 --
 matlab/ecc2flat.m                                  |  10 -
 matlab/flat2ecc.m                                  |   9 -
 matlab/geocentricforward.m                         |  36 --
 matlab/geocentricreverse.m                         |  37 --
 matlab/geodesicdirect.m                            |  51 ---
 matlab/geodesicinverse.m                           |  51 ---
 matlab/geodesicline.m                              |  54 ---
 matlab/geodproj.m                                  | 139 ------
 matlab/geographiclib-legacy/Contents.m             |  38 ++
 .../geocentricforward.cpp                          |   0
 matlab/geographiclib-legacy/geocentricforward.m    |  46 ++
 .../geocentricreverse.cpp                          |   0
 matlab/geographiclib-legacy/geocentricreverse.m    |  47 ++
 .../{ => geographiclib-legacy}/geodesicdirect.cpp  |   0
 matlab/geographiclib-legacy/geodesicdirect.m       |  50 +++
 .../{ => geographiclib-legacy}/geodesicinverse.cpp |   0
 matlab/geographiclib-legacy/geodesicinverse.m      |  49 +++
 matlab/{ => geographiclib-legacy}/geodesicline.cpp |   0
 matlab/geographiclib-legacy/geodesicline.m         |  52 +++
 .../geographiclibinterface.m                       |  55 +--
 matlab/{ => geographiclib-legacy}/geoidheight.cpp  |   0
 matlab/geographiclib-legacy/geoidheight.m          |  39 ++
 .../localcartesianforward.cpp                      |   0
 .../geographiclib-legacy/localcartesianforward.m   |  63 +++
 .../localcartesianreverse.cpp                      |   0
 .../geographiclib-legacy/localcartesianreverse.m   |  59 +++
 matlab/{ => geographiclib-legacy}/mgrsforward.cpp  |   4 +-
 matlab/geographiclib-legacy/mgrsforward.m          |  34 ++
 matlab/{ => geographiclib-legacy}/mgrsreverse.cpp  |   2 +-
 matlab/{ => geographiclib-legacy}/mgrsreverse.m    |  29 +-
 matlab/{ => geographiclib-legacy}/polygonarea.cpp  |   0
 matlab/geographiclib-legacy/polygonarea.m          |  42 ++
 .../{ => geographiclib-legacy}/utmupsforward.cpp   |   0
 matlab/{ => geographiclib-legacy}/utmupsforward.m  |  36 +-
 .../{ => geographiclib-legacy}/utmupsreverse.cpp   |   0
 matlab/geographiclib-legacy/utmupsreverse.m        |  36 ++
 matlab/geographiclib/Contents.m                    |  95 ++++
 matlab/{ => geographiclib}/cassini_fwd.m           |  46 +-
 matlab/geographiclib/cassini_inv.m                 |  41 ++
 matlab/{ => geographiclib}/defaultellipsoid.m      |   4 +-
 matlab/geographiclib/ecc2flat.m                    |  12 +
 matlab/{ => geographiclib}/eqdazim_fwd.m           |  35 +-
 matlab/{ => geographiclib}/eqdazim_inv.m           |  39 +-
 matlab/geographiclib/flat2ecc.m                    |  11 +
 matlab/{ => geographiclib}/gedistance.m            |  54 ++-
 matlab/{ => geographiclib}/gedoc.m                 |  65 ++-
 matlab/geographiclib/geocent_fwd.m                 |  61 +++
 matlab/geographiclib/geocent_inv.m                 | 151 +++++++
 matlab/{ => geographiclib}/geodarea.m              |  24 +-
 matlab/{ => geographiclib}/geoddistance.m          |  51 +--
 matlab/{ => geographiclib}/geoddoc.m               |  58 +--
 matlab/{ => geographiclib}/geodreckon.m            |  24 +-
 matlab/geographiclib/geoid_height.m                | 165 +++++++
 matlab/geographiclib/geoid_load.m                  |  53 +++
 matlab/{ => geographiclib}/gereckon.m              |  37 +-
 matlab/{ => geographiclib}/gnomonic_fwd.m          |  41 +-
 matlab/{ => geographiclib}/gnomonic_inv.m          |  46 +-
 matlab/geographiclib/loccart_fwd.m                 |  57 +++
 matlab/geographiclib/loccart_inv.m                 |  56 +++
 matlab/geographiclib/mgrs_fwd.m                    | 169 ++++++++
 matlab/geographiclib/mgrs_inv.m                    | 214 +++++++++
 matlab/geographiclib/polarst_fwd.m                 |  67 +++
 matlab/geographiclib/polarst_inv.m                 |  64 +++
 matlab/{ => geographiclib}/private/A1m1f.m         |   2 +-
 matlab/{ => geographiclib}/private/A2m1f.m         |   2 +-
 matlab/{ => geographiclib}/private/A3coeff.m       |   4 +-
 matlab/{ => geographiclib}/private/A3f.m           |   4 +-
 matlab/{ => geographiclib}/private/AngDiff.m       |   4 +-
 matlab/{ => geographiclib}/private/AngNormalize.m  |   4 +-
 matlab/{ => geographiclib}/private/AngNormalize2.m |   4 +-
 matlab/{ => geographiclib}/private/AngRound.m      |   4 +-
 matlab/{ => geographiclib}/private/C1f.m           |   2 +-
 matlab/geographiclib/private/C1pf.m                |  22 +
 matlab/{ => geographiclib}/private/C2f.m           |   2 +-
 matlab/{ => geographiclib}/private/C3coeff.m       |   4 +-
 matlab/{ => geographiclib}/private/C3f.m           |   4 +-
 matlab/{ => geographiclib}/private/C4coeff.m       |   4 +-
 matlab/{ => geographiclib}/private/C4f.m           |   4 +-
 matlab/{ => geographiclib}/private/G4coeff.m       |   5 +-
 matlab/geographiclib/private/GeoRotation.m         |  26 ++
 matlab/{ => geographiclib}/private/SinCosSeries.m  |  11 +-
 matlab/geographiclib/private/cbrtx.m               |   9 +
 matlab/{ => geographiclib}/private/cvmgt.m         |   8 +-
 matlab/geographiclib/private/eatanhe.m             |  13 +
 matlab/geographiclib/private/geoid_file.m          |  27 ++
 matlab/geographiclib/private/geoid_load_file.m     |  32 ++
 matlab/geographiclib/private/norm2.m               |  10 +
 matlab/{ => geographiclib}/private/sumx.m          |   4 +-
 matlab/geographiclib/private/swap.m                |   5 +
 matlab/geographiclib/private/tauf.m                |  22 +
 matlab/geographiclib/private/taupf.m               |  10 +
 matlab/geographiclib/projdoc.m                     |  76 ++++
 matlab/{ => geographiclib}/tranmerc_fwd.m          |  55 +--
 matlab/{ => geographiclib}/tranmerc_inv.m          |  68 +--
 matlab/geographiclib/utmups_fwd.m                  | 120 ++++++
 matlab/geographiclib/utmups_inv.m                  |  83 ++++
 matlab/geoidheight.m                               |  38 --
 matlab/localcartesianforward.m                     |  41 --
 matlab/localcartesianreverse.m                     |  41 --
 matlab/mgrsforward.m                               |  31 --
 matlab/polygonarea.m                               |  47 --
 matlab/private/C1pf.m                              |  22 -
 matlab/private/SinCosNorm.m                        |  10 -
 matlab/private/atanhee.m                           |  15 -
 matlab/private/cbrt.m                              |   9 -
 matlab/private/swap.m                              |   8 -
 matlab/utm_fwd.m                                   |  50 ---
 matlab/utm_inv.m                                   |  51 ---
 matlab/utmupsreverse.m                             |  33 --
 missing                                            |   4 +-
 pom.xml                                            |   3 +-
 python/Makefile.in                                 |   2 +-
 src/CassiniSoldner.cpp                             |   6 +-
 src/DMS.cpp                                        |  53 ++-
 src/Ellipsoid.cpp                                  |  30 +-
 src/GeoCoords.cpp                                  |   5 +-
 src/Geocentric.cpp                                 |   8 +-
 src/Geodesic.cpp                                   |  41 +-
 src/GeodesicExact.cpp                              |  50 ++-
 src/GeodesicLine.cpp                               |  12 +-
 src/GeodesicLineExact.cpp                          |  14 +-
 src/GeographicLib.pro                              |   3 +-
 src/Geoid.cpp                                      |   1 +
 src/LambertConformalConic.cpp                      |  50 +--
 src/LocalCartesian.cpp                             |   3 +-
 src/MagneticModel.cpp                              |   8 +-
 src/Makefile.am                                    |   1 +
 src/Makefile.in                                    |   8 +-
 src/Makefile.mk                                    |   3 +-
 src/Math.cpp                                       |  65 +++
 src/PolarStereographic.cpp                         |  41 +-
 src/Rhumb.cpp                                      |  41 +-
 src/TransverseMercator.cpp                         |  74 +---
 src/TransverseMercatorExact.cpp                    |  41 +-
 src/UTMUPS.cpp                                     |   2 +-
 tools/CMakeLists.txt                               | 292 +------------
 tools/Makefile.am                                  |   2 +-
 tools/Makefile.in                                  |   4 +-
 tools/{CMakeLists.txt => tests.cmake}              | 123 ++----
 windows/Geographic-vc10.vcxproj                    |   1 +
 windows/Geographic-vc10x.vcxproj                   |   1 +
 windows/Geographic-vc13n.vcxproj                   |   5 +-
 windows/Geographic-vc8.vcproj                      |   4 +
 windows/Geographic-vc9.vcproj                      |   4 +
 234 files changed, 4912 insertions(+), 3099 deletions(-)

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



More information about the Pkg-grass-devel mailing list