[geos-commits] [SCM] GEOS branch svn-3.6 updated. 8a0f6d0e121c663bfdeab9a76baba189db52bacb

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GEOS".

The branch, svn-3.6 has been updated
       via  8a0f6d0e121c663bfdeab9a76baba189db52bacb (commit)
       via  d1a649fcbeeffa3a21e7d2bf66e7f545a73a2388 (commit)
      from  bff56668fda7958634413d223bef199da24d6110 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8a0f6d0e121c663bfdeab9a76baba189db52bacb
Author: Daniel Baston <dbaston at gmail.com>
Date:   Mon Oct 29 10:16:45 2018 -0400

    Add NEWS entry for #941

diff --git a/NEWS b/NEWS
index 8d63ff7..ea82867 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ Changes in 3.6.4
 - Bug fixes / improvements
   - Fix crash in GEOSUnaryUnion with empty LineString
     (#928, Sergey Fedoseev)
+  - Fix incorrect error return values in GEOSLength and
+    GEOSisValidDetail (#941, Dan Baston)
 
 
 Changes in 3.6.3

commit d1a649fcbeeffa3a21e7d2bf66e7f545a73a2388
Author: Daniel Baston <dbaston at gmail.com>
Date:   Sat Oct 27 15:20:11 2018 -0400

    Fix incorrect error return values in CAPI
    
    Fixes #941

diff --git a/capi/geos_ts_c.cpp b/capi/geos_ts_c.cpp
index 6e5c109..09c3bae 100644
--- a/capi/geos_ts_c.cpp
+++ b/capi/geos_ts_c.cpp
@@ -409,7 +409,7 @@ GEOSFree_r (GEOSContextHandle_t extHandle, void* buffer)
 
 //-----------------------------------------------------------
 // relate()-related functions
-//  return 0 = false, 1 = true, 2 = error occured
+//  return 0 = false, 1 = true, 2 = error occurred
 //-----------------------------------------------------------
 
 char
@@ -1006,14 +1006,14 @@ GEOSisValidDetail_r(GEOSContextHandle_t extHandle, const Geometry *g,
 {
     if ( 0 == extHandle )
     {
-        return 0;
+        return 2;
     }
 
     GEOSContextHandleInternal_t *handle = 0;
     handle = reinterpret_cast<GEOSContextHandleInternal_t*>(extHandle);
     if ( 0 == handle->initialized )
     {
-        return 0;
+        return 2;
     }
 
     try
@@ -1266,7 +1266,7 @@ GEOSLength_r(GEOSContextHandle_t extHandle, const Geometry *g, double *length)
 
     if ( 0 == extHandle )
     {
-        return 2;
+        return 0;
     }
 
     GEOSContextHandleInternal_t *handle = 0;

-----------------------------------------------------------------------

Summary of changes:
 NEWS               | 2 ++
 capi/geos_ts_c.cpp | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GEOS