[geos-commits] [SCM] GEOS branch master updated. f107c5b20bf5f1359e01a6a8a0265f3f99c64c9d

[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, master has been updated
       via  f107c5b20bf5f1359e01a6a8a0265f3f99c64c9d (commit)
      from  685aeb9643044376e020ca9d4d3287f3bcafef19 (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 f107c5b20bf5f1359e01a6a8a0265f3f99c64c9d
Author: Martin Davis <mtnclimb at gmail.com>
Date:   Tue Jan 12 16:43:14 2021 -0800

    Fix geosop operation count

diff --git a/util/geosop/GeosOp.cpp b/util/geosop/GeosOp.cpp
index 4fe4e1c..6472477 100644
--- a/util/geosop/GeosOp.cpp
+++ b/util/geosop/GeosOp.cpp
@@ -365,7 +365,6 @@ void GeosOp::execute() {
 
 void GeosOp::executeUnary(GeomFunction * fun) {
     for (unsigned i = 0; i < geomA.size(); i++) {
-        opCount++;
         vertexCount += geomA[i]->getNumPoints();
         Result* result = executeOpRepeat(fun, i, geomA[i], 0, nullptr);
 
@@ -377,7 +376,6 @@ void GeosOp::executeUnary(GeomFunction * fun) {
 void GeosOp::executeBinary(GeomFunction * fun) {
     for (unsigned ia = 0; ia < geomA.size(); ia++) {
         for (unsigned ib = 0; ib < geomB.size(); ib++) {
-            opCount++;
             vertexCount += geomA[ia]->getNumPoints();
             vertexCount += geomB[ib]->getNumPoints();
             Result* result = executeOpRepeat(fun, ia, geomA[ia], ib, geomB[ib]);
@@ -417,6 +415,7 @@ Result* GeosOp::executeOp(GeomFunction * fun,
     int indexB,
     const std::unique_ptr<Geometry>& geomB) {
 
+    opCount++;
     geos::util::Profile sw( "op" );
     sw.start();
 

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

Summary of changes:
 util/geosop/GeosOp.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
GEOS