Skip to content

Commit

Permalink
Merge 862c4ba into 1384b97
Browse files Browse the repository at this point in the history
  • Loading branch information
busstoptaktik committed May 18, 2016
2 parents 1384b97 + 862c4ba commit 7abc4dd
Show file tree
Hide file tree
Showing 128 changed files with 19,411 additions and 7,919 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,15 @@ install:
fi
- make -j3
- make check
- ./src/proj -VC
- mv src/.libs/*.gc* src

script:
- echo "done"

after_success:
- coveralls --extension .c
# coveralls falsely reports .c-files in the build directories as having 100% coverage so we exclude them
- coveralls --extension .c --exclude build_autoconf --exclude build_cmake
- echo "$TRAVIS_SECURE_ENV_VARS"
- sh -c "./travis/build_docs.sh"
- sh -c 'if test "$TRAVIS_SECURE_ENV_VARS" = "true" -a "$TRAVIS_BRANCH" = "master"; then echo "publish website"; ./travis/add_deploy_key.sh; ./travis/deploy_website.sh $TRAVIS_BUILD_DIR/docs/build /tmp; fi'
Expand Down
15 changes: 10 additions & 5 deletions man/man1/proj.1
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
.nr LL 5.5i
.ad b
.hy 1
.TH PROJ 1 "2000/03/21 Rel. 4.4"
.TH PROJ 1 "2000/03/21 Rel. 4.4"
.SH NAME
proj \- forward cartographic projection filter
.br
invproj \- inverse cartographic projection filter
.SH SYNOPSIS
.B proj
[
.B \-bceEfiIlmorsStTvVwW
.B \-bcCeEfiIlmorsStTvVwW
[
.I args
] ] [
Expand All @@ -20,7 +20,7 @@ file[s]
.br
.B invproj
[
.B \-bceEfiIlmorsStTwW
.B \-bcCeEfiIlmorsStTwW
[
.I args
] ] [
Expand Down Expand Up @@ -52,6 +52,11 @@ process and allows bypassing formatting operations.
Selects binary input only (see
.B \-b option).
.TP
.BI \-C
Check. Invoke all built in self tests and report.
Get more verbose report by preceding with the
.B \-V option).
.TP
.BI \-I
alternate method to specify inverse projection.
Redundant when used with
Expand Down Expand Up @@ -106,7 +111,7 @@ that can be selected with
.B +units
or
.B \-ld
list of datums that can be selected with
list of datums that can be selected with
.B +datum.
.TP
.BI \-r
Expand Down Expand Up @@ -278,7 +283,7 @@ projection coordinates within one datum.
The \fIcs2cs\fR program operates
similarly, but allows translation between any pair of definable coordinate
systems, including support for datum translation.
.PP
.PP
The \fIgeod\fR program provides the ability to compute geodesic (Great
Circle) computations.
.SH SEE ALSO
Expand Down
5 changes: 3 additions & 2 deletions src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,9 @@ libproj_la_SOURCES = \
pj_factors.c pj_fwd.c pj_init.c pj_inv.c pj_fwd3d.c pj_inv3d.c\
pj_list.c pj_malloc.c pj_mlfn.c pj_msfn.c proj_mdist.c \
pj_open_lib.c pj_param.c pj_phi2.c pj_pr_list.c \
pj_qsfn.c pj_strerrno.c pj_tsfn.c pj_units.c pj_ctx.c pj_log.c \
pj_zpoly1.c rtodms.c vector1.c pj_release.c pj_gauss.c \
pj_qsfn.c pj_generic_selftest.c pj_run_selftests.c pj_strerrno.c \
pj_tsfn.c pj_units.c pj_ctx.c pj_log.c pj_zpoly1.c rtodms.c \
vector1.c pj_release.c pj_gauss.c \
PJ_healpix.c PJ_natearth.c PJ_natearth2.c PJ_calcofi.c pj_fileapi.c \
\
pj_gc_reader.c pj_gridcatalog.c \
Expand Down

0 comments on commit 7abc4dd

Please sign in to comment.