rgeo 0.3.2 → 0.3.3

data/ext/geos_c_impl/main.c

@@ -57,7 +57,9 @@ RGEO_BEGIN_C
 void Init_geos_c_impl()
 {
 #ifdef RGEO_GEOS_SUPPORTED
-  RGeo_Globals* globals = rgeo_init_geos_factory();
+  RGeo_Globals* globals;
+
+  globals = rgeo_init_geos_factory();
   rgeo_init_geos_geometry(globals);
   rgeo_init_geos_point(globals);
   rgeo_init_geos_line_string(globals);

data/ext/geos_c_impl/point.c

@@ -51,8 +51,11 @@ RGEO_BEGIN_C
 
 static VALUE method_point_geometry_type(VALUE self)
 {
-  VALUE result = Qnil;
-  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  VALUE result;
+  RGeo_GeometryData* self_data;
+
+  result = Qnil;
+  self_data = RGEO_GEOMETRY_DATA_PTR(self);
   if (self_data->geom) {
     result = RGEO_FACTORY_DATA_PTR(self_data->factory)->globals->feature_point;
   }
@@ -62,14 +65,20 @@ static VALUE method_point_geometry_type(VALUE self)
 
 static VALUE method_point_x(VALUE self)
 {
-  VALUE result = Qnil;
-  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
-  const GEOSGeometry* self_geom = self_data->geom;
+  VALUE result;
+  RGeo_GeometryData* self_data;
+  const GEOSGeometry* self_geom;
+  GEOSContextHandle_t self_context;
+  const GEOSCoordSequence* coord_seq;
+  double val;
+
+  result = Qnil;
+  self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  self_geom = self_data->geom;
   if (self_geom) {
-    GEOSContextHandle_t self_context = self_data->geos_context;
-    const GEOSCoordSequence* coord_seq = GEOSGeom_getCoordSeq_r(self_context, self_geom);
+    self_context = self_data->geos_context;
+    coord_seq = GEOSGeom_getCoordSeq_r(self_context, self_geom);
     if (coord_seq) {
-      double val;
       if (GEOSCoordSeq_getX_r(self_context, coord_seq, 0, &val)) {
         result = rb_float_new(val);
       }
@@ -81,14 +90,20 @@ static VALUE method_point_x(VALUE self)
 
 static VALUE method_point_y(VALUE self)
 {
-  VALUE result = Qnil;
-  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
-  const GEOSGeometry* self_geom = self_data->geom;
+  VALUE result;
+  RGeo_GeometryData* self_data;
+  const GEOSGeometry* self_geom;
+  GEOSContextHandle_t self_context;
+  const GEOSCoordSequence* coord_seq;
+  double val;
+
+  result = Qnil;
+  self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  self_geom = self_data->geom;
   if (self_geom) {
-    GEOSContextHandle_t self_context = self_data->geos_context;
-    const GEOSCoordSequence* coord_seq = GEOSGeom_getCoordSeq_r(self_context, self_geom);
+    self_context = self_data->geos_context;
+    coord_seq = GEOSGeom_getCoordSeq_r(self_context, self_geom);
     if (coord_seq) {
-      double val;
       if (GEOSCoordSeq_getY_r(self_context, coord_seq, 0, &val)) {
         result = rb_float_new(val);
       }
@@ -100,15 +115,21 @@ static VALUE method_point_y(VALUE self)
 
 static VALUE get_3d_point(VALUE self, int flag)
 {
-  VALUE result = Qnil;
-  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
-  const GEOSGeometry* self_geom = self_data->geom;
+  VALUE result;
+  RGeo_GeometryData* self_data;
+  const GEOSGeometry* self_geom;
+  GEOSContextHandle_t self_context;
+  const GEOSCoordSequence* coord_seq;
+  double val;
+
+  result = Qnil;
+  self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  self_geom = self_data->geom;
   if (self_geom) {
     if (RGEO_FACTORY_DATA_PTR(self_data->factory)->flags & flag) {
-      GEOSContextHandle_t self_context = self_data->geos_context;
-      const GEOSCoordSequence* coord_seq = GEOSGeom_getCoordSeq_r(self_context, self_geom);
+      self_context = self_data->geos_context;
+      coord_seq = GEOSGeom_getCoordSeq_r(self_context, self_geom);
       if (coord_seq) {
-        double val;
         if (GEOSCoordSeq_getZ_r(self_context, coord_seq, 0, &val)) {
           result = rb_float_new(val);
         }
@@ -133,9 +154,12 @@ static VALUE method_point_m(VALUE self)
 
 static VALUE method_point_eql(VALUE self, VALUE rhs)
 {
-  VALUE result = rgeo_geos_klasses_and_factories_eql(self, rhs);
+  VALUE result;
+  RGeo_GeometryData* self_data;
+
+  result = rgeo_geos_klasses_and_factories_eql(self, rhs);
   if (RTEST(result)) {
-    RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
+    self_data = RGEO_GEOMETRY_DATA_PTR(self);
     result = rgeo_geos_coordseqs_eql(self_data->geos_context, self_data->geom, RGEO_GEOMETRY_DATA_PTR(rhs)->geom, RGEO_FACTORY_DATA_PTR(self_data->factory)->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M);
   }
   return result;
@@ -151,7 +175,9 @@ static VALUE cmethod_create(VALUE module, VALUE factory, VALUE x, VALUE y, VALUE
 
 void rgeo_init_geos_point(RGeo_Globals* globals)
 {
-  VALUE geos_point_class = rb_define_class_under(globals->geos_module, "PointImpl", globals->geos_geometry);
+  VALUE geos_point_class;
+
+  geos_point_class = rb_define_class_under(globals->geos_module, "PointImpl", globals->geos_geometry);
   globals->geos_point = geos_point_class;
   globals->feature_point = rb_const_get_at(globals->feature_module, rb_intern("Point"));
   rb_funcall(globals->global_mixins, rb_intern("include_in_class"), 2,
@@ -170,15 +196,21 @@ void rgeo_init_geos_point(RGeo_Globals* globals)
 
 VALUE rgeo_create_geos_point(VALUE factory, double x, double y, double z)
 {
-  VALUE result = Qnil;
-  RGeo_FactoryData* factory_data = RGEO_FACTORY_DATA_PTR(factory);
-  GEOSContextHandle_t context = factory_data->geos_context;
-  GEOSCoordSequence* coord_seq = GEOSCoordSeq_create_r(context, 1, 3);
+  VALUE result;
+  RGeo_FactoryData* factory_data;
+  GEOSContextHandle_t context;
+  GEOSCoordSequence* coord_seq;
+  GEOSGeometry* geom;
+
+  result = Qnil;
+  factory_data = RGEO_FACTORY_DATA_PTR(factory);
+  context = factory_data->geos_context;
+  coord_seq = GEOSCoordSeq_create_r(context, 1, 3);
   if (coord_seq) {
     if (GEOSCoordSeq_setX_r(context, coord_seq, 0, x)) {
       if (GEOSCoordSeq_setY_r(context, coord_seq, 0, y)) {
         if (GEOSCoordSeq_setZ_r(context, coord_seq, 0, z)) {
-          GEOSGeometry* geom = GEOSGeom_createPoint_r(context, coord_seq);
+          geom = GEOSGeom_createPoint_r(context, coord_seq);
           if (geom) {
             result = rgeo_wrap_geos_geometry(factory, geom, factory_data->globals->geos_point);
           }

data/ext/geos_c_impl/polygon.c

@@ -52,9 +52,12 @@ RGEO_BEGIN_C
 
 static VALUE method_polygon_eql(VALUE self, VALUE rhs)
 {
-  VALUE result = rgeo_geos_klasses_and_factories_eql(self, rhs);
+  VALUE result;
+  RGeo_GeometryData* self_data;
+
+  result = rgeo_geos_klasses_and_factories_eql(self, rhs);
   if (RTEST(result)) {
-    RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
+    self_data = RGEO_GEOMETRY_DATA_PTR(self);
     result = rgeo_geos_polygons_eql(self_data->geos_context, self_data->geom, RGEO_GEOMETRY_DATA_PTR(rhs)->geom, RGEO_FACTORY_DATA_PTR(self_data->factory)->flags & RGEO_FACTORYFLAGS_SUPPORTS_Z_OR_M);
   }
   return result;
@@ -63,8 +66,11 @@ static VALUE method_polygon_eql(VALUE self, VALUE rhs)
 
 static VALUE method_polygon_geometry_type(VALUE self)
 {
-  VALUE result = Qnil;
-  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  VALUE result;
+  RGeo_GeometryData* self_data;
+
+  result = Qnil;
+  self_data = RGEO_GEOMETRY_DATA_PTR(self);
   if (self_data->geom) {
     result = RGEO_FACTORY_DATA_PTR(self_data->factory)->globals->feature_polygon;
   }
@@ -74,11 +80,15 @@ static VALUE method_polygon_geometry_type(VALUE self)
 
 static VALUE method_polygon_area(VALUE self)
 {
-  VALUE result = Qnil;
-  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
-  const GEOSGeometry* self_geom = self_data->geom;
+  VALUE result;
+  RGeo_GeometryData* self_data;
+  const GEOSGeometry* self_geom;
+  double area;
+
+  result = Qnil;
+  self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  self_geom = self_data->geom;
   if (self_geom) {
-    double area;
     if (GEOSArea_r(self_data->geos_context, self_geom, &area)) {
       result = rb_float_new(area);
     }
@@ -89,9 +99,13 @@ static VALUE method_polygon_area(VALUE self)
 
 static VALUE method_polygon_centroid(VALUE self)
 {
-  VALUE result = Qnil;
-  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
-  const GEOSGeometry* self_geom = self_data->geom;
+  VALUE result;
+  RGeo_GeometryData* self_data;
+  const GEOSGeometry* self_geom;
+
+  result = Qnil;
+  self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  self_geom = self_data->geom;
   if (self_geom) {
     result = rgeo_wrap_geos_geometry(self_data->factory, GEOSGetCentroid_r(self_data->geos_context, self_geom), RGEO_FACTORY_DATA_PTR(self_data->factory)->globals->geos_point);
   }
@@ -101,9 +115,13 @@ static VALUE method_polygon_centroid(VALUE self)
 
 static VALUE method_polygon_point_on_surface(VALUE self)
 {
-  VALUE result = Qnil;
-  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
-  const GEOSGeometry* self_geom = self_data->geom;
+  VALUE result;
+  RGeo_GeometryData* self_data;
+  const GEOSGeometry* self_geom;
+
+  result = Qnil;
+  self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  self_geom = self_data->geom;
   if (self_geom) {
     result = rgeo_wrap_geos_geometry(self_data->factory, GEOSPointOnSurface_r(self_data->geos_context, self_geom), RGEO_FACTORY_DATA_PTR(self_data->factory)->globals->geos_point);
   }
@@ -113,9 +131,13 @@ static VALUE method_polygon_point_on_surface(VALUE self)
 
 static VALUE method_polygon_exterior_ring(VALUE self)
 {
-  VALUE result = Qnil;
-  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
-  const GEOSGeometry* self_geom = self_data->geom;
+  VALUE result;
+  RGeo_GeometryData* self_data;
+  const GEOSGeometry* self_geom;
+
+  result = Qnil;
+  self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  self_geom = self_data->geom;
   if (self_geom) {
     result = rgeo_wrap_geos_geometry_clone(self_data->factory, GEOSGetExteriorRing_r(self_data->geos_context, self_geom), RGEO_FACTORY_DATA_PTR(self_data->factory)->globals->geos_linear_ring);
   }
@@ -125,11 +147,16 @@ static VALUE method_polygon_exterior_ring(VALUE self)
 
 static VALUE method_polygon_num_interior_rings(VALUE self)
 {
-  VALUE result = Qnil;
-  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
-  const GEOSGeometry* self_geom = self_data->geom;
+  VALUE result;
+  RGeo_GeometryData* self_data;
+  const GEOSGeometry* self_geom;
+  int num;
+
+  result = Qnil;
+  self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  self_geom = self_data->geom;
   if (self_geom) {
-    int num = GEOSGetNumInteriorRings_r(self_data->geos_context, self_geom);
+    num = GEOSGetNumInteriorRings_r(self_data->geos_context, self_geom);
     if (num >= 0) {
       result = INT2NUM(num);
     }
@@ -140,14 +167,21 @@ static VALUE method_polygon_num_interior_rings(VALUE self)
 
 static VALUE method_polygon_interior_ring_n(VALUE self, VALUE n)
 {
-  VALUE result = Qnil;
-  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
-  const GEOSGeometry* self_geom = self_data->geom;
+  VALUE result;
+  RGeo_GeometryData* self_data;
+  const GEOSGeometry* self_geom;
+  int i;
+  GEOSContextHandle_t self_context;
+  int num;
+
+  result = Qnil;
+  self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  self_geom = self_data->geom;
   if (self_geom) {
-    int i = NUM2INT(n);
+    i = NUM2INT(n);
     if (i >= 0) {
-      GEOSContextHandle_t self_context = self_data->geos_context;
-      int num = GEOSGetNumInteriorRings_r(self_context, self_geom);
+      self_context = self_data->geos_context;
+      num = GEOSGetNumInteriorRings_r(self_context, self_geom);
       if (i < num) {
         result = rgeo_wrap_geos_geometry_clone(self_data->factory,
           GEOSGetInteriorRingN_r(self_context, self_geom, i),
@@ -161,17 +195,25 @@ static VALUE method_polygon_interior_ring_n(VALUE self, VALUE n)
 
 static VALUE method_polygon_interior_rings(VALUE self)
 {
-  VALUE result = Qnil;
-  RGeo_GeometryData* self_data = RGEO_GEOMETRY_DATA_PTR(self);
-  const GEOSGeometry* self_geom = self_data->geom;
+  VALUE result;
+  RGeo_GeometryData* self_data;
+  const GEOSGeometry* self_geom;
+  GEOSContextHandle_t self_context;
+  int count;
+  VALUE factory;
+  VALUE linear_ring_class;
+  int i;
+
+  result = Qnil;
+  self_data = RGEO_GEOMETRY_DATA_PTR(self);
+  self_geom = self_data->geom;
   if (self_geom) {
-    GEOSContextHandle_t self_context = self_data->geos_context;
-    int count = GEOSGetNumInteriorRings_r(self_context, self_geom);
+    self_context = self_data->geos_context;
+    count = GEOSGetNumInteriorRings_r(self_context, self_geom);
     if (count >= 0) {
       result = rb_ary_new2(count);
-      VALUE factory = self_data->factory;
-      VALUE linear_ring_class = RGEO_FACTORY_DATA_PTR(self_data->factory)->globals->geos_linear_ring;
-      int i;
+      factory = self_data->factory;
+      linear_ring_class = RGEO_FACTORY_DATA_PTR(self_data->factory)->globals->geos_linear_ring;
       for (i=0; i<count; ++i) {
         rb_ary_store(result, i, rgeo_wrap_geos_geometry_clone(factory, GEOSGetInteriorRingN_r(self_context, self_geom, i), linear_ring_class));
       }
@@ -183,25 +225,35 @@ static VALUE method_polygon_interior_rings(VALUE self)
 
 static VALUE cmethod_create(VALUE module, VALUE factory, VALUE exterior, VALUE interior_array)
 {
+  RGeo_FactoryData* factory_data;
+  VALUE linear_ring_type;
+  GEOSGeometry* exterior_geom;
+  GEOSContextHandle_t context;
+  unsigned int len;
+  GEOSGeometry** interior_geoms;
+  unsigned int actual_len;
+  unsigned int i;
+  GEOSGeometry* interior_geom;
+  GEOSGeometry* polygon;
+
   Check_Type(interior_array, T_ARRAY);
-  RGeo_FactoryData* factory_data = RGEO_FACTORY_DATA_PTR(factory);
-  VALUE linear_ring_type = factory_data->globals->feature_linear_ring;
-  GEOSGeometry* exterior_geom = rgeo_convert_to_detached_geos_geometry(exterior, factory, linear_ring_type, NULL);
+  factory_data = RGEO_FACTORY_DATA_PTR(factory);
+  linear_ring_type = factory_data->globals->feature_linear_ring;
+  exterior_geom = rgeo_convert_to_detached_geos_geometry(exterior, factory, linear_ring_type, NULL);
   if (exterior_geom) {
-    GEOSContextHandle_t context = factory_data->geos_context;
-    unsigned int len = (unsigned int)RARRAY_LEN(interior_array);
-    GEOSGeometry** interior_geoms = ALLOC_N(GEOSGeometry*, len == 0 ? 1 : len);
+    context = factory_data->geos_context;
+    len = (unsigned int)RARRAY_LEN(interior_array);
+    interior_geoms = ALLOC_N(GEOSGeometry*, len == 0 ? 1 : len);
     if (interior_geoms) {
-      unsigned int actual_len = 0;
-      unsigned int i;
+      actual_len = 0;
       for (i=0; i<len; ++i) {
-        GEOSGeometry* interior_geom = rgeo_convert_to_detached_geos_geometry(rb_ary_entry(interior_array, i), factory, linear_ring_type, NULL);
+        interior_geom = rgeo_convert_to_detached_geos_geometry(rb_ary_entry(interior_array, i), factory, linear_ring_type, NULL);
         if (interior_geom) {
           interior_geoms[actual_len++] = interior_geom;
         }
       }
       if (len == actual_len) {
-        GEOSGeometry* polygon = GEOSGeom_createPolygon_r(context, exterior_geom, interior_geoms, actual_len);
+        polygon = GEOSGeom_createPolygon_r(context, exterior_geom, interior_geoms, actual_len);
         if (polygon) {
           free(interior_geoms);
           return rgeo_wrap_geos_geometry(factory, polygon, factory_data->globals->geos_polygon);
@@ -220,7 +272,9 @@ static VALUE cmethod_create(VALUE module, VALUE factory, VALUE exterior, VALUE i
 
 void rgeo_init_geos_polygon(RGeo_Globals* globals)
 {
-  VALUE geos_polygon_class = rb_define_class_under(globals->geos_module, "PolygonImpl", globals->geos_geometry);
+  VALUE geos_polygon_class;
+
+  geos_polygon_class = rb_define_class_under(globals->geos_module, "PolygonImpl", globals->geos_geometry);
   globals->geos_polygon = geos_polygon_class;
   globals->feature_polygon = rb_const_get_at(globals->feature_module, rb_intern("Polygon"));
   rb_funcall(globals->global_mixins, rb_intern("include_in_class"), 2,
@@ -244,15 +298,19 @@ void rgeo_init_geos_polygon(RGeo_Globals* globals)
 
 VALUE rgeo_geos_polygons_eql(GEOSContextHandle_t context, const GEOSGeometry* geom1, const GEOSGeometry* geom2, char check_z)
 {
-  VALUE result = Qnil;
+  VALUE result;
+  int len1;
+  int len2;
+  int i;
+
+  result = Qnil;
   if (geom1 && geom2) {
     result = rgeo_geos_coordseqs_eql(context, GEOSGetExteriorRing_r(context, geom1), GEOSGetExteriorRing_r(context, geom2), check_z);
     if (RTEST(result)) {
-      int len1 = GEOSGetNumInteriorRings_r(context, geom1);
-      int len2 = GEOSGetNumInteriorRings_r(context, geom2);
+      len1 = GEOSGetNumInteriorRings_r(context, geom1);
+      len2 = GEOSGetNumInteriorRings_r(context, geom2);
       if (len1 >= 0 && len2 >= 0) {
         if (len1 == len2) {
-          int i;
           for (i=0; i<len1; ++i) {
             result = rgeo_geos_coordseqs_eql(context, GEOSGetInteriorRingN_r(context, geom1, i), GEOSGetInteriorRingN_r(context, geom2, i), check_z);
             if (!RTEST(result)) {

data/ext/proj4_c_impl/extconf.rb

@@ -52,7 +52,7 @@ else
      '/opt/proj4/include',
      '/opt/include',
      '/Library/Frameworks/PROJ.framework/unix/include',
-     ::Config::CONFIG['includedir'],
+     ::RbConfig::CONFIG['includedir'],
      '/usr/include',
     ]
   lib_dirs_ =
@@ -65,7 +65,7 @@ else
      '/opt/proj4/lib',
      '/opt/lib',
      '/Library/Frameworks/PROJ.framework/unix/lib',
-     ::Config::CONFIG['libdir'],
+     ::RbConfig::CONFIG['libdir'],
      '/usr/lib',
     ]
   header_dirs_.delete_if{ |path_| !::File.directory?(path_) }

data/ext/proj4_c_impl/main.c

@@ -95,8 +95,11 @@ static void mark_proj4_func(RGeo_Proj4Data* data)
 
 static VALUE alloc_proj4(VALUE klass)
 {
-  VALUE result = Qnil;
-  RGeo_Proj4Data* data = ALLOC(RGeo_Proj4Data);
+  VALUE result;
+  RGeo_Proj4Data* data;
+
+  result = Qnil;
+  data = ALLOC(RGeo_Proj4Data);
   if (data) {
     data->pj = NULL;
     data->original_str = Qnil;
@@ -109,9 +112,14 @@ static VALUE alloc_proj4(VALUE klass)
 
 static VALUE method_proj4_initialize_copy(VALUE self, VALUE orig)
 {
+  RGeo_Proj4Data* self_data;
+  projPJ pj;
+  RGeo_Proj4Data* orig_data;
+  char* str;
+
   // Clear out any existing value
-  RGeo_Proj4Data* self_data = RGEO_PROJ4_DATA_PTR(self);
-  projPJ pj = self_data->pj;
+  self_data = RGEO_PROJ4_DATA_PTR(self);
+  pj = self_data->pj;
   if (pj) {
     pj_free(pj);
     self_data->pj = NULL;
@@ -119,12 +127,12 @@ static VALUE method_proj4_initialize_copy(VALUE self, VALUE orig)
   }
   
   // Copy value from orig
-  RGeo_Proj4Data* orig_data = RGEO_PROJ4_DATA_PTR(orig);
+  orig_data = RGEO_PROJ4_DATA_PTR(orig);
   if (!NIL_P(orig_data->original_str)) {
     self_data->pj = pj_init_plus(RSTRING_PTR(orig_data->original_str));
   }
   else {
-    char* str = pj_get_def(orig_data->pj, 0);
+    str = pj_get_def(orig_data->pj, 0);
     self_data->pj = pj_init_plus(str);
     pj_dalloc(str);
   }
@@ -137,11 +145,14 @@ static VALUE method_proj4_initialize_copy(VALUE self, VALUE orig)
 
 static VALUE method_proj4_set_value(VALUE self, VALUE str, VALUE uses_radians)
 {
+  RGeo_Proj4Data* self_data;
+  projPJ pj;
+
   Check_Type(str, T_STRING);
   
   // Clear out any existing value
-  RGeo_Proj4Data* self_data = RGEO_PROJ4_DATA_PTR(self);
-  projPJ pj = self_data->pj;
+  self_data = RGEO_PROJ4_DATA_PTR(self);
+  pj = self_data->pj;
   if (pj) {
     pj_free(pj);
     self_data->pj = NULL;
@@ -159,10 +170,14 @@ static VALUE method_proj4_set_value(VALUE self, VALUE str, VALUE uses_radians)
 
 static VALUE method_proj4_get_geographic(VALUE self)
 {
-  VALUE result = Qnil;
-  RGeo_Proj4Data* new_data = ALLOC(RGeo_Proj4Data);
+  VALUE result;
+  RGeo_Proj4Data* new_data;
+  RGeo_Proj4Data* self_data;
+
+  result = Qnil;
+  new_data = ALLOC(RGeo_Proj4Data);
   if (new_data) {
-    RGeo_Proj4Data* self_data = RGEO_PROJ4_DATA_PTR(self);
+    self_data = RGEO_PROJ4_DATA_PTR(self);
     new_data->pj = pj_latlong_from_proj(self_data->pj);
     new_data->original_str = Qnil;
     new_data->uses_radians = self_data->uses_radians;
@@ -186,10 +201,14 @@ static VALUE method_proj4_uses_radians(VALUE self)
 
 static VALUE method_proj4_canonical_str(VALUE self)
 {
-  VALUE result = Qnil;
-  projPJ pj = RGEO_PROJ4_DATA_PTR(self)->pj;
+  VALUE result;
+  projPJ pj;
+  char* str;
+
+  result = Qnil;
+  pj = RGEO_PROJ4_DATA_PTR(self)->pj;
   if (pj) {
-    char* str = pj_get_def(pj, 0);
+    str = pj_get_def(pj, 0);
     if (str) {
       result = rb_str_new2(str);
       pj_dalloc(str);
@@ -201,8 +220,11 @@ static VALUE method_proj4_canonical_str(VALUE self)
 
 static VALUE method_proj4_is_geographic(VALUE self)
 {
-  VALUE result = Qnil;
-  projPJ pj = RGEO_PROJ4_DATA_PTR(self)->pj;
+  VALUE result;
+  projPJ pj;
+
+  result = Qnil;
+  pj = RGEO_PROJ4_DATA_PTR(self)->pj;
   if (pj) {
     result = pj_is_latlong(pj) ? Qtrue : Qfalse;
   }
@@ -212,8 +234,11 @@ static VALUE method_proj4_is_geographic(VALUE self)
 
 static VALUE method_proj4_is_geocentric(VALUE self)
 {
-  VALUE result = Qnil;
-  projPJ pj = RGEO_PROJ4_DATA_PTR(self)->pj;
+  VALUE result;
+  projPJ pj;
+
+  result = Qnil;
+  pj = RGEO_PROJ4_DATA_PTR(self)->pj;
   if (pj) {
     result = pj_is_geocent(pj) ? Qtrue : Qfalse;
   }
@@ -229,17 +254,23 @@ static VALUE method_proj4_is_valid(VALUE self)
 
 static VALUE cmethod_proj4_transform(VALUE method, VALUE from, VALUE to, VALUE x, VALUE y, VALUE z)
 {
-  VALUE result = Qnil;
-  projPJ from_pj = RGEO_PROJ4_DATA_PTR(from)->pj;
-  projPJ to_pj = RGEO_PROJ4_DATA_PTR(to)->pj;
+  VALUE result;
+  projPJ from_pj;
+  projPJ to_pj;
+  double xval, yval, zval;
+  int err;
+
+  result = Qnil;
+  from_pj = RGEO_PROJ4_DATA_PTR(from)->pj;
+  to_pj = RGEO_PROJ4_DATA_PTR(to)->pj;
   if (from_pj && to_pj) {
-    double xval = rb_num2dbl(x);
-    double yval = rb_num2dbl(y);
-    double zval = 0.0;
+    xval = rb_num2dbl(x);
+    yval = rb_num2dbl(y);
+    zval = 0.0;
     if (!NIL_P(z)) {
       zval = rb_num2dbl(z);
     }
-    int err = pj_transform(from_pj, to_pj, 1, 1, &xval, &yval, NIL_P(z) ? NULL : &zval);
+    err = pj_transform(from_pj, to_pj, 1, 1, &xval, &yval, NIL_P(z) ? NULL : &zval);
     if (!err && xval != HUGE_VAL && yval != HUGE_VAL && (NIL_P(z) || zval != HUGE_VAL)) {
       result = rb_ary_new2(NIL_P(z) ? 2 : 3);
       rb_ary_push(result, rb_float_new(xval));
@@ -255,9 +286,12 @@ static VALUE cmethod_proj4_transform(VALUE method, VALUE from, VALUE to, VALUE x
 
 static VALUE cmethod_proj4_create(VALUE klass, VALUE str, VALUE uses_radians)
 {
-  VALUE result = Qnil;
+  VALUE result;
+  RGeo_Proj4Data* data;
+
+  result = Qnil;
   Check_Type(str, T_STRING);
-  RGeo_Proj4Data* data = ALLOC(RGeo_Proj4Data);
+  data = ALLOC(RGeo_Proj4Data);
   if (data) {
     data->pj = pj_init_plus(RSTRING_PTR(str));
     data->original_str = str;
@@ -270,9 +304,13 @@ static VALUE cmethod_proj4_create(VALUE klass, VALUE str, VALUE uses_radians)
 
 static void rgeo_init_proj4()
 {
-  VALUE rgeo_module = rb_define_module("RGeo");
-  VALUE coordsys_module = rb_define_module_under(rgeo_module, "CoordSys");
-  VALUE proj4_class = rb_define_class_under(coordsys_module, "Proj4", rb_cObject);
+  VALUE rgeo_module;
+  VALUE coordsys_module;
+  VALUE proj4_class;
+
+  rgeo_module = rb_define_module("RGeo");
+  coordsys_module = rb_define_module_under(rgeo_module, "CoordSys");
+  proj4_class = rb_define_class_under(coordsys_module, "Proj4", rb_cObject);
 
   rb_define_alloc_func(proj4_class, alloc_proj4);
   rb_define_module_function(proj4_class, "_create", cmethod_proj4_create, 2);