gdal 0.0.7 → 1.0.0

data/ext/gdal-ruby/ogr/extconf.rb

@@ -1,5 +1,8 @@
 require 'mkmf'
 
+# see https://github.com/zhm/gdal-ruby/issues/5
+require_relative '../ruby-2.2-patch'
+
 raise 'gdal-config not found.' if `which gdal-config`.empty?
 
 dir_config 'gdal',

data/ext/gdal-ruby/ogr/ogr.cpp

@@ -1,11 +1,11 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 2.0.4
- * 
- * This file is not intended to be easily readable and contains a number of 
+ * Version 3.0.5
+ *
+ * This file is not intended to be easily readable and contains a number of
  * coding conventions designed to improve portability and efficiency. Do not make
- * changes to this file unless you know what you are doing--modify the SWIG 
- * interface file instead. 
+ * changes to this file unless you know what you are doing--modify the SWIG
+ * interface file instead.
  * ----------------------------------------------------------------------------- */
 
 #define SWIGRUBY
@@ -65,28 +65,28 @@ template <typename T> T SwigValueInit() {
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -129,7 +129,7 @@ template <typename T> T SwigValueInit() {
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -174,28 +174,28 @@ template <typename T> T SwigValueInit() {
 #ifndef SWIGUNUSED
 # if defined(__GNUC__)
 #   if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-#     define SWIGUNUSED __attribute__ ((__unused__)) 
+#     define SWIGUNUSED __attribute__ ((__unused__))
 #   else
 #     define SWIGUNUSED
 #   endif
 # elif defined(__ICC)
-#   define SWIGUNUSED __attribute__ ((__unused__)) 
+#   define SWIGUNUSED __attribute__ ((__unused__))
 # else
-#   define SWIGUNUSED 
+#   define SWIGUNUSED
 # endif
 #endif
 
 #ifndef SWIG_MSC_UNSUPPRESS_4505
 # if defined(_MSC_VER)
 #   pragma warning(disable : 4505) /* unreferenced local function has been removed */
-# endif 
+# endif
 #endif
 
 #ifndef SWIGUNUSEDPARM
 # ifdef __cplusplus
 #   define SWIGUNUSEDPARM(p)
 # else
-#   define SWIGUNUSEDPARM(p) p SWIGUNUSED 
+#   define SWIGUNUSEDPARM(p) p SWIGUNUSED
 # endif
 #endif
 
@@ -238,7 +238,7 @@ template <typename T> T SwigValueInit() {
 #   define SWIGSTDCALL __stdcall
 # else
 #   define SWIGSTDCALL
-# endif 
+# endif
 #endif
 
 /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -276,7 +276,7 @@ template <typename T> T SwigValueInit() {
   You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
   creating a static or dynamic library from the SWIG runtime code.
   In 99.9% of the cases, SWIG just needs to declare them as 'static'.
-  
+
   But only do this if strictly necessary, ie, if you have problems
   with your compiler or suchlike.
 */
@@ -302,16 +302,16 @@ template <typename T> T SwigValueInit() {
 #define SWIG_POINTER_OWN           0x1
 
 
-/* 
+/*
    Flags/methods for returning states.
-   
-   The SWIG conversion methods, as ConvertPtr, return an integer 
+
+   The SWIG conversion methods, as ConvertPtr, return an integer
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
-   
+
    Use the following macros/flags to set or process the returning
    states.
-   
+
    In old versions of SWIG, code such as the following was usually written:
 
      if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -344,23 +344,23 @@ template <typename T> T SwigValueInit() {
     } else {
       // fail code
     }
-    
+
    I.e., now SWIG_ConvertPtr can return new objects and you can
    identify the case and take care of the deallocation. Of course that
    also requires SWIG_ConvertPtr to return new result values, such as
 
-      int SWIG_ConvertPtr(obj, ptr,...) {         
-        if (<obj is ok>) {			       
-          if (<need new object>) {		       
-            *ptr = <ptr to new allocated object>; 
-            return SWIG_NEWOBJ;		       
-          } else {				       
-            *ptr = <ptr to old object>;	       
-            return SWIG_OLDOBJ;		       
-          } 				       
-        } else {				       
-          return SWIG_BADOBJ;		       
-        }					       
+      int SWIG_ConvertPtr(obj, ptr,...) {
+        if (<obj is ok>) {
+          if (<need new object>) {
+            *ptr = <ptr to new allocated object>;
+            return SWIG_NEWOBJ;
+          } else {
+            *ptr = <ptr to old object>;
+            return SWIG_OLDOBJ;
+          }
+        } else {
+          return SWIG_BADOBJ;
+        }
       }
 
    Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -374,17 +374,17 @@ template <typename T> T SwigValueInit() {
        int fooi(int);
 
    and you call
- 
+
       food(1)   // cast rank '1'  (1 -> 1.0)
       fooi(1)   // cast rank '0'
 
    just use the SWIG_AddCast()/SWIG_CheckState()
 */
 
-#define SWIG_OK                    (0) 
+#define SWIG_OK                    (0)
 #define SWIG_ERROR                 (-1)
 #define SWIG_IsOK(r)               (r >= 0)
-#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)  
+#define SWIG_ArgError(r)           ((r != SWIG_ERROR) ? r : SWIG_TypeError)
 
 /* The CastRankLimit says how many bits are used for the cast rank */
 #define SWIG_CASTRANKLIMIT         (1 << 8)
@@ -415,14 +415,14 @@ template <typename T> T SwigValueInit() {
 #  endif
 #  define SWIG_CASTRANKMASK          ((SWIG_CASTRANKLIMIT) -1)
 #  define SWIG_CastRank(r)           (r & SWIG_CASTRANKMASK)
-SWIGINTERNINLINE int SWIG_AddCast(int r) { 
+SWIGINTERNINLINE int SWIG_AddCast(int r) {
   return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
 }
-SWIGINTERNINLINE int SWIG_CheckState(int r) { 
-  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0; 
+SWIGINTERNINLINE int SWIG_CheckState(int r) {
+  return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
 }
 #else /* no cast-rank mode */
-#  define SWIG_AddCast
+#  define SWIG_AddCast(r) (r)
 #  define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
 #endif
 
@@ -466,7 +466,7 @@ typedef struct swig_module_info {
   void                    *clientdata;		/* Language specific module data */
 } swig_module_info;
 
-/* 
+/*
   Compare two type names skipping the space characters, therefore
   "char*" == "char *" and "Class<int>" == "Class<int >", etc.
 
@@ -486,18 +486,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if not equal, 1 if equal
+  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
 */
 SWIGRUNTIME int
-SWIG_TypeEquiv(const char *nb, const char *tb) {
-  int equiv = 0;
+SWIG_TypeCmp(const char *nb, const char *tb) {
+  int equiv = 1;
   const char* te = tb + strlen(tb);
   const char* ne = nb;
-  while (!equiv && *ne) {
+  while (equiv != 0 && *ne) {
     for (nb = ne; *ne; ++ne) {
       if (*ne == '|') break;
     }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
+    equiv = SWIG_TypeNameComp(nb, ne, tb, te);
     if (*ne) ++ne;
   }
   return equiv;
@@ -505,24 +505,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
 
 /*
   Check type equivalence in a name list like <name1>|<name2>|...
-  Return 0 if equal, -1 if nb < tb, 1 if nb > tb
+  Return 0 if not equal, 1 if equal
 */
 SWIGRUNTIME int
-SWIG_TypeCompare(const char *nb, const char *tb) {
-  int equiv = 0;
-  const char* te = tb + strlen(tb);
-  const char* ne = nb;
-  while (!equiv && *ne) {
-    for (nb = ne; *ne; ++ne) {
-      if (*ne == '|') break;
-    }
-    equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
-    if (*ne) ++ne;
-  }
-  return equiv;
+SWIG_TypeEquiv(const char *nb, const char *tb) {
+  return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
 }
 
-
 /*
   Check the typename
 */
@@ -550,7 +539,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
   return 0;
 }
 
-/* 
+/*
   Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
 */
 SWIGRUNTIME swig_cast_info *
@@ -585,7 +574,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
   return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
 }
 
-/* 
+/*
    Dynamic pointer casting. Down an inheritance hierarchy
 */
 SWIGRUNTIME swig_type_info *
@@ -629,7 +618,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
     return type->name;
 }
 
-/* 
+/*
    Set the clientdata field for a type
 */
 SWIGRUNTIME void
@@ -637,14 +626,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
   swig_cast_info *cast = ti->cast;
   /* if (ti->clientdata == clientdata) return; */
   ti->clientdata = clientdata;
-  
+
   while (cast) {
     if (!cast->converter) {
       swig_type_info *tc = cast->type;
       if (!tc->clientdata) {
 	SWIG_TypeClientData(tc, clientdata);
       }
-    }    
+    }
     cast = cast->next;
   }
 }
@@ -653,31 +642,31 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
   SWIG_TypeClientData(ti, clientdata);
   ti->owndata = 1;
 }
-  
+
 /*
   Search for a swig_type_info structure only by mangled name
   Search is a O(log #types)
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_MangledTypeQueryModule(swig_module_info *start, 
-                            swig_module_info *end, 
+SWIG_MangledTypeQueryModule(swig_module_info *start,
+                            swig_module_info *end,
 		            const char *name) {
   swig_module_info *iter = start;
   do {
     if (iter->size) {
-      register size_t l = 0;
-      register size_t r = iter->size - 1;
+      size_t l = 0;
+      size_t r = iter->size - 1;
       do {
 	/* since l+r >= 0, we can (>> 1) instead (/ 2) */
-	register size_t i = (l + r) >> 1; 
+	size_t i = (l + r) >> 1;
 	const char *iname = iter->types[i]->name;
 	if (iname) {
-	  register int compare = strcmp(name, iname);
-	  if (compare == 0) {	    
+	  int compare = strcmp(name, iname);
+	  if (compare == 0) {
 	    return iter->types[i];
 	  } else if (compare < 0) {
 	    if (i) {
@@ -702,14 +691,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
   Search for a swig_type_info structure for either a mangled name or a human readable name.
   It first searches the mangled names of the types, which is a O(log #types)
   If a type is not found it then searches the human readable names, which is O(#types).
-  
-  We start searching at module start, and finish searching when start == end.  
+
+  We start searching at module start, and finish searching when start == end.
   Note: if start == end at the beginning of the function, we go all the way around
   the circular list.
 */
 SWIGRUNTIME swig_type_info *
-SWIG_TypeQueryModule(swig_module_info *start, 
-                     swig_module_info *end, 
+SWIG_TypeQueryModule(swig_module_info *start,
+                     swig_module_info *end,
 		     const char *name) {
   /* STEP 1: Search the name field using binary search */
   swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -720,7 +709,7 @@ SWIG_TypeQueryModule(swig_module_info *start,
        of the str field (the human readable name) */
     swig_module_info *iter = start;
     do {
-      register size_t i = 0;
+      size_t i = 0;
       for (; i < iter->size; ++i) {
 	if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
 	  return iter->types[i];
@@ -728,56 +717,56 @@ SWIG_TypeQueryModule(swig_module_info *start,
       iter = iter->next;
     } while (iter != end);
   }
-  
+
   /* neither found a match */
   return 0;
 }
 
-/* 
+/*
    Pack binary data into a string
 */
 SWIGRUNTIME char *
 SWIG_PackData(char *c, void *ptr, size_t sz) {
   static const char hex[17] = "0123456789abcdef";
-  register const unsigned char *u = (unsigned char *) ptr;
-  register const unsigned char *eu =  u + sz;
+  const unsigned char *u = (unsigned char *) ptr;
+  const unsigned char *eu =  u + sz;
   for (; u != eu; ++u) {
-    register unsigned char uu = *u;
+    unsigned char uu = *u;
     *(c++) = hex[(uu & 0xf0) >> 4];
     *(c++) = hex[uu & 0xf];
   }
   return c;
 }
 
-/* 
+/*
    Unpack binary data from a string
 */
 SWIGRUNTIME const char *
 SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
-  register unsigned char *u = (unsigned char *) ptr;
-  register const unsigned char *eu = u + sz;
+  unsigned char *u = (unsigned char *) ptr;
+  const unsigned char *eu = u + sz;
   for (; u != eu; ++u) {
-    register char d = *(c++);
-    register unsigned char uu;
+    char d = *(c++);
+    unsigned char uu;
     if ((d >= '0') && (d <= '9'))
       uu = ((d - '0') << 4);
     else if ((d >= 'a') && (d <= 'f'))
       uu = ((d - ('a'-10)) << 4);
-    else 
+    else
       return (char *) 0;
     d = *(c++);
     if ((d >= '0') && (d <= '9'))
       uu |= (d - '0');
     else if ((d >= 'a') && (d <= 'f'))
       uu |= (d - ('a'-10));
-    else 
+    else
       return (char *) 0;
     *u = uu;
   }
   return c;
 }
 
-/* 
+/*
    Pack 'void *' into a string buffer.
 */
 SWIGRUNTIME char *
@@ -837,18 +826,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #endif
 
 /*  Errors in SWIG */
-#define  SWIG_UnknownError    	   -1 
-#define  SWIG_IOError        	   -2 
-#define  SWIG_RuntimeError   	   -3 
-#define  SWIG_IndexError     	   -4 
-#define  SWIG_TypeError      	   -5 
-#define  SWIG_DivisionByZero 	   -6 
-#define  SWIG_OverflowError  	   -7 
-#define  SWIG_SyntaxError    	   -8 
-#define  SWIG_ValueError     	   -9 
+#define  SWIG_UnknownError    	   -1
+#define  SWIG_IOError        	   -2
+#define  SWIG_RuntimeError   	   -3
+#define  SWIG_IndexError     	   -4
+#define  SWIG_TypeError      	   -5
+#define  SWIG_DivisionByZero 	   -6
+#define  SWIG_OverflowError  	   -7
+#define  SWIG_SyntaxError    	   -8
+#define  SWIG_ValueError     	   -9
 #define  SWIG_SystemError    	   -10
 #define  SWIG_AttributeError 	   -11
-#define  SWIG_MemoryError    	   -12 
+#define  SWIG_MemoryError    	   -12
 #define  SWIG_NullReferenceError   -13
 
 
@@ -1398,7 +1387,7 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
 
 /* Runtime API */
 
-#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule()	
+#define SWIG_GetModule(clientdata)                      SWIG_Ruby_GetModule(clientdata)
 #define SWIG_SetModule(clientdata, pointer) 		SWIG_Ruby_SetModule(pointer)
 
 
@@ -1514,14 +1503,13 @@ SWIG_Ruby_InitRuntime(void)
 SWIGRUNTIME void
 SWIG_Ruby_define_class(swig_type_info *type)
 {
-  VALUE klass;
   char *klass_name = (char *) malloc(4 + strlen(type->name) + 1);
   sprintf(klass_name, "TYPE%s", type->name);
   if (NIL_P(_cSWIG_Pointer)) {
     _cSWIG_Pointer = rb_define_class_under(_mSWIG, "Pointer", rb_cObject);
     rb_undef_method(CLASS_OF(_cSWIG_Pointer), "new");
   }
-  klass = rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
+  rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
   free((void *) klass_name);
 }
 
@@ -1552,7 +1540,7 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
         downcast methods. */
       if (obj != Qnil) {
         VALUE value = rb_iv_get(obj, "@__swigtype__");
-        char* type_name = RSTRING_PTR(value);
+        const char* type_name = RSTRING_PTR(value);
 				
         if (strcmp(type->name, type_name) == 0) {
           return obj;
@@ -1734,7 +1722,7 @@ SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty) {
 }
 
 SWIGRUNTIME swig_module_info *
-SWIG_Ruby_GetModule(void)
+SWIG_Ruby_GetModule(void *SWIGUNUSEDPARM(clientdata))
 {
   VALUE pointer;
   swig_module_info *ret = 0;
@@ -1774,7 +1762,7 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
 SWIGINTERN
 int SWIG_Ruby_isCallable( VALUE proc )
 {
-  if ( rb_respond_to( proc, swig_call_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_call_id ) )
     return 1;
   return 0;
 }
@@ -1787,7 +1775,7 @@ int SWIG_Ruby_isCallable( VALUE proc )
 SWIGINTERN
 int SWIG_Ruby_arity( VALUE proc, int minimal )
 {
-  if ( rb_respond_to( proc, swig_arity_id ) == Qtrue )
+  if ( rb_respond_to( proc, swig_arity_id ) )
     {
       VALUE num = rb_funcall( proc, swig_arity_id, 0 );
       int arity = NUM2INT(num);
@@ -1816,25 +1804,27 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
 
 /* -------- TYPES TABLE (BEGIN) -------- */
 
-#define SWIGTYPE_p_GIntBig swig_types[0]
-#define SWIGTYPE_p_OGRDataSourceShadow swig_types[1]
-#define SWIGTYPE_p_OGRDriverShadow swig_types[2]
-#define SWIGTYPE_p_OGRFeatureDefnShadow swig_types[3]
-#define SWIGTYPE_p_OGRFeatureShadow swig_types[4]
-#define SWIGTYPE_p_OGRFieldDefnShadow swig_types[5]
-#define SWIGTYPE_p_OGRGeometryShadow swig_types[6]
-#define SWIGTYPE_p_OGRLayerShadow swig_types[7]
-#define SWIGTYPE_p_OSRCoordinateTransformationShadow swig_types[8]
-#define SWIGTYPE_p_OSRSpatialReferenceShadow swig_types[9]
-#define SWIGTYPE_p_char swig_types[10]
-#define SWIGTYPE_p_double swig_types[11]
-#define SWIGTYPE_p_int swig_types[12]
-#define SWIGTYPE_p_p_char swig_types[13]
-#define SWIGTYPE_p_p_double swig_types[14]
-#define SWIGTYPE_p_p_int swig_types[15]
-#define SWIGTYPE_p_p_p_char swig_types[16]
-static swig_type_info *swig_types[18];
-static swig_module_info swig_module = {swig_types, 17, 0, 0, 0, 0};
+#define SWIGTYPE_p_GDALProgressFunc swig_types[0]
+#define SWIGTYPE_p_GIntBig swig_types[1]
+#define SWIGTYPE_p_OGRDataSourceShadow swig_types[2]
+#define SWIGTYPE_p_OGRDriverShadow swig_types[3]
+#define SWIGTYPE_p_OGRFeatureDefnShadow swig_types[4]
+#define SWIGTYPE_p_OGRFeatureShadow swig_types[5]
+#define SWIGTYPE_p_OGRFieldDefnShadow swig_types[6]
+#define SWIGTYPE_p_OGRGeometryShadow swig_types[7]
+#define SWIGTYPE_p_OGRLayerShadow swig_types[8]
+#define SWIGTYPE_p_OSRCoordinateTransformationShadow swig_types[9]
+#define SWIGTYPE_p_OSRSpatialReferenceShadow swig_types[10]
+#define SWIGTYPE_p_char swig_types[11]
+#define SWIGTYPE_p_double swig_types[12]
+#define SWIGTYPE_p_f_double_p_q_const__char_p_void__int swig_types[13]
+#define SWIGTYPE_p_int swig_types[14]
+#define SWIGTYPE_p_p_char swig_types[15]
+#define SWIGTYPE_p_p_double swig_types[16]
+#define SWIGTYPE_p_p_int swig_types[17]
+#define SWIGTYPE_p_p_p_char swig_types[18]
+static swig_type_info *swig_types[20];
+static swig_module_info swig_module = {swig_types, 19, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -1849,7 +1839,7 @@ static VALUE mOgr;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020004 
+#define SWIGVERSION 0x030005 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1958,7 +1948,7 @@ SWIG_FromCharPtr(const char *cptr)
 extern "C" {
 #endif
 
-// Ruby 1.9 changed the file name of this header
+/* Ruby 1.9 changed the file name of this header */
 #ifdef HAVE_RUBY_IO_H
 #include "ruby/io.h"
 #else
@@ -2034,11 +2024,7 @@ SWIGINTERN int
 SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 {
   if (TYPE(obj) == T_STRING) {
-    #if defined(StringValuePtr)
     char *cstr = StringValuePtr(obj); 
-    #else
-    char *cstr = STR2CSTR(obj);
-    #endif
     size_t size = RSTRING_LEN(obj) + 1;
     if (cptr)  {
       if (alloc) {
@@ -2086,7 +2072,7 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/local/Cellar/swig/2.0.4/share/swig/2.0.4/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/3.0.5/share/swig/3.0.5/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2131,12 +2117,15 @@ SWIG_AsVal_int (VALUE obj, int *val)
 }
 
 SWIGINTERN OGRDataSourceShadow *OGRDriverShadow_Open(OGRDriverShadow *self,char const *utf8_path,int update=0){
+    CPLErrorReset();
     OGRDataSourceShadow* ds = (OGRDataSourceShadow*) OGR_Dr_Open(self, utf8_path, update);
     if( CPLGetLastErrorType() == CE_Failure && ds != NULL )
     {
-        CPLDebug( "SWIG",
-          "OGR_Dr_Open() succeeded, but an error is posted, so we destroy"
-          " the datasource and fail at swig level." );
+        CPLDebug(
+            "SWIG",
+            "OGR_Dr_Open() succeeded, but an error is posted, so we destroy"
+            " the datasource and fail at swig level.\nError:%s",
+            CPLGetLastErrorMsg() );
         OGRReleaseDataSource(ds);
         ds = NULL;
     }
@@ -2238,13 +2227,13 @@ SWIGINTERN void OGRLayerShadow_SetSpatialFilter(OGRLayerShadow *self,OGRGeometry
     OGR_L_SetSpatialFilter (self, filter);
   }
 
-/*@SWIG:/usr/local/Cellar/swig/2.0.4/share/swig/2.0.4/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
+/*@SWIG:/usr/local/Cellar/swig/3.0.5/share/swig/3.0.5/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
 {
   VALUE obj = args[0];
   VALUE type = TYPE(obj);
   double *res = (double *)(args[1]);
-  *res = NUM2DBL(obj);
+  *res = NUM2DBL(obj); (void)type;
   return obj;
 }
 /*@SWIG@*/
@@ -2369,6 +2358,27 @@ SWIGINTERN GIntBig OGRLayerShadow_GetFeaturesRead(OGRLayerShadow *self){
 SWIGINTERN OGRErr OGRLayerShadow_SetIgnoredFields(OGRLayerShadow *self,char const **options){
     return OGR_L_SetIgnoredFields( self, options );
   }
+SWIGINTERN OGRErr OGRLayerShadow_Intersection(OGRLayerShadow *self,OGRLayerShadow *method_layer,OGRLayerShadow *result_layer,char **options=NULL,GDALProgressFunc callback=NULL,void *callback_data=NULL){
+    return OGR_L_Intersection( self, method_layer, result_layer, options, callback, callback_data );
+  }
+SWIGINTERN OGRErr OGRLayerShadow_Union(OGRLayerShadow *self,OGRLayerShadow *method_layer,OGRLayerShadow *result_layer,char **options=NULL,GDALProgressFunc callback=NULL,void *callback_data=NULL){
+    return OGR_L_Union( self, method_layer, result_layer, options, callback, callback_data );
+  }
+SWIGINTERN OGRErr OGRLayerShadow_SymDifference(OGRLayerShadow *self,OGRLayerShadow *method_layer,OGRLayerShadow *result_layer,char **options=NULL,GDALProgressFunc callback=NULL,void *callback_data=NULL){
+    return OGR_L_SymDifference( self, method_layer, result_layer, options, callback, callback_data );
+  }
+SWIGINTERN OGRErr OGRLayerShadow_Identity(OGRLayerShadow *self,OGRLayerShadow *method_layer,OGRLayerShadow *result_layer,char **options=NULL,GDALProgressFunc callback=NULL,void *callback_data=NULL){
+    return OGR_L_Identity( self, method_layer, result_layer, options, callback, callback_data );
+  }
+SWIGINTERN OGRErr OGRLayerShadow_Update(OGRLayerShadow *self,OGRLayerShadow *method_layer,OGRLayerShadow *result_layer,char **options=NULL,GDALProgressFunc callback=NULL,void *callback_data=NULL){
+    return OGR_L_Update( self, method_layer, result_layer, options, callback, callback_data );
+  }
+SWIGINTERN OGRErr OGRLayerShadow_Clip(OGRLayerShadow *self,OGRLayerShadow *method_layer,OGRLayerShadow *result_layer,char **options=NULL,GDALProgressFunc callback=NULL,void *callback_data=NULL){
+    return OGR_L_Clip( self, method_layer, result_layer, options, callback, callback_data );
+  }
+SWIGINTERN OGRErr OGRLayerShadow_Erase(OGRLayerShadow *self,OGRLayerShadow *method_layer,OGRLayerShadow *result_layer,char **options=NULL,GDALProgressFunc callback=NULL,void *callback_data=NULL){
+    return OGR_L_Erase( self, method_layer, result_layer, options, callback, callback_data );
+  }
 SWIGINTERN void OGRLayerShadow_each(OGRLayerShadow *self){
 		OGRFeatureShadow* feature = NULL;
 
@@ -2881,6 +2891,13 @@ OGRGeometryShadow* ForceToPolygon( OGRGeometryShadow *geom_in ) {
 }
 
 
+OGRGeometryShadow* ForceToLineString( OGRGeometryShadow *geom_in ) {
+ if (geom_in == NULL)
+     return NULL;
+ return (OGRGeometryShadow* )OGR_G_ForceToLineString( OGR_G_Clone(geom_in) );
+}
+
+
 OGRGeometryShadow* ForceToMultiPolygon( OGRGeometryShadow *geom_in ) {
  if (geom_in == NULL)
      return NULL;
@@ -3121,6 +3138,9 @@ SWIGINTERN OGRGeometryShadow *OGRGeometryShadow_Centroid(OGRGeometryShadow *self
     OGR_G_Centroid( self, pt );
     return pt;
   }
+SWIGINTERN OGRGeometryShadow *OGRGeometryShadow_PointOnSurface(OGRGeometryShadow *self){
+    return (OGRGeometryShadow*) OGR_G_PointOnSurface( self );
+  }
 SWIGINTERN int OGRGeometryShadow_WkbSize(OGRGeometryShadow *self){
     return OGR_G_WkbSize(self);
   }
@@ -3208,6 +3228,11 @@ OGRDriverShadow* GetDriver(int driver_number) {
   }
 
 
+int GDALTermProgress_nocb( double dfProgress, const char * pszMessage=NULL, void *pData=NULL ) {
+  return GDALTermProgress( dfProgress, pszMessage, pData);
+}
+
+
 /*
   Document-method: Gdal::Ogr.use_exceptions
 
@@ -3259,14 +3284,14 @@ fail:
 
 
 */
-swig_class SwigClassDriver;
+static swig_class SwigClassDriver;
 
 
 /*
   Document-method: Gdal::Ogr::Driver.name
 
   call-seq:
-    name -> char
+    name -> char const *
 
 Get value of attribute.
 
@@ -3319,7 +3344,7 @@ fail:
   Document-method: Gdal::Ogr::Driver.create_data_source
 
   call-seq:
-    create_data_source(char utf8_path, char options=0) -> DataSource
+    create_data_source(char const * utf8_path, char ** options=None) -> DataSource
 
 An instance method.
 
@@ -3334,7 +3359,7 @@ _wrap_Driver_create_data_source(int argc, VALUE *argv, VALUE self) {
   int res2 ;
   char *buf2 = 0 ;
   int alloc2 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","utf8_path","options", NULL 
   };
   OGRDataSourceShadow *result = 0 ;
@@ -3412,7 +3437,7 @@ fail:
   Document-method: Gdal::Ogr::Driver.copy_data_source
 
   call-seq:
-    copy_data_source(DataSource copy_ds, char utf8_path, char options=0) -> DataSource
+    copy_data_source(DataSource copy_ds, char const * utf8_path, char ** options=None) -> DataSource
 
 An instance method.
 
@@ -3430,7 +3455,7 @@ _wrap_Driver_copy_data_source(int argc, VALUE *argv, VALUE self) {
   int res3 ;
   char *buf3 = 0 ;
   int alloc3 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","copy_ds","utf8_path","options", NULL 
   };
   OGRDataSourceShadow *result = 0 ;
@@ -3513,7 +3538,7 @@ fail:
   Document-method: Gdal::Ogr::Driver.open
 
   call-seq:
-    open(char utf8_path, int update=0) -> DataSource
+    open(char const * utf8_path, int update=0) -> DataSource
 
 An instance method.
 
@@ -3530,7 +3555,7 @@ _wrap_Driver_open(int argc, VALUE *argv, VALUE self) {
   int alloc2 = 0 ;
   int val3 ;
   int ecode3 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","utf8_path","update", NULL 
   };
   OGRDataSourceShadow *result = 0 ;
@@ -3590,7 +3615,7 @@ fail:
   Document-method: Gdal::Ogr::Driver.delete_data_source
 
   call-seq:
-    delete_data_source(char utf8_path) -> int
+    delete_data_source(char const * utf8_path) -> int
 
 An instance method.
 
@@ -3654,7 +3679,7 @@ fail:
   Document-method: Gdal::Ogr::Driver.test_capability
 
   call-seq:
-    test_capability(char cap) -> bool
+    test_capability(char const * cap) -> bool
 
 An instance method.
 
@@ -3723,7 +3748,7 @@ fail:
   Document-method: Gdal::Ogr::Driver.get_name
 
   call-seq:
-    get_name -> char
+    get_name -> char const *
 
 An instance method.
 
@@ -3879,14 +3904,14 @@ fail:
 
 
 */
-swig_class SwigClassDataSource;
+static swig_class SwigClassDataSource;
 
 
 /*
   Document-method: Gdal::Ogr::DataSource.name
 
   call-seq:
-    name -> char
+    name -> char const *
 
 Get value of attribute.
 
@@ -4159,7 +4184,7 @@ fail:
   Document-method: Gdal::Ogr::DataSource.get_name
 
   call-seq:
-    get_name -> char
+    get_name -> char const *
 
 An instance method.
 
@@ -4346,8 +4371,8 @@ fail:
   Document-method: Gdal::Ogr::DataSource.create_layer
 
   call-seq:
-    create_layer(char name, SpatialReference srs=nil, OGRwkbGeometryType geom_type=WKBUNKNOWN, 
-    char options=0) -> Layer
+    create_layer(char const * name, SpatialReference srs=nil, OGRwkbGeometryType geom_type=WKBUNKNOWN, 
+    char ** options=None) -> Layer
 
 An instance method.
 
@@ -4366,7 +4391,7 @@ _wrap_DataSource_create_layer(int argc, VALUE *argv, VALUE self) {
   int alloc2 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","name","srs","geom_type","options", NULL 
   };
   OGRLayerShadow *result = 0 ;
@@ -4462,7 +4487,7 @@ fail:
   Document-method: Gdal::Ogr::DataSource.copy_layer
 
   call-seq:
-    copy_layer(Layer src_layer, char new_name, char options=0) -> Layer
+    copy_layer(Layer src_layer, char const * new_name, char ** options=None) -> Layer
 
 An instance method.
 
@@ -4480,7 +4505,7 @@ _wrap_DataSource_copy_layer(int argc, VALUE *argv, VALUE self) {
   int res3 ;
   char *buf3 = 0 ;
   int alloc3 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","src_layer","new_name","options", NULL 
   };
   OGRLayerShadow *result = 0 ;
@@ -4568,7 +4593,7 @@ fail:
   Document-method: Gdal::Ogr::DataSource.test_capability
 
   call-seq:
-    test_capability(char cap) -> bool
+    test_capability(char const * cap) -> bool
 
 An instance method.
 
@@ -4637,7 +4662,7 @@ fail:
   Document-method: Gdal::Ogr::DataSource.execute_sql
 
   call-seq:
-    execute_sql(char statement, Geometry spatialFilter=nil, char dialect="") -> Layer
+    execute_sql(char const * statement, Geometry spatialFilter=nil, char const * dialect="") -> Layer
 
 An instance method.
 
@@ -4658,7 +4683,7 @@ _wrap_DataSource_execute_sql(int argc, VALUE *argv, VALUE self) {
   int res4 ;
   char *buf4 = 0 ;
   int alloc4 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","statement","spatialFilter","dialect", NULL 
   };
   OGRLayerShadow *result = 0 ;
@@ -4846,7 +4871,7 @@ fail:
 
 
 */
-swig_class SwigClassLayer;
+static swig_class SwigClassLayer;
 
 
 /*
@@ -5099,7 +5124,7 @@ fail:
   Document-method: Gdal::Ogr::Layer.set_attribute_filter
 
   call-seq:
-    set_attribute_filter(char filter_string) -> OGRErr
+    set_attribute_filter(char * filter_string) -> OGRErr
 
 An instance method.
 
@@ -5223,7 +5248,7 @@ fail:
   Document-method: Gdal::Ogr::Layer.get_name
 
   call-seq:
-    get_name -> char
+    get_name -> char const *
 
 An instance method.
 
@@ -5329,7 +5354,7 @@ fail:
   Document-method: Gdal::Ogr::Layer.get_geometry_column
 
   call-seq:
-    get_geometry_column -> char
+    get_geometry_column -> char const *
 
 An instance method.
 
@@ -5382,7 +5407,7 @@ fail:
   Document-method: Gdal::Ogr::Layer.get_fidcolumn
 
   call-seq:
-    get_fidcolumn -> char
+    get_fidcolumn -> char const *
 
 An instance method.
 
@@ -5972,7 +5997,7 @@ _wrap_Layer_get_feature_count(int argc, VALUE *argv, VALUE self) {
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","force", NULL 
   };
   int result;
@@ -6040,7 +6065,7 @@ _wrap_Layer_get_extent(int argc, VALUE *argv, VALUE self) {
   double argout2[4] ;
   int val3 ;
   int ecode3 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","force", NULL 
   };
   OGRErr result;
@@ -6120,7 +6145,7 @@ fail:
   Document-method: Gdal::Ogr::Layer.test_capability
 
   call-seq:
-    test_capability(char cap) -> bool
+    test_capability(char const * cap) -> bool
 
 An instance method.
 
@@ -6205,7 +6230,7 @@ _wrap_Layer_create_field(int argc, VALUE *argv, VALUE self) {
   int res2 = 0 ;
   int val3 ;
   int ecode3 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","field_def","approx_ok", NULL 
   };
   OGRErr result;
@@ -6874,14 +6899,879 @@ _wrap_Layer_get_features_read(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
-  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
-  if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","GetFeaturesRead", 1, self )); 
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","GetFeaturesRead", 1, self )); 
+  }
+  arg1 = reinterpret_cast< OGRLayerShadow * >(argp1);
+  {
+    CPLErrorReset();
+    result = OGRLayerShadow_GetFeaturesRead(arg1);
+    CPLErr eclass = CPLGetLastErrorType();
+    if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+      SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  }
+  vresult = SWIG_NewPointerObj((new GIntBig(static_cast< const GIntBig& >(result))), SWIGTYPE_p_GIntBig, SWIG_POINTER_OWN |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+
+/*
+  Document-method: Gdal::Ogr::Layer.set_ignored_fields
+
+  call-seq:
+    set_ignored_fields(char const ** options) -> OGRErr
+
+An instance method.
+
+*/
+SWIGINTERN VALUE
+_wrap_Layer_set_ignored_fields(int argc, VALUE *argv, VALUE self) {
+  OGRLayerShadow *arg1 = (OGRLayerShadow *) 0 ;
+  char **arg2 = (char **) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  OGRErr result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","SetIgnoredFields", 1, self )); 
+  }
+  arg1 = reinterpret_cast< OGRLayerShadow * >(argp1);
+  {
+    /* %typemap(in) char **options */
+    
+    /* Check if is a list */
+    Check_Type(argv[0], T_ARRAY);
+    
+    int size = RARRAY_LEN(argv[0]);
+    for (int i = 0; i < size; i++) {
+      VALUE item = rb_ary_entry(argv[0], i);
+      char *pszItem = StringValuePtr(item);
+      arg2 = CSLAddString( arg2, pszItem );
+    }
+  }
+  {
+    CPLErrorReset();
+    result = (OGRErr)OGRLayerShadow_SetIgnoredFields(arg1,(char const **)arg2);
+    CPLErr eclass = CPLGetLastErrorType();
+    if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+      SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  }
+  {
+    /* %typemap(out) OGRErr */
+    if (result != 0) {
+      rb_raise(rb_eRuntimeError, OGRErrMessages(result));
+    }
+  }
+  {
+    /* %typemap(freearg) char **options */
+    
+    CSLDestroy( arg2 );
+  }
+  {
+    /* %typemap(ret) OGRErr */
+    if (vresult == Qnil) {
+      vresult = INT2NUM(0);
+    }
+  }    return vresult;
+fail:
+  {
+    /* %typemap(freearg) char **options */
+    
+    CSLDestroy( arg2 );
+  }
+  return Qnil;
+}
+
+
+
+/*
+  Document-method: Gdal::Ogr::Layer.intersection
+
+  call-seq:
+    intersection(Layer method_layer, Layer result_layer, char ** options=nil, GDALProgressFunc callback=0, 
+    void * callback_data=nil) -> OGRErr
+
+An instance method.
+
+*/
+SWIGINTERN VALUE
+_wrap_Layer_intersection(int argc, VALUE *argv, VALUE self) {
+  OGRLayerShadow *arg1 = (OGRLayerShadow *) 0 ;
+  OGRLayerShadow *arg2 = (OGRLayerShadow *) 0 ;
+  OGRLayerShadow *arg3 = (OGRLayerShadow *) 0 ;
+  char **arg4 = (char **) NULL ;
+  GDALProgressFunc arg5 = (GDALProgressFunc) NULL ;
+  void *arg6 = (void *) NULL ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp5 ;
+  int res5 = 0 ;
+  int res6 ;
+  const char *kwnames[] = {
+    "self","method_layer","result_layer","options","callback","callback_data", NULL 
+  };
+  OGRErr result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 5)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","Intersection", 1, self )); 
+  }
+  arg1 = reinterpret_cast< OGRLayerShadow * >(argp1);
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "OGRLayerShadow *","Intersection", 2, argv[0] )); 
+  }
+  arg2 = reinterpret_cast< OGRLayerShadow * >(argp2);
+  res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "OGRLayerShadow *","Intersection", 3, argv[1] )); 
+  }
+  arg3 = reinterpret_cast< OGRLayerShadow * >(argp3);
+  if (argc > 2) {
+    {
+      /* %typemap(in) char **options */
+      
+      /* Check if is a list */
+      Check_Type(argv[2], T_ARRAY);
+      
+      int size = RARRAY_LEN(argv[2]);
+      for (int i = 0; i < size; i++) {
+        VALUE item = rb_ary_entry(argv[2], i);
+        char *pszItem = StringValuePtr(item);
+        arg4 = CSLAddString( arg4, pszItem );
+      }
+    }
+  }
+  if (argc > 3) {
+    {
+      res5 = SWIG_ConvertPtr(argv[3], &argp5, SWIGTYPE_p_GDALProgressFunc,  0 );
+      if (!SWIG_IsOK(res5)) {
+        SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "GDALProgressFunc","Intersection", 5, argv[3] )); 
+      }  
+      if (!argp5) {
+        SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "GDALProgressFunc","Intersection", 5, argv[3]));
+      } else {
+        arg5 = *(reinterpret_cast< GDALProgressFunc * >(argp5));
+      }
+    }
+  }
+  if (argc > 4) {
+    res6 = SWIG_ConvertPtr(argv[4],SWIG_as_voidptrptr(&arg6), 0, 0);
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "void *","Intersection", 6, argv[4] )); 
+    }
+  }
+  {
+    CPLErrorReset();
+    result = (OGRErr)OGRLayerShadow_Intersection(arg1,arg2,arg3,arg4,arg5,arg6);
+    CPLErr eclass = CPLGetLastErrorType();
+    if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+      SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  }
+  {
+    /* %typemap(out) OGRErr */
+    if (result != 0) {
+      rb_raise(rb_eRuntimeError, OGRErrMessages(result));
+    }
+  }
+  {
+    /* %typemap(freearg) char **options */
+    
+    CSLDestroy( arg4 );
+  }
+  {
+    /* %typemap(ret) OGRErr */
+    if (vresult == Qnil) {
+      vresult = INT2NUM(0);
+    }
+  }    return vresult;
+fail:
+  {
+    /* %typemap(freearg) char **options */
+    
+    CSLDestroy( arg4 );
+  }
+  return Qnil;
+}
+
+
+
+/*
+  Document-method: Gdal::Ogr::Layer.union
+
+  call-seq:
+    union(Layer method_layer, Layer result_layer, char ** options=nil, GDALProgressFunc callback=0, 
+    void * callback_data=nil) -> OGRErr
+
+An instance method.
+
+*/
+SWIGINTERN VALUE
+_wrap_Layer_union(int argc, VALUE *argv, VALUE self) {
+  OGRLayerShadow *arg1 = (OGRLayerShadow *) 0 ;
+  OGRLayerShadow *arg2 = (OGRLayerShadow *) 0 ;
+  OGRLayerShadow *arg3 = (OGRLayerShadow *) 0 ;
+  char **arg4 = (char **) NULL ;
+  GDALProgressFunc arg5 = (GDALProgressFunc) NULL ;
+  void *arg6 = (void *) NULL ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp5 ;
+  int res5 = 0 ;
+  int res6 ;
+  const char *kwnames[] = {
+    "self","method_layer","result_layer","options","callback","callback_data", NULL 
+  };
+  OGRErr result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 5)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","Union", 1, self )); 
+  }
+  arg1 = reinterpret_cast< OGRLayerShadow * >(argp1);
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "OGRLayerShadow *","Union", 2, argv[0] )); 
+  }
+  arg2 = reinterpret_cast< OGRLayerShadow * >(argp2);
+  res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "OGRLayerShadow *","Union", 3, argv[1] )); 
+  }
+  arg3 = reinterpret_cast< OGRLayerShadow * >(argp3);
+  if (argc > 2) {
+    {
+      /* %typemap(in) char **options */
+      
+      /* Check if is a list */
+      Check_Type(argv[2], T_ARRAY);
+      
+      int size = RARRAY_LEN(argv[2]);
+      for (int i = 0; i < size; i++) {
+        VALUE item = rb_ary_entry(argv[2], i);
+        char *pszItem = StringValuePtr(item);
+        arg4 = CSLAddString( arg4, pszItem );
+      }
+    }
+  }
+  if (argc > 3) {
+    {
+      res5 = SWIG_ConvertPtr(argv[3], &argp5, SWIGTYPE_p_GDALProgressFunc,  0 );
+      if (!SWIG_IsOK(res5)) {
+        SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "GDALProgressFunc","Union", 5, argv[3] )); 
+      }  
+      if (!argp5) {
+        SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "GDALProgressFunc","Union", 5, argv[3]));
+      } else {
+        arg5 = *(reinterpret_cast< GDALProgressFunc * >(argp5));
+      }
+    }
+  }
+  if (argc > 4) {
+    res6 = SWIG_ConvertPtr(argv[4],SWIG_as_voidptrptr(&arg6), 0, 0);
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "void *","Union", 6, argv[4] )); 
+    }
+  }
+  {
+    CPLErrorReset();
+    result = (OGRErr)OGRLayerShadow_Union(arg1,arg2,arg3,arg4,arg5,arg6);
+    CPLErr eclass = CPLGetLastErrorType();
+    if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+      SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  }
+  {
+    /* %typemap(out) OGRErr */
+    if (result != 0) {
+      rb_raise(rb_eRuntimeError, OGRErrMessages(result));
+    }
+  }
+  {
+    /* %typemap(freearg) char **options */
+    
+    CSLDestroy( arg4 );
+  }
+  {
+    /* %typemap(ret) OGRErr */
+    if (vresult == Qnil) {
+      vresult = INT2NUM(0);
+    }
+  }    return vresult;
+fail:
+  {
+    /* %typemap(freearg) char **options */
+    
+    CSLDestroy( arg4 );
+  }
+  return Qnil;
+}
+
+
+
+/*
+  Document-method: Gdal::Ogr::Layer.sym_difference
+
+  call-seq:
+    sym_difference(Layer method_layer, Layer result_layer, char ** options=nil, GDALProgressFunc callback=0, 
+    void * callback_data=nil) -> OGRErr
+
+An instance method.
+
+*/
+SWIGINTERN VALUE
+_wrap_Layer_sym_difference(int argc, VALUE *argv, VALUE self) {
+  OGRLayerShadow *arg1 = (OGRLayerShadow *) 0 ;
+  OGRLayerShadow *arg2 = (OGRLayerShadow *) 0 ;
+  OGRLayerShadow *arg3 = (OGRLayerShadow *) 0 ;
+  char **arg4 = (char **) NULL ;
+  GDALProgressFunc arg5 = (GDALProgressFunc) NULL ;
+  void *arg6 = (void *) NULL ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp5 ;
+  int res5 = 0 ;
+  int res6 ;
+  const char *kwnames[] = {
+    "self","method_layer","result_layer","options","callback","callback_data", NULL 
+  };
+  OGRErr result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 5)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","SymDifference", 1, self )); 
+  }
+  arg1 = reinterpret_cast< OGRLayerShadow * >(argp1);
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "OGRLayerShadow *","SymDifference", 2, argv[0] )); 
+  }
+  arg2 = reinterpret_cast< OGRLayerShadow * >(argp2);
+  res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "OGRLayerShadow *","SymDifference", 3, argv[1] )); 
+  }
+  arg3 = reinterpret_cast< OGRLayerShadow * >(argp3);
+  if (argc > 2) {
+    {
+      /* %typemap(in) char **options */
+      
+      /* Check if is a list */
+      Check_Type(argv[2], T_ARRAY);
+      
+      int size = RARRAY_LEN(argv[2]);
+      for (int i = 0; i < size; i++) {
+        VALUE item = rb_ary_entry(argv[2], i);
+        char *pszItem = StringValuePtr(item);
+        arg4 = CSLAddString( arg4, pszItem );
+      }
+    }
+  }
+  if (argc > 3) {
+    {
+      res5 = SWIG_ConvertPtr(argv[3], &argp5, SWIGTYPE_p_GDALProgressFunc,  0 );
+      if (!SWIG_IsOK(res5)) {
+        SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "GDALProgressFunc","SymDifference", 5, argv[3] )); 
+      }  
+      if (!argp5) {
+        SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "GDALProgressFunc","SymDifference", 5, argv[3]));
+      } else {
+        arg5 = *(reinterpret_cast< GDALProgressFunc * >(argp5));
+      }
+    }
+  }
+  if (argc > 4) {
+    res6 = SWIG_ConvertPtr(argv[4],SWIG_as_voidptrptr(&arg6), 0, 0);
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "void *","SymDifference", 6, argv[4] )); 
+    }
+  }
+  {
+    CPLErrorReset();
+    result = (OGRErr)OGRLayerShadow_SymDifference(arg1,arg2,arg3,arg4,arg5,arg6);
+    CPLErr eclass = CPLGetLastErrorType();
+    if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+      SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  }
+  {
+    /* %typemap(out) OGRErr */
+    if (result != 0) {
+      rb_raise(rb_eRuntimeError, OGRErrMessages(result));
+    }
+  }
+  {
+    /* %typemap(freearg) char **options */
+    
+    CSLDestroy( arg4 );
+  }
+  {
+    /* %typemap(ret) OGRErr */
+    if (vresult == Qnil) {
+      vresult = INT2NUM(0);
+    }
+  }    return vresult;
+fail:
+  {
+    /* %typemap(freearg) char **options */
+    
+    CSLDestroy( arg4 );
+  }
+  return Qnil;
+}
+
+
+
+/*
+  Document-method: Gdal::Ogr::Layer.identity
+
+  call-seq:
+    identity(Layer method_layer, Layer result_layer, char ** options=nil, GDALProgressFunc callback=0, 
+    void * callback_data=nil) -> OGRErr
+
+An instance method.
+
+*/
+SWIGINTERN VALUE
+_wrap_Layer_identity(int argc, VALUE *argv, VALUE self) {
+  OGRLayerShadow *arg1 = (OGRLayerShadow *) 0 ;
+  OGRLayerShadow *arg2 = (OGRLayerShadow *) 0 ;
+  OGRLayerShadow *arg3 = (OGRLayerShadow *) 0 ;
+  char **arg4 = (char **) NULL ;
+  GDALProgressFunc arg5 = (GDALProgressFunc) NULL ;
+  void *arg6 = (void *) NULL ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp5 ;
+  int res5 = 0 ;
+  int res6 ;
+  const char *kwnames[] = {
+    "self","method_layer","result_layer","options","callback","callback_data", NULL 
+  };
+  OGRErr result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 5)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","Identity", 1, self )); 
+  }
+  arg1 = reinterpret_cast< OGRLayerShadow * >(argp1);
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "OGRLayerShadow *","Identity", 2, argv[0] )); 
+  }
+  arg2 = reinterpret_cast< OGRLayerShadow * >(argp2);
+  res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "OGRLayerShadow *","Identity", 3, argv[1] )); 
+  }
+  arg3 = reinterpret_cast< OGRLayerShadow * >(argp3);
+  if (argc > 2) {
+    {
+      /* %typemap(in) char **options */
+      
+      /* Check if is a list */
+      Check_Type(argv[2], T_ARRAY);
+      
+      int size = RARRAY_LEN(argv[2]);
+      for (int i = 0; i < size; i++) {
+        VALUE item = rb_ary_entry(argv[2], i);
+        char *pszItem = StringValuePtr(item);
+        arg4 = CSLAddString( arg4, pszItem );
+      }
+    }
+  }
+  if (argc > 3) {
+    {
+      res5 = SWIG_ConvertPtr(argv[3], &argp5, SWIGTYPE_p_GDALProgressFunc,  0 );
+      if (!SWIG_IsOK(res5)) {
+        SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "GDALProgressFunc","Identity", 5, argv[3] )); 
+      }  
+      if (!argp5) {
+        SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "GDALProgressFunc","Identity", 5, argv[3]));
+      } else {
+        arg5 = *(reinterpret_cast< GDALProgressFunc * >(argp5));
+      }
+    }
+  }
+  if (argc > 4) {
+    res6 = SWIG_ConvertPtr(argv[4],SWIG_as_voidptrptr(&arg6), 0, 0);
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "void *","Identity", 6, argv[4] )); 
+    }
+  }
+  {
+    CPLErrorReset();
+    result = (OGRErr)OGRLayerShadow_Identity(arg1,arg2,arg3,arg4,arg5,arg6);
+    CPLErr eclass = CPLGetLastErrorType();
+    if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+      SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  }
+  {
+    /* %typemap(out) OGRErr */
+    if (result != 0) {
+      rb_raise(rb_eRuntimeError, OGRErrMessages(result));
+    }
+  }
+  {
+    /* %typemap(freearg) char **options */
+    
+    CSLDestroy( arg4 );
+  }
+  {
+    /* %typemap(ret) OGRErr */
+    if (vresult == Qnil) {
+      vresult = INT2NUM(0);
+    }
+  }    return vresult;
+fail:
+  {
+    /* %typemap(freearg) char **options */
+    
+    CSLDestroy( arg4 );
+  }
+  return Qnil;
+}
+
+
+
+/*
+  Document-method: Gdal::Ogr::Layer.update
+
+  call-seq:
+    update(Layer method_layer, Layer result_layer, char ** options=nil, GDALProgressFunc callback=0, 
+    void * callback_data=nil) -> OGRErr
+
+An instance method.
+
+*/
+SWIGINTERN VALUE
+_wrap_Layer_update(int argc, VALUE *argv, VALUE self) {
+  OGRLayerShadow *arg1 = (OGRLayerShadow *) 0 ;
+  OGRLayerShadow *arg2 = (OGRLayerShadow *) 0 ;
+  OGRLayerShadow *arg3 = (OGRLayerShadow *) 0 ;
+  char **arg4 = (char **) NULL ;
+  GDALProgressFunc arg5 = (GDALProgressFunc) NULL ;
+  void *arg6 = (void *) NULL ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp5 ;
+  int res5 = 0 ;
+  int res6 ;
+  const char *kwnames[] = {
+    "self","method_layer","result_layer","options","callback","callback_data", NULL 
+  };
+  OGRErr result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 5)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","Update", 1, self )); 
+  }
+  arg1 = reinterpret_cast< OGRLayerShadow * >(argp1);
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "OGRLayerShadow *","Update", 2, argv[0] )); 
+  }
+  arg2 = reinterpret_cast< OGRLayerShadow * >(argp2);
+  res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "OGRLayerShadow *","Update", 3, argv[1] )); 
+  }
+  arg3 = reinterpret_cast< OGRLayerShadow * >(argp3);
+  if (argc > 2) {
+    {
+      /* %typemap(in) char **options */
+      
+      /* Check if is a list */
+      Check_Type(argv[2], T_ARRAY);
+      
+      int size = RARRAY_LEN(argv[2]);
+      for (int i = 0; i < size; i++) {
+        VALUE item = rb_ary_entry(argv[2], i);
+        char *pszItem = StringValuePtr(item);
+        arg4 = CSLAddString( arg4, pszItem );
+      }
+    }
+  }
+  if (argc > 3) {
+    {
+      res5 = SWIG_ConvertPtr(argv[3], &argp5, SWIGTYPE_p_GDALProgressFunc,  0 );
+      if (!SWIG_IsOK(res5)) {
+        SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "GDALProgressFunc","Update", 5, argv[3] )); 
+      }  
+      if (!argp5) {
+        SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "GDALProgressFunc","Update", 5, argv[3]));
+      } else {
+        arg5 = *(reinterpret_cast< GDALProgressFunc * >(argp5));
+      }
+    }
+  }
+  if (argc > 4) {
+    res6 = SWIG_ConvertPtr(argv[4],SWIG_as_voidptrptr(&arg6), 0, 0);
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "void *","Update", 6, argv[4] )); 
+    }
+  }
+  {
+    CPLErrorReset();
+    result = (OGRErr)OGRLayerShadow_Update(arg1,arg2,arg3,arg4,arg5,arg6);
+    CPLErr eclass = CPLGetLastErrorType();
+    if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+      SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  }
+  {
+    /* %typemap(out) OGRErr */
+    if (result != 0) {
+      rb_raise(rb_eRuntimeError, OGRErrMessages(result));
+    }
+  }
+  {
+    /* %typemap(freearg) char **options */
+    
+    CSLDestroy( arg4 );
+  }
+  {
+    /* %typemap(ret) OGRErr */
+    if (vresult == Qnil) {
+      vresult = INT2NUM(0);
+    }
+  }    return vresult;
+fail:
+  {
+    /* %typemap(freearg) char **options */
+    
+    CSLDestroy( arg4 );
+  }
+  return Qnil;
+}
+
+
+
+/*
+  Document-method: Gdal::Ogr::Layer.clip
+
+  call-seq:
+    clip(Layer method_layer, Layer result_layer, char ** options=nil, GDALProgressFunc callback=0, 
+    void * callback_data=nil) -> OGRErr
+
+An instance method.
+
+*/
+SWIGINTERN VALUE
+_wrap_Layer_clip(int argc, VALUE *argv, VALUE self) {
+  OGRLayerShadow *arg1 = (OGRLayerShadow *) 0 ;
+  OGRLayerShadow *arg2 = (OGRLayerShadow *) 0 ;
+  OGRLayerShadow *arg3 = (OGRLayerShadow *) 0 ;
+  char **arg4 = (char **) NULL ;
+  GDALProgressFunc arg5 = (GDALProgressFunc) NULL ;
+  void *arg6 = (void *) NULL ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp5 ;
+  int res5 = 0 ;
+  int res6 ;
+  const char *kwnames[] = {
+    "self","method_layer","result_layer","options","callback","callback_data", NULL 
+  };
+  OGRErr result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 5)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","Clip", 1, self )); 
+  }
+  arg1 = reinterpret_cast< OGRLayerShadow * >(argp1);
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "OGRLayerShadow *","Clip", 2, argv[0] )); 
+  }
+  arg2 = reinterpret_cast< OGRLayerShadow * >(argp2);
+  res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "OGRLayerShadow *","Clip", 3, argv[1] )); 
+  }
+  arg3 = reinterpret_cast< OGRLayerShadow * >(argp3);
+  if (argc > 2) {
+    {
+      /* %typemap(in) char **options */
+      
+      /* Check if is a list */
+      Check_Type(argv[2], T_ARRAY);
+      
+      int size = RARRAY_LEN(argv[2]);
+      for (int i = 0; i < size; i++) {
+        VALUE item = rb_ary_entry(argv[2], i);
+        char *pszItem = StringValuePtr(item);
+        arg4 = CSLAddString( arg4, pszItem );
+      }
+    }
+  }
+  if (argc > 3) {
+    {
+      res5 = SWIG_ConvertPtr(argv[3], &argp5, SWIGTYPE_p_GDALProgressFunc,  0 );
+      if (!SWIG_IsOK(res5)) {
+        SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "GDALProgressFunc","Clip", 5, argv[3] )); 
+      }  
+      if (!argp5) {
+        SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "GDALProgressFunc","Clip", 5, argv[3]));
+      } else {
+        arg5 = *(reinterpret_cast< GDALProgressFunc * >(argp5));
+      }
+    }
+  }
+  if (argc > 4) {
+    res6 = SWIG_ConvertPtr(argv[4],SWIG_as_voidptrptr(&arg6), 0, 0);
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "void *","Clip", 6, argv[4] )); 
+    }
   }
-  arg1 = reinterpret_cast< OGRLayerShadow * >(argp1);
   {
     CPLErrorReset();
-    result = OGRLayerShadow_GetFeaturesRead(arg1);
+    result = (OGRErr)OGRLayerShadow_Clip(arg1,arg2,arg3,arg4,arg5,arg6);
     CPLErr eclass = CPLGetLastErrorType();
     if ( eclass == CE_Failure || eclass == CE_Fatal ) {
       SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
@@ -6899,56 +7789,122 @@ _wrap_Layer_get_features_read(int argc, VALUE *argv, VALUE self) {
     
     
   }
-  vresult = SWIG_NewPointerObj((new GIntBig(static_cast< const GIntBig& >(result))), SWIGTYPE_p_GIntBig, SWIG_POINTER_OWN |  0 );
-  return vresult;
+  {
+    /* %typemap(out) OGRErr */
+    if (result != 0) {
+      rb_raise(rb_eRuntimeError, OGRErrMessages(result));
+    }
+  }
+  {
+    /* %typemap(freearg) char **options */
+    
+    CSLDestroy( arg4 );
+  }
+  {
+    /* %typemap(ret) OGRErr */
+    if (vresult == Qnil) {
+      vresult = INT2NUM(0);
+    }
+  }    return vresult;
 fail:
+  {
+    /* %typemap(freearg) char **options */
+    
+    CSLDestroy( arg4 );
+  }
   return Qnil;
 }
 
 
 
 /*
-  Document-method: Gdal::Ogr::Layer.set_ignored_fields
+  Document-method: Gdal::Ogr::Layer.erase
 
   call-seq:
-    set_ignored_fields(char options) -> OGRErr
+    erase(Layer method_layer, Layer result_layer, char ** options=nil, GDALProgressFunc callback=0, 
+    void * callback_data=nil) -> OGRErr
 
 An instance method.
 
 */
 SWIGINTERN VALUE
-_wrap_Layer_set_ignored_fields(int argc, VALUE *argv, VALUE self) {
+_wrap_Layer_erase(int argc, VALUE *argv, VALUE self) {
   OGRLayerShadow *arg1 = (OGRLayerShadow *) 0 ;
-  char **arg2 = (char **) 0 ;
+  OGRLayerShadow *arg2 = (OGRLayerShadow *) 0 ;
+  OGRLayerShadow *arg3 = (OGRLayerShadow *) 0 ;
+  char **arg4 = (char **) NULL ;
+  GDALProgressFunc arg5 = (GDALProgressFunc) NULL ;
+  void *arg6 = (void *) NULL ;
   void *argp1 = 0 ;
   int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp5 ;
+  int res5 = 0 ;
+  int res6 ;
+  const char *kwnames[] = {
+    "self","method_layer","result_layer","options","callback","callback_data", NULL 
+  };
   OGRErr result;
   VALUE vresult = Qnil;
   
-  if ((argc < 1) || (argc > 1)) {
-    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  if ((argc < 2) || (argc > 5)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","SetIgnoredFields", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","Erase", 1, self )); 
   }
   arg1 = reinterpret_cast< OGRLayerShadow * >(argp1);
-  {
-    /* %typemap(in) char **options */
-    
-    /* Check if is a list */
-    Check_Type(argv[0], T_ARRAY);
-    
-    int size = RARRAY_LEN(argv[0]);
-    for (int i = 0; i < size; i++) {
-      VALUE item = rb_ary_entry(argv[0], i);
-      char *pszItem = StringValuePtr(item);
-      arg2 = CSLAddString( arg2, pszItem );
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "OGRLayerShadow *","Erase", 2, argv[0] )); 
+  }
+  arg2 = reinterpret_cast< OGRLayerShadow * >(argp2);
+  res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_OGRLayerShadow, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "OGRLayerShadow *","Erase", 3, argv[1] )); 
+  }
+  arg3 = reinterpret_cast< OGRLayerShadow * >(argp3);
+  if (argc > 2) {
+    {
+      /* %typemap(in) char **options */
+      
+      /* Check if is a list */
+      Check_Type(argv[2], T_ARRAY);
+      
+      int size = RARRAY_LEN(argv[2]);
+      for (int i = 0; i < size; i++) {
+        VALUE item = rb_ary_entry(argv[2], i);
+        char *pszItem = StringValuePtr(item);
+        arg4 = CSLAddString( arg4, pszItem );
+      }
+    }
+  }
+  if (argc > 3) {
+    {
+      res5 = SWIG_ConvertPtr(argv[3], &argp5, SWIGTYPE_p_GDALProgressFunc,  0 );
+      if (!SWIG_IsOK(res5)) {
+        SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "GDALProgressFunc","Erase", 5, argv[3] )); 
+      }  
+      if (!argp5) {
+        SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "GDALProgressFunc","Erase", 5, argv[3]));
+      } else {
+        arg5 = *(reinterpret_cast< GDALProgressFunc * >(argp5));
+      }
+    }
+  }
+  if (argc > 4) {
+    res6 = SWIG_ConvertPtr(argv[4],SWIG_as_voidptrptr(&arg6), 0, 0);
+    if (!SWIG_IsOK(res6)) {
+      SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "void *","Erase", 6, argv[4] )); 
     }
   }
   {
     CPLErrorReset();
-    result = (OGRErr)OGRLayerShadow_SetIgnoredFields(arg1,(char const **)arg2);
+    result = (OGRErr)OGRLayerShadow_Erase(arg1,arg2,arg3,arg4,arg5,arg6);
     CPLErr eclass = CPLGetLastErrorType();
     if ( eclass == CE_Failure || eclass == CE_Fatal ) {
       SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
@@ -6975,7 +7931,7 @@ _wrap_Layer_set_ignored_fields(int argc, VALUE *argv, VALUE self) {
   {
     /* %typemap(freearg) char **options */
     
-    CSLDestroy( arg2 );
+    CSLDestroy( arg4 );
   }
   {
     /* %typemap(ret) OGRErr */
@@ -6987,7 +7943,7 @@ fail:
   {
     /* %typemap(freearg) char **options */
     
-    CSLDestroy( arg2 );
+    CSLDestroy( arg4 );
   }
   return Qnil;
 }
@@ -7050,7 +8006,7 @@ fail:
 
 
 */
-swig_class SwigClassFeature;
+static swig_class SwigClassFeature;
 
 SWIGINTERN void delete_OGRFeatureShadow(OGRFeatureShadow *self){
     OGR_F_Destroy(self);
@@ -7092,7 +8048,7 @@ _wrap_new_Feature(int argc, VALUE *argv, VALUE self) {
   OGRFeatureDefnShadow *arg1 = (OGRFeatureDefnShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "feature_def", NULL 
   };
   OGRFeatureShadow *result = 0 ;
@@ -7561,7 +8517,7 @@ fail:
 
   call-seq:
     get_field_defn_ref(int id) -> FieldDefn
-    get_field_defn_ref(char name) -> FieldDefn
+    get_field_defn_ref(char const * name) -> FieldDefn
 
 An instance method.
 
@@ -7730,8 +8686,8 @@ fail:
   Document-method: Gdal::Ogr::Feature.get_field_as_string
 
   call-seq:
-    get_field_as_string(int id) -> char
-    get_field_as_string(char name) -> char
+    get_field_as_string(int id) -> char const *
+    get_field_as_string(char const * name) -> char const
 
 An instance method.
 
@@ -7901,7 +8857,7 @@ fail:
 
   call-seq:
     get_field_as_integer(int id) -> int
-    get_field_as_integer(char name) -> int
+    get_field_as_integer(char const * name) -> int
 
 An instance method.
 
@@ -8071,7 +9027,7 @@ fail:
 
   call-seq:
     get_field_as_double(int id) -> double
-    get_field_as_double(char name) -> double
+    get_field_as_double(char const * name) -> double
 
 An instance method.
 
@@ -8370,7 +9326,7 @@ fail:
   Document-method: Gdal::Ogr::Feature.get_field_as_integer_list
 
   call-seq:
-    get_field_as_integer_list(int id, int nLen, int pList)
+    get_field_as_integer_list(int id, int * nLen, int const ** pList)
 
 An instance method.
 
@@ -8444,7 +9400,7 @@ fail:
   Document-method: Gdal::Ogr::Feature.get_field_as_double_list
 
   call-seq:
-    get_field_as_double_list(int id, int nLen, double pList)
+    get_field_as_double_list(int id, int * nLen, double const ** pList)
 
 An instance method.
 
@@ -8518,7 +9474,7 @@ fail:
   Document-method: Gdal::Ogr::Feature.get_field_as_string_list
 
   call-seq:
-    get_field_as_string_list(int id, char pList)
+    get_field_as_string_list(int id, char *** pList)
 
 An instance method.
 
@@ -8585,7 +9541,7 @@ fail:
 
   call-seq:
     is_field_set(int id) -> bool
-    is_field_set(char name) -> bool
+    is_field_set(char const * name) -> bool
 
 An instance method.
 
@@ -8754,7 +9710,7 @@ fail:
   Document-method: Gdal::Ogr::Feature.get_field_index
 
   call-seq:
-    get_field_index(char name) -> int
+    get_field_index(char const * name) -> int
 
 An instance method.
 
@@ -8998,7 +9954,7 @@ fail:
 
   call-seq:
     unset_field(int id)
-    unset_field(char name)
+    unset_field(char const * name)
 
 An instance method.
 
@@ -9161,16 +10117,15 @@ fail:
   Document-method: Gdal::Ogr::Feature.set_field
 
   call-seq:
-    set_field(int id, char value)
-    set_field(char name, char value)
+    set_field(int id, char const * value)
+    set_field(char const * name, char const * value)
     set_field(int id, int value)
-    set_field(char name, int value)
+    set_field(char const * name, int value)
     set_field(int id, double value)
-    set_field(char name, double value)
-    set_field(int id, int year, int month, int day, int hour, int minute, 
-    int second, int tzflag)
-    set_field(char name, int year, int month, int day, int hour, 
-    int minute, int second, int tzflag)
+    set_field(char const * name, double value)
+    set_field(int id, int year, int month, int day, int hour, int minute, int second, int tzflag)
+    set_field(char const * name, int year, int month, int day, int hour, int minute, int second, 
+    int tzflag)
 
 An instance method.
 
@@ -10108,7 +11063,7 @@ fail:
   Document-method: Gdal::Ogr::Feature.set_field_double_list
 
   call-seq:
-    set_field_double_list(int id, int nList, double pList)
+    set_field_double_list(int id, int nList, double * pList)
 
 An instance method.
 
@@ -10182,7 +11137,7 @@ fail:
   Document-method: Gdal::Ogr::Feature.set_field_string_list
 
   call-seq:
-    set_field_string_list(int id, char pList)
+    set_field_string_list(int id, char ** pList)
 
 An instance method.
 
@@ -10280,7 +11235,7 @@ _wrap_Feature_set_from(int argc, VALUE *argv, VALUE self) {
   int res2 = 0 ;
   int val3 ;
   int ecode3 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","other","forgiving", NULL 
   };
   OGRErr result;
@@ -10470,7 +11425,7 @@ fail:
   Document-method: Gdal::Ogr::Feature.get_style_string
 
   call-seq:
-    get_style_string -> char
+    get_style_string -> char const *
 
 An instance method.
 
@@ -10523,7 +11478,7 @@ fail:
   Document-method: Gdal::Ogr::Feature.set_style_string
 
   call-seq:
-    set_style_string(char the_string)
+    set_style_string(char const * the_string)
 
 An instance method.
 
@@ -10585,7 +11540,7 @@ fail:
 
   call-seq:
     get_field_type(int id) -> OGRFieldType
-    get_field_type(char name) -> OGRFieldType
+    get_field_type(char const * name) -> OGRFieldType
 
 An instance method.
 
@@ -10812,7 +11767,7 @@ fail:
 
 
 */
-swig_class SwigClassFeatureDefn;
+static swig_class SwigClassFeatureDefn;
 
 SWIGINTERN void delete_OGRFeatureDefnShadow(OGRFeatureDefnShadow *self){
     /*OGR_FD_Destroy(self);*/
@@ -10845,7 +11800,7 @@ _wrap_FeatureDefn_allocate(VALUE self) {
   Document-method: Gdal::Ogr::FeatureDefn.new
 
   call-seq:
-    FeatureDefn.new(char name_null_ok=nil)
+    FeatureDefn.new(char const * name_null_ok=nil)
 
 Class constructor.
 
@@ -10856,7 +11811,7 @@ _wrap_new_FeatureDefn(int argc, VALUE *argv, VALUE self) {
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "name_null_ok", NULL 
   };
   OGRFeatureDefnShadow *result = 0 ;
@@ -10905,7 +11860,7 @@ fail:
   Document-method: Gdal::Ogr::FeatureDefn.get_name
 
   call-seq:
-    get_name -> char
+    get_name -> char const *
 
 An instance method.
 
@@ -11072,7 +12027,7 @@ fail:
   Document-method: Gdal::Ogr::FeatureDefn.get_field_index
 
   call-seq:
-    get_field_index(char name) -> int
+    get_field_index(char const * name) -> int
 
 An instance method.
 
@@ -11590,7 +12545,7 @@ fail:
 
 
 */
-swig_class SwigClassFieldDefn;
+static swig_class SwigClassFieldDefn;
 
 SWIGINTERN void delete_OGRFieldDefnShadow(OGRFieldDefnShadow *self){
     OGR_Fld_Destroy(self);
@@ -11622,7 +12577,7 @@ _wrap_FieldDefn_allocate(VALUE self) {
   Document-method: Gdal::Ogr::FieldDefn.new
 
   call-seq:
-    FieldDefn.new(char name_null_ok="unnamed", OGRFieldType field_type=OFTSTRING)
+    FieldDefn.new(char const * name_null_ok="unnamed", OGRFieldType field_type=OFTSTRING)
 
 Class constructor.
 
@@ -11634,7 +12589,7 @@ _wrap_new_FieldDefn(int argc, VALUE *argv, VALUE self) {
   int res1 ;
   char *buf1 = 0 ;
   int alloc1 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "name_null_ok","field_type", NULL 
   };
   OGRFieldDefnShadow *result = 0 ;
@@ -11689,7 +12644,7 @@ fail:
   Document-method: Gdal::Ogr::FieldDefn.get_name
 
   call-seq:
-    get_name -> char
+    get_name -> char const *
 
 An instance method.
 
@@ -11742,7 +12697,7 @@ fail:
   Document-method: Gdal::Ogr::FieldDefn.get_name_ref
 
   call-seq:
-    get_name_ref -> char
+    get_name_ref -> char const *
 
 An instance method.
 
@@ -11795,7 +12750,7 @@ fail:
   Document-method: Gdal::Ogr::FieldDefn.set_name
 
   call-seq:
-    set_name(char name)
+    set_name(char const * name)
 
 An instance method.
 
@@ -12299,7 +13254,7 @@ fail:
   Document-method: Gdal::Ogr::FieldDefn.get_type_name
 
   call-seq:
-    get_type_name -> char
+    get_type_name -> char const *
 
 An instance method.
 
@@ -12352,7 +13307,7 @@ fail:
   Document-method: Gdal::Ogr::FieldDefn.get_field_type_name
 
   call-seq:
-    get_field_type_name(OGRFieldType type) -> char
+    get_field_type_name(OGRFieldType type) -> char const *
 
 An instance method.
 
@@ -12537,7 +13492,7 @@ _wrap_create_geometry_from_wkb(int argc, VALUE *argv, VALUE self) {
   int alloc1 = 0 ;
   void *argp3 = 0 ;
   int res3 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "len","reference", NULL 
   };
   OGRGeometryShadow *result = 0 ;
@@ -12591,7 +13546,7 @@ fail:
   Document-method: Gdal::Ogr.create_geometry_from_wkt
 
   call-seq:
-    create_geometry_from_wkt(char val, SpatialReference reference=nil) -> Geometry
+    create_geometry_from_wkt(char ** val, SpatialReference reference=nil) -> Geometry
 
 A module function.
 
@@ -12603,7 +13558,7 @@ _wrap_create_geometry_from_wkt(int argc, VALUE *argv, VALUE self) {
   char *val1 = 0 ;
   void *argp2 = 0 ;
   int res2 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "val","reference", NULL 
   };
   OGRGeometryShadow *result = 0 ;
@@ -12657,7 +13612,7 @@ fail:
   Document-method: Gdal::Ogr.create_geometry_from_gml
 
   call-seq:
-    create_geometry_from_gml(char input_string) -> Geometry
+    create_geometry_from_gml(char const * input_string) -> Geometry
 
 A module function.
 
@@ -12713,7 +13668,7 @@ fail:
   Document-method: Gdal::Ogr.create_geometry_from_json
 
   call-seq:
-    create_geometry_from_json(char input_string) -> Geometry
+    create_geometry_from_json(char const * input_string) -> Geometry
 
 A module function.
 
@@ -12769,8 +13724,7 @@ fail:
   Document-method: Gdal::Ogr.build_polygon_from_edges
 
   call-seq:
-    build_polygon_from_edges(Geometry hLineCollection, int bBestEffort=0, int bAutoClose=0, 
-    double dfTolerance=0) -> Geometry
+    build_polygon_from_edges(Geometry hLineCollection, int bBestEffort=0, int bAutoClose=0, double dfTolerance=0) -> Geometry
 
 A module function.
 
@@ -12789,7 +13743,7 @@ _wrap_build_polygon_from_edges(int argc, VALUE *argv, VALUE self) {
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "hLineCollection","bBestEffort","bAutoClose","dfTolerance", NULL 
   };
   OGRGeometryShadow *result = 0 ;
@@ -12856,10 +13810,8 @@ fail:
   Document-method: Gdal::Ogr.approximate_arc_angles
 
   call-seq:
-    approximate_arc_angles(double dfCenterX, double dfCenterY, double dfZ, double dfPrimaryRadius, 
-    double dfSecondaryAxis, 
-    double dfRotation, double dfStartAngle, double dfEndAngle, 
-    double dfMaxAngleStepSizeDegrees) -> Geometry
+    approximate_arc_angles(double dfCenterX, double dfCenterY, double dfZ, double dfPrimaryRadius, double dfSecondaryAxis, 
+    double dfRotation, double dfStartAngle, double dfEndAngle, double dfMaxAngleStepSizeDegrees) -> Geometry
 
 A module function.
 
@@ -12893,7 +13845,7 @@ _wrap_approximate_arc_angles(int argc, VALUE *argv, VALUE self) {
   int ecode8 = 0 ;
   double val9 ;
   int ecode9 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "dfCenterX","dfCenterY","dfZ","dfPrimaryRadius","dfSecondaryAxis","dfRotation","dfStartAngle","dfEndAngle","dfMaxAngleStepSizeDegrees", NULL 
   };
   OGRGeometryShadow *result = 0 ;
@@ -13019,6 +13971,59 @@ _wrap_force_to_polygon(int argc, VALUE *argv, VALUE self) {
     
     
     
+  }
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OGRGeometryShadow, SWIG_POINTER_OWN |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+
+/*
+  Document-method: Gdal::Ogr.force_to_line_string
+
+  call-seq:
+    force_to_line_string(Geometry geom_in) -> Geometry
+
+A module function.
+
+*/
+SWIGINTERN VALUE
+_wrap_force_to_line_string(int argc, VALUE *argv, VALUE self) {
+  OGRGeometryShadow *arg1 = (OGRGeometryShadow *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  OGRGeometryShadow *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_OGRGeometryShadow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRGeometryShadow *","ForceToLineString", 1, argv[0] )); 
+  }
+  arg1 = reinterpret_cast< OGRGeometryShadow * >(argp1);
+  {
+    CPLErrorReset();
+    result = (OGRGeometryShadow *)ForceToLineString(arg1);
+    CPLErr eclass = CPLGetLastErrorType();
+    if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+      SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
   }
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OGRGeometryShadow, SWIG_POINTER_OWN |  0 );
   return vresult;
@@ -13194,7 +14199,7 @@ fail:
 
 
 */
-swig_class SwigClassGeometry;
+static swig_class SwigClassGeometry;
 
 SWIGINTERN void delete_OGRGeometryShadow(OGRGeometryShadow *self){
     OGR_G_DestroyGeometry( self );
@@ -13226,8 +14231,7 @@ _wrap_Geometry_allocate(VALUE self) {
   Document-method: Gdal::Ogr::Geometry.new
 
   call-seq:
-    Geometry.new(OGRwkbGeometryType type=WKBUNKNOWN, char wkt=0, int wkb=0, 
-    char gml=0)
+    Geometry.new(OGRwkbGeometryType type=WKBUNKNOWN, char * wkt=None, int wkb=0, char * gml=None)
 
 Class constructor.
 
@@ -13249,7 +14253,7 @@ _wrap_new_Geometry(int argc, VALUE *argv, VALUE self) {
   int res5 ;
   char *buf5 = 0 ;
   int alloc5 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "type","wkt","wkb","gml", NULL 
   };
   OGRGeometryShadow *result = 0 ;
@@ -13429,7 +14433,7 @@ _wrap_Geometry_export_to_wkb(int argc, VALUE *argv, VALUE self) {
   int res1 = 0 ;
   int nLen2 = 0 ;
   char *pBuf2 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","byte_order", NULL 
   };
   OGRErr result;
@@ -13512,7 +14516,7 @@ fail:
   Document-method: Gdal::Ogr::Geometry.export_to_gml
 
   call-seq:
-    export_to_gml -> char
+    export_to_gml -> char const *
 
 An instance method.
 
@@ -13565,7 +14569,7 @@ fail:
   Document-method: Gdal::Ogr::Geometry.export_to_kml
 
   call-seq:
-    export_to_kml(char altitude_mode=nil) -> char
+    export_to_kml(char const * altitude_mode=nil) -> char const *
 
 An instance method.
 
@@ -13631,7 +14635,7 @@ fail:
   Document-method: Gdal::Ogr::Geometry.export_to_json
 
   call-seq:
-    export_to_json -> char
+    export_to_json -> char const *
 
 An instance method.
 
@@ -13703,7 +14707,7 @@ _wrap_Geometry_add_point(int argc, VALUE *argv, VALUE self) {
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","x","y","z", NULL 
   };
   
@@ -14085,7 +15089,7 @@ fail:
   Document-method: Gdal::Ogr::Geometry.get_geometry_name
 
   call-seq:
-    get_geometry_name -> char
+    get_geometry_name -> char const *
 
 An instance method.
 
@@ -14363,7 +15367,7 @@ _wrap_Geometry_get_x(int argc, VALUE *argv, VALUE self) {
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","point", NULL 
   };
   double result;
@@ -14429,7 +15433,7 @@ _wrap_Geometry_get_y(int argc, VALUE *argv, VALUE self) {
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","point", NULL 
   };
   double result;
@@ -14495,7 +15499,7 @@ _wrap_Geometry_get_z(int argc, VALUE *argv, VALUE self) {
   int res1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","point", NULL 
   };
   double result;
@@ -14783,7 +15787,7 @@ _wrap_Geometry_set_point(int argc, VALUE *argv, VALUE self) {
   int ecode4 = 0 ;
   double val5 ;
   int ecode5 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","point","x","y","z", NULL 
   };
   
@@ -14867,7 +15871,7 @@ _wrap_Geometry_set_point_2d(int argc, VALUE *argv, VALUE self) {
   int ecode3 = 0 ;
   double val4 ;
   int ecode4 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","point","x","y", NULL 
   };
   
@@ -15283,7 +16287,7 @@ _wrap_Geometry_buffer(int argc, VALUE *argv, VALUE self) {
   int ecode2 = 0 ;
   int val3 ;
   int ecode3 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","distance","quadsecs", NULL 
   };
   OGRGeometryShadow *result = 0 ;
@@ -17313,6 +18317,59 @@ _wrap_Geometry_centroid(int argc, VALUE *argv, VALUE self) {
     
     
     
+  }
+  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OGRGeometryShadow, SWIG_POINTER_OWN |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
+
+/*
+  Document-method: Gdal::Ogr::Geometry.point_on_surface
+
+  call-seq:
+    point_on_surface -> Geometry
+
+An instance method.
+
+*/
+SWIGINTERN VALUE
+_wrap_Geometry_point_on_surface(int argc, VALUE *argv, VALUE self) {
+  OGRGeometryShadow *arg1 = (OGRGeometryShadow *) 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  OGRGeometryShadow *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRGeometryShadow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRGeometryShadow *","PointOnSurface", 1, self )); 
+  }
+  arg1 = reinterpret_cast< OGRGeometryShadow * >(argp1);
+  {
+    CPLErrorReset();
+    result = (OGRGeometryShadow *)OGRGeometryShadow_PointOnSurface(arg1);
+    CPLErr eclass = CPLGetLastErrorType();
+    if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+      SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
   }
   vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OGRGeometryShadow, SWIG_POINTER_OWN |  0 );
   return vresult;
@@ -17737,7 +18794,7 @@ fail:
   Document-method: Gdal::Ogr.GeometryTypeToName
 
   call-seq:
-    GeometryTypeToName(OGRwkbGeometryType eType) -> char
+    GeometryTypeToName(OGRwkbGeometryType eType) -> char const *
 
 A module function.
 
@@ -17787,7 +18844,7 @@ fail:
   Document-method: Gdal::Ogr.GetFieldTypeName
 
   call-seq:
-    GetFieldTypeName(OGRFieldType type) -> char
+    GetFieldTypeName(OGRFieldType type) -> char const *
 
 A module function.
 
@@ -17890,7 +18947,7 @@ fail:
   Document-method: Gdal::Ogr.open
 
   call-seq:
-    open(char utf8_path, int update=0) -> DataSource
+    open(char const * utf8_path, int update=0) -> DataSource
 
 A module function.
 
@@ -17904,7 +18961,7 @@ _wrap_open(int argc, VALUE *argv, VALUE self) {
   int alloc1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "utf8_path","update", NULL 
   };
   OGRDataSourceShadow *result = 0 ;
@@ -17959,7 +19016,7 @@ fail:
   Document-method: Gdal::Ogr.open_shared
 
   call-seq:
-    open_shared(char utf8_path, int update=0) -> DataSource
+    open_shared(char const * utf8_path, int update=0) -> DataSource
 
 A module function.
 
@@ -17973,7 +19030,7 @@ _wrap_open_shared(int argc, VALUE *argv, VALUE self) {
   int alloc1 = 0 ;
   int val2 ;
   int ecode2 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "utf8_path","update", NULL 
   };
   OGRDataSourceShadow *result = 0 ;
@@ -18028,7 +19085,7 @@ fail:
   Document-method: Gdal::Ogr.get_driver_by_name
 
   call-seq:
-    get_driver_by_name(char name) -> Driver
+    get_driver_by_name(char const * name) -> Driver
 
 A module function.
 
@@ -18142,7 +19199,7 @@ fail:
   Document-method: Gdal::Ogr.general_cmd_line_processor
 
   call-seq:
-    general_cmd_line_processor(char papszArgv, int nOptions=0) -> char
+    general_cmd_line_processor(char ** papszArgv, int nOptions=0) -> char **
 
 A module function.
 
@@ -18232,8 +19289,86 @@ fail:
 
 
 
+/*
+  Document-method: Gdal::Ogr.TermProgress_nocb
+
+  call-seq:
+    TermProgress_nocb(double dfProgress, char const * pszMessage=nil, void * pData=nil) -> int
+
+A module function.
+
+*/
+SWIGINTERN VALUE
+_wrap_TermProgress_nocb(int argc, VALUE *argv, VALUE self) {
+  double arg1 ;
+  char *arg2 = (char *) NULL ;
+  void *arg3 = (void *) NULL ;
+  double val1 ;
+  int ecode1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  int res3 ;
+  const char *kwnames[] = {
+    "dfProgress","pszMessage","pData", NULL 
+  };
+  int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 3)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  ecode1 = SWIG_AsVal_double(argv[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "double","GDALTermProgress_nocb", 1, argv[0] ));
+  } 
+  arg1 = static_cast< double >(val1);
+  if (argc > 1) {
+    res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
+    if (!SWIG_IsOK(res2)) {
+      SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","GDALTermProgress_nocb", 2, argv[1] ));
+    }
+    arg2 = reinterpret_cast< char * >(buf2);
+  }
+  if (argc > 2) {
+    res3 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg3), 0, 0);
+    if (!SWIG_IsOK(res3)) {
+      SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","GDALTermProgress_nocb", 3, argv[2] )); 
+    }
+  }
+  {
+    CPLErrorReset();
+    result = (int)GDALTermProgress_nocb(arg1,(char const *)arg2,arg3);
+    CPLErr eclass = CPLGetLastErrorType();
+    if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+      SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  }
+  vresult = SWIG_From_int(static_cast< int >(result));
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return vresult;
+fail:
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return Qnil;
+}
+
+
+
 /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
 
+static swig_type_info _swigt__p_GDALProgressFunc = {"_p_GDALProgressFunc", "GDALProgressFunc *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_GIntBig = {"_p_GIntBig", "GIntBig *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_OGRDataSourceShadow = {"_p_OGRDataSourceShadow", "OGRDataSourceShadow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_OGRDriverShadow = {"_p_OGRDriverShadow", "OGRDriverShadow *", 0, 0, (void*)0, 0};
@@ -18246,6 +19381,7 @@ static swig_type_info _swigt__p_OSRCoordinateTransformationShadow = {"_p_OSRCoor
 static swig_type_info _swigt__p_OSRSpatialReferenceShadow = {"_p_OSRSpatialReferenceShadow", "OSRSpatialReferenceShadow *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *|retStringAndCPLFree *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_double = {"_p_double", "double *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_f_double_p_q_const__char_p_void__int = {"_p_f_double_p_q_const__char_p_void__int", "int (*)(double,char const *,void *)", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_int = {"_p_int", "OGRFieldType *|int *|OGRwkbGeometryType *|OGRJustification *|OGRwkbByteOrder *|OGRErr *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_p_double = {"_p_p_double", "double **", 0, 0, (void*)0, 0};
@@ -18253,6 +19389,7 @@ static swig_type_info _swigt__p_p_int = {"_p_p_int", "int **", 0, 0, (void*)0, 0
 static swig_type_info _swigt__p_p_p_char = {"_p_p_p_char", "char ***", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
+  &_swigt__p_GDALProgressFunc,
   &_swigt__p_GIntBig,
   &_swigt__p_OGRDataSourceShadow,
   &_swigt__p_OGRDriverShadow,
@@ -18265,6 +19402,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_OSRSpatialReferenceShadow,
   &_swigt__p_char,
   &_swigt__p_double,
+  &_swigt__p_f_double_p_q_const__char_p_void__int,
   &_swigt__p_int,
   &_swigt__p_p_char,
   &_swigt__p_p_double,
@@ -18272,6 +19410,7 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_p_p_char,
 };
 
+static swig_cast_info _swigc__p_GDALProgressFunc[] = {  {&_swigt__p_GDALProgressFunc, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_GIntBig[] = {  {&_swigt__p_GIntBig, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_OGRDataSourceShadow[] = {  {&_swigt__p_OGRDataSourceShadow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_OGRDriverShadow[] = {  {&_swigt__p_OGRDriverShadow, 0, 0, 0},{0, 0, 0, 0}};
@@ -18284,6 +19423,7 @@ static swig_cast_info _swigc__p_OSRCoordinateTransformationShadow[] = {  {&_swig
 static swig_cast_info _swigc__p_OSRSpatialReferenceShadow[] = {  {&_swigt__p_OSRSpatialReferenceShadow, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_double[] = {  {&_swigt__p_double, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_f_double_p_q_const__char_p_void__int[] = {  {&_swigt__p_f_double_p_q_const__char_p_void__int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_int[] = {  {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_char[] = {  {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_p_double[] = {  {&_swigt__p_p_double, 0, 0, 0},{0, 0, 0, 0}};
@@ -18291,6 +19431,7 @@ static swig_cast_info _swigc__p_p_int[] = {  {&_swigt__p_p_int, 0, 0, 0},{0, 0,
 static swig_cast_info _swigc__p_p_p_char[] = {  {&_swigt__p_p_p_char, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {
+  _swigc__p_GDALProgressFunc,
   _swigc__p_GIntBig,
   _swigc__p_OGRDataSourceShadow,
   _swigc__p_OGRDriverShadow,
@@ -18303,6 +19444,7 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_OSRSpatialReferenceShadow,
   _swigc__p_char,
   _swigc__p_double,
+  _swigc__p_f_double_p_q_const__char_p_void__int,
   _swigc__p_int,
   _swigc__p_p_char,
   _swigc__p_p_double,
@@ -18315,18 +19457,18 @@ static swig_cast_info *swig_cast_initial[] = {
 
 /* -----------------------------------------------------------------------------
  * Type initialization:
- * This problem is tough by the requirement that no dynamic 
- * memory is used. Also, since swig_type_info structures store pointers to 
+ * This problem is tough by the requirement that no dynamic
+ * memory is used. Also, since swig_type_info structures store pointers to
  * swig_cast_info structures and swig_cast_info structures store pointers back
- * to swig_type_info structures, we need some lookup code at initialization. 
- * The idea is that swig generates all the structures that are needed. 
- * The runtime then collects these partially filled structures. 
- * The SWIG_InitializeModule function takes these initial arrays out of 
+ * to swig_type_info structures, we need some lookup code at initialization.
+ * The idea is that swig generates all the structures that are needed.
+ * The runtime then collects these partially filled structures.
+ * The SWIG_InitializeModule function takes these initial arrays out of
  * swig_module, and does all the lookup, filling in the swig_module.types
  * array with the correct data and linking the correct swig_cast_info
  * structures together.
  *
- * The generated swig_type_info structures are assigned staticly to an initial 
+ * The generated swig_type_info structures are assigned statically to an initial
  * array. We just loop through that array, and handle each type individually.
  * First we lookup if this type has been already loaded, and if so, use the
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -18336,17 +19478,17 @@ static swig_cast_info *swig_cast_initial[] = {
  * a column is one of the swig_cast_info structures for that type.
  * The cast_initial array is actually an array of arrays, because each row has
  * a variable number of columns. So to actually build the cast linked list,
- * we find the array of casts associated with the type, and loop through it 
+ * we find the array of casts associated with the type, and loop through it
  * adding the casts to the list. The one last trick we need to do is making
  * sure the type pointer in the swig_cast_info struct is correct.
  *
- * First off, we lookup the cast->type name to see if it is already loaded. 
+ * First off, we lookup the cast->type name to see if it is already loaded.
  * There are three cases to handle:
  *  1) If the cast->type has already been loaded AND the type we are adding
  *     casting info to has not been loaded (it is in this module), THEN we
  *     replace the cast->type pointer with the type pointer that has already
  *     been loaded.
- *  2) If BOTH types (the one we are adding casting info to, and the 
+ *  2) If BOTH types (the one we are adding casting info to, and the
  *     cast->type) are loaded, THEN the cast info has already been loaded by
  *     the previous module so we just ignore it.
  *  3) Finally, if cast->type has not already been loaded, then we add that
@@ -18370,9 +19512,7 @@ SWIGRUNTIME void
 SWIG_InitializeModule(void *clientdata) {
   size_t i;
   swig_module_info *module_head, *iter;
-  int found, init;
-
-  clientdata = clientdata;
+  int init;
 
   /* check to see if the circular list has been setup, if not, set it up */
   if (swig_module.next==0) {
@@ -18391,27 +19531,23 @@ SWIG_InitializeModule(void *clientdata) {
     /* This is the first module loaded for this interpreter */
     /* so set the swig module into the interpreter */
     SWIG_SetModule(clientdata, &swig_module);
-    module_head = &swig_module;
   } else {
     /* the interpreter has loaded a SWIG module, but has it loaded this one? */
-    found=0;
     iter=module_head;
     do {
       if (iter==&swig_module) {
-        found=1;
-        break;
+        /* Our module is already in the list, so there's nothing more to do. */
+        return;
       }
       iter=iter->next;
     } while (iter!= module_head);
 
-    /* if the is found in the list, then all is done and we may leave */
-    if (found) return;
-    /* otherwise we must add out module into the list */
+    /* otherwise we must add our module into the list */
     swig_module.next = module_head->next;
     module_head->next = &swig_module;
   }
 
-  /* When multiple interpeters are used, a module could have already been initialized in
+  /* When multiple interpreters are used, a module could have already been initialized in
      a different interpreter, but not yet have a pointer in this interpreter.
      In this case, we do not want to continue adding types... everything should be
      set up already */
@@ -18425,7 +19561,7 @@ SWIG_InitializeModule(void *clientdata) {
     swig_type_info *type = 0;
     swig_type_info *ret;
     swig_cast_info *cast;
-  
+
 #ifdef SWIGRUNTIME_DEBUG
     printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
 #endif
@@ -18452,7 +19588,7 @@ SWIG_InitializeModule(void *clientdata) {
     /* Insert casting types */
     cast = swig_module.cast_initial[i];
     while (cast->type) {
-    
+
       /* Don't need to add information already in the list */
       ret = 0;
 #ifdef SWIGRUNTIME_DEBUG
@@ -18714,6 +19850,13 @@ SWIGEXPORT void Init_ogr(void) {
   rb_define_method(SwigClassLayer.klass, "get_spatial_ref", VALUEFUNC(_wrap_Layer_get_spatial_ref), -1);
   rb_define_method(SwigClassLayer.klass, "get_features_read", VALUEFUNC(_wrap_Layer_get_features_read), -1);
   rb_define_method(SwigClassLayer.klass, "set_ignored_fields", VALUEFUNC(_wrap_Layer_set_ignored_fields), -1);
+  rb_define_method(SwigClassLayer.klass, "intersection", VALUEFUNC(_wrap_Layer_intersection), -1);
+  rb_define_method(SwigClassLayer.klass, "union", VALUEFUNC(_wrap_Layer_union), -1);
+  rb_define_method(SwigClassLayer.klass, "sym_difference", VALUEFUNC(_wrap_Layer_sym_difference), -1);
+  rb_define_method(SwigClassLayer.klass, "identity", VALUEFUNC(_wrap_Layer_identity), -1);
+  rb_define_method(SwigClassLayer.klass, "update", VALUEFUNC(_wrap_Layer_update), -1);
+  rb_define_method(SwigClassLayer.klass, "clip", VALUEFUNC(_wrap_Layer_clip), -1);
+  rb_define_method(SwigClassLayer.klass, "erase", VALUEFUNC(_wrap_Layer_erase), -1);
   rb_define_method(SwigClassLayer.klass, "each", VALUEFUNC(_wrap_Layer_each), -1);
   SwigClassLayer.mark = 0;
   SwigClassLayer.trackObjects = 0;
@@ -18806,6 +19949,7 @@ SWIGEXPORT void Init_ogr(void) {
   rb_define_module_function(mOgr, "build_polygon_from_edges", VALUEFUNC(_wrap_build_polygon_from_edges), -1);
   rb_define_module_function(mOgr, "approximate_arc_angles", VALUEFUNC(_wrap_approximate_arc_angles), -1);
   rb_define_module_function(mOgr, "force_to_polygon", VALUEFUNC(_wrap_force_to_polygon), -1);
+  rb_define_module_function(mOgr, "force_to_line_string", VALUEFUNC(_wrap_force_to_line_string), -1);
   rb_define_module_function(mOgr, "force_to_multi_polygon", VALUEFUNC(_wrap_force_to_multi_polygon), -1);
   rb_define_module_function(mOgr, "force_to_multi_point", VALUEFUNC(_wrap_force_to_multi_point), -1);
   rb_define_module_function(mOgr, "force_to_multi_line_string", VALUEFUNC(_wrap_force_to_multi_line_string), -1);
@@ -18877,6 +20021,7 @@ SWIGEXPORT void Init_ogr(void) {
   rb_define_method(SwigClassGeometry.klass, "get_envelope", VALUEFUNC(_wrap_Geometry_get_envelope), -1);
   rb_define_method(SwigClassGeometry.klass, "get_envelope_3d", VALUEFUNC(_wrap_Geometry_get_envelope_3d), -1);
   rb_define_method(SwigClassGeometry.klass, "centroid", VALUEFUNC(_wrap_Geometry_centroid), -1);
+  rb_define_method(SwigClassGeometry.klass, "point_on_surface", VALUEFUNC(_wrap_Geometry_point_on_surface), -1);
   rb_define_method(SwigClassGeometry.klass, "wkb_size", VALUEFUNC(_wrap_Geometry_wkb_size), -1);
   rb_define_method(SwigClassGeometry.klass, "get_coordinate_dimension", VALUEFUNC(_wrap_Geometry_get_coordinate_dimension), -1);
   rb_define_method(SwigClassGeometry.klass, "set_coordinate_dimension", VALUEFUNC(_wrap_Geometry_set_coordinate_dimension), -1);
@@ -18896,5 +20041,7 @@ SWIGEXPORT void Init_ogr(void) {
   rb_define_module_function(mOgr, "get_driver_by_name", VALUEFUNC(_wrap_get_driver_by_name), -1);
   rb_define_module_function(mOgr, "get_driver", VALUEFUNC(_wrap_get_driver), -1);
   rb_define_module_function(mOgr, "general_cmd_line_processor", VALUEFUNC(_wrap_general_cmd_line_processor), -1);
+  rb_define_module_function(mOgr, "TermProgress_nocb", VALUEFUNC(_wrap_TermProgress_nocb), -1);
+  rb_define_const(mOgr, "TermProgress", SWIG_NewFunctionPtrObj((void *)(int (*)(double,char const *,void *))(GDALTermProgress), SWIGTYPE_p_f_double_p_q_const__char_p_void__int));
 }