librtree 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c35526142564e94d93f091e405467f2ee2df3d294b1a4b8e3a87db66f1229043
-  data.tar.gz: dffb928767c821a14460f21d06fc1c90e41a7a17a94a8e700fac0c409d65ca59
+  metadata.gz: 0b253861945be28133a07d5041b080939164dc3725a4b5b458319899d1ad9b66
+  data.tar.gz: 56704611278f67678693ce56e4cec85ae436ba41d534803e0fb8694c39d5b45b
 SHA512:
-  metadata.gz: 0447a6e59546922ed8d227e0f3589aae7771243c4e16c24ae46cde5075dae4b1f7be2b1a8526d58adc6c3db379719201fcf370f1251e82773f488046ab66caff
-  data.tar.gz: 8ed4fd4e3982a4bfbffac9a53f92ae6dfd497ac4e684110d72591e7ec500a4ee2629a5b3a17dad5cc404383eb7aaccf333d7d15a8aeaa943d858a3e973a35d13
+  metadata.gz: 904eacdcbbe518f91ccc41d2c03da9191591a0af6e17be87874be1d74525707a10815e68ed0c9c3dacf91afe70384f982723487f3b6434241ec51097745f0f3e
+  data.tar.gz: 8be9c36a56b92d1bea25a2ef352cb1e3062b1d197983c92cd11d0f753451573b454b3af22327c05fa300d52f3036561555bd1464faa79ea304d87811ddd4acd2

data/CHANGELOG.md

@@ -1,7 +1,16 @@
 Changelog
 ---------
 
-### 1.0.2, pending
+### 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
+- Remove workaround for "optional argument to #exit!" issue
+
+### 1.0.2, 06-04-2023
 
 - The `#serialise` method raises if the read from pipe returns
   nil (which it might), so the method (and other methods which
@@ -26,7 +35,7 @@ Changelog
 
 - Tidying
 - Fix warning "undefining the allocator of T_DATA class" on
-  Ruby 3,2
+  Ruby 3.2
 - No functional changes
 
 ### 0.9.0, 07-11-2021

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 2.7.0
+    rbenv local 3.2.0
     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.
+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).
 
 If not using **rbenv** then just
 

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>

data/ext/rtree/lib/branch.c

@@ -2,7 +2,8 @@
 #include "config.h"
 #endif
 
-#include "rtree/branch.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 "rtree/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,18 +2,20 @@
 #include "config.h"
 #endif
 
-#include "bsrt.h"
+#include "private/branch.h"
+#include "private/branches.h"
+#include "private/bsrt.h"
+#include "private/node.h"
 
 #include "rtree/error.h"
-#include "rtree/branches.h"
 
 #include <errno.h>
 #include <string.h>
 
 #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"
@@ -129,28 +131,18 @@ static int write_rect(const state_t *state,
 
   for (size_t i = 0 ; i < n ; i++)
     {
-      /*
-        The type-punning to/from char* here is legal (the standard
-        makes an explicit exception), but cppcheck warns anyway, so
-        we suppress those warnings
-      */
-
       char p[k];
 
-      /* cppcheck-suppress invalidPointerCast */
       *(rtree_coord_t*)p = rect[i];
 
 #if SIZEOF_RTREE_COORD_T == 4
-      /* cppcheck-suppress invalidPointerCast */
       *(uint32_t*)p = htole32(*(uint32_t*)p);
 #elif SIZEOF_RTREE_COORD_T == 8
-      /* cppcheck-suppress invalidPointerCast */
       *(uint64_t*)p = htole64(*(uint64_t*)p);
 #else
 #error rtree_coord_t size not handled
 #endif
 
-      /* cppcheck-suppress invalidPointerCast */
       buffer[i] = *(rtree_coord_t*)p;
     }
 
@@ -321,7 +313,7 @@ static int read_v1_header(FILE *stream, uint16_t v[5])
   return 0;
 }
 
-static bool read_v1_state_consistent(uint16_t v[5], const state_t *state)
+static bool read_v1_state_consistent(const uint16_t v[5], const state_t *state)
 {
   return
     (v[0] == state_dims(state)) &&
@@ -360,8 +352,6 @@ static int read_v1_rect(FILE *stream,
 #error rtree_coord_t size not handled
 #endif
 
-      /* cppcheck-suppress invalidPointerCast */
-
       rect[i] = *(rtree_coord_t*)p;
     }
 
@@ -592,7 +582,7 @@ static int read_v2_header(FILE *stream, uint16_t v[6])
   return 0;
 }
 
-static bool read_v2_state_consistent(uint16_t v[6], const state_t *state)
+static bool read_v2_state_consistent(const uint16_t v[6], const state_t *state)
 {
   return
     (v[0] == state_dims(state)) &&

data/ext/rtree/lib/csv.c

@@ -2,7 +2,9 @@
 #include "config.h"
 #endif
 
-#include "csv.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";

data/ext/rtree/lib/json.c

@@ -2,11 +2,14 @@
 #include "config.h"
 #endif
 
-#include "json.h"
-#include "bounds.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"
-#include "rtree/branches.h"
 
 #include <errno.h>
 

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

@@ -1,3 +1,3 @@
-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/branch.h rtree/error.h rtree/extent.h rtree/node.h \
+	rtree/package.h rtree/postscript.h rtree/rectf.h rtree/search.h \
+	rtree/state.h rtree/types.h rtree.h

data/ext/rtree/lib/node.c

@@ -2,12 +2,13 @@
 #include "config.h"
 #endif
 
-#include "rtree/node.h"
-#include "rtree/branches.h"
-#include "rtree/rect.h"
-#include "rtree/error.h"
+#include "private/branch.h"
+#include "private/branches.h"
+#include "private/node.h"
+#include "private/rect.h"
+#include "private/split.h"
 
-#include "split.h"
+#include "rtree/error.h"
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -307,23 +308,27 @@ 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 the least total volume for the covering rectangles in the current
-  node.  In case of a tie, pick the one which was smaller before, to
-  get the best resolution when searching.
+  node.
+
+  This is expensive but does not show up directly in the profile since
+  it is only called once so obviously inlined.
 */
 
 static int node_pick_branch(const state_t *state,
-                            node_t *node, const rtree_coord_t *rect,
+                            node_t *node,
+                            const rtree_coord_t *rect,
                             size_t *index)
 {
-  const size_t
-    dims = state_dims(state);
-  size_t
-    index_min = SIZE_MAX;
-  rtree_coord_t
-    dvol_min = INFINITY,
-    vol_min = INFINITY;
 
-  for (size_t i = 0 ; i < node_count(node) ; i++)
+  const size_t dims = state_dims(state);
+  assert(dims > 0);
+  rtree_coord_t rect2[2 * dims];
+
+  const size_t n = node_count(node);
+  assert(n > 0);
+  rtree_coord_t dvol[n];
+
+  for (size_t i = 0 ; i < n ; i++)
     {
       branch_t *branch;
 
@@ -331,34 +336,29 @@ static int node_pick_branch(const state_t *state,
         return RTREE_ERR_GETBRANCH;
 
       const rtree_coord_t *rect1 = branch_get_rect(branch);
-      rtree_coord_t rect2[2 * dims];
       rect_combine(state, rect, rect1, rect2);
 
       rtree_coord_t
         vol1 = rect_spherical_volume(state, rect1),
-        vol2 = rect_spherical_volume(state, rect2),
-        dvol = vol2 - vol1;
+        vol2 = rect_spherical_volume(state, rect2);
 
-      if ((dvol < dvol_min) || ((dvol == dvol_min) && (vol1 < vol_min)))
+      dvol[i] = vol2 - vol1;
+    }
+
+  rtree_coord_t dvol_min = dvol[0];
+  size_t index_min = 0;
+
+  for (size_t i = 1 ; i < n ; i++)
+    {
+      rtree_coord_t dvol_i = dvol[i];
+
+      if (dvol_i < dvol_min)
         {
+          dvol_min = dvol_i;
           index_min = i;
-          vol_min = vol1;
-          dvol_min = dvol;
         }
     }
 
-  /*
-    This can only happen if no branches are assigned in the above
-    block, on the first call of it, dvol_min == DBL_MAX, so either
-    the first case is called, or dvol == DBL_MAX, but dvol is equal
-    to vol2 - vol1, and vol1, vol2 are non-negative, so vol2 must
-    be DBL_MAX and vol1 zero, in particular vol1 < vol_min (DBL_MAX),
-    so the second condition is met.
-  */
-
-  if (index_min == SIZE_MAX)
-    return RTREE_ERR_PICKBRANCH;
-
   *index = index_min;
 
   return RTREE_OK;

data/ext/rtree/lib/package.c

@@ -5,7 +5,7 @@
 
 #include "rtree/package.h"
 
-const char rtree_package_version[] = "1.1.4";
+const char rtree_package_version[] = "1.3.0";
 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,9 +2,13 @@
 #include "config.h"
 #endif
 
-#include "rtree/postscript.h"
-#include "rtree/package.h"
+#include "private/branch.h"
+#include "private/node.h"
+#include "private/state.h"
+
 #include "rtree/error.h"
+#include "rtree/package.h"
+#include "rtree/postscript.h"
 
 #include <time.h>
 #include <errno.h>
@@ -32,7 +36,7 @@ typedef struct {
 typedef struct {
   const state_t *state;
   const node_t *root;
-  const style_t *style;
+  const postscript_style_t *style;
   page_t page;
 } ps_t;
 
@@ -45,7 +49,7 @@ static bool clamped(float value)
   return (value >= 0.0) && (value <= 1.0);
 }
 
-static int psr_colour(json_t *json, colour_t *colour)
+static int psr_colour(json_t *json, postscript_colour_t *colour)
 {
   json_t *json_colour;
 
@@ -127,7 +131,7 @@ static int psr_colour(json_t *json, colour_t *colour)
   return 1;
 }
 
-static int psr_style_level(json_t *json, style_level_t *style_level)
+static int psr_style_level(json_t *json, postscript_style_level_t *style_level)
 {
   if (! json_is_object(json))
     return 1;
@@ -169,7 +173,7 @@ static int psr_style_level(json_t *json, style_level_t *style_level)
   return 0;
 }
 
-static style_t* psr_style(json_t *json)
+static postscript_style_t* psr_style(json_t *json)
 {
   if (! json_is_array(json))
     return NULL;
@@ -179,16 +183,16 @@ static style_t* psr_style(json_t *json)
   if (n == 0)
     return NULL;
 
-  style_level_t *array;
+  postscript_style_level_t *array;
 
-  if ((array = calloc(n, sizeof(style_level_t))) != NULL)
+  if ((array = calloc(n, sizeof(postscript_style_level_t))) != NULL)
     {
       size_t i;
       json_t *json_style;
 
       json_array_foreach(json, i, json_style)
         {
-          style_level_t *style_level = array + i;
+          postscript_style_level_t *style_level = array + i;
 
           if (psr_style_level(json_style, style_level) != 0)
             {
@@ -197,9 +201,9 @@ static style_t* psr_style(json_t *json)
             }
         }
 
-      style_t *style;
+      postscript_style_t *style;
 
-      if ((style = malloc(sizeof(style_t))) != NULL)
+      if ((style = malloc(sizeof(postscript_style_t))) != NULL)
         {
           style->n = n;
           style->array = array;
@@ -212,14 +216,14 @@ static style_t* psr_style(json_t *json)
   return NULL;
 }
 
-style_t* postscript_style_read(FILE *stream)
+postscript_style_t* postscript_style_read(FILE *stream)
 {
   const size_t flags = JSON_REJECT_DUPLICATES;
   json_t *json;
 
   if ((json = json_loadf(stream, flags, NULL)) != NULL)
     {
-      style_t *style = psr_style(json);
+      postscript_style_t *style = psr_style(json);
       json_decref(json);
       return style;
     }
@@ -231,7 +235,7 @@ style_t* postscript_style_read(FILE *stream)
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
-style_t* postscript_style_read(FILE *stream)
+postscript_style_t* postscript_style_read(FILE *stream)
 {
   errno = ENOSYS;
   return NULL;
@@ -240,7 +244,7 @@ style_t* postscript_style_read(FILE *stream)
 
 #endif
 
-void postscript_style_destroy(style_t *style)
+void postscript_style_destroy(postscript_style_t *style)
 {
   if (style != NULL)
     free(style->array);
@@ -473,7 +477,7 @@ int postscript_write(const state_t *state,
       if (i >= ps.style->n)
         break;
 
-      style_level_t style_level = ps.style->array[i];
+      postscript_style_level_t style_level = ps.style->array[i];
       node_level_t level = max_level - i;
 
       switch (style_level.fill.colour.model)

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/{rtree → private}/branch.h

@@ -1,23 +1,20 @@
 /*
-  rtree/branch.h
-  Copyright (c) J.J. Green 2019
+  private/branch.h
+  Copyright (c) J.J. Green 2023
 */
 
-#ifndef RTREE_BRANCH_H
-#define RTREE_BRANCH_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdlib.h>
+#ifndef PRIVATE_BRANCH_H
+#define PRIVATE_BRANCH_H
 
 typedef struct branch_t branch_t;
 
+#include <private/rect.h>
+#include <private/node.h>
+#include <private/state.h>
+
 #include <rtree/types.h>
-#include <rtree/state.h>
-#include <rtree/node.h>
-#include <rtree/rect.h>
+
+#include <stddef.h>
 
 /*
   The union is either a pointer to the child-node in the tree, or
@@ -98,8 +95,4 @@ inline rtree_coord_t* branch_get_rect_mutable(branch_t *branch)
   return branch->rect;
 }
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif

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

@@ -1,22 +1,20 @@
 /*
-  rtree/branches.h
+  private/branches.h
   Copyright (c) J.J. Green 2020
 */
 
-#ifndef RTREE_BRANCHES_H
-#define RTREE_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 <rtree/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>