[proj] 03/06: Imported Upstream version 4.9.2~rc2
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Sep 10 16:17:19 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository proj.
commit afaaf3e5c68fbee7b8668f1033da6989d91ce637
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Thu Sep 10 16:42:31 2015 +0200
Imported Upstream version 4.9.2~rc2
---
ChangeLog | 17 +++++++++-------
configure | 54 +++++++++++++++++++++++++++++++++++++++++++++++++
configure.in | 4 ++++
nad/Makefile.am | 6 +++---
nad/Makefile.in | 6 +++---
nad/ntf_r93.gsb | Bin 277424 -> 0 bytes
nad/ntv1_can.dat | Bin 1113184 -> 0 bytes
nad/null.lla | 5 -----
nad/nzgd2kgrid0005.gsb | Bin 318464 -> 0 bytes
src/PJ_moll.c | 8 ++++++--
src/pj_mutex.c | 8 +++++---
11 files changed, 85 insertions(+), 23 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ab3ece1..a00c974 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
-2015-05-25 Elliott Sales de Andrade <https://github.com/QuLogic>
- * : Fix inverse stereo projection on an ellipsoid
- https://github.com/OSGeo/proj.4/pull/277
+2015-09-10 Bas Couwenberg <https://github.com/sebastic>
+ * : Don't include files in proj dist, also included in proj-datumgrids
+ dist #301
+
+2015-09-10 Ture Pålsson <https://github.com/turepalsson>
+ * : PTHREAD_MUTEX_RECURSIVE detection issue on FreeBSD #303
+
+2015-09-10 Martin Raspaud <https://github.com/mraspaud>
+ * : Don't return values when doing inverse projections outside of the
+ mollweide map #304
2015-09-08 Charles Karney <https://github.com/cffk>
* : Update Geodesic library from GeographicLib
@@ -23,10 +30,6 @@
https://github.com/OSGeo/proj.4/issues/296 and
https://github.com/OSGeo/proj.4/issues/297
-2015-06-01 Charles Karney <https://github.com/cffk>
- Make PJ_aeqd.c use geodesics for inverse and forward projection
- modification so that the geodesic structure is not global
- https://github.com/OSGeo/proj.4/pull/281
2015-07-27 Even Rouault <even.rouault at spatialys.com>
* : Remove setlocale() use in pj_init_ctx(), and replace uses of atof() &
diff --git a/configure b/configure
index a746a26..6f5383f 100755
--- a/configure
+++ b/configure
@@ -1864,6 +1864,52 @@ fi
eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ as_decl_name=`echo $2|sed 's/ *(.*//'`
+ as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+ (void) $as_decl_use;
+#else
+ (void) $as_decl_name;
+#endif
+#endif
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ eval "$3=yes"
+else
+ eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_decl
cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
@@ -12667,6 +12713,14 @@ _ACEOF
fi
+ ac_fn_c_check_decl "$LINENO" "PTHREAD_MUTEX_RECURSIVE" "ac_cv_have_decl_PTHREAD_MUTEX_RECURSIVE" "#include <pthread.h>
+"
+if test "x$ac_cv_have_decl_PTHREAD_MUTEX_RECURSIVE" = xyes; then :
+
+$as_echo "#define HAVE_PTHREAD_MUTEX_RECURSIVE /**/" >>confdefs.h
+
+fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled, pthread" >&5
$as_echo "enabled, pthread" >&6; }
else
diff --git a/configure.in b/configure.in
index 095a191..30f7a16 100644
--- a/configure.in
+++ b/configure.in
@@ -98,6 +98,10 @@ if test "$with_mutex" = yes -o x"$with_mutex" = x ; then
THREAD_LIB="-lpthread"
fi
AC_CHECK_LIB(pthread,pthread_mutexattr_settype,,,)
+ AC_CHECK_DECL(PTHREAD_MUTEX_RECURSIVE,
+ AC_DEFINE(HAVE_PTHREAD_MUTEX_RECURSIVE, [], [Define if your pthreads implementation have PTHREAD_MUTEX_RECURSIVE]),
+ ,
+ [#include <pthread.h>])
AC_MSG_RESULT([enabled, pthread])
else
MUTEX_SETTING=stub
diff --git a/nad/Makefile.am b/nad/Makefile.am
index 705d65e..e437910 100644
--- a/nad/Makefile.am
+++ b/nad/Makefile.am
@@ -15,15 +15,15 @@ TESTIGN = $(NADPATH)/testIGNF
pkgdata_DATA = GL27 nad.lst proj_def.dat nad27 nad83 world epsg esri \
esri.extra other.extra \
- CH IGNF testIGNF proj_outIGNF.dist \
- null.lla ntf_r93.gsb nzgd2kgrid0005.gsb ntv1_can.dat makefile.vc CMakeLists.txt
+ CH IGNF
EXTRA_DIST = GL27 nad.lst proj_def.dat nad27 nad83 pj_out27.dist pj_out83.dist td_out.dist \
test27 test83 world epsg esri tv_out.dist tf_out.dist \
testflaky testvarious testdatumfile testntv2 ntv2_out.dist \
esri.extra other.extra \
CH IGNF testIGNF proj_outIGNF.dist \
- null.lla ntf_r93.gsb nzgd2kgrid0005.gsb ntv1_can.dat makefile.vc CMakeLists.txt
+ makefile.vc CMakeLists.txt
+
process-nad2bin:
@if [ -f $(NADPATH)/null.lla -a ! -f null ] || [ -f $(NADPATH)/conus.lla -a ! -f conus ] ; then \
for x in $(NADPATH)/*.lla ; do \
diff --git a/nad/Makefile.in b/nad/Makefile.in
index 03c3d28..6a412df 100644
--- a/nad/Makefile.in
+++ b/nad/Makefile.in
@@ -278,15 +278,14 @@ TESTDATUMFILE = $(NADPATH)/testdatumfile
TESTIGN = $(NADPATH)/testIGNF
pkgdata_DATA = GL27 nad.lst proj_def.dat nad27 nad83 world epsg esri \
esri.extra other.extra \
- CH IGNF testIGNF proj_outIGNF.dist \
- null.lla ntf_r93.gsb nzgd2kgrid0005.gsb ntv1_can.dat makefile.vc CMakeLists.txt
+ CH IGNF
EXTRA_DIST = GL27 nad.lst proj_def.dat nad27 nad83 pj_out27.dist pj_out83.dist td_out.dist \
test27 test83 world epsg esri tv_out.dist tf_out.dist \
testflaky testvarious testdatumfile testntv2 ntv2_out.dist \
esri.extra other.extra \
CH IGNF testIGNF proj_outIGNF.dist \
- null.lla ntf_r93.gsb nzgd2kgrid0005.gsb ntv1_can.dat makefile.vc CMakeLists.txt
+ makefile.vc CMakeLists.txt
all: all-am
@@ -504,6 +503,7 @@ uninstall-am: uninstall-pkgdataDATA
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags-am uninstall uninstall-am uninstall-pkgdataDATA
+
process-nad2bin:
@if [ -f $(NADPATH)/null.lla -a ! -f null ] || [ -f $(NADPATH)/conus.lla -a ! -f conus ] ; then \
for x in $(NADPATH)/*.lla ; do \
diff --git a/nad/ntf_r93.gsb b/nad/ntf_r93.gsb
deleted file mode 100644
index 07e34fc..0000000
Binary files a/nad/ntf_r93.gsb and /dev/null differ
diff --git a/nad/ntv1_can.dat b/nad/ntv1_can.dat
deleted file mode 100644
index 8acad07..0000000
Binary files a/nad/ntv1_can.dat and /dev/null differ
diff --git a/nad/null.lla b/nad/null.lla
deleted file mode 100644
index eb25285..0000000
--- a/nad/null.lla
+++ /dev/null
@@ -1,5 +0,0 @@
-Null transform for whole world
- 3 3 1 -180.00000 180.00000 -90.00000 90.00000
-0: 0 0 0 0 0 0
-1: 0 0 0 0 0 0
-2: 0 0 0 0 0 0
diff --git a/nad/nzgd2kgrid0005.gsb b/nad/nzgd2kgrid0005.gsb
deleted file mode 100644
index 840bd00..0000000
Binary files a/nad/nzgd2kgrid0005.gsb and /dev/null differ
diff --git a/src/PJ_moll.c b/src/PJ_moll.c
index 98f0457..cf9369d 100644
--- a/src/PJ_moll.c
+++ b/src/PJ_moll.c
@@ -29,8 +29,12 @@ FORWARD(s_forward); /* spheroid */
INVERSE(s_inverse); /* spheroid */
lp.phi = aasin(P->ctx, xy.y / P->C_y);
lp.lam = xy.x / (P->C_x * cos(lp.phi));
- lp.phi += lp.phi;
- lp.phi = aasin(P->ctx, (lp.phi + sin(lp.phi)) / P->C_p);
+ if (fabs(lp.lam) < PI) {
+ lp.phi += lp.phi;
+ lp.phi = aasin(P->ctx, (lp.phi + sin(lp.phi)) / P->C_p);
+ } else {
+ lp.lam = lp.phi = HUGE_VAL;
+ }
return (lp);
}
FREEUP; if (P) pj_dalloc(P); }
diff --git a/src/pj_mutex.c b/src/pj_mutex.c
index 349537c..dc484c6 100644
--- a/src/pj_mutex.c
+++ b/src/pj_mutex.c
@@ -33,7 +33,9 @@
#define _XOPEN_SOURCE 500
#endif
+
#ifndef _WIN32
+#include "proj_config.h"
#include <projects.h>
#else
#include <proj_api.h>
@@ -120,10 +122,10 @@ void pj_acquire_lock()
pthread_mutex_lock( &pj_precreated_lock);
pthread_mutexattr_init(&mutex_attr);
-#ifndef PTHREAD_MUTEX_RECURSIVE
- pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP);
-#else
+#ifdef HAVE_PTHREAD_MUTEX_RECURSIVE
pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE);
+#else
+ pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP);
#endif
pthread_mutex_init(&pj_core_lock, &mutex_attr);
pj_core_lock_created = 1;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/proj.git
More information about the Pkg-grass-devel
mailing list