librtree 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97e18073b1466bdc07ddba6d4b06cfa850c3531240920ab4bd391a1896def24f
-  data.tar.gz: 0a57abcf15c8dd21e3ec7ee26fdb2f5d98ae8ec06838297eb00b05f5ebaae70d
+  metadata.gz: b945bd1abd981557382119ef56ebde1c6bd1f3e75dfa0ca4656b43a59c99d833
+  data.tar.gz: 9af9d2d1317582970d0b27fd43c2947472d66be2383f29bdb7f3d8d19743a897
 SHA512:
-  metadata.gz: e633393e0fc75958fae7ee302a0a1e51e42ce41f86ec887da9c41bf74c2bb1657b4c06d4e690939c83945092ba4531901050f537bef6c48c73ddeea28a272a69
-  data.tar.gz: 25b6456ab526e41afd095157c96715118cdadbb9a15c2c863197fda329a61f5d6f8adda1e78aeb8733f8e74d54faf4bba193103e81aff3db7bfebcc8e54c2052
+  metadata.gz: 752765087a236c6ae456475af539ffafb72f02ba13521ff75c094e997c367b717f6d3166e97146a9bc45f2b58581ec6b292aea1faaababf18e6f57d2b8cbc705
+  data.tar.gz: 6aa633e4d38ca15f6a4dc6392870cb0ec8d3713bb15b53a9142b06a00a8e7d295eb5a5f57494eb72cdfdf2b9f8098b86e4703f310a9b3382b39d47df971f29d0

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 Changelog
 ---------
 
+### 1.0.5, 16-01-2024
+
+- All methods which take a `File` object (i.e., a stream), now
+  also accept a `String` or `Pathname` to the file instead.
+
+### 1.0.4, 30-10-2023
+
+- Check for `__builtin_ctzl` (and use if found)
+
 ### 1.0.3, 16-10-2023
 
 - Update to librtree 1.3.0

data/ext/rtree/extconf.rb

@@ -17,7 +17,7 @@ if have_header('endian.h') ||
    have_header('libkern/OSByteOrder.h') ||
    have_header('winsock2.h')
 then
-  append_cflags("-DWITH_BSRT")
+  append_cflags('-DWITH_BSRT')
 else
   warn('cannot determine endianness, no BSRT support')
 end
@@ -25,7 +25,7 @@ end
 if have_header('jansson.h') &&
    have_library('jansson', 'json_pack')
 then
-  append_cflags("-DWITH_JSON")
+  append_cflags('-DWITH_JSON')
 else
   warn('cannot find jansson, no JSON support')
 end
@@ -41,5 +41,20 @@ end
 
 have_header('features.h')
 
+if have_macro('__has_builtin') then
+  src = <<~EOF
+    #if __has_builtin(__builtin_ctzl)
+    #else
+    #error no __builtin_ctzl
+    #endif
+  EOF
+  checking_for(checking_message('__builtin_ctzl')) do
+    if result = try_compile(src) then
+      $defs.push('-DHAVE___BUILTIN_CTZL')
+      result
+    end
+  end
+end
+
 create_header('config.h')
-create_makefile("rtree")
+create_makefile('rtree')

data/ext/rtree/lib/bindex.c

@@ -8,7 +8,8 @@
 #include "config.h"
 #endif
 
-#include "bindex.h"
+#include "private/bindex.h"
+
 #include "rtree/error.h"
 
 #include <errno.h>
@@ -19,6 +20,22 @@
 #define UL_BYTES sizeof(unsigned long)
 #define UL_BITS (UL_BYTES << 3)
 
+/*
+  config.h may contain HAVE___BUILTIN_CTZL defined from an autoconf
+  check (for the standalone C library, there will be such a check),
+  but in the embedded case, performing that check may be tricky, so
+  in that case we fall-back onto the __has_builtin macro which has
+  been present in clang for many years, and in gcc since version 10.
+*/
+
+#ifndef HAVE___BUILTIN_CTZL
+#ifdef __has_builtin
+#if __has_builtin(__builtin_ctzl)
+#define HAVE___BUILTIN_CTZL 1
+#endif
+#endif
+#endif
+
 /* see note on branch_sizeof in branch.c */
 
 static size_t bindex_sizeof(size_t n)

data/ext/rtree/lib/branch.c

@@ -2,8 +2,8 @@
 #include "config.h"
 #endif
 
-#include "branch.h"
-#include "state.h"
+#include "private/branch.h"
+#include "private/state.h"
 
 #include <stddef.h>
 #include <stdalign.h>

data/ext/rtree/lib/branches.c

@@ -4,14 +4,14 @@
   not known until runtime, so we have to perform those calculations
   ourselves.  Note that we just do the arithmatic here, no error
   checking -- so a over-sized index to branches_get()  will lead to
-  a memory error, the caller is epected to do this check themselves
+  a memory error, the caller is expected to do this check themselves
 */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include "branches.h"
+#include "private/branches.h"
 
 extern branch_t* branches_get(const state_t*, void*, size_t);
 extern void branches_set(const state_t*, void*, size_t, const branch_t*);

data/ext/rtree/lib/bsrt.c

@@ -2,11 +2,10 @@
 #include "config.h"
 #endif
 
-#include "bsrt.h"
-
-#include "node.h"
-#include "branch.h"
-#include "branches.h"
+#include "private/branch.h"
+#include "private/branches.h"
+#include "private/bsrt.h"
+#include "private/node.h"
 
 #include "rtree/error.h"
 
@@ -15,8 +14,8 @@
 
 #ifdef WITH_BSRT
 
-#include "endianness.h"
-#include "bounds.h"
+#include "private/endianness.h"
+#include "private/bounds.h"
 
 #define BSRT_MAGIC "BSRt"
 #define BSRT_FOOTER "fin"

data/ext/rtree/lib/csv.c

@@ -2,8 +2,9 @@
 #include "config.h"
 #endif
 
-#include "csv.h"
-#include "state.h"
+#include "private/csv.h"
+#include "private/rtree.h"
+#include "private/state.h"
 
 #include "rtree/error.h"
 #include "rtree/types.h"

data/ext/rtree/lib/error.c

@@ -2,10 +2,10 @@
 #include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #include "rtree/error.h"
 
+#include <stdlib.h>
+
 const char* strerror_rtree(int err)
 {
   static const char nomsg[] = "unimplemented message";
@@ -23,7 +23,7 @@ const char* strerror_rtree(int err)
         { RTREE_ERR_NOCSV, "Compiled without CSV support" },
         { RTREE_ERR_JANSSON, "Error from the Jansson library" },
         { RTREE_ERR_NOJSON, "Compiled without JSON support" },
-        { RTREE_ERR_NOJSON, "Compiled without BSRT support" },
+        { RTREE_ERR_NOBSRT, "Compiled without BSRT support" },
         { RTREE_ERR_GETBRANCH, "Error getting branch" },
         { RTREE_ERR_GETCHILD, "Error getting child node" },
         { RTREE_ERR_NODECLONE, "Error cloning node" },

data/ext/rtree/lib/json.c

@@ -2,11 +2,12 @@
 #include "config.h"
 #endif
 
-#include "json.h"
-#include "bounds.h"
-#include "node.h"
-#include "branch.h"
-#include "branches.h"
+#include "private/bounds.h"
+#include "private/branch.h"
+#include "private/branches.h"
+#include "private/json.h"
+#include "private/node.h"
+#include "private/rtree.h"
 
 #include "rtree/error.h"
 

data/ext/rtree/lib/mk/Hdr.mk

@@ -1,3 +1,9 @@
-HDR := rtree/branch.h rtree/branches.h rtree/error.h rtree/extent.h \
-	rtree/node.h rtree/package.h rtree/postscript.h rtree/rect.h \
-	rtree/rectf.h rtree/search.h rtree/state.h rtree/types.h rtree.h
+HDR := rtree.h \
+	rtree/error.h \
+	rtree/extent.h \
+	rtree/node.h \
+	rtree/package.h \
+	rtree/postscript.h \
+	rtree/search.h \
+	rtree/state.h \
+	rtree/types.h

data/ext/rtree/lib/node.c

@@ -2,15 +2,14 @@
 #include "config.h"
 #endif
 
-#include "node.h"
+#include "private/branch.h"
+#include "private/branches.h"
+#include "private/node.h"
+#include "private/rect.h"
+#include "private/split.h"
 
 #include "rtree/error.h"
 
-#include "branch.h"
-#include "branches.h"
-#include "rect.h"
-#include "split.h"
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>

data/ext/rtree/lib/package.c

@@ -5,7 +5,7 @@
 
 #include "rtree/package.h"
 
-const char rtree_package_version[] = "1.2.0";
+const char rtree_package_version[] = "1.3.1";
 const char rtree_package_name[] = "librtree";
 const char rtree_package_url[] = "https://gitlab.com/jjg/librtree";
 const char rtree_package_bugreport[] = "j.j.green@gmx.co.uk";

data/ext/rtree/lib/page.c

@@ -2,7 +2,7 @@
 #include "config.h"
 #endif
 
-#include "page.h"
+#include "private/page.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

data/ext/rtree/lib/postscript.c

@@ -2,18 +2,18 @@
 #include "config.h"
 #endif
 
-#include "rtree/postscript.h"
-
-#include "node.h"
-#include "branch.h"
-#include "state.h"
+#include "private/branch.h"
+#include "private/node.h"
+#include "private/state.h"
 
-#include "rtree/package.h"
 #include "rtree/error.h"
+#include "rtree/package.h"
+#include "rtree/postscript.h"
 
 #include <time.h>
 #include <errno.h>
 #include <stdbool.h>
+#include <stdlib.h>
 
 #ifdef HAVE_TGMATH_H
 #include <tgmath.h>

data/ext/rtree/lib/{bindex.h → private/bindex.h}

@@ -1,14 +1,10 @@
 /*
-  bindex.h
+  private/bindex.h
   Copyright (c) J.J. Green 2020
 */
 
-#ifndef BINDEX_H
-#define BINDEX_H
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#ifndef PRIVATE_BINDEX_H
+#define PRIVATE_BINDEX_H
 
 #include <stddef.h>
 
@@ -27,5 +23,4 @@ int bindex_set(bindex_t*, size_t, size_t);
 size_t bindex_first_unset(const bindex_t*);
 size_t bindex_next_unset(const bindex_t*, size_t);
 
-
 #endif

data/ext/rtree/lib/{bounds.h → private/bounds.h}

@@ -1,10 +1,10 @@
 /*
-  bounds.h
+  private/bounds.h
   Copyright (c) J.J. Green 2022
 */
 
-#ifndef BOUNDS_H
-#define BOUNDS_H
+#ifndef PRIVATE_BOUNDS_H
+#define PRIVATE_BOUNDS_H
 
 #ifndef RTREE_DIMS_MAX
 #define RTREE_DIMS_MAX 256

data/ext/rtree/lib/{branch.h → private/branch.h}

@@ -1,19 +1,20 @@
 /*
-  branch.h
+  private/branch.h
   Copyright (c) J.J. Green 2023
 */
 
-#ifndef BRANCH_H
-#define BRANCH_H
+#ifndef PRIVATE_BRANCH_H
+#define PRIVATE_BRANCH_H
 
-#include <stdlib.h>
+typedef struct branch_t branch_t;
 
-#include "rtree/branch.h"
+#include <private/rect.h>
+#include <private/node.h>
+#include <private/state.h>
 
-#include "rect.h"
-#include "rtree/types.h"
-#include "rtree/state.h"
-#include "rtree/node.h"
+#include <rtree/types.h>
+
+#include <stddef.h>
 
 /*
   The union is either a pointer to the child-node in the tree, or

data/ext/rtree/lib/{branches.h → private/branches.h}

@@ -1,22 +1,20 @@
 /*
-  branches.h
+  private/branches.h
   Copyright (c) J.J. Green 2020
 */
 
-#ifndef BRANCHES_H
-#define BRANCHES_H
+#ifndef PRIVATE_BRANCHES_H
+#define PRIVATE_BRANCHES_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <private/state.h>
+#include <private/branch.h>
+
+#include <rtree/error.h>
 
-#include <stdlib.h>
+#include <stddef.h>
 #include <errno.h>
 #include <string.h>
 
-#include "state.h"
-#include "rtree/branch.h"
-#include "rtree/error.h"
 
 inline branch_t* branches_get(const state_t *state, void *buffer, size_t i)
 {
@@ -31,8 +29,4 @@ inline void branches_set(const state_t *state, void *buffer, size_t i,
   memcpy(branches_get(state, buffer, i), src, state_branch_size(state));
 }
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif

data/ext/rtree/lib/{bsrt.h → private/bsrt.h}

@@ -1,14 +1,14 @@
 /*
-  bsrt.h
+  private/bsrt.h
   Copyright (c) J.J. Green 2019
 */
 
-#ifndef BSRT_H
-#define BSRT_H
+#ifndef PRIVATE_BSRT_H
+#define PRIVATE_BSRT_H
 
-#include <stdio.h>
+#include <private/rtree.h>
 
-#include "rtree.h"
+#include <stdio.h>
 
 int bsrt_rtree_write(const rtree_t*, FILE*);
 rtree_t* bsrt_rtree_read(FILE*);

data/ext/rtree/lib/{constants.h → private/constants.h}

@@ -1,10 +1,10 @@
 /*
-  constants.h
+  private/constants.h
   Copyright (c) J.J. Green 2019
 */
 
-#ifndef CONSTANTS_H
-#define CONSTANTS_H
+#ifndef PRIVATE_CONSTANTS_H
+#define PRIVATE_CONSTANTS_H
 
 #include <math.h>
 

data/ext/rtree/lib/{csv.h → private/csv.h}

@@ -1,15 +1,15 @@
 /*
-  csv.h
+  private/csv.h
   Copyright (c) J.J. Green 2020
 */
 
-#ifndef CSV_H
-#define CSV_H
+#ifndef PRIVATE_CSV_H
+#define PRIVATE_CSV_H
 
-#include <stdio.h>
+#include <rtree.h>
+#include <rtree/state.h>
 
-#include "rtree.h"
-#include "rtree/state.h"
+#include <stdio.h>
 
 rtree_t* csv_rtree_read(FILE*, size_t, state_flags_t);
 

data/ext/rtree/lib/{endianness.h → private/endianness.h}

@@ -1,9 +1,5 @@
 /*
-  endian.h
-
-  This is an "internal" header, it is not used by any public headers
-  and not installed; it handles the messing around that you need to
-  do to get endinannes functions even close to portable.
+  private/endianness.h
 
   This is largely from https://github.com/mikepb/endian.h which is
   based on a Gist by Mathias Panzenböck, those are both released into
@@ -19,11 +15,11 @@
   Copyright (c) J.J. Green 2020
 */
 
-#ifndef ENDIANNESS_H
-#define ENDIANNESS_H
+#ifndef PRIVATE_ENDIANNESS_H
+#define PRIVATE_ENDIANNESS_H
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #if defined HAVE_ENDIAN_H

data/ext/rtree/lib/{json.h → private/json.h}

@@ -1,14 +1,14 @@
 /*
-  json.h
+  private/json.h
   Copyright (c) J.J. Green 2019
 */
 
-#ifndef JSON_H
-#define JSON_H
+#ifndef PRIVATE_JSON_H
+#define PRIVATE_JSON_H
 
-#include <stdio.h>
+#include <rtree.h>
 
-#include "rtree.h"
+#include <stdio.h>
 
 int json_rtree_write(const rtree_t*, FILE*);
 rtree_t* json_rtree_read(FILE*);

data/ext/rtree/lib/{node.h → private/node.h}

@@ -17,11 +17,13 @@ typedef uint16_t node_height_t;
 #define NODE_LEVEL_MAX UINT16_MAX
 #define NODE_COUNT_MAX UINT16_MAX
 
-#include "rtree/node.h"
+typedef struct node_t node_t;
 
-#include "rtree/types.h"
-#include "rtree/state.h"
-#include "rtree/branch.h"
+#include <private/branch.h>
+#include <private/state.h>
+
+#include <rtree/node.h>
+#include <rtree/types.h>
 
 struct node_t
 {

data/ext/rtree/lib/private/page.h

@@ -0,0 +1,13 @@
+/*
+  private/page.h
+  Copyright (c) J.J. Green 2019
+*/
+
+#ifndef PRIVATE_PAGE_H
+#define PRIVATE_PAGE_H
+
+#include <stddef.h>
+
+int page_size(size_t*);
+
+#endif

data/ext/rtree/lib/private/postscript.h

@@ -0,0 +1,17 @@
+/*
+  private/postscript.h
+  Copyright (c) J.J. Green 2023
+*/
+
+#ifndef PRIVATE_POSTSCRIPT_H
+#define PRIVATE_POSTSCRIPT_H
+
+#include <private/node.h>
+#include <private/state.h>
+
+#include <rtree/postscript.h>
+
+int postscript_write(const state_t*, const node_t*,
+                     const rtree_postscript_t*, FILE*);
+
+#endif

data/ext/rtree/lib/{rect.h → private/rect.h}

@@ -1,16 +1,16 @@
 /*
-  rect.h
+  private/rect.h
   Copyright (c) J.J. Green 2019
 */
 
-#ifndef RECT_H
-#define RECT_H
+#ifndef PRIVATE_RECT_H
+#define PRIVATE_RECT_H
 
-#include <stdlib.h>
-#include <stdbool.h>
+#include <private/state.h>
+#include <rtree/types.h>
 
-#include "rtree/state.h"
-#include "rtree/types.h"
+#include <stddef.h>
+#include <stdbool.h>
 
 int rect_init(const state_t*, rtree_coord_t*);
 

data/ext/rtree/lib/{rtree → private}/rectf.h

@@ -1,26 +1,18 @@
 /*
-  rtree/rectf.h
+  private/rectf.h
   Copyright (c) J.J. Green 2022
 */
 
-#ifndef RTREE_RECTF_H
-#define RTREE_RECTF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef PRIVATE_RECTF_H
+#define PRIVATE_RECTF_H
 
 #include <rtree/types.h>
 #include <stddef.h>
 
-/* rect-spherical-volume */
-
 typedef rtree_coord_t (rectf_rsv_t)(size_t, const rtree_coord_t*);
 
 rectf_rsv_t* rectf_spherical_volume(size_t);
 
-/* rect-combine */
-
 typedef void (rectf_rc_t)(size_t,
                           const rtree_coord_t*,
                           const rtree_coord_t*,
@@ -28,7 +20,4 @@ typedef void (rectf_rc_t)(size_t,
 
 rectf_rc_t* rectf_combine(size_t);
 
-#ifdef __cplusplus
-}
-#endif
 #endif

data/ext/rtree/lib/private/rtree.h

@@ -0,0 +1,20 @@
+/*
+  private/rtree.h
+  Copyright (c) J.J. Green 2023
+*/
+
+#ifndef PRIVATE_RTREE_H
+#define PRIVATE_RTREE_H
+
+#include <private/state.h>
+#include <private/node.h>
+
+#include <rtree.h>
+
+struct rtree_t
+{
+  state_t *state;
+  node_t *root;
+};
+
+#endif

data/ext/rtree/lib/{search.h → private/search.h}

@@ -1,16 +1,15 @@
 /*
-  search.h
+  private/search.h
   Copyright (c) J.J. Green 2023
 */
 
-#ifndef SEARCH_H
-#define SEARCH_H
+#ifndef PRIVATE_SEARCH_H
+#define PRIVATE_SEARCH_H
 
-#include "rtree/search.h"
-
-#include "rtree/node.h"
-#include "rtree/types.h"
-#include "rtree/state.h"
+#include <private/node.h>
+#include <private/state.h>
+#include <rtree/search.h>
+#include <rtree/types.h>
 
 int search(const state_t*,
            const rtree_coord_t*,