/ Check-in [c486a63c]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Remove surplus code in geopoly.c that seems to have come from a bad merge.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | apple-osx
Files: files | file ages | folders
SHA3-256: c486a63c33fd2e05d20c689c6557f597e1215488230ef2dc5c2dc766faa7eaf9
User & Date: drh 2018-10-11 14:07:38
Context
2018-10-11
16:28
Fix a merge problem in main.mk check-in: 9a549359 user: drh tags: apple-osx
14:07
Remove surplus code in geopoly.c that seems to have come from a bad merge. check-in: c486a63c user: drh tags: apple-osx
13:57
Merge enhancements from trunk. check-in: 9e10d88b user: drh tags: apple-osx
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to ext/rtree/geopoly.c.

   531    531           GeoCoord t = p->a[ii];
   532    532           p->a[ii] = p->a[jj];
   533    533           p->a[jj] = t;
   534    534           t = p->a[ii+1];
   535    535           p->a[ii+1] = p->a[jj+1];
   536    536           p->a[jj+1] = t;
   537    537         }
   538         -    }
   539         -    sqlite3_result_blob(context, p->hdr, 
   540         -       4+8*p->nVertex, SQLITE_TRANSIENT);
   541         -    sqlite3_free(p);
   542         -  }            
   543         -}
   544         -
   545         -/*
   546         -** Implementation of the geopoly_reverse(X) function.
   547         -**
   548         -** Reverse the order of the vertexes in polygon X.  This can be used
   549         -** to convert an historical polygon that uses a clockwise rotation into
   550         -** a well-formed GeoJSON polygon that uses counter-clockwise rotation.
   551         -*/
   552         -static void geopolyReverseFunc(
   553         -  sqlite3_context *context,
   554         -  int argc,
   555         -  sqlite3_value **argv
   556         -){
   557         -  GeoPoly *p = geopolyFuncParam(context, argv[0], 0);
   558         -  if( p ){
   559         -    int ii, jj;
   560         -    for(ii=2, jj=p->nVertex*2 - 4; ii<jj; ii+=2, jj-=2){
   561         -      GeoCoord t = p->a[ii];
   562         -      p->a[ii] = p->a[jj];
   563         -      p->a[jj] = t;
   564         -      t = p->a[ii+1];
   565         -      p->a[ii+1] = p->a[jj+1];
   566         -      p->a[jj+1] = t;
   567         -
   568    538       }
   569    539       sqlite3_result_blob(context, p->hdr, 
   570    540          4+8*p->nVertex, SQLITE_TRANSIENT);
   571    541       sqlite3_free(p);
   572    542     }            
   573    543   }
   574    544