Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lib/shapelib: sync upstream with shapelib 1.6.0 and GDAL 3.9.2 #4395

Merged
merged 4 commits into from
Sep 29, 2024

Conversation

nilason
Copy link
Contributor

@nilason nilason commented Sep 26, 2024

Sync external library shapelib with upstream shapelib 1.6.0 and GDAL 3.9.2.

@nilason nilason added this to the 8.5.0 milestone Sep 26, 2024
@nilason nilason self-assigned this Sep 26, 2024
wenzeslaus
wenzeslaus previously approved these changes Sep 26, 2024
wenzeslaus
wenzeslaus previously approved these changes Sep 26, 2024
@nilason
Copy link
Contributor Author

nilason commented Sep 26, 2024

Before we merge this, I was hoping to revisit the issue of the patch:

--- a/lib/external/shapelib/dbfopen.c
+++ b/lib/external/shapelib/dbfopen.c
@@ -1226,9 +1226,10 @@ DBFGetFieldInfo( DBFHandle psDBF, int iField, char * pszFieldName,
     else if( psDBF->pachFieldType[iField] == 'N'
              || psDBF->pachFieldType[iField] == 'F' )
     {
-    if( psDBF->panFieldDecimals[iField] > 0
-            || psDBF->panFieldSize[iField] >= 10 )
+    if( psDBF->panFieldDecimals[iField] > 0 ) {
+        /* || psDBF->panFieldSize[iField] >= 10 ) */ /* GDAL bug #809 */
         return( FTDouble );
+    }
     else
         return( FTInteger );
     }

(https://github.com/OSGeo/grass/tree/main/lib/external/shapelib#full-fix)

solving the very old issue of http://trac.osgeo.org/gdal/ticket/809

Is that patch really needed? If so, how to reproduce it?

@neteler
Copy link
Member

neteler commented Sep 26, 2024

solving the very old issue of http://trac.osgeo.org/gdal/ticket/809

(from the end of the ticket)

This ticket was incorporated into https://trac.osgeo.org/gdal/ticket/3615 which eventually led to https://gdal.org/en/latest/development/rfc/rfc31_ogr_64.html

I assume that the improvements also became part of SHAPElib.

@nilason
Copy link
Contributor Author

nilason commented Sep 27, 2024

solving the very old issue of http://trac.osgeo.org/gdal/ticket/809

(from the end of the ticket)

This ticket was incorporated into https://trac.osgeo.org/gdal/ticket/3615 which eventually led to https://gdal.org/en/latest/development/rfc/rfc31_ogr_64.html

I assume that the improvements also became part of SHAPElib.

I did see that, which is the reason I raised this issue. If that was a GDAL/shapelib specific issue at that time, I believe we can presume it has been solved by now.

I removed the patch (sorry @wenzeslaus :), only a small fix from shapelib 1.6.1 is taken to enable the Win CI runner.

I have no further plans with this PR.

@nilason nilason merged commit 16c87b1 into OSGeo:main Sep 29, 2024
26 checks passed
@nilason nilason deleted the upgrade_shapelib branch September 29, 2024 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C Related code is in C docs libraries
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants