librtree 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d23f82b41d0757dbca1d30fc447bd2573db6d1584727c3244c84bbae0bc6b83
-  data.tar.gz: 36b7cda50a05140949537890a4ab99ebc555f08d7f7789cd7d4d0bd14c7b4c27
+  metadata.gz: 8f4355feb78dc5d06882ae60a9dccaa1a3aa3946e3bafd36c83bd156e0c75999
+  data.tar.gz: 2ba67193b74dffcc28c692651395378a07396815b8183622cf53e99ae85b0161
 SHA512:
-  metadata.gz: 5ad5636536266f5ac027bd9f7ee59b359f4a3b00c07107057c7b83d378122be21343ebb54db36fe0e7683c926e674a7c8e4f3a6013b4a38c3019078851995c38
-  data.tar.gz: 22292e552cd05823802107094df3ff12c0a0a04129e26dd0fe8a9dd1c1b966f47b1b1cf4a1ac046f0965710965235c5e3a195c4de87b5612aa968e042a3c38fb
+  metadata.gz: '070128ec3f09d7e7d9afdd72a1a1c883aa4acabde300b3a6093a5437a8c95b0a0d527339b48930f048f8925d10ef2d9aff34604bfe8e8c9545327b9082fdb584'
+  data.tar.gz: 9958de3a7289de82051876d54968e48cb1350d15e20257e87ce162875dbdabf9ea12501cc9502b345ff10a470248275682ed78f906c211aa2e14acda3446d027

data/CHANGELOG.md

@@ -1,9 +1,18 @@
 Changelog
 ---------
 
+### 1.0.8, 12-10-2026
+
+- Update to librtree 1.3.3
+
+### 1.0.7, 20-01-2026
+
+- Spelling
+- Tested on Ruby 3.4, 4.0
+
 ### 1.0.6, 07-04-2024
 
-- Update to librtree 1.3.0
+- Update to librtree 1.3.2
 - Adds `#envelope` `#csv_write`, `#to_csv`
 
 ### 1.0.5, 16-01-2024
@@ -62,7 +71,7 @@ Changelog
 ### 0.8.8, 14-07-2021
 
 - De-nest C base-class for neater documentation
-- Adopt "standard" naming-convention for the benfit of Yard
+- Adopt "standard" naming-convention for the benefit of Yard
   introspection
 - No functional changes
 

data/README.md

@@ -54,12 +54,12 @@ this.
 If using [rbenv][4], then first set a local version of Ruby to use,
 then install the gems into your local cache
 
-    rbenv local 3.2.0
+    rbenv local 4.0.2
     bundle install
 
 The repository's `.gitignore` ignores **rbenv**'s `.ruby-version` file,
 since we don't want to mandate a particular Ruby version for the package
-(although 3.0 is the minimal version for development at present).
+(although 3.1 is the minimal version for development at present).
 
 If not using **rbenv** then just
 
@@ -83,6 +83,6 @@ run the tests:
 
 
 [1]: http://www.digip.org/jansson/
-[3]: http://soliton.vm.bytemark.co.uk/pub/jjg/en/code/librtree/
+[3]: https://jjg.gitlab.io/en/code/librtree/
 [4]: https://github.com/rbenv/rbenv
 [5]: https://www.rubydoc.info/gems/librtree/RTree

data/ext/rtree/lib/bindex.c

@@ -70,7 +70,7 @@ static size_t first_unset(const unsigned long *words, size_t n_bits)
 
   for (size_t j = 0 ; j < n_words ; j++)
     {
-      unsigned long word = ~words[j];
+      unsigned long word = ~(words[j]);
 
       if (word)
         {

data/ext/rtree/lib/branches.c

@@ -2,7 +2,7 @@
   The code here is to handle a void* buffer as an array of branch,
   we can't actually create an array of branch since its size is
   not known until runtime, so we have to perform those calculations
-  ourselves.  Note that we just do the arithmatic here, no error
+  ourselves.  Note that we just do the arithmetic here, no error
   checking -- so a over-sized index to branches_get()  will lead to
   a memory error, the caller is expected to do this check themselves
 */

data/ext/rtree/lib/bsrt.c

@@ -45,17 +45,16 @@ static int write_version(FILE *stream)
 
 /* state, 12 bytes */
 
-static int write_state(state_t *state, FILE *stream)
+static int write_state(const state_t *state, FILE *stream)
 {
-  uint16_t v[6] =
-    {
-     htole16(state_dims(state)),
-     htole16(state_page_size(state)),
-     htole16(SIZEOF_RTREE_COORD_T),
-     htole16(state_rect_size(state)),
-     htole16(state_branch_size(state)),
-     htole16(state_node_size(state))
-    };
+  const uint16_t v[6] = {
+    htole16(state_dims(state)),
+    htole16(state_page_size(state)),
+    htole16(SIZEOF_RTREE_COORD_T),
+    htole16(state_rect_size(state)),
+    htole16(state_branch_size(state)),
+    htole16(state_node_size(state))
+  };
 
   if (fwrite(&v, 2, 6, stream) != 6)
     return RTREE_ERR_FWRITE;
@@ -94,7 +93,7 @@ static int write_id(rtree_id_t id, FILE *stream)
 #elif SIZEOF_RTREE_ID_T == 8
   uint64_t v = htole64(id);
 #else
-#error rtree_id_t size not handled
+#error MSG_RTREE_COORD_SIZE
 #endif
 
   if (fwrite(&v, SIZEOF_RTREE_ID_T, 1, stream) != 1)
@@ -108,7 +107,7 @@ static int write_id(rtree_id_t id, FILE *stream)
   byte-order is big-endian, this saves time on little-endian
   hardware.  Note that in the big-endian case, we call htole32()
   which converts from the host integer byte-order to little-endian,
-  this will only be correct if integer and float endianess are
+  this will only be correct if integer and float endianness are
   the same, this is not true in general (!), there exists real
   hardware with big-endian floats and little-endian integers.
   So it would be better to use be32tole32() here, but that does
@@ -140,7 +139,7 @@ static int write_rect(const state_t *state,
 #elif SIZEOF_RTREE_COORD_T == 8
       *(uint64_t*)p = htole64(*(uint64_t*)p);
 #else
-#error rtree_coord_t size not handled
+#error MSG_RTREE_COORD_SIZE
 #endif
 
       buffer[i] = *(rtree_coord_t*)p;
@@ -349,7 +348,7 @@ static int read_v1_rect(FILE *stream,
 #elif SIZEOF_RTREE_COORD_T == 8
       *(uint64_t*)p = le64toh(*(uint64_t*)p);
 #else
-#error rtree_coord_t size not handled
+#error MSG_RTREE_COORD_SIZE
 #endif
 
       rect[i] = *(rtree_coord_t*)p;
@@ -377,7 +376,7 @@ static int read_v1_id(FILE *stream, rtree_id_t *id)
 #elif SIZEOF_RTREE_ID_T == 2
   *id = le16toh(*id);
 #else
-#error rtree_id_t size not handled
+#error MSG_RTREE_COORD_SIZE
 #endif
 
   return 0;

data/ext/rtree/lib/csv.c

@@ -5,6 +5,7 @@
 #include "private/csv.h"
 #include "private/rtree.h"
 #include "private/state.h"
+#include "private/message.h"
 
 #include "rtree/error.h"
 #include "rtree/types.h"
@@ -37,7 +38,7 @@ static int parse(FILE *stream, rtree_t *rtree)
 
   while (fgets(line, LINE_LEN, stream) != NULL)
     {
-      char *tok;
+      const char *tok;
 
       if ((tok = strtok(line, ",")) == NULL)
         continue;
@@ -91,12 +92,14 @@ static int write_internal_branch(const state_t *state,
   return write_node(state, branch_get_child(branch), arg);
 }
 
-#if SIZEOF_RTREE_COORD_T == 4
-#define PRECISION 6
+#if SIZEOF_RTREE_COORD_T == 2
+#define PRECISION 5
+#elif SIZEOF_RTREE_COORD_T == 4
+#define PRECISION 9
 #elif SIZEOF_RTREE_COORD_T == 8
-#define PRECISION 14
+#define PRECISION 17
 #else
-#error "strange size for rtree_coord_t"
+#error MSG_RTREE_COORD_SIZE
 #endif
 
 static int write_leaf_branch(const state_t *state,

data/ext/rtree/lib/error.c

@@ -13,32 +13,31 @@ const char* strerror_rtree(int err)
   {
     int err;
     const char *msg;
-  } *m, mtab[] =
-      {
-        { RTREE_OK, "Success" },
-        { RTREE_ERR_INVAL, "Invalid argument" },
-        { RTREE_ERR_DOM, "Argument outside domain" },
-        { RTREE_ERR_NOMEM, "Out of memory" },
-        { RTREE_ERR_CSVPARSE, "Error parsing CSV" },
-        { RTREE_ERR_NOCSV, "Compiled without CSV support" },
-        { RTREE_ERR_JANSSON, "Error from the Jansson library" },
-        { RTREE_ERR_NOJSON, "Compiled without JSON 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" },
-        { RTREE_ERR_PICKBRANCH, "Error picking branch" },
-        { RTREE_ERR_ADDRECT, "Error adding rectangle" },
-        { RTREE_ERR_NOSUCHSPLIT, "No such splitting method" },
-        { RTREE_ERR_DIMS, "Bad R-tree dimension" },
-        { RTREE_ERR_EMPTY, "Empty R-tree" },
-        { RTREE_ERR_BUFFER, "Buffer to small" },
-        { RTREE_ERR_POSTSCRIPT, "Error generating PostScript" },
-        { RTREE_ERR_USER, "User abort" },
-        { RTREE_ERR_FWRITE, "Failed write" },
-        { RTREE_ERR_SPLIT, "Error in split" },
-        { -1, NULL }
-      };
+  } *m, mtab[] = {
+    { RTREE_OK, "Success" },
+    { RTREE_ERR_INVAL, "Invalid argument" },
+    { RTREE_ERR_DOM, "Argument outside domain" },
+    { RTREE_ERR_NOMEM, "Out of memory" },
+    { RTREE_ERR_CSVPARSE, "Error parsing CSV" },
+    { RTREE_ERR_NOCSV, "Compiled without CSV support" },
+    { RTREE_ERR_JANSSON, "Error from the Jansson library" },
+    { RTREE_ERR_NOJSON, "Compiled without JSON 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" },
+    { RTREE_ERR_PICKBRANCH, "Error picking branch" },
+    { RTREE_ERR_ADDRECT, "Error adding rectangle" },
+    { RTREE_ERR_NOSUCHSPLIT, "No such splitting method" },
+    { RTREE_ERR_DIMS, "Bad R-tree dimension" },
+    { RTREE_ERR_EMPTY, "Empty R-tree" },
+    { RTREE_ERR_BUFFER, "Buffer too small" },
+    { RTREE_ERR_POSTSCRIPT, "Error generating PostScript" },
+    { RTREE_ERR_USER, "User abort" },
+    { RTREE_ERR_FWRITE, "Failed write" },
+    { RTREE_ERR_SPLIT, "Error in split" },
+    { -1, NULL }
+  };
 
   for (m = mtab ; m->msg ; m++)
     if (m->err == err) return m->msg;

data/ext/rtree/lib/json.c

@@ -197,7 +197,7 @@ static bool jr_value_equal(json_t *object, const char *key, size_t value)
   return (int_value >= 0) && ((size_t)int_value == value);
 }
 
-static bool jr_state_is_consistent(json_t *json_state, state_t *state)
+static bool jr_state_is_consistent(json_t *json_state, const state_t *state)
 {
   return
     jr_value_equal(json_state, "dims", state_dims(state)) &&

data/ext/rtree/lib/node.c

@@ -206,7 +206,7 @@ int node_branch_each_level(const state_t *state, const node_t *node,
     {
       for (size_t i = 0 ; i < node_count(node) ; i++)
         {
-          branch_t *branch = node_get_branch(state, node, i);
+          const branch_t *branch = node_get_branch(state, node, i);
           const node_t *child = branch_get_child(branch);
           int err = node_branch_each_level(state, child, level, f, arg);
           if (err != 0) return err;
@@ -236,7 +236,7 @@ size_t node_bytes(const state_t *state, const node_t *node)
 
   for (size_t i = 0 ; i < node_count(node) ; i++)
     {
-      branch_t *branch = node_get_branch(state, node, i);
+      const branch_t *branch = node_get_branch(state, node, i);
       const node_t *child = branch_get_child(branch);
       bytes += node_bytes(state, child);
     }
@@ -261,7 +261,8 @@ int node_detach_branch(const state_t *state, node_t *node, size_t i)
 
   if (i + 1 != node_count(node))
     {
-      branch_t *branch_end = node_get_branch(state, node, node_count(node) - 1);
+      const branch_t
+        *branch_end = node_get_branch(state, node, node_count(node) - 1);
 
       if (branch_end == NULL)
         return RTREE_ERR_GETBRANCH;
@@ -282,8 +283,8 @@ static node_t* node_split(const state_t *state, node_t *node, branch_t *branch)
 
 /*
   add branch to node, which may split the node: if so the new node
-  argumemnt is returned, so comparing the node argument and return
-  value is the way to detect that splitting has occured.
+  argument is returned, so comparing the node argument and return
+  value is the way to detect that splitting has occurred.
 */
 
 node_t* node_add_branch(const state_t *state, node_t *node, branch_t *branch)
@@ -306,7 +307,7 @@ node_t* node_add_branch(const state_t *state, node_t *node, branch_t *branch)
 
 /*
   Pick a branch.  Pick the one that will need the smallest increase
-  in volume to accomodate the new (hyper-)rectangle.  This will result
+  in volume to accommodate the new (hyper-)rectangle.  This will result
   in the least total volume for the covering rectangles in the current
   node.
 
@@ -315,7 +316,7 @@ node_t* node_add_branch(const state_t *state, node_t *node, branch_t *branch)
 */
 
 static int node_pick_branch(const state_t *state,
-                            node_t *node,
+                            const node_t *node,
                             const rtree_coord_t *rect,
                             size_t *index)
 {
@@ -330,7 +331,7 @@ static int node_pick_branch(const state_t *state,
 
   for (size_t i = 0 ; i < n ; i++)
     {
-      branch_t *branch;
+      const branch_t *branch;
 
       if ((branch = node_get_branch(state, node, i)) == NULL)
         return RTREE_ERR_GETBRANCH;
@@ -472,7 +473,9 @@ static node_t* node_add_rect2(const state_t *state,
 */
 
 node_t* node_add_rect(const state_t *state,
-                      rtree_id_t id, rtree_coord_t *rect, node_t *root,
+                      rtree_id_t id,
+                      const rtree_coord_t *rect,
+                      node_t *root,
                       node_level_t level)
 {
   const size_t dims = state_dims(state);
@@ -538,9 +541,12 @@ node_t* node_add_rect(const state_t *state,
                 {
                   branch_set_child(branch, sibling);
                   branch_set_rect(state, branch, envelope);
-                  node_add_branch(state, new_root, branch);
+                  n = node_add_branch(state, new_root, branch);
 
-                  return new_root;
+                  if (n != new_root)
+                    node_destroy(state, n);
+                  else
+                    return new_root;
                 }
             }
         }

data/ext/rtree/lib/package.c

@@ -5,7 +5,7 @@
 
 #include "rtree/package.h"
 
-const char rtree_package_version[] = "1.3.1";
+const char rtree_package_version[] = "1.3.3";
 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/postscript.c

@@ -252,10 +252,10 @@ void postscript_style_destroy(postscript_style_t *style)
   free(style);
 }
 
-static int pw_header(FILE *stream, uint32_t *bbox, const char *title)
+static int pw_header(FILE *stream, const uint32_t *bbox, const char *title)
 {
   time_t t; time(&t);
-  struct tm *tm = gmtime(&t);
+  const struct tm *tm = gmtime(&t);
   size_t n = 1024;
   char time_string[n];
   if (strftime(time_string, n,  "%a, %d %b %Y %T %z", tm) == 0)
@@ -341,7 +341,7 @@ typedef struct
 static int rect_proc(const branch_t *branch, const char *proc, rect_data_t *data)
 {
   const rtree_coord_t *rect = branch_get_rect(branch);
-  page_t *page = data->page;
+  const page_t *page = data->page;
   float scale = page->scale;
   fprintf(data->stream,
           "%.2f %.2f %.2f %.2f %s\n",
@@ -434,6 +434,7 @@ static int pw_state(const rtree_postscript_t *opts, ps_t *ps)
   page->body.height = body_height;
   page->body.width = body_width;
   page->scale = scale;
+  page->margin = margin;
   page->offset.x = rect[0] - margin / scale;
   page->offset.y = rect[1] - margin / scale;
 

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

@@ -0,0 +1,33 @@
+/*
+  private/generic.h
+  Copyright (c) J.J. Green 2026
+*/
+
+#ifndef PRIVATE_GENERIC_H
+#define PRIVATE_GENERIC_H
+
+#include "config.h"
+#include "private/message.h"
+
+/*
+  the functions fabs() and so on, while having formal double
+  arguments are generic, will call fabsf() for float arguments
+  and so on.  But does not handle float16, so in that case we use
+  an explicit fabsf() which will case the float16 to float32 ...
+*/
+
+#if (SIZEOF_RTREE_COORD_T == 2) || (SIZEOF_RTREE_COORD_T == 4)
+#  define FABS(x) fabsf(x)
+#  define POW(x, y) powf(x, y)
+#  define FMIN(x, y) fminf(x, y)
+#  define FMAX(x, y) fmaxf(x, y)
+#elif SIZEOF_RTREE_COORD_T == 8
+#  define FABS(x) fabs(x)
+#  define POW(x, y) pow(x, y)
+#  define FMIN(x, y) fmin(x, y)
+#  define FMAX(x, y) fmax(x, y)
+#else
+#  error MSG_RTREE_COORD_SIZE
+#endif
+
+#endif

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

@@ -0,0 +1,11 @@
+/*
+  private/message.h
+  Copyright (c) J.J. Green 2026
+*/
+
+#ifndef PRIVATE_MESSAGE_H
+#define PRIVATE_MESSAGE_H
+
+#define MSG_RTREE_COORD_SIZE "unhandled rtree_coord_t size"
+
+#endif

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

@@ -45,7 +45,7 @@ size_t node_num_branch(size_t, size_t);
 int node_detach_branch(const state_t*, node_t*, size_t);
 node_t* node_add_branch(const state_t*, node_t*, branch_t*);
 int node_envelope(const state_t*, const node_t*, rtree_coord_t*);
-node_t* node_add_rect(const state_t*, rtree_id_t, rtree_coord_t*,
+node_t* node_add_rect(const state_t*, rtree_id_t, const rtree_coord_t*,
                       node_t*, node_level_t);
 int node_update(const state_t*, const node_t*, rtree_update_t*, void*);
 bool node_identical(const state_t*, const node_t*, const node_t*);

data/ext/rtree/lib/rectf.c

@@ -3,6 +3,8 @@
 #endif
 
 #include "private/rectf.h"
+#include "private/generic.h"
+#include "private/message.h"
 
 #ifdef HAVE_TGMATH_H
 #include <tgmath.h>
@@ -29,7 +31,7 @@
 
 rtree_coord_t rectf_rsv1(size_t dims, const rtree_coord_t *rect)
 {
-  return 0.5 * fabs(rect[1] - rect[0]);
+  return 0.5 * FABS(rect[1] - rect[0]);
 }
 
 rtree_coord_t rectf_rsv2(size_t dims, const rtree_coord_t *rect)
@@ -56,7 +58,7 @@ rtree_coord_t rectf_rsvd(size_t dims, const rtree_coord_t *rect)
       r2 += hx * hx;
     }
 
-  return pow(0.25 * r2, 0.5 * dims);
+  return POW(0.25 * r2, 0.5 * dims);
 }
 
 rectf_rsv_t* rectf_spherical_volume(size_t dims)
@@ -100,15 +102,19 @@ void rectf_rcd(size_t dims,
         x0 = rect0[i], x1 = rect1[i],
         y0 = rect0[j], y1 = rect1[j];
 
-      rect2[i] = fmin(x0, x1);
-      rect2[j] = fmax(y0, y1);
+      rect2[i] = FMIN(x0, x1);
+      rect2[j] = FMAX(y0, y1);
     }
 }
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 
-#if SIZEOF_RTREE_COORD_T == 4
+#if SIZEOF_RTREE_COORD_T == 2
+
+/* https://gitlab.com/jjg/librtree/-/work_items/83 */
+
+#elif SIZEOF_RTREE_COORD_T == 4
 
 #ifdef HAVE_SSE2
 
@@ -127,7 +133,6 @@ void rectf_rc2(size_t dims,
   _mm_storeu_ps(rect2, res);
 }
 
-
 #endif
 
 #ifdef HAVE_AVX
@@ -188,7 +193,7 @@ void rectf_rc2(size_t dims,
 #endif
 
 #else
-#error "strange size for rtree_coord_t"
+#error MSG_RTREE_COORD_SIZE
 #endif
 
 #pragma GCC diagnostic pop
@@ -198,7 +203,9 @@ rectf_rc_t* rectf_combine(size_t dims)
   switch (dims)
     {
 
-#if SIZEOF_RTREE_COORD_T == 4
+#if SIZEOF_RTREE_COORD_T == 2
+      /* https://gitlab.com/jjg/librtree/-/work_items/83 */
+#elif SIZEOF_RTREE_COORD_T == 4
 # ifdef HAVE_SSE2
     case 2: return rectf_rc2;
 # endif
@@ -211,7 +218,7 @@ rectf_rc_t* rectf_combine(size_t dims)
     case 2: return rectf_rc2;
 # endif
 #else
-# error "strange size for rtree_coord_t"
+# error MSG_RTREE_COORD_SIZE
 #endif
 
     default: return rectf_rcd;

data/ext/rtree/lib/rtree-base.c

@@ -134,7 +134,7 @@ rtree_t* rtree_bsrt_read(FILE *stream)
   return bsrt_rtree_read(stream);
 }
 
-int rtree_add_rect(rtree_t *rtree, rtree_id_t id, rtree_coord_t *rect)
+int rtree_add_rect(rtree_t *rtree, rtree_id_t id, const rtree_coord_t *rect)
 {
   node_t *node = node_add_rect(rtree->state, id, rect, rtree->root, 0);
 

data/ext/rtree/lib/rtree.h

@@ -31,7 +31,7 @@ rtree_t* rtree_clone(const rtree_t*);
 void rtree_destroy(rtree_t*);
 rtree_height_t rtree_height(const rtree_t*);
 int rtree_search(const rtree_t*, const rtree_coord_t*, rtree_search_t*, void*);
-int rtree_add_rect(rtree_t*, rtree_id_t, rtree_coord_t*);
+int rtree_add_rect(rtree_t*, rtree_id_t, const rtree_coord_t*);
 int rtree_update(rtree_t*, rtree_update_t*, void*);
 bool rtree_identical(const rtree_t*, const rtree_t*);
 int rtree_csv_write(const rtree_t*, FILE*);

data/ext/rtree/lib/split.c

@@ -6,6 +6,7 @@
 #include "private/branch.h"
 #include "private/branches.h"
 #include "private/node.h"
+#include "private/generic.h"
 #include "private/split.h"
 
 #include "rtree/error.h"
@@ -44,7 +45,7 @@ static int split_classify(size_t i, size_t group,
                           const state_t *state, split_t *split)
 {
   partition_t *part = &(split->partition);
-  branch_t *branch = branches_get(state, split->branches, i);
+  const branch_t *branch = branches_get(state, split->branches, i);
   const rtree_coord_t *rect = branch_get_rect(branch);
 
   int err;
@@ -87,7 +88,7 @@ static int split_seed_linear(const state_t *state, split_t *split)
 
       for (size_t i = 1 ; i < nbuf ; i++)
         {
-          branch_t
+          const branch_t
             *b0 = branches_get(state, split->branches, greatest_lower[dim]),
             *b1 = branches_get(state, split->branches, i),
             *b2 = branches_get(state, split->branches, least_upper[dim]);
@@ -111,7 +112,7 @@ static int split_seed_linear(const state_t *state, split_t *split)
 
   for (size_t dim = 0 ; dim < dims ; dim++)
     {
-      branch_t
+      const branch_t
         *bl = branches_get(state, split->branches, least_upper[dim]),
         *bh = branches_get(state, split->branches, greatest_lower[dim]);
       const rtree_coord_t
@@ -143,7 +144,7 @@ static int split_seed_linear(const state_t *state, split_t *split)
 /*
   Picks two rectangles to be the first (seed) elements of the
   partition groups.  They are the two that waste the most area
-  if convered by a single rectangle.
+  if covered by a single rectangle.
 
   Note that this is as implemented in the Guttman-Green version
   quadratic splitting, but is quadratic only in the page-size,
@@ -161,7 +162,7 @@ static int split_seed_quadratic(const state_t *state, split_t *split)
 
   for (size_t i = 0 ; i < total ; i++)
     {
-      branch_t *branch = branches_get(state, split->branches, i);
+      const branch_t *branch = branches_get(state, split->branches, i);
       const rtree_coord_t *rect = branch_get_rect(branch);
       area[i] = rect_spherical_volume(state, rect);
     }
@@ -172,12 +173,12 @@ static int split_seed_quadratic(const state_t *state, split_t *split)
 
   for (size_t i = 0 ; i < total - 1 ; i++)
     {
-      branch_t *bi = branches_get(state, split->branches, i);
+      const branch_t *bi = branches_get(state, split->branches, i);
       const rtree_coord_t *ri = branch_get_rect(bi);
 
       for (size_t j = i + 1 ; j < total ; j++)
         {
-          branch_t *bj = branches_get(state, split->branches, j);
+          const branch_t *bj = branches_get(state, split->branches, j);
           const rtree_coord_t *rj = branch_get_rect(bj);
           rtree_coord_t rect[2 * dims];
 
@@ -238,7 +239,7 @@ static int split_linear(const state_t *state, split_t *split)
           continue;
         }
 
-      branch_t *branch = branches_get(state, split->branches, i);
+      const branch_t *branch = branches_get(state, split->branches, i);
       const rtree_coord_t *rect = branch_get_rect(branch);
 
       for (size_t group = 0 ; group < 2 ; group++)
@@ -312,9 +313,8 @@ static int split_quadratic(const state_t *state, split_t *split)
     total = part->total,
     minfill = part->minfill,
     *count = part->count;
-  rtree_coord_t
-    **cover = part->cover,
-    *area = part->area;
+  rtree_coord_t **cover = part->cover;
+  const rtree_coord_t *area = part->area;
 
   while ( (count[0] + count[1] < total) &&
           (count[0] + minfill < total) &&
@@ -327,7 +327,7 @@ static int split_quadratic(const state_t *state, split_t *split)
            i < total ;
            i = bindex_next_unset(part->taken, i + 1))
         {
-          branch_t *branch = branches_get(state, split->branches, i);
+          const branch_t *branch = branches_get(state, split->branches, i);
           const rtree_coord_t *rect = branch_get_rect(branch);
           rtree_coord_t r0[2 * dims], r1[2 * dims];
 
@@ -395,7 +395,7 @@ typedef struct
 #elif SIZEOF_RTREE_COORD_T == 8
   uint64_t id;
 #else
-#error rtree_id_t size not handled
+#error MSG_RTREE_COORD_SIZE
 #endif
   rtree_coord_t min;
 } pair_t;
@@ -428,7 +428,7 @@ static int split_greene(const state_t *state, split_t *split)
     if ((err = split_seed_quadratic(state, split)) != RTREE_OK)
       return err;
 
-    branch_t
+    const branch_t
       *b0 = branches_get(state, split->branches, 0),
       *b1 = branches_get(state, split->branches, 1);
     const rtree_coord_t
@@ -442,9 +442,9 @@ static int split_greene(const state_t *state, split_t *split)
         rtree_coord_t
           s0 = r0[dim] - r1[dim + dims],
           s1 = r1[dim] - r0[dim + dims],
-          s2 = fmax(s0, s1),
-          n0 = fmin(r0[dim], r1[dim]),
-          n1 = fmax(r0[dim + dims], r1[dim + dims]),
+          s2 = FMAX(s0, s1),
+          n0 = FMIN(r0[dim], r1[dim]),
+          n1 = FMAX(r0[dim + dims], r1[dim + dims]),
           n2 = n1 - n0,
           sep = s2 / n2;
 
@@ -461,13 +461,13 @@ static int split_greene(const state_t *state, split_t *split)
 
   /* order by lower boumd in this dimension */
 
-  partition_t *part = &(split->partition);
+  const partition_t *part = &(split->partition);
   const size_t total = part->total;
   pair_t pairs[total];
 
   for (size_t i = 0 ; i < total ; i++)
     {
-      branch_t *b = branches_get(state, split->branches, i);
+      const branch_t *b = branches_get(state, split->branches, i);
       const rtree_coord_t *r = branch_get_rect(b);
       pairs[i].id = i;
       pairs[i].min = r[axis];
@@ -587,7 +587,7 @@ static node_t* split_load(const state_t *state, node_t *node, split_t *split)
     {
       branch_t *branch = branches_get(state, split->branches, i);
       size_t group = bindex_get(part->choice, i);
-      node_t *result;
+      const node_t *result;
 
       switch (group)
         {
@@ -654,7 +654,7 @@ static node_t* split_cover(const state_t *state, node_t *node, split_t *split)
 
   split->rect = split_rect;
 
-  branch_t *b = branches_get(state, split->branches, 0);
+  const branch_t *b = branches_get(state, split->branches, 0);
   const rtree_coord_t *r;
 
   if ((r = branch_get_rect(b)) != NULL)
@@ -697,7 +697,7 @@ node_t* split_node(const state_t *state, node_t *node, branch_t *branch)
 
       for (size_t i = 0 ; i < n ; i++)
         {
-          branch_t *b = branches_get(state, branches, i);
+          const branch_t *b = branches_get(state, branches, i);
           branches_set(state, split.branches, i, b);
         }
 

data/lib/rtree.rb

@@ -16,7 +16,7 @@ require 'fcntl'
 #
 # A Ruby native extension implementing the R-tree spatial index of
 # Guttman-Green.  The code is an embedded version of
-# {http://soliton.vm.bytemark.co.uk/pub/jjg/en/code/librtree librtree}.
+# {https://jjg.gitlab.io/en/code/librtree librtree}.
 #
 # Use
 #
@@ -346,7 +346,7 @@ class RTree < RTreeBase
     if block_given? then
       super
     else
-      ids = []
+      ids = [] #: Array[Integer]
       super(coords) { |id| ids << id }
       ids
     end
@@ -482,10 +482,10 @@ class RTree < RTreeBase
     super
   end
 
-  # @return [Array[float]] the bounding rectangle
-  # @note Ruturns the bounding rectangle (in the same format
-  #   as the rectangle input) for all rectangles in the tree.
-  #   In the case that the input is empty, returns nil.
+  # The bounding rectangle (in the same format as the rectangle
+  # input) for all rectangles in the tree.  In the case that the
+  # input is empty, returns nil.
+  # @return [Array<Float>] the bounding rectangle
   #
   def envelope
     super
@@ -627,11 +627,11 @@ class RTree::Style < RTreeStyleBase
     #     ]
     #   )
     #
-    def from_a(array)
+    def from_array(array)
       from_json(array.to_json)
     end
 
-    alias_method :from_array, :from_a
+    alias_method :from_a, :from_array
 
     private
 

metadata

@@ -1,139 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: librtree
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors:
 - J.J. Green
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-07 00:00:00.000000000 Z
+date: 2026-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.10'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.22'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: steep
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rbs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 description: |
@@ -172,7 +186,9 @@ files:
 - ext/rtree/lib/private/constants.h
 - ext/rtree/lib/private/csv.h
 - ext/rtree/lib/private/endianness.h
+- ext/rtree/lib/private/generic.h
 - ext/rtree/lib/private/json.h
+- ext/rtree/lib/private/message.h
 - ext/rtree/lib/private/node.h
 - ext/rtree/lib/private/page.h
 - ext/rtree/lib/private/postscript.h
@@ -205,7 +221,7 @@ homepage: https://gitlab.com/jjg/librtree-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -214,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -222,8 +238,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - The Jansson library
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: R-tree spatial index
 test_files: []