gmt 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c3d9adf57be499c296fab1aa6c6c23d1001d17709f96c0cfc62d5a3fa344a66
-  data.tar.gz: e51bafc40060577b2bc98a376dcc23b863e586697122e28335582ac0ffea522b
+  metadata.gz: 47175ab0f9f220eec500e98bb1b392ec93ae42b61e13c851bae392a0dd4d9d08
+  data.tar.gz: 0f24492604a31c82461d730be0afbc508849ff757939ac99596020f8ffe0c6f7
 SHA512:
-  metadata.gz: 29d50bccf9a8868617653da560a520e2af073e81dcd8a99e75086f4108abfd6516f4a08073cadad8d78b60687434c06032299708b5dac9c674a09c2b5fdf9ed1
-  data.tar.gz: 8f57a9db15bd3a1d5afbd899af330632e6fc72fec26c64c5ba64781ec939d42cc502a07b9d373ce02e1874e423d607dab608735d155b360130a66c81a3746ec4
+  metadata.gz: 7fb19342fb1e3480531f02e1d9ca34203791820952c2d683d5294af027a5f9cc8205f9f2ed07fa452b7a0f9bb4dd51b9bafe36e7b08934e745fea6410cfb4c30
+  data.tar.gz: 8e59daf96977b38a4498c7934d04ec302c7044a50af43e07ad36118742c87070d1d1eb268578f4c3a17c41a3c04912d3db1afd849b0e16d96cce98b7b13f9172

data/ext/gmt/gmt.c

@@ -1,4 +1,6 @@
 #include <ruby.h>
+#include <ruby/version.h>
+
 #include <gmt.h>
 #include <gmt_version.h>
 
@@ -27,6 +29,26 @@ static void raise_if_error(int err, const char *module)
     rb_raise(rb_eRuntimeError, "failed call to GMT module %s", module);
 }
 
+static void gmt_free(void*);
+
+static rb_data_type_t data_type = {
+  .wrap_struct_name = "ruby-gmt-wrap",
+  .function = {
+    .dmark = NULL,
+    .dfree = gmt_free,
+    .dsize = NULL,
+#if RUBY_API_VERSION_CODE < 20700
+    .reserved = { NULL, NULL }
+#else
+    .dcompact = NULL,
+    .reserved = { NULL }
+#endif
+  },
+  .parent = NULL,
+  .data = NULL,
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 /* ruby object interface */
 
 static void gmt_free(void *p)
@@ -38,13 +60,18 @@ static void gmt_free(void *p)
       GMT_Destroy_Session(gmt->session);
       gmt->session = NULL;
     }
+
+  free(gmt);
 }
 
-static VALUE gmt_alloc(VALUE klass)
+static VALUE gmt_alloc(VALUE cls)
 {
   gmt_t *gmt;
 
-  VALUE obj = Data_Make_Struct(klass, gmt_t, NULL, gmt_free, gmt);
+  if ((gmt = malloc(sizeof(gmt_t))) == NULL)
+    rb_raise(rb_eNoMemError, "failed to alloc GMT struct");
+
+  VALUE obj = TypedData_Wrap_Struct(cls, &data_type, gmt);
 
   gmt->session = NULL;
 
@@ -55,7 +82,7 @@ static VALUE gmt_init(VALUE self)
 {
   gmt_t *gmt;
 
-  Data_Get_Struct(self, gmt_t, gmt);
+  TypedData_Get_Struct(self, gmt_t, &data_type, gmt);
 
   gmt->session =
     GMT_Create_Session("Session name", 2, 0, NULL);
@@ -70,7 +97,7 @@ static VALUE gmt_release(VALUE self)
 {
   gmt_t *gmt;
 
-  Data_Get_Struct(self, gmt_t, gmt);
+  TypedData_Get_Struct(self, gmt_t, &data_type, gmt);
 
   if (gmt->session)
     {
@@ -89,7 +116,7 @@ static VALUE gmt_simple(const char *name, int argc, VALUE *argv, VALUE self)
   rb_scan_args(argc, argv, "*1", &files, &opts);
 
   gmt_t *gmt;
-  Data_Get_Struct(self, gmt_t, gmt);
+  TypedData_Get_Struct(self, gmt_t, &data_type, gmt);
   raise_unless_class_data(gmt);
 
   void *session = gmt->session;
@@ -114,7 +141,7 @@ static VALUE gmt_simple(const char *name, int argc, VALUE *argv, VALUE self)
 
   The "modern mode" modules (which have a slicker way of routing and
   combining postscript output) will probably need a different treatment,
-  possibly a more attractive on from the Ruby perspective; for now we
+  possibly a more attractive one from the Ruby perspective; for now we
   just limit ourselves to the classic mode.
 */
 
@@ -218,10 +245,6 @@ GMT_FUN(sphtriangulate)
 
 /* Convert or extract subsets of data */
 
-#if API_AT_LEAST(6, 2, 0)
-GMT_FUN(gmtbinstats)
-#endif
-
 GMT_FUN(gmtconnect)
 GMT_FUN(gmtconvert)
 GMT_FUN(gmtselect)
@@ -241,6 +264,10 @@ GMT_FUN(grd2kml)
 GMT_FUN(grd2rgb) /* https://github.com/GenericMappingTools/gmt/pull/425 */
 #endif
 
+#if API_AT_LEAST(6, 2, 0)
+GMT_FUN(gmtbinstats)
+#endif
+
 /* trends in 1-D and 2-D data */
 
 GMT_FUN(fitcircle)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gmt
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - J.J. Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-09 00:00:00.000000000 Z
+date: 2022-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler