Skip to content

Commit 3e36e99

Browse files
committed
Prepare for shapelib 1.6.0
1 parent 3b6e08d commit 3e36e99

File tree

4 files changed

+45
-4
lines changed

4 files changed

+45
-4
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ message(STATUS "CMake version = ${CMAKE_VERSION}")
1515
message(STATUS "CMAKE_SYSTEM_NAME = ${CMAKE_SYSTEM_NAME}")
1616

1717
set(PROJECT_VERSION_MAJOR 1)
18-
set(PROJECT_VERSION_MINOR 5)
18+
set(PROJECT_VERSION_MINOR 6)
1919
set(PROJECT_VERSION_PATCH 0)
20-
set(shp_LIB_VERSIONINFO "3:0:1")
20+
set(shp_LIB_VERSIONINFO "4:0:0")
2121
set(PROJECT_VERSION
2222
"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
2323

HOWTO-RELEASE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
- PROJECT_VERSION_PATCH
1414
- shp_LIB_VERSIONINFO
1515

16+
In shapefil.h, update SHAPELIB_VERSION_MAJOR, SHAPELIB_VERSION_MINOR,
17+
SHAPELIB_VERSION_MICRO
18+
1619
1) Update web/release.html with change notes on the new release and commit.
1720

1821
2) Build the release files.

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
dnl Process this file with autoconf to produce a configure script.
22

33
m4_define(shapelib_version_major, 1)
4-
m4_define(shapelib_version_minor, 5)
4+
m4_define(shapelib_version_minor, 6)
55
m4_define(shapelib_version_micro, 0)
66

77
AC_PREREQ(2.62)
@@ -16,7 +16,7 @@ AM_SILENT_RULES([yes])
1616
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
1717

1818
dnl See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
19-
AC_SUBST([SHAPELIB_SO_VERSION], [3:0:1])
19+
AC_SUBST([SHAPELIB_SO_VERSION], [4:0:0])
2020

2121
AC_PROG_CC
2222
AC_PROG_CXX

web/release.html

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,44 @@ <h1>Shapelib Release Notes</h1>
1010
To get notification of new releases of Shapelib <i>subscribe</i> to
1111
the project mailing list at https://lists.osgeo.org/pipermail/shapelib/.<p>
1212

13+
<b>Release 1.6.0</b>:
14+
<ul>
15+
<li>shapefil.h: add SHAPELIB_VERSION_MAJOR/MINOR/MICRO, SHAPELIB_VERSION_NUMBER, and SHAPELIB_AT_LEAST macros</li>
16+
<li>Compiler warning fixes and various code cleanups</li>
17+
<li>SAHooks: add a void *pvUserData member. ABI change</li>
18+
<li>SAHooks.FOpen and FClose callbacks: add a void *pvUserData parameter. API and ABI change</li>
19+
<li>SAHooks.FWrite: make first parameter a const void*. API change</li>
20+
<li>Do not distribute default COPYING and INSTALL</li>
21+
<li>Use standard integer data types</li>
22+
<li>Changes to allow building with cmake -DCMAKE_UNITY_BUILD=ON</li>
23+
<li>Polygon writing: avoid considering rings slightly overlapping as inner-outer rings of others (refs OSGeo/gdal#5315)</li>
24+
<li>Polygon writing: consider rings at non-constant Z as outer rings (fixes OSGeo/gdal#5315)
25+
As noted in code comments, this is an approximation of more complicated
26+
tests we'd likely have to do, that would take into account real
27+
co-planar testing, to allow detecting inner rings of outer rings in an
28+
oblique plane.</li>
29+
<li>shpopen.c: Communicate why the file size cannot be reached when appending features (OSGeo/gdal#4140)
30+
Clearly state why the file size cannot be reached. This is important in order
31+
to correctly inform the user and prevent him/her from looking for other reasons.
32+
Related to https://github.com/qgis/QGIS/issues/44202</li>
33+
<li>SHPWriteObject(): prevent potential overflows on 64-bit platforms on huge geometries</li>
34+
<li>SHPRestoreSHX: update SHX content length even if error occurred</li>
35+
<li>In creation, uses w+b file opening mode instead of wb followed by r+b,
36+
to support network file systems having sequential write only and when
37+
using CPL_VSIL_USE_TEMP_FILE_FOR_RANDOM_WRITE=YES (fixes OSGeo/gdal#7801)</li>
38+
<li>Fix adding features in a .dbf without columns (fixes qgis/qgis#51247)</li>
39+
<li>Have matching SOVERSION for CMake and autotools</li>
40+
<li>Code reformatting</li>
41+
<li>Enable csv2shp build with MSVC</li>
42+
<li>Build contributed utilities via CMake</li>
43+
<li>fix mis-matching CMake arguments</li>
44+
<li>Use the the standard BUILD_TESTING CMake variable</li>
45+
<li>Remove double free() in contrib/shpsrt, issue #39</li>
46+
<li>SHPRestoreSHX: fix for (64 bit) big endian</li>
47+
<li>Add config-style support for find_package(shapefile)</li>
48+
<li>Prevent no-op FSeeks writing dbf & shp records for network filesystem performance</li>
49+
</ul>
50+
1351
<b>Release 1.5.0</b>:
1452
<ul>
1553
<li> Add FTDate entry in DBFFieldType

0 commit comments

Comments
 (0)