rgeo-proj4 4.0.0.pre.rc.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0a179679b6f6471a9626bf6fbc08758a52b0d60f5ba81fa4ab5119456680470
-  data.tar.gz: 2a58dfbbf870d24ea9d4b2880444c1f331ba184dc38862af6b4347fb9cc96366
+  metadata.gz: 62f388f5389751fb4be6fd44e37b436c2a3465dc407346cb8c311c839af0e35f
+  data.tar.gz: 259d631dcf07572b4a99de70cef87156ea880bc2db54aeaea9cf6db4530772ed
 SHA512:
-  metadata.gz: a3f86ad3fd2ef994a74ebf0df1f6f4d87446f7a28055417d551822ed88384893f74e20d6803200083f129fe152170ae3d887b50769a5861391b3c0447d83c7a5
-  data.tar.gz: b41045b6502bd6172632021e942da3214b9de534ffd1461bb4969813c3fbcd60a8c0c7f3074c692609380f1179a1c9b600b99bba9a0c3a3f620ad99a8226b618
+  metadata.gz: c48f8cb2676bbc08309a6c103b7df1c7f121e586b300357bc278bccc3dcdfb72f597b9e89bf11603a749a329910685ee93adf719ab4f47db7b3676a9290911ac
+  data.tar.gz: 623d1af171edc6e69bc1d8967d9b9262f2a96dd560fcaa6cc5982be75d1e4d4177957255fd28895230c4645cc1ed778a0f77354d3b0b30d031cda8d9bc984687

data/ext/proj4_c_impl/errors.c

@@ -20,8 +20,10 @@ void rgeo_init_proj_errors() {
 
   rgeo_module = rb_define_module("RGeo");
   error_module = rb_define_module_under(rgeo_module, "Error");
-  rb_eRGeoError = rb_define_class_under(error_module, "RGeoError", rb_eRuntimeError);
-  rb_eRGeoInvalidProjectionError = rb_define_class_under(error_module, "InvalidProjection", rb_eRGeoError);
+  rb_eRGeoError =
+      rb_define_class_under(error_module, "RGeoError", rb_eRuntimeError);
+  rb_eRGeoInvalidProjectionError =
+      rb_define_class_under(error_module, "InvalidProjection", rb_eRGeoError);
 }
 
 RGEO_END_C

data/ext/proj4_c_impl/extconf.rb

@@ -12,6 +12,17 @@ else
 
   require "mkmf"
 
+  if ENV.key?("DEBUG") || ENV.key?("MAINTAINER_MODE")
+    $CFLAGS << " -DDEBUG" \
+               " -Wall" \
+               " -ggdb" \
+               " -pedantic" \
+               " -std=c17"
+
+    extra_flags = ENV.fetch("MAINTAINER_MODE", ENV.fetch("DEBUG", ""))
+    $CFLAGS << " " << extra_flags if extra_flags.strip.start_with?("-")
+  end
+
   header_dirs =
     [
       ::RbConfig::CONFIG["includedir"],

data/ext/proj4_c_impl/main.c

@@ -6,16 +6,14 @@
 
 #ifdef RGEO_PROJ4_SUPPORTED
 
-#include <ruby.h>
-#include <proj.h>
 #include "errors.h"
+#include <proj.h>
+#include <ruby.h>
 
 #endif
 
-
 RGEO_BEGIN_C
 
-
 #ifdef RGEO_PROJ4_SUPPORTED
 
 #if PROJ_VERSION_MAJOR == 6 && PROJ_VERSION_MINOR < 3
@@ -34,72 +32,63 @@ typedef struct {
   PJ *crs_to_crs;
 } RGeo_CRSToCRSData;
 
-
 // Destroy function for proj data.
-static void rgeo_proj4_free(void *ptr)
-{
+static void rgeo_proj4_free(void *ptr) {
   RGeo_Proj4Data *data = (RGeo_Proj4Data *)ptr;
-  if (data->pj){
+  if (data->pj) {
     proj_destroy(data->pj);
   }
-  free(data);
+  FREE(data);
 }
 
 // Destroy function for crs_to_crs data.
-static void rgeo_crs_to_crs_free(void *ptr)
-{
+static void rgeo_crs_to_crs_free(void *ptr) {
   RGeo_CRSToCRSData *data = (RGeo_CRSToCRSData *)ptr;
-  if (data->crs_to_crs){
+  if (data->crs_to_crs) {
     proj_destroy(data->crs_to_crs);
   }
-  free(data);
+  FREE(data);
 }
 
-
-static size_t rgeo_proj4_memsize(const void *ptr)
-{
+static size_t rgeo_proj4_memsize(const void *ptr) {
   size_t size = 0;
   const RGeo_Proj4Data *data = (const RGeo_Proj4Data *)ptr;
 
   size += sizeof(*data);
-  if (data->pj){
+  if (data->pj) {
     size += sizeof(data->pj);
   }
   return size;
 }
 
-static size_t rgeo_crs_to_crs_memsize(const void *ptr)
-{
+static size_t rgeo_crs_to_crs_memsize(const void *ptr) {
   size_t size = 0;
   const RGeo_CRSToCRSData *data = (const RGeo_CRSToCRSData *)ptr;
   size += sizeof(*data);
-  if (data->crs_to_crs){
+  if (data->crs_to_crs) {
     size += sizeof(data->crs_to_crs);
   }
   return size;
 }
 
-static void rgeo_proj4_mark(void *ptr)
-{
+static void rgeo_proj4_mark(void *ptr) {
   RGeo_Proj4Data *data = (RGeo_Proj4Data *)ptr;
-  if (!NIL_P(data->original_str)){
+  if (!NIL_P(data->original_str)) {
     mark(data->original_str);
   }
 }
 
 #ifdef HAVE_RB_GC_MARK_MOVABLE
-static void rgeo_proj4_compact(void *ptr)
-{
+static void rgeo_proj4_compact(void *ptr) {
   RGeo_Proj4Data *data = (RGeo_Proj4Data *)ptr;
-  if (data && !NIL_P(data->original_str)){
+  if (data && !NIL_P(data->original_str)) {
     data->original_str = rb_gc_location(data->original_str);
   }
 }
 #endif
 
-static void rgeo_proj4_clear_struct(RGeo_Proj4Data *data)
-{
-  if (data->pj){
+static void rgeo_proj4_clear_struct(RGeo_Proj4Data *data) {
+  if (data->pj) {
     proj_destroy(data->pj);
     data->pj = NULL;
     data->original_str = Qnil;
@@ -110,26 +99,27 @@ static const rb_data_type_t rgeo_proj4_data_type = {
     "RGeo::CoordSys::Proj4",
     {rgeo_proj4_mark, rgeo_proj4_free, rgeo_proj4_memsize,
 #ifdef HAVE_RB_GC_MARK_MOVABLE
-    rgeo_proj4_compact
+     rgeo_proj4_compact
 #endif
     },
-    0, 0,
+    0,
+    0,
     RUBY_TYPED_FREE_IMMEDIATELY};
 
 static const rb_data_type_t rgeo_crs_to_crs_data_type = {
     "RGeo::CoordSys::CRSToCRS",
     {0, rgeo_crs_to_crs_free, rgeo_crs_to_crs_memsize},
-    0, 0,
+    0,
+    0,
     RUBY_TYPED_FREE_IMMEDIATELY};
 
-static VALUE rgeo_proj4_data_alloc(VALUE self)
-{
+static VALUE rgeo_proj4_data_alloc(VALUE self) {
   VALUE result;
   RGeo_Proj4Data *data = ALLOC(RGeo_Proj4Data);
 
   result = Qnil;
 
-  if (data){
+  if (data) {
     data->pj = NULL;
     data->original_str = Qnil;
     data->uses_radians = 0;
@@ -138,26 +128,23 @@ static VALUE rgeo_proj4_data_alloc(VALUE self)
   return result;
 }
 
-
-static VALUE rgeo_crs_to_crs_data_alloc(VALUE self)
-{
+static VALUE rgeo_crs_to_crs_data_alloc(VALUE self) {
   VALUE result;
   RGeo_CRSToCRSData *data = ALLOC(RGeo_CRSToCRSData);
 
   result = Qnil;
 
-  if (data){
+  if (data) {
     data->crs_to_crs = NULL;
     result = TypedData_Wrap_Struct(self, &rgeo_crs_to_crs_data_type, data);
   }
   return result;
 }
 
-static VALUE method_proj4_initialize_copy(VALUE self, VALUE orig)
-{
+static VALUE method_proj4_initialize_copy(VALUE self, VALUE orig) {
   RGeo_Proj4Data *self_data;
   RGeo_Proj4Data *orig_data;
-  const char* str;
+  const char *str;
 
   // Clear out any existing value
   TypedData_Get_Struct(self, RGeo_Proj4Data, &rgeo_proj4_data_type, self_data);
@@ -166,9 +153,9 @@ static VALUE method_proj4_initialize_copy(VALUE self, VALUE orig)
   // Copy value from orig
   TypedData_Get_Struct(orig, RGeo_Proj4Data, &rgeo_proj4_data_type, orig_data);
   if (!NIL_P(orig_data->original_str)) {
-    self_data->pj = proj_create(PJ_DEFAULT_CTX, StringValuePtr(orig_data->original_str));
-  }
-  else {
+    self_data->pj =
+        proj_create(PJ_DEFAULT_CTX, StringValuePtr(orig_data->original_str));
+  } else {
     str = proj_as_proj_string(PJ_DEFAULT_CTX, orig_data->pj, PJ_PROJ_4, NULL);
     self_data->pj = proj_create(PJ_DEFAULT_CTX, str);
   }
@@ -178,9 +165,7 @@ static VALUE method_proj4_initialize_copy(VALUE self, VALUE orig)
   return self;
 }
 
-
-static VALUE method_proj4_set_value(VALUE self, VALUE str, VALUE uses_radians)
-{
+static VALUE method_proj4_set_value(VALUE self, VALUE str, VALUE uses_radians) {
   RGeo_Proj4Data *self_data;
 
   Check_Type(str, T_STRING);
@@ -197,9 +182,7 @@ static VALUE method_proj4_set_value(VALUE self, VALUE str, VALUE uses_radians)
   return self;
 }
 
-
-static VALUE method_proj4_get_geographic(VALUE self)
-{
+static VALUE method_proj4_get_geographic(VALUE self) {
   VALUE result;
   RGeo_Proj4Data *new_data;
   RGeo_Proj4Data *self_data;
@@ -208,41 +191,39 @@ static VALUE method_proj4_get_geographic(VALUE self)
   result = Qnil;
   new_data = ALLOC(RGeo_Proj4Data);
   if (new_data) {
-    TypedData_Get_Struct(self, RGeo_Proj4Data, &rgeo_proj4_data_type, self_data);
+    TypedData_Get_Struct(self, RGeo_Proj4Data, &rgeo_proj4_data_type,
+                         self_data);
 
     geographic_proj = proj_crs_get_geodetic_crs(PJ_DEFAULT_CTX, self_data->pj);
     if (geographic_proj == 0) {
-      xfree(new_data);
-      rb_raise(rb_eRGeoInvalidProjectionError, "Geographic CRS could not be created because the source projection is not a CRS");
+      FREE(new_data);
+      rb_raise(rb_eRGeoInvalidProjectionError,
+               "Geographic CRS could not be created because the source "
+               "projection is not a CRS");
     }
 
     new_data->pj = geographic_proj;
     new_data->original_str = Qnil;
     new_data->uses_radians = self_data->uses_radians;
-    result = TypedData_Wrap_Struct(CLASS_OF(self), &rgeo_proj4_data_type, new_data);
+    result =
+        TypedData_Wrap_Struct(CLASS_OF(self), &rgeo_proj4_data_type, new_data);
   }
   return result;
 }
 
-
-static VALUE method_proj4_original_str(VALUE self)
-{
+static VALUE method_proj4_original_str(VALUE self) {
   RGeo_Proj4Data *data;
   TypedData_Get_Struct(self, RGeo_Proj4Data, &rgeo_proj4_data_type, data);
   return data->original_str;
 }
 
-
-static VALUE method_proj4_uses_radians(VALUE self)
-{
+static VALUE method_proj4_uses_radians(VALUE self) {
   RGeo_Proj4Data *data;
   TypedData_Get_Struct(self, RGeo_Proj4Data, &rgeo_proj4_data_type, data);
   return data->uses_radians ? Qtrue : Qfalse;
 }
 
-
-static VALUE method_proj4_canonical_str(VALUE self)
-{
+static VALUE method_proj4_canonical_str(VALUE self) {
   VALUE result;
   PJ *pj;
   const char *str;
@@ -260,8 +241,7 @@ static VALUE method_proj4_canonical_str(VALUE self)
   return result;
 }
 
-static VALUE method_proj4_wkt_str(VALUE self)
-{
+static VALUE method_proj4_wkt_str(VALUE self) {
   VALUE result;
   PJ *pj;
   const char *str;
@@ -273,15 +253,14 @@ static VALUE method_proj4_wkt_str(VALUE self)
   if (pj) {
     const char *const options[] = {"MULTILINE=NO", NULL};
     str = proj_as_wkt(PJ_DEFAULT_CTX, pj, WKT_TYPE, options);
-    if (str){
+    if (str) {
       result = rb_str_new2(str);
     }
   }
   return result;
 }
 
-static VALUE method_proj4_auth_name_str(VALUE self)
-{
+static VALUE method_proj4_auth_name_str(VALUE self) {
   VALUE result;
   PJ *pj;
   const char *id;
@@ -294,15 +273,14 @@ static VALUE method_proj4_auth_name_str(VALUE self)
   if (pj) {
     auth = proj_get_id_auth_name(pj, 0);
     id = proj_get_id_code(pj, 0);
-    if (id && auth){
+    if (id && auth) {
       result = rb_sprintf("%s:%s", auth, id);
     }
   }
   return result;
 }
 
-static VALUE method_proj4_axis_and_unit_info_str(VALUE self, VALUE dimension)
-{
+static VALUE method_proj4_axis_and_unit_info_str(VALUE self, VALUE dimension) {
   VALUE result;
   int dimension_index;
   PJ *pj;
@@ -318,10 +296,12 @@ static VALUE method_proj4_axis_and_unit_info_str(VALUE self, VALUE dimension)
 
   TypedData_Get_Struct(self, RGeo_Proj4Data, &rgeo_proj4_data_type, data);
   pj = data->pj;
-  if (pj){
+  if (pj) {
     pj_cs = proj_crs_get_coordinate_system(PJ_DEFAULT_CTX, pj);
     if (pj_cs) {
-      if (proj_cs_get_axis_info(PJ_DEFAULT_CTX, pj_cs, dimension_index, &axis_info, NULL, NULL, NULL, &unit_name, NULL, NULL)) {
+      if (proj_cs_get_axis_info(PJ_DEFAULT_CTX, pj_cs, dimension_index,
+                                &axis_info, NULL, NULL, NULL, &unit_name, NULL,
+                                NULL)) {
         result = rb_sprintf("%s:%s", axis_info, unit_name);
       }
 
@@ -331,8 +311,7 @@ static VALUE method_proj4_axis_and_unit_info_str(VALUE self, VALUE dimension)
   return result;
 }
 
-static VALUE method_proj4_axis_count(VALUE self)
-{
+static VALUE method_proj4_axis_count(VALUE self) {
   VALUE result;
   PJ *pj;
   PJ *pj_cs;
@@ -342,7 +321,7 @@ static VALUE method_proj4_axis_count(VALUE self)
   result = Qnil;
   TypedData_Get_Struct(self, RGeo_Proj4Data, &rgeo_proj4_data_type, data);
   pj = data->pj;
-  if (pj){
+  if (pj) {
     pj_cs = proj_crs_get_coordinate_system(PJ_DEFAULT_CTX, pj);
     if (pj_cs) {
       count = proj_cs_get_axis_count(PJ_DEFAULT_CTX, pj_cs);
@@ -354,9 +333,7 @@ static VALUE method_proj4_axis_count(VALUE self)
   return result;
 }
 
-
-static VALUE method_proj4_is_geographic(VALUE self)
-{
+static VALUE method_proj4_is_geographic(VALUE self) {
   VALUE result;
   PJ *pj;
   PJ_TYPE proj_type;
@@ -367,7 +344,8 @@ static VALUE method_proj4_is_geographic(VALUE self)
   pj = data->pj;
   if (pj) {
     proj_type = proj_get_type(pj);
-    if (proj_type == PJ_TYPE_GEOGRAPHIC_2D_CRS || proj_type == PJ_TYPE_GEOGRAPHIC_3D_CRS){
+    if (proj_type == PJ_TYPE_GEOGRAPHIC_2D_CRS ||
+        proj_type == PJ_TYPE_GEOGRAPHIC_3D_CRS) {
       result = Qtrue;
     } else {
       result = Qfalse;
@@ -376,9 +354,7 @@ static VALUE method_proj4_is_geographic(VALUE self)
   return result;
 }
 
-
-static VALUE method_proj4_is_geocentric(VALUE self)
-{
+static VALUE method_proj4_is_geocentric(VALUE self) {
   VALUE result;
   PJ *pj;
   PJ_TYPE proj_type;
@@ -394,8 +370,7 @@ static VALUE method_proj4_is_geocentric(VALUE self)
   return result;
 }
 
-static VALUE method_proj4_is_projected(VALUE self)
-{
+static VALUE method_proj4_is_projected(VALUE self) {
   VALUE result;
   PJ *pj;
   PJ_TYPE proj_type;
@@ -411,32 +386,27 @@ static VALUE method_proj4_is_projected(VALUE self)
   return result;
 }
 
-
-static VALUE method_proj4_is_valid(VALUE self)
-{
+static VALUE method_proj4_is_valid(VALUE self) {
   RGeo_Proj4Data *data;
   TypedData_Get_Struct(self, RGeo_Proj4Data, &rgeo_proj4_data_type, data);
   return data->pj ? Qtrue : Qfalse;
 }
 
-static VALUE method_proj4_is_crs(VALUE self)
-{
+static VALUE method_proj4_is_crs(VALUE self) {
   RGeo_Proj4Data *self_data;
 
   TypedData_Get_Struct(self, RGeo_Proj4Data, &rgeo_proj4_data_type, self_data);
   return proj_is_crs(self_data->pj) ? Qtrue : Qfalse;
 }
 
-
-static VALUE cmethod_proj4_version(VALUE module)
-{
-  return rb_sprintf("%d.%d.%d", PROJ_VERSION_MAJOR, PROJ_VERSION_MINOR, PROJ_VERSION_PATCH);
+static VALUE cmethod_proj4_version(VALUE module) {
+  return rb_sprintf("%d.%d.%d", PROJ_VERSION_MAJOR, PROJ_VERSION_MINOR,
+                    PROJ_VERSION_PATCH);
 }
 
-static VALUE cmethod_proj4_create(VALUE klass, VALUE str, VALUE uses_radians)
-{
+static VALUE cmethod_proj4_create(VALUE klass, VALUE str, VALUE uses_radians) {
   VALUE result;
-  RGeo_Proj4Data* data;
+  RGeo_Proj4Data *data;
 
   result = Qnil;
   Check_Type(str, T_STRING);
@@ -450,8 +420,7 @@ static VALUE cmethod_proj4_create(VALUE klass, VALUE str, VALUE uses_radians)
   return result;
 }
 
-static VALUE cmethod_crs_to_crs_create(VALUE klass, VALUE from, VALUE to)
-{
+static VALUE cmethod_crs_to_crs_create(VALUE klass, VALUE from, VALUE to) {
   VALUE result;
   RGeo_Proj4Data *from_data;
   RGeo_Proj4Data *to_data;
@@ -460,38 +429,39 @@ static VALUE cmethod_crs_to_crs_create(VALUE klass, VALUE from, VALUE to)
   PJ *to_pj;
   PJ *gis_pj;
   PJ *crs_to_crs;
-  RGeo_CRSToCRSData* data;
+  RGeo_CRSToCRSData *data;
 
   TypedData_Get_Struct(from, RGeo_Proj4Data, &rgeo_proj4_data_type, from_data);
   TypedData_Get_Struct(to, RGeo_Proj4Data, &rgeo_proj4_data_type, to_data);
   from_pj = from_data->pj;
   to_pj = to_data->pj;
-  crs_to_crs = proj_create_crs_to_crs_from_pj(PJ_DEFAULT_CTX, from_pj, to_pj, 0, NULL);
+  crs_to_crs =
+      proj_create_crs_to_crs_from_pj(PJ_DEFAULT_CTX, from_pj, to_pj, 0, NULL);
 
   // check for invalid transformation
   if (crs_to_crs == 0) {
-    rb_raise(rb_eRGeoInvalidProjectionError, "CRSToCRS could not be created from input projections");
+    rb_raise(rb_eRGeoInvalidProjectionError,
+             "CRSToCRS could not be created from input projections");
   }
 
   // necessary to use proj_normalize_for_visualization so that we
   // do not have to worry about the order of coordinates in every
   // coord system
   gis_pj = proj_normalize_for_visualization(PJ_DEFAULT_CTX, crs_to_crs);
-  if (gis_pj){
+  if (gis_pj) {
     proj_destroy(crs_to_crs);
     crs_to_crs = gis_pj;
   }
   data = ALLOC(RGeo_CRSToCRSData);
-  if (data){
+  if (data) {
     data->crs_to_crs = crs_to_crs;
     result = TypedData_Wrap_Struct(klass, &rgeo_crs_to_crs_data_type, data);
   }
   return result;
 }
 
-
-static VALUE method_crs_to_crs_transform(VALUE self, VALUE x, VALUE y, VALUE z)
-{
+static VALUE method_crs_to_crs_transform(VALUE self, VALUE x, VALUE y,
+                                         VALUE z) {
   VALUE result;
   RGeo_CRSToCRSData *crs_to_crs_data;
   PJ *crs_to_crs_pj;
@@ -500,9 +470,10 @@ static VALUE method_crs_to_crs_transform(VALUE self, VALUE x, VALUE y, VALUE z)
   PJ_COORD output;
 
   result = Qnil;
-  TypedData_Get_Struct(self, RGeo_CRSToCRSData, &rgeo_crs_to_crs_data_type, crs_to_crs_data);
+  TypedData_Get_Struct(self, RGeo_CRSToCRSData, &rgeo_crs_to_crs_data_type,
+                       crs_to_crs_data);
   crs_to_crs_pj = crs_to_crs_data->crs_to_crs;
-  if (crs_to_crs_pj){
+  if (crs_to_crs_pj) {
     xval = rb_num2dbl(x);
     yval = rb_num2dbl(y);
     zval = NIL_P(z) ? 0.0 : rb_num2dbl(z);
@@ -513,60 +484,61 @@ static VALUE method_crs_to_crs_transform(VALUE self, VALUE x, VALUE y, VALUE z)
     result = rb_ary_new2(NIL_P(z) ? 2 : 3);
     rb_ary_push(result, DBL2NUM(output.xyz.x));
     rb_ary_push(result, DBL2NUM(output.xyz.y));
-    if (!NIL_P(z)){
+    if (!NIL_P(z)) {
       rb_ary_push(result, DBL2NUM(output.xyz.z));
     }
   }
   return result;
 }
 
-static VALUE method_crs_to_crs_wkt_str(VALUE self)
-{
+static VALUE method_crs_to_crs_wkt_str(VALUE self) {
   VALUE result;
   RGeo_CRSToCRSData *crs_to_crs_data;
   PJ *crs_to_crs_pj;
   const char *str;
 
   result = Qnil;
-  TypedData_Get_Struct(self, RGeo_CRSToCRSData, &rgeo_crs_to_crs_data_type, crs_to_crs_data);
+  TypedData_Get_Struct(self, RGeo_CRSToCRSData, &rgeo_crs_to_crs_data_type,
+                       crs_to_crs_data);
   crs_to_crs_pj = crs_to_crs_data->crs_to_crs;
   if (crs_to_crs_pj) {
     const char *const options[] = {"MULTILINE=NO", NULL};
     str = proj_as_wkt(PJ_DEFAULT_CTX, crs_to_crs_pj, WKT_TYPE, options);
-    if (str){
+    if (str) {
       result = rb_str_new2(str);
     }
   }
   return result;
 }
 
-static VALUE method_crs_to_crs_area_of_use_str(VALUE self)
-{
+static VALUE method_crs_to_crs_area_of_use_str(VALUE self) {
   VALUE result;
   RGeo_CRSToCRSData *crs_to_crs_data;
   PJ *crs_to_crs_pj;
   const char *str;
 
   result = Qnil;
-  TypedData_Get_Struct(self, RGeo_CRSToCRSData, &rgeo_crs_to_crs_data_type, crs_to_crs_data);
+  TypedData_Get_Struct(self, RGeo_CRSToCRSData, &rgeo_crs_to_crs_data_type,
+                       crs_to_crs_data);
   crs_to_crs_pj = crs_to_crs_data->crs_to_crs;
   if (crs_to_crs_pj) {
-    if (proj_get_area_of_use(PJ_DEFAULT_CTX, crs_to_crs_pj, NULL, NULL, NULL, NULL, &str)){
+    if (proj_get_area_of_use(PJ_DEFAULT_CTX, crs_to_crs_pj, NULL, NULL, NULL,
+                             NULL, &str)) {
       result = rb_str_new2(str);
     }
   }
   return result;
 }
 
-static VALUE method_crs_to_crs_proj_type(VALUE self)
-{
+static VALUE method_crs_to_crs_proj_type(VALUE self) {
   VALUE result;
   RGeo_CRSToCRSData *crs_to_crs_data;
   PJ *crs_to_crs_pj;
   int proj_type;
 
   result = Qnil;
-  TypedData_Get_Struct(self, RGeo_CRSToCRSData, &rgeo_crs_to_crs_data_type, crs_to_crs_data);
+  TypedData_Get_Struct(self, RGeo_CRSToCRSData, &rgeo_crs_to_crs_data_type,
+                       crs_to_crs_data);
   crs_to_crs_pj = crs_to_crs_data->crs_to_crs;
   if (crs_to_crs_pj) {
     proj_type = proj_get_type(crs_to_crs_pj);
@@ -575,8 +547,7 @@ static VALUE method_crs_to_crs_proj_type(VALUE self)
   return result;
 }
 
-static VALUE method_crs_to_crs_identity(VALUE self, VALUE from, VALUE to)
-{
+static VALUE method_crs_to_crs_identity(VALUE self, VALUE from, VALUE to) {
   VALUE result;
   RGeo_Proj4Data *from_data;
   RGeo_Proj4Data *to_data;
@@ -591,8 +562,8 @@ static VALUE method_crs_to_crs_identity(VALUE self, VALUE from, VALUE to)
   from_pj = from_data->pj;
   to_pj = to_data->pj;
 
-  if (from_pj && to_pj){
-    if (proj_is_equivalent_to(from_pj, to_pj, PJ_COMP_EQUIVALENT)){
+  if (from_pj && to_pj) {
+    if (proj_is_equivalent_to(from_pj, to_pj, PJ_COMP_EQUIVALENT)) {
       result = Qtrue;
     }
   }
@@ -600,8 +571,7 @@ static VALUE method_crs_to_crs_identity(VALUE self, VALUE from, VALUE to)
   return result;
 }
 
-static void rgeo_init_proj4()
-{
+static void rgeo_init_proj4() {
   VALUE rgeo_module;
   VALUE coordsys_module;
   VALUE cs_module;
@@ -618,14 +588,18 @@ static void rgeo_init_proj4()
   cs_base_class = rb_define_class_under(cs_module, "Base", rb_cObject);
   cs_info_class = rb_define_class_under(cs_module, "Info", cs_base_class);
 
-  coordinate_system_class = rb_define_class_under(cs_module, "CoordinateSystem", cs_info_class);
-  proj4_class = rb_define_class_under(coordsys_module, "Proj4", coordinate_system_class);
+  coordinate_system_class =
+      rb_define_class_under(cs_module, "CoordinateSystem", cs_info_class);
+  proj4_class =
+      rb_define_class_under(coordsys_module, "Proj4", coordinate_system_class);
   rb_define_alloc_func(proj4_class, rgeo_proj4_data_alloc);
   rb_define_module_function(proj4_class, "_create", cmethod_proj4_create, 2);
-  rb_define_method(proj4_class, "initialize_copy", method_proj4_initialize_copy, 1);
+  rb_define_method(proj4_class, "initialize_copy", method_proj4_initialize_copy,
+                   1);
   rb_define_method(proj4_class, "_set_value", method_proj4_set_value, 2);
   rb_define_method(proj4_class, "_original_str", method_proj4_original_str, 0);
-  rb_define_method(proj4_class, "_canonical_str", method_proj4_canonical_str, 0);
+  rb_define_method(proj4_class, "_canonical_str", method_proj4_canonical_str,
+                   0);
   rb_define_method(proj4_class, "_as_text", method_proj4_wkt_str, 0);
   rb_define_method(proj4_class, "_auth_name", method_proj4_auth_name_str, 0);
   rb_define_method(proj4_class, "_valid?", method_proj4_is_valid, 0);
@@ -633,35 +607,41 @@ static void rgeo_init_proj4()
   rb_define_method(proj4_class, "_geocentric?", method_proj4_is_geocentric, 0);
   rb_define_method(proj4_class, "_projected?", method_proj4_is_projected, 0);
   rb_define_method(proj4_class, "_radians?", method_proj4_uses_radians, 0);
-  rb_define_method(proj4_class, "_get_geographic", method_proj4_get_geographic, 0);
+  rb_define_method(proj4_class, "_get_geographic", method_proj4_get_geographic,
+                   0);
   rb_define_method(proj4_class, "_crs?", method_proj4_is_crs, 0);
-  rb_define_method(proj4_class, "_axis_and_unit_info", method_proj4_axis_and_unit_info_str, 1);
+  rb_define_method(proj4_class, "_axis_and_unit_info",
+                   method_proj4_axis_and_unit_info_str, 1);
   rb_define_method(proj4_class, "_axis_count", method_proj4_axis_count, 0);
-  rb_define_module_function(proj4_class, "_proj_version", cmethod_proj4_version, 0);
+  rb_define_module_function(proj4_class, "_proj_version", cmethod_proj4_version,
+                            0);
 
-  coordinate_transform_class = rb_define_class_under(cs_module, "CoordinateTransform", cs_info_class);
+  coordinate_transform_class =
+      rb_define_class_under(cs_module, "CoordinateTransform", cs_info_class);
 
-  crs_to_crs_class = rb_define_class_under(coordsys_module, "CRSToCRS", coordinate_transform_class);
+  crs_to_crs_class = rb_define_class_under(coordsys_module, "CRSToCRS",
+                                           coordinate_transform_class);
   rb_define_alloc_func(crs_to_crs_class, rgeo_crs_to_crs_data_alloc);
-  rb_define_module_function(crs_to_crs_class, "_create", cmethod_crs_to_crs_create, 2);
-  rb_define_method(crs_to_crs_class, "_transform_coords", method_crs_to_crs_transform, 3);
+  rb_define_module_function(crs_to_crs_class, "_create",
+                            cmethod_crs_to_crs_create, 2);
+  rb_define_method(crs_to_crs_class, "_transform_coords",
+                   method_crs_to_crs_transform, 3);
   rb_define_method(crs_to_crs_class, "_as_text", method_crs_to_crs_wkt_str, 0);
-  rb_define_method(crs_to_crs_class, "_proj_type", method_crs_to_crs_proj_type, 0);
-  rb_define_method(crs_to_crs_class, "_area_of_use", method_crs_to_crs_area_of_use_str, 0);
-  rb_define_method(crs_to_crs_class, "_identity?", method_crs_to_crs_identity, 2);
+  rb_define_method(crs_to_crs_class, "_proj_type", method_crs_to_crs_proj_type,
+                   0);
+  rb_define_method(crs_to_crs_class, "_area_of_use",
+                   method_crs_to_crs_area_of_use_str, 0);
+  rb_define_method(crs_to_crs_class, "_identity?", method_crs_to_crs_identity,
+                   2);
 }
 
-
 #endif
 
-
-void Init_proj4_c_impl()
-{
+void Init_proj4_c_impl() {
 #ifdef RGEO_PROJ4_SUPPORTED
   rgeo_init_proj4();
   rgeo_init_proj_errors();
 #endif
 }
 
-
 RGEO_END_C

data/ext/proj4_c_impl/preface.h

@@ -14,6 +14,10 @@
 #define mark rb_gc_mark
 #endif
 
+// When using ruby ALLOC* macros, we are using ruby_xmalloc, which counterpart
+// is ruby_xfree. This macro helps enforcing that by showing us the way.
+#define FREE ruby_xfree
+
 #ifdef __cplusplus
 #define RGEO_BEGIN_C extern "C" {
 #define RGEO_END_C }

data/lib/rgeo/proj4/version.rb

@@ -2,6 +2,6 @@
 
 module RGeo
   module Proj4
-    VERSION = "4.0.0-rc.1"
+    VERSION = "4.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgeo-proj4
 version: !ruby/object:Gem::Version
-  version: 4.0.0.pre.rc.1
+  version: 4.0.0
 platform: ruby
 authors:
-- Tee Parham, Daniel Azuma
+- Tee Parham, Daniel Azuma, Keith Doggett, Ulysse Buonomo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-12 00:00:00.000000000 Z
+date: 2023-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgeo
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre.rc.3
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.pre.rc.3
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: ffi-geos
   requirement: !ruby/object:Gem::Requirement
@@ -94,9 +94,23 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.1
+- !ruby/object:Gem::Dependency
+  name: ruby_memcheck
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Proj4 extension for rgeo.
 email:
-- parhameter@gmail.com, dazuma@gmail.com
+- parhameter@gmail.com, dazuma@gmail.com, kfdoggett@gmail.com
 executables: []
 extensions:
 - ext/proj4_c_impl/extconf.rb
@@ -125,12 +139,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.4
 signing_key: