librtree 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f559b211be3e93ded31a86b61c68ea28cdea151ef62d0c64a79aa38131fa5a7
-  data.tar.gz: 7df99f8990a461d60e2276a20891be62c1dc27e6279a2226f2fec6d63d30f5dd
+  metadata.gz: a175d9b929078c0a8d94c7adbb7af7eb728acda5a401a99f95504fa30f129470
+  data.tar.gz: c5042bd9893f64c112d3940d549fa9dde8503121ced5507ddf2392840950aac0
 SHA512:
-  metadata.gz: d6c204e2ba3a7b26fe2ab8ba1148b159a21cc697061d672fa2ccff85924dc56c2a9f19b6241d68e5ec96e3b5f955ffc617ecfc26bc9db94cb0f2190e3178e693
-  data.tar.gz: c831af24c76a719bfae623a5b525840cf910065426833589d8c04160524e576daf4ad13daf2793387931599187ad80f6bc596aaf21b72334e5230a449cda818d
+  metadata.gz: c106ef413a5d28068882ce4c9a24d9d1cb7124b925722915482d59809fdb71b556326e6bca3ebc1fcb9191edb9d799a6233054ae417e9f3c8d3ae5f871057c08
+  data.tar.gz: b14066ff0a21bfea29efb91fd52018906358b2ef6eb9ba9337869af62a4be4f2e17b6686f7788fda038b96015630b0b005d0c0a9133899b96e163ac630e49c7d

data/ext/rtree/rtree.c

@@ -6,29 +6,20 @@
 #include <errno.h>
 #include <stdint.h>
 
-typedef struct
-{
-  rtree_t *rtree;
-} lrt_t;
-
 static void lrt_free(void *p)
 {
-  lrt_t *lrt = p;
-
-  if (lrt->rtree)
-    {
-      rtree_destroy(lrt->rtree);
-      lrt->rtree = NULL;
-    }
+  rtree_t *rtree = p;
+  rtree_destroy(rtree);
 }
 
 static VALUE lrt_alloc(VALUE cls)
 {
-  lrt_t *lrt;
-  VALUE obj = Data_Make_Struct(cls, lrt_t, NULL, lrt_free, lrt);
+  rtree_t *rtree;;
 
-  lrt->rtree = NULL;
+  if ((rtree = rtree_alloc()) == NULL)
+    rb_raise(rb_eNoMemError, "failed to alloc rtree");
 
+  VALUE obj = Data_Wrap_Struct(cls, NULL, lrt_free, rtree);
   return obj;
 }
 
@@ -40,31 +31,28 @@ static VALUE lrt_init(VALUE self, VALUE dim_obj, VALUE flags_obj)
   Check_Type(dim_obj, T_FIXNUM);
   state_flags_t flags = FIX2UINT(flags_obj);
 
-  lrt_t *lrt;
-  Data_Get_Struct(self, lrt_t, lrt);
+  rtree_t *rtree;
+  Data_Get_Struct(self, rtree_t, rtree);
 
-  if ((lrt->rtree = rtree_new(dim, flags)) == NULL)
-    rb_raise(rb_eNoMemError, "failed to create rtree");
+  if ((rtree_init(rtree, dim, flags)) != 0)
+    rb_raise(rb_eNoMemError, "failed to init rtree");
 
   return self;
 }
 
 static VALUE lrt_release(VALUE self)
 {
-  lrt_t *lrt;
-  Data_Get_Struct(self, lrt_t, lrt);
-
-  free(lrt->rtree);
-
+  rtree_t *rtree;
+  Data_Get_Struct(self, rtree_t, rtree);
+  rtree_destroy(rtree);
   return self;
 }
 
 static VALUE lrt_height(VALUE self)
 {
-  lrt_t *lrt;
-  Data_Get_Struct(self, lrt_t, lrt);
-
-  return INT2NUM(rtree_height(lrt->rtree));
+  rtree_t *rtree;
+  Data_Get_Struct(self, rtree_t, rtree);
+  return INT2NUM(rtree_height(rtree));
 }
 
 static VALUE lrt_add_rect(VALUE self, VALUE id_obj, VALUE coord_obj)
@@ -72,11 +60,9 @@ static VALUE lrt_add_rect(VALUE self, VALUE id_obj, VALUE coord_obj)
   Check_Type(coord_obj, T_ARRAY);
   Check_Type(id_obj, T_FIXNUM);
 
-  lrt_t *lrt;
-  Data_Get_Struct(self, lrt_t, lrt);
+  rtree_t *rtree;
+  Data_Get_Struct(self, rtree_t, rtree);
 
-  rtree_t
-    *rtree = lrt->rtree;
   rtree_id_t
     id = FIX2ULONG(id_obj);
   size_t
@@ -132,11 +118,10 @@ static VALUE lrt_update(VALUE self)
   if (!rb_block_given_p())
     rb_raise(rb_eArgError, "Expected block");
 
-  lrt_t *lrt;
-  Data_Get_Struct(self, lrt_t, lrt);
-  rtree_t *rtree = lrt->rtree;
-  size_t len = 2 * state_dims(rtree->state);
+  rtree_t *rtree;
+  Data_Get_Struct(self, rtree_t, rtree);
 
+  size_t len = 2 * state_dims(rtree->state);
   int err = rtree_update(rtree, update_cb, &len);
 
   if (err != 0)
@@ -169,11 +154,9 @@ static VALUE lrt_search(VALUE self, VALUE coord_obj)
 
   Check_Type(coord_obj, T_ARRAY);
 
-  lrt_t *lrt;
-  Data_Get_Struct(self, lrt_t, lrt);
+  rtree_t *rtree;
+  Data_Get_Struct(self, rtree_t, rtree);
 
-  rtree_t
-    *rtree = lrt->rtree;
   size_t
     len = RARRAY_LEN(coord_obj),
     dim = state_dims(rtree->state);
@@ -215,10 +198,7 @@ static VALUE deserialise(VALUE cls, VALUE io_obj, deserialise_t *f)
         rb_raise(rb_eRuntimeError, "Failed read from stream");
     }
 
-  lrt_t *lrt;
-  VALUE obj = Data_Make_Struct(cls, lrt_t, NULL, lrt_free, lrt);
-
-  lrt->rtree = rtree;
+  VALUE obj = Data_Wrap_Struct(cls, NULL, lrt_free, rtree);
 
   return obj;
 }
@@ -259,10 +239,7 @@ static VALUE lrt_csv_read(VALUE cls,
         rb_raise(rb_eRuntimeError, "Failed read from stream");
     }
 
-  lrt_t *lrt;
-  VALUE obj = Data_Make_Struct(cls, lrt_t, NULL, lrt_free, lrt);
-
-  lrt->rtree = rtree;
+  VALUE obj = Data_Wrap_Struct(cls, NULL, lrt_free, rtree);
 
   return obj;
 }
@@ -281,9 +258,8 @@ static VALUE serialise(VALUE self, VALUE io_obj, serialise_t *f)
   rb_io_check_writable(io);
   FILE *fp = rb_io_stdio_file(io);
 
-  lrt_t *lrt;
-  Data_Get_Struct(self, lrt_t, lrt);
-  rtree_t *rtree = lrt->rtree;
+  rtree_t *rtree;
+  Data_Get_Struct(self, rtree_t, rtree);
 
   int err = f(rtree, fp);
   if (err != 0)
@@ -304,12 +280,10 @@ static VALUE lrt_bsrt_write(VALUE self, VALUE io_obj)
 
 static VALUE lrt_identical(VALUE self, VALUE other)
 {
-  lrt_t *lrt_self, *lrt_other;
-  Data_Get_Struct(self, lrt_t, lrt_self);
-  Data_Get_Struct(other, lrt_t, lrt_other);
-  rtree_t
-    *rtree_self = lrt_self->rtree,
-    *rtree_other = lrt_other->rtree;
+  rtree_t *rtree_self, *rtree_other;
+
+  Data_Get_Struct(self, rtree_t, rtree_self);
+  Data_Get_Struct(other, rtree_t, rtree_other);
 
   if (rtree_identical(rtree_self, rtree_other))
     return Qtrue;
@@ -319,12 +293,12 @@ static VALUE lrt_identical(VALUE self, VALUE other)
 
 static VALUE lrt_clone(VALUE self)
 {
-  lrt_t *lrt;
-  Data_Get_Struct(self, lrt_t, lrt);
   rtree_t *rtree;
+  Data_Get_Struct(self, rtree_t, rtree);
 
+  rtree_t *clone;
   errno = 0;
-  if ((rtree = rtree_clone(lrt->rtree)) == NULL)
+  if ((clone = rtree_clone(rtree)) == NULL)
     {
       if (errno)
         rb_sys_fail(__func__);
@@ -332,20 +306,17 @@ static VALUE lrt_clone(VALUE self)
         rb_raise(rb_eRuntimeError, "Failed clone");
     }
 
-  lrt_t *lrt_cloned;
   VALUE cls = CLASS_OF(self);
-  VALUE obj = Data_Make_Struct(cls, lrt_t, NULL, lrt_free, lrt_cloned);
-
-  lrt_cloned->rtree = rtree;
+  VALUE obj = Data_Wrap_Struct(cls, NULL, lrt_free, clone);
 
   return obj;
 }
 
 static VALUE state_size_access(VALUE self, size_t (*f)(const state_t*))
 {
-  lrt_t *lrt;
-  Data_Get_Struct(self, lrt_t, lrt);
-  return INT2NUM(f(lrt->rtree->state));
+  rtree_t *rtree;
+  Data_Get_Struct(self, rtree_t, rtree);
+  return INT2NUM(f(rtree->state));
 }
 
 static VALUE lrt_dim(VALUE self)
@@ -380,12 +351,11 @@ static VALUE lrt_branching_factor(VALUE self)
 
 static VALUE lrt_unit_sphere_volume(VALUE self)
 {
-  lrt_t *lrt;
-  Data_Get_Struct(self, lrt_t, lrt);
-  return DBL2NUM(state_unit_sphere_volume(lrt->rtree->state));
+  rtree_t *rtree;
+  Data_Get_Struct(self, rtree_t, rtree);
+  return DBL2NUM(state_unit_sphere_volume(rtree->state));
 }
 
-
 void Init_rtree(void)
 {
   VALUE cls = rb_const_get(rb_cObject, rb_intern("RTreeC"));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: librtree
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - J.J. Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-22 00:00:00.000000000 Z
+date: 2021-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,8 +95,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 description: |
-  A Ruby extension for librtree implementing the R-tree
-  spatial-index of Guttman-Green.
+  A Ruby extension implementing the R-tree spatial-index of
+  Guttman-Green.
 email: j.j.green@gmx.co.uk
 executables: []
 extensions:
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- The librtree library
+- The librtree library (1.0.2 or later)
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4