gdal 0.0.7 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adf6ca7ec898c0788ef32fb41c86e02411ece7be
-  data.tar.gz: a05c414f390743bc212188114d5fbd085c543049
+  metadata.gz: efd2479353115fa849e01a0b9c4429e12486dc69
+  data.tar.gz: f0dc55bec95189756a0178d5a0783c2653bb09ea
 SHA512:
-  metadata.gz: f7b02e7987450fe2db33006c06942d405394755e57c15a0c2ff028c5bd7ff90efc206d972b59a5112d6ca038c66afc3184e517a2d1d733081b34d816c3556be5
-  data.tar.gz: 14b50ccc8e7f15155d708f0fb78bae8ff66e12d7c6ecb534fbf1106da1558bde3b65da02cb6f5339ca29c9411ec150be0c3ee11b61a5236b540bea7aab3386b9
+  metadata.gz: 17038000eb84539bc04a01018861f7928971d2f58539f905b5abcc2c8d6a9d9666aa2a50983d6f4a7139df1de792a31279cc9114e2c68a54bc348946339c57e9
+  data.tar.gz: 6e70d3e50ba2a3a9b7a687004522d4bff78db58c840eb2bb2a315a81367e57546cfc03c0935b149119254f33689c4c143a19378f87b67f641eb6349ecec797cd

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+## v1.0.0
+* Regenerated bindings using GDAL 1.10.1 sources and SWIG 3.0.5
+* Patch for ruby 2.2.1 (Thanks @aleksejleonov and @johnjohndoe) (Issue #5)
+* Fix symbol conflicts when requiring both `gdal-ruby/gdal` and `gdal-ruby/ogr` with `get_driver_by_name` and other functions (Issue #2)
+* Since the symbol conflicts are now fixed, `gdal`, `ogr`, `osr` and `gdalconst` are now `require`'d be default (Issue #2)
+
+## v0.0.7
+* Fix for building on ruby versions where `$CXXFLAGS` isn't defined

data/ext/gdal-ruby/gdal/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/gdal/gdal.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);
@@ -1855,7 +1843,7 @@ static VALUE mGdal;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x020004 
+#define SWIGVERSION 0x030005 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -1872,6 +1860,7 @@ using namespace std;
 #include "cpl_port.h"
 #include "cpl_string.h"
 #include "cpl_multiproc.h"
+#include "cpl_http.h"
 
 #include "gdal.h"
 #include "gdal_priv.h"
@@ -1975,7 +1964,8 @@ typedef char retStringAndCPLFree;
     CPLDebug( msg_class, "%s", message );
   }
 
-  CPLErr PushErrorHandler( char const * pszCallbackName = NULL ) {
+  CPLErr SetErrorHandler( char const * pszCallbackName = NULL )
+  {
     CPLErrorHandler pfnHandler = NULL;
     if( pszCallbackName == NULL || EQUAL(pszCallbackName,"CPLQuietErrorHandler") )
       pfnHandler = CPLQuietErrorHandler;
@@ -1987,13 +1977,12 @@ typedef char retStringAndCPLFree;
     if ( pfnHandler == NULL )
       return CE_Fatal;
 
-    CPLPushErrorHandler( pfnHandler );
+    CPLSetErrorHandler( pfnHandler );
 
     return CE_None;
   }
 
 
-
 SWIGINTERN swig_type_info*
 SWIG_pchar_descriptor(void)
 {
@@ -2011,11 +2000,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) {
@@ -2048,6 +2033,24 @@ SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
 
 
 
+  CPLErr PushErrorHandler( char const * pszCallbackName = NULL ) {
+    CPLErrorHandler pfnHandler = NULL;
+    if( pszCallbackName == NULL || EQUAL(pszCallbackName,"CPLQuietErrorHandler") )
+      pfnHandler = CPLQuietErrorHandler;
+    else if( EQUAL(pszCallbackName,"CPLDefaultErrorHandler") )
+      pfnHandler = CPLDefaultErrorHandler;
+    else if( EQUAL(pszCallbackName,"CPLLoggingErrorHandler") )
+      pfnHandler = CPLLoggingErrorHandler;
+
+    if ( pfnHandler == NULL )
+      return CE_Fatal;
+
+    CPLPushErrorHandler( pfnHandler );
+
+    return CE_None;
+  }
+
+
   void Error( CPLErr msg_class = CE_Failure, int err_code = 0, const char* msg = "error" ) {
     CPLError( msg_class, err_code, "%s", msg );
   }
@@ -2070,7 +2073,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];
@@ -2115,11 +2118,6 @@ SWIG_AsVal_int (VALUE obj, int *val)
 }
 
 
-char* EscapeString(int len, char *bin_string , int scheme=CPLES_SQL) {
-    return CPLEscapeString(bin_string, len, scheme);
-} 
-
-
 SWIGINTERNINLINE VALUE 
 SWIG_FromCharPtrAndSize(const char* carray, size_t size)
 {
@@ -2144,6 +2142,11 @@ SWIG_FromCharPtr(const char *cptr)
 }
 
 
+char* EscapeString(int len, char *bin_string , int scheme=CPLES_SQL) {
+    return CPLEscapeString(bin_string, len, scheme);
+} 
+
+
   #define SWIG_From_long   LONG2NUM 
 
 
@@ -2258,13 +2261,13 @@ SWIG_From_short  (short value)
 }
 
 
-/*@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@*/
@@ -3464,6 +3467,14 @@ SWIGINTERN int GDALTransformerInfoShadow_TransformPoints(GDALTransformerInfoShad
 
     return nRet;
   }
+SWIGINTERN int GDALTransformerInfoShadow_TransformGeolocations(GDALTransformerInfoShadow *self,GDALRasterBandShadow *xBand,GDALRasterBandShadow *yBand,GDALRasterBandShadow *zBand,GDALProgressFunc callback=NULL,void *callback_data=NULL,char **options=NULL){
+
+    CPLErrorReset();
+
+    return GDALTransformGeolocations( xBand, yBand, zBand, 
+                                      GDALUseTransformer, self,
+                            	      callback, callback_data, options );
+  }
 
 int wrapper_GDALGetCacheMax()
 {
@@ -3544,7 +3555,7 @@ GDALDriverShadow *IdentifyDriver( const char *utf8_path,
   }
 
 SWIGINTERN VALUE
-_wrap_use_exceptions(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_use_exceptions(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
@@ -3556,7 +3567,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_dont_use_exceptions(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_dont_use_exceptions(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
@@ -3568,7 +3579,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_debug(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_debug(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
   int res1 ;
@@ -3622,7 +3633,58 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_push_error_handler__SWIG_0(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_set_error_handler(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) NULL ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  CPLErr result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 0) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  if (argc > 0) {
+    res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+    if (!SWIG_IsOK(res1)) {
+      SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","SetErrorHandler", 1, argv[0] ));
+    }
+    arg1 = reinterpret_cast< char * >(buf1);
+  }
+  {
+    CPLErrorReset();
+    result = (CPLErr)SetErrorHandler((char const *)arg1);
+    CPLErr eclass = CPLGetLastErrorType();
+    if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+      SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  }
+  {
+    /* %typemap(out) CPLErr */
+    vresult = (CPLErr)LONG2NUM(result);
+  }
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  return vresult;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_gdal_wrap_push_error_handler__SWIG_0(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) NULL ;
   int res1 ;
   char *buf1 = 0 ;
@@ -3673,7 +3735,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_error(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_error(int argc, VALUE *argv, VALUE self) {
   CPLErr arg1 = (CPLErr) CE_Failure ;
   int arg2 = (int) 0 ;
   char *arg3 = (char *) "error" ;
@@ -3735,7 +3797,167 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_push_error_handler__SWIG_1(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_goa_2get_authorization_url(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  retStringAndCPLFree *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_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","GOA2GetAuthorizationURL", 1, argv[0] ));
+  }
+  arg1 = reinterpret_cast< char * >(buf1);
+  {
+    CPLErrorReset();
+    result = (retStringAndCPLFree *)GOA2GetAuthorizationURL((char const *)arg1);
+    CPLErr eclass = CPLGetLastErrorType();
+    if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+      SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  }
+  vresult = SWIG_FromCharPtr((const char *)result);
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  return vresult;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_gdal_wrap_goa_2get_refresh_token(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  retStringAndCPLFree *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","GOA2GetRefreshToken", 1, argv[0] ));
+  }
+  arg1 = reinterpret_cast< char * >(buf1);
+  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","GOA2GetRefreshToken", 2, argv[1] ));
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  {
+    CPLErrorReset();
+    result = (retStringAndCPLFree *)GOA2GetRefreshToken((char const *)arg1,(char const *)arg2);
+    CPLErr eclass = CPLGetLastErrorType();
+    if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+      SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  }
+  vresult = SWIG_FromCharPtr((const char *)result);
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return vresult;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_gdal_wrap_goa_2get_access_token(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  char *arg2 = (char *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  int res2 ;
+  char *buf2 = 0 ;
+  int alloc2 = 0 ;
+  retStringAndCPLFree *result = 0 ;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 2) || (argc > 2)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
+  }
+  res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","GOA2GetAccessToken", 1, argv[0] ));
+  }
+  arg1 = reinterpret_cast< char * >(buf1);
+  res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","GOA2GetAccessToken", 2, argv[1] ));
+  }
+  arg2 = reinterpret_cast< char * >(buf2);
+  {
+    CPLErrorReset();
+    result = (retStringAndCPLFree *)GOA2GetAccessToken((char const *)arg1,(char const *)arg2);
+    CPLErr eclass = CPLGetLastErrorType();
+    if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+      SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  }
+  vresult = SWIG_FromCharPtr((const char *)result);
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return vresult;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_gdal_wrap_push_error_handler__SWIG_1(int argc, VALUE *argv, VALUE self) {
   CPLErrorHandler arg1 ;
   void *argp1 ;
   int res1 = 0 ;
@@ -3780,7 +4002,7 @@ fail:
 }
 
 
-SWIGINTERN VALUE _wrap_push_error_handler(int nargs, VALUE *args, VALUE self) {
+SWIGINTERN VALUE _gdal_wrap_push_error_handler(int nargs, VALUE *args, VALUE self) {
   int argc;
   VALUE argv[1];
   int ii;
@@ -3793,12 +4015,12 @@ SWIGINTERN VALUE _wrap_push_error_handler(int nargs, VALUE *args, VALUE self) {
   if ((argc >= 0) && (argc <= 1)) {
     int _v;
     if (argc <= 0) {
-      return _wrap_push_error_handler__SWIG_0(nargs, args, self);
+      return _gdal_wrap_push_error_handler__SWIG_0(nargs, args, self);
     }
     int res = SWIG_AsCharPtrAndSize(argv[0], 0, NULL, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_push_error_handler__SWIG_0(nargs, args, self);
+      return _gdal_wrap_push_error_handler__SWIG_0(nargs, args, self);
     }
   }
   if (argc == 1) {
@@ -3807,7 +4029,7 @@ SWIGINTERN VALUE _wrap_push_error_handler(int nargs, VALUE *args, VALUE self) {
     int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_CPLErrorHandler, 0);
     _v = SWIG_CheckState(res);
     if (_v) {
-      return _wrap_push_error_handler__SWIG_1(nargs, args, self);
+      return _gdal_wrap_push_error_handler__SWIG_1(nargs, args, self);
     }
   }
   
@@ -3821,7 +4043,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_pop_error_handler(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_pop_error_handler(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
@@ -3852,7 +4074,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_error_reset(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_error_reset(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
@@ -3883,7 +4105,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_escape_string(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_escape_string(int argc, VALUE *argv, VALUE self) {
   int arg1 ;
   char *arg2 = (char *) 0 ;
   int arg3 = (int) CPLES_SQL ;
@@ -3893,7 +4115,7 @@ _wrap_escape_string(int argc, VALUE *argv, VALUE self) {
   int alloc1 = 0 ;
   int val3 ;
   int ecode3 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "len","scheme", NULL 
   };
   char *result = 0 ;
@@ -3943,7 +4165,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_get_last_error_no(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_get_last_error_no(int argc, VALUE *argv, VALUE self) {
   int result;
   VALUE vresult = Qnil;
   
@@ -3978,7 +4200,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_get_last_error_type(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_get_last_error_type(int argc, VALUE *argv, VALUE self) {
   CPLErr result;
   VALUE vresult = Qnil;
   
@@ -4016,7 +4238,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_get_last_error_msg(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_get_last_error_msg(int argc, VALUE *argv, VALUE self) {
   char *result = 0 ;
   VALUE vresult = Qnil;
   
@@ -4051,7 +4273,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_push_finder_location(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_push_finder_location(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
   int res1 ;
   char *buf1 = 0 ;
@@ -4094,7 +4316,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_pop_finder_location(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_pop_finder_location(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
@@ -4125,7 +4347,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_finder_clean(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_finder_clean(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
@@ -4156,7 +4378,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_find_file(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_find_file(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
   int res1 ;
@@ -4213,7 +4435,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_read_dir(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_read_dir(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
   int res1 ;
   char *buf1 = 0 ;
@@ -4259,7 +4481,53 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_set_config_option(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_read_dir_recursive(int argc, VALUE *argv, VALUE self) {
+  char *arg1 = (char *) 0 ;
+  int res1 ;
+  char *buf1 = 0 ;
+  int alloc1 = 0 ;
+  char **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_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "char const *","VSIReadDirRecursive", 1, argv[0] ));
+  }
+  arg1 = reinterpret_cast< char * >(buf1);
+  {
+    CPLErrorReset();
+    result = (char **)VSIReadDirRecursive((char const *)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_p_char, 0 |  0 );
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  return vresult;
+fail:
+  if (alloc1 == SWIG_NEWOBJ) delete[] buf1;
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_gdal_wrap_set_config_option(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) 0 ;
   int res1 ;
@@ -4318,7 +4586,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_get_config_option(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_get_config_option(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
   char *arg2 = (char *) NULL ;
   int res1 ;
@@ -4382,7 +4650,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_binary_to_hex(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_binary_to_hex(int argc, VALUE *argv, VALUE self) {
   int arg1 ;
   GByte *arg2 = (GByte *) 0 ;
   int res1 ;
@@ -4441,7 +4709,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_hex_to_binary(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_hex_to_binary(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
   int *arg2 = (int *) 0 ;
   int res1 ;
@@ -4499,10 +4767,10 @@ fail:
 }
 
 
-swig_class SwigClassMajorObject;
+static swig_class SwigClassMajorObject;
 
 SWIGINTERN VALUE
-_wrap_MajorObject_get_description(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_MajorObject_get_description(int argc, VALUE *argv, VALUE self) {
   GDALMajorObjectShadow *arg1 = (GDALMajorObjectShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4545,7 +4813,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_MajorObject_set_description(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_MajorObject_set_description(int argc, VALUE *argv, VALUE self) {
   GDALMajorObjectShadow *arg1 = (GDALMajorObjectShadow *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
@@ -4601,7 +4869,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_MajorObject_get_metadata_dict(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_MajorObject_get_metadata_dict(int argc, VALUE *argv, VALUE self) {
   GDALMajorObjectShadow *arg1 = (GDALMajorObjectShadow *) 0 ;
   char *arg2 = (char *) "" ;
   void *argp1 = 0 ;
@@ -4683,7 +4951,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_MajorObject_get_metadata_list(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_MajorObject_get_metadata_list(int argc, VALUE *argv, VALUE self) {
   GDALMajorObjectShadow *arg1 = (GDALMajorObjectShadow *) 0 ;
   char *arg2 = (char *) "" ;
   void *argp1 = 0 ;
@@ -4754,7 +5022,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_MajorObject_set_metadata__SWIG_0(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_MajorObject_set_metadata__SWIG_0(int argc, VALUE *argv, VALUE self) {
   GDALMajorObjectShadow *arg1 = (GDALMajorObjectShadow *) 0 ;
   char **arg2 = (char **) 0 ;
   char *arg3 = (char *) "" ;
@@ -4872,7 +5140,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_MajorObject_set_metadata__SWIG_1(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_MajorObject_set_metadata__SWIG_1(int argc, VALUE *argv, VALUE self) {
   GDALMajorObjectShadow *arg1 = (GDALMajorObjectShadow *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) "" ;
@@ -4941,7 +5209,7 @@ fail:
 }
 
 
-SWIGINTERN VALUE _wrap_MajorObject_set_metadata(int nargs, VALUE *args, VALUE self) {
+SWIGINTERN VALUE _gdal_wrap_MajorObject_set_metadata(int nargs, VALUE *args, VALUE self) {
   int argc;
   VALUE argv[4];
   int ii;
@@ -4964,12 +5232,12 @@ SWIGINTERN VALUE _wrap_MajorObject_set_metadata(int nargs, VALUE *args, VALUE se
       }
       if (_v) {
         if (argc <= 2) {
-          return _wrap_MajorObject_set_metadata__SWIG_0(nargs, args, self);
+          return _gdal_wrap_MajorObject_set_metadata__SWIG_0(nargs, args, self);
         }
         int res = SWIG_AsCharPtrAndSize(argv[2], 0, NULL, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_MajorObject_set_metadata__SWIG_0(nargs, args, self);
+          return _gdal_wrap_MajorObject_set_metadata__SWIG_0(nargs, args, self);
         }
       }
     }
@@ -4984,12 +5252,12 @@ SWIGINTERN VALUE _wrap_MajorObject_set_metadata(int nargs, VALUE *args, VALUE se
       _v = SWIG_CheckState(res);
       if (_v) {
         if (argc <= 2) {
-          return _wrap_MajorObject_set_metadata__SWIG_1(nargs, args, self);
+          return _gdal_wrap_MajorObject_set_metadata__SWIG_1(nargs, args, self);
         }
         int res = SWIG_AsCharPtrAndSize(argv[2], 0, NULL, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_MajorObject_set_metadata__SWIG_1(nargs, args, self);
+          return _gdal_wrap_MajorObject_set_metadata__SWIG_1(nargs, args, self);
         }
       }
     }
@@ -5005,7 +5273,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_MajorObject_get_metadata_item(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_MajorObject_get_metadata_item(int argc, VALUE *argv, VALUE self) {
   GDALMajorObjectShadow *arg1 = (GDALMajorObjectShadow *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) "" ;
@@ -5077,7 +5345,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_MajorObject_set_metadata_item(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_MajorObject_set_metadata_item(int argc, VALUE *argv, VALUE self) {
   GDALMajorObjectShadow *arg1 = (GDALMajorObjectShadow *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
@@ -5162,10 +5430,10 @@ fail:
 }
 
 
-swig_class SwigClassDriver;
+static swig_class SwigClassDriver;
 
 SWIGINTERN VALUE
-_wrap_Driver_ShortName_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Driver_ShortName_get(int argc, VALUE *argv, VALUE self) {
   GDALDriverShadow *arg1 = (GDALDriverShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5208,7 +5476,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Driver_LongName_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Driver_LongName_get(int argc, VALUE *argv, VALUE self) {
   GDALDriverShadow *arg1 = (GDALDriverShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5251,7 +5519,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Driver_HelpTopic_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Driver_HelpTopic_get(int argc, VALUE *argv, VALUE self) {
   GDALDriverShadow *arg1 = (GDALDriverShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5294,7 +5562,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Driver_create(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Driver_create(int argc, VALUE *argv, VALUE self) {
   GDALDriverShadow *arg1 = (GDALDriverShadow *) 0 ;
   char *arg2 = (char *) 0 ;
   int arg3 ;
@@ -5313,7 +5581,7 @@ _wrap_Driver_create(int argc, VALUE *argv, VALUE self) {
   int ecode4 = 0 ;
   int val5 ;
   int ecode5 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","utf8_path","xsize","ysize","bands","eType","options", NULL 
   };
   GDALDatasetShadow *result = 0 ;
@@ -5410,7 +5678,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Driver_create_copy(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Driver_create_copy(int argc, VALUE *argv, VALUE self) {
   GDALDriverShadow *arg1 = (GDALDriverShadow *) 0 ;
   char *arg2 = (char *) 0 ;
   GDALDatasetShadow *arg3 = (GDALDatasetShadow *) 0 ;
@@ -5430,7 +5698,7 @@ _wrap_Driver_create_copy(int argc, VALUE *argv, VALUE self) {
   void *argp6 ;
   int res6 = 0 ;
   int res7 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","utf8_path","src","strict","options","callback","callback_data", NULL 
   };
   GDALDatasetShadow *result = 0 ;
@@ -5540,7 +5808,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Driver_delete(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Driver_delete(int argc, VALUE *argv, VALUE self) {
   GDALDriverShadow *arg1 = (GDALDriverShadow *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
@@ -5594,7 +5862,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Driver_rename(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Driver_rename(int argc, VALUE *argv, VALUE self) {
   GDALDriverShadow *arg1 = (GDALDriverShadow *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
@@ -5669,7 +5937,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Driver_copy_files(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Driver_copy_files(int argc, VALUE *argv, VALUE self) {
   GDALDriverShadow *arg1 = (GDALDriverShadow *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
@@ -5744,7 +6012,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Driver_register(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Driver_register(int argc, VALUE *argv, VALUE self) {
   GDALDriverShadow *arg1 = (GDALDriverShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5787,7 +6055,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Driver_deregister(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Driver_deregister(int argc, VALUE *argv, VALUE self) {
   GDALDriverShadow *arg1 = (GDALDriverShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5826,10 +6094,10 @@ fail:
 }
 
 
-swig_class SwigClassColorEntry;
+static swig_class SwigClassColorEntry;
 
 SWIGINTERN VALUE
-_wrap_ColorEntry_c1_set(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_ColorEntry_c1_set(int argc, VALUE *argv, VALUE self) {
   GDALColorEntry *arg1 = (GDALColorEntry *) 0 ;
   short arg2 ;
   void *argp1 = 0 ;
@@ -5858,7 +6126,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_ColorEntry_c1_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_ColorEntry_c1_get(int argc, VALUE *argv, VALUE self) {
   GDALColorEntry *arg1 = (GDALColorEntry *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5882,7 +6150,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_ColorEntry_c2_set(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_ColorEntry_c2_set(int argc, VALUE *argv, VALUE self) {
   GDALColorEntry *arg1 = (GDALColorEntry *) 0 ;
   short arg2 ;
   void *argp1 = 0 ;
@@ -5911,7 +6179,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_ColorEntry_c2_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_ColorEntry_c2_get(int argc, VALUE *argv, VALUE self) {
   GDALColorEntry *arg1 = (GDALColorEntry *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5935,7 +6203,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_ColorEntry_c3_set(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_ColorEntry_c3_set(int argc, VALUE *argv, VALUE self) {
   GDALColorEntry *arg1 = (GDALColorEntry *) 0 ;
   short arg2 ;
   void *argp1 = 0 ;
@@ -5964,7 +6232,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_ColorEntry_c3_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_ColorEntry_c3_get(int argc, VALUE *argv, VALUE self) {
   GDALColorEntry *arg1 = (GDALColorEntry *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -5988,7 +6256,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_ColorEntry_c4_set(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_ColorEntry_c4_set(int argc, VALUE *argv, VALUE self) {
   GDALColorEntry *arg1 = (GDALColorEntry *) 0 ;
   short arg2 ;
   void *argp1 = 0 ;
@@ -6017,7 +6285,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_ColorEntry_c4_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_ColorEntry_c4_get(int argc, VALUE *argv, VALUE self) {
   GDALColorEntry *arg1 = (GDALColorEntry *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6042,10 +6310,10 @@ fail:
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 SWIGINTERN VALUE
-_wrap_ColorEntry_allocate(VALUE self) {
+_gdal_wrap_ColorEntry_allocate(VALUE self) {
 #else
   SWIGINTERN VALUE
-  _wrap_ColorEntry_allocate(int argc, VALUE *argv, VALUE self) {
+  _gdal_wrap_ColorEntry_allocate(int argc, VALUE *argv, VALUE self) {
 #endif
     
     
@@ -6058,7 +6326,7 @@ _wrap_ColorEntry_allocate(VALUE self) {
   
 
 SWIGINTERN VALUE
-_wrap_new_ColorEntry(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_new_ColorEntry(int argc, VALUE *argv, VALUE self) {
   GDALColorEntry *result = 0 ;
   
   if ((argc < 0) || (argc > 0)) {
@@ -6096,10 +6364,10 @@ free_GDALColorEntry(GDALColorEntry *arg1) {
     delete arg1;
 }
 
-swig_class SwigClassGCP;
+static swig_class SwigClassGCP;
 
 SWIGINTERN VALUE
-_wrap_GCP_GCPX_set(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_GCP_GCPX_set(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -6147,7 +6415,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_GCP_GCPX_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_GCP_GCPX_get(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6190,7 +6458,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_GCP_GCPY_set(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_GCP_GCPY_set(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -6238,7 +6506,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_GCP_GCPY_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_GCP_GCPY_get(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6281,7 +6549,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_GCP_GCPZ_set(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_GCP_GCPZ_set(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -6329,7 +6597,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_GCP_GCPZ_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_GCP_GCPZ_get(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6372,7 +6640,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_GCP_GCPPixel_set(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_GCP_GCPPixel_set(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -6420,7 +6688,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_GCP_GCPPixel_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_GCP_GCPPixel_get(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6463,7 +6731,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_GCP_GCPLine_set(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_GCP_GCPLine_set(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -6511,7 +6779,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_GCP_GCPLine_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_GCP_GCPLine_get(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6554,7 +6822,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_GCP_Info_set(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_GCP_Info_set(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
@@ -6605,7 +6873,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_GCP_Info_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_GCP_Info_get(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6648,7 +6916,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_GCP_Id_set(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_GCP_Id_set(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
@@ -6699,7 +6967,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_GCP_Id_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_GCP_Id_get(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6743,10 +7011,10 @@ fail:
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 SWIGINTERN VALUE
-_wrap_GCP_allocate(VALUE self) {
+_gdal_wrap_GCP_allocate(VALUE self) {
 #else
   SWIGINTERN VALUE
-  _wrap_GCP_allocate(int argc, VALUE *argv, VALUE self) {
+  _gdal_wrap_GCP_allocate(int argc, VALUE *argv, VALUE self) {
 #endif
     
     
@@ -6759,7 +7027,7 @@ _wrap_GCP_allocate(VALUE self) {
   
 
 SWIGINTERN VALUE
-_wrap_new_GCP(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_new_GCP(int argc, VALUE *argv, VALUE self) {
   double arg1 = (double) 0.0 ;
   double arg2 = (double) 0.0 ;
   double arg3 = (double) 0.0 ;
@@ -6881,7 +7149,7 @@ free_GDAL_GCP(GDAL_GCP *arg1) {
 }
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_gcpx_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_gcpx_get(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -6929,7 +7197,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_gcpx_set(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_gcpx_set(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -6982,7 +7250,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_gcpy_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_gcpy_get(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7030,7 +7298,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_gcpy_set(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_gcpy_set(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -7083,7 +7351,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_gcpz_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_gcpz_get(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7131,7 +7399,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_gcpz_set(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_gcpz_set(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -7184,7 +7452,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_gcppixel_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_gcppixel_get(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7232,7 +7500,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_gcppixel_set(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_gcppixel_set(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -7285,7 +7553,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_gcpline_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_gcpline_get(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7333,7 +7601,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_gcpline_set(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_gcpline_set(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -7386,7 +7654,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_info_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_info_get(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7434,7 +7702,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_info_set(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_info_set(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
@@ -7490,7 +7758,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_id_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_id_get(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7538,7 +7806,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_id_set(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_id_set(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
@@ -7594,7 +7862,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_get_gcpx(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_get_gcpx(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7642,7 +7910,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_set_gcpx(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_set_gcpx(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -7695,7 +7963,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_get_gcpy(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_get_gcpy(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7743,7 +8011,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_set_gcpy(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_set_gcpy(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -7796,7 +8064,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_get_gcpz(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_get_gcpz(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7844,7 +8112,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_set_gcpz(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_set_gcpz(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -7897,7 +8165,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_get_gcppixel(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_get_gcppixel(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -7945,7 +8213,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_set_gcppixel(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_set_gcppixel(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -7998,7 +8266,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_get_gcpline(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_get_gcpline(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8046,7 +8314,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_set_gcpline(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_set_gcpline(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -8099,7 +8367,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_get_info(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_get_info(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8147,7 +8415,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_set_info(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_set_info(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
@@ -8203,7 +8471,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_get_id(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_get_id(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8251,7 +8519,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdal_gcp_set_id(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdal_gcp_set_id(int argc, VALUE *argv, VALUE self) {
   GDAL_GCP *arg1 = (GDAL_GCP *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
@@ -8307,7 +8575,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gcps_to_geo_transform(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gcps_to_geo_transform(int argc, VALUE *argv, VALUE self) {
   int arg1 ;
   GDAL_GCP *arg2 = (GDAL_GCP *) 0 ;
   double *arg3 ;
@@ -8414,7 +8682,7 @@ fail:
 }
 
 
-swig_class SwigClassAsyncReader;
+static swig_class SwigClassAsyncReader;
 
 SWIGINTERN void delete_GDALAsyncReaderShadow(GDALAsyncReaderShadow *self){
         DeleteAsyncReaderWrapper(self);
@@ -8425,7 +8693,7 @@ free_GDALAsyncReaderShadow(GDALAsyncReaderShadow *arg1) {
 }
 
 SWIGINTERN VALUE
-_wrap_AsyncReader_get_next_updated_region(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_AsyncReader_get_next_updated_region(int argc, VALUE *argv, VALUE self) {
   GDALAsyncReaderShadow *arg1 = (GDALAsyncReaderShadow *) 0 ;
   double arg2 ;
   int *arg3 = (int *) 0 ;
@@ -8516,7 +8784,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_AsyncReader_lock_buffer(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_AsyncReader_lock_buffer(int argc, VALUE *argv, VALUE self) {
   GDALAsyncReaderShadow *arg1 = (GDALAsyncReaderShadow *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -8567,7 +8835,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_AsyncReader_unlock_buffer(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_AsyncReader_unlock_buffer(int argc, VALUE *argv, VALUE self) {
   GDALAsyncReaderShadow *arg1 = (GDALAsyncReaderShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8606,10 +8874,10 @@ fail:
 }
 
 
-swig_class SwigClassDataset;
+static swig_class SwigClassDataset;
 
 SWIGINTERN VALUE
-_wrap_Dataset_RasterXSize_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Dataset_RasterXSize_get(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8652,7 +8920,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Dataset_RasterYSize_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Dataset_RasterYSize_get(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8695,7 +8963,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Dataset_RasterCount_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Dataset_RasterCount_get(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8748,7 +9016,7 @@ free_GDALDatasetShadow(GDALDatasetShadow *arg1) {
 }
 
 SWIGINTERN VALUE
-_wrap_Dataset_get_driver(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Dataset_get_driver(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8791,7 +9059,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Dataset_get_raster_band(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Dataset_get_raster_band(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
@@ -8842,7 +9110,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Dataset_get_projection(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Dataset_get_projection(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8885,7 +9153,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Dataset_get_projection_ref(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Dataset_get_projection_ref(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -8928,7 +9196,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Dataset_set_projection(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Dataset_set_projection(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
@@ -8990,7 +9258,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Dataset_get_geo_transform(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Dataset_get_geo_transform(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   double *arg2 ;
   void *argp1 = 0 ;
@@ -9050,7 +9318,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Dataset_set_geo_transform(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Dataset_set_geo_transform(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   double *arg2 ;
   void *argp1 = 0 ;
@@ -9121,7 +9389,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Dataset_build_overviews(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Dataset_build_overviews(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   char *arg2 = (char *) "NEAREST" ;
   int arg3 = (int) 0 ;
@@ -9136,7 +9404,7 @@ _wrap_Dataset_build_overviews(int argc, VALUE *argv, VALUE self) {
   void *argp5 ;
   int res5 = 0 ;
   int res6 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","resampling","overviewlist","callback","callback_data", NULL 
   };
   int result;
@@ -9239,7 +9507,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Dataset_get_gcpcount(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Dataset_get_gcpcount(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9282,7 +9550,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Dataset_get_gcpprojection(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Dataset_get_gcpprojection(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9325,7 +9593,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Dataset_get_gcps(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Dataset_get_gcps(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   int *arg2 = (int *) 0 ;
   GDAL_GCP **arg3 = (GDAL_GCP **) 0 ;
@@ -9393,7 +9661,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Dataset_set_gcps(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Dataset_set_gcps(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   int arg2 ;
   GDAL_GCP *arg3 = (GDAL_GCP *) 0 ;
@@ -9489,7 +9757,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Dataset_flush_cache(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Dataset_flush_cache(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9529,13 +9797,13 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Dataset_add_band(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Dataset_add_band(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   GDALDataType arg2 = (GDALDataType) GDT_Byte ;
   char **arg3 = (char **) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","datatype","options", NULL 
   };
   CPLErr result;
@@ -9611,7 +9879,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Dataset_create_mask_band(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Dataset_create_mask_band(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
@@ -9665,7 +9933,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Dataset_get_file_list(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Dataset_get_file_list(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -9708,7 +9976,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Dataset_write_raster(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Dataset_write_raster(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   int arg2 ;
   int arg3 ;
@@ -9750,7 +10018,7 @@ _wrap_Dataset_write_raster(int argc, VALUE *argv, VALUE self) {
   int res14 = 0 ;
   void *argp15 = 0 ;
   int res15 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","xoff","yoff","xsize","ysize","buf_len","buf_xsize","buf_ysize","buf_type","band_list","buf_pixel_space","buf_line_space","buf_band_space", NULL 
   };
   CPLErr result;
@@ -9896,7 +10164,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Dataset_read_raster(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Dataset_read_raster(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   int arg2 ;
   int arg3 ;
@@ -9936,7 +10204,7 @@ _wrap_Dataset_read_raster(int argc, VALUE *argv, VALUE self) {
   int res14 = 0 ;
   void *argp15 = 0 ;
   int res15 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","xoff","yoff","xsize","ysize","buf_xsize","buf_ysize","buf_type","band_list","buf_pixel_space","buf_line_space","buf_band_space", NULL 
   };
   CPLErr result;
@@ -10096,10 +10364,10 @@ fail:
 }
 
 
-swig_class SwigClassBand;
+static swig_class SwigClassBand;
 
 SWIGINTERN VALUE
-_wrap_Band_XSize_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_XSize_get(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -10142,7 +10410,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_YSize_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_YSize_get(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -10185,7 +10453,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_DataType_get(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_DataType_get(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -10228,7 +10496,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_band(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_band(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -10271,7 +10539,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_block_size(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_block_size(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   int *arg2 = (int *) 0 ;
   int *arg3 = (int *) 0 ;
@@ -10333,7 +10601,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_color_interpretation(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_color_interpretation(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -10376,7 +10644,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_raster_color_interpretation(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_raster_color_interpretation(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -10419,7 +10687,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_set_color_interpretation(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_set_color_interpretation(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   GDALColorInterp arg2 ;
   void *argp1 = 0 ;
@@ -10470,7 +10738,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_set_raster_color_interpretation(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_set_raster_color_interpretation(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   GDALColorInterp arg2 ;
   void *argp1 = 0 ;
@@ -10521,7 +10789,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_no_data_value(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_no_data_value(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   double *arg2 = (double *) 0 ;
   int *arg3 = (int *) 0 ;
@@ -10584,7 +10852,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_set_no_data_value(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_set_no_data_value(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -10638,7 +10906,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_unit_type(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_unit_type(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -10681,7 +10949,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_set_unit_type(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_set_unit_type(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   char *arg2 = (char *) 0 ;
   void *argp1 = 0 ;
@@ -10738,7 +11006,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_raster_category_names(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_raster_category_names(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -10796,7 +11064,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_set_raster_category_names(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_set_raster_category_names(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   char **arg2 = (char **) 0 ;
   void *argp1 = 0 ;
@@ -10866,7 +11134,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_minimum(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_minimum(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   double *arg2 = (double *) 0 ;
   int *arg3 = (int *) 0 ;
@@ -10929,7 +11197,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_maximum(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_maximum(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   double *arg2 = (double *) 0 ;
   int *arg3 = (int *) 0 ;
@@ -10992,7 +11260,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_offset(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_offset(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   double *arg2 = (double *) 0 ;
   int *arg3 = (int *) 0 ;
@@ -11055,7 +11323,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_scale(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_scale(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   double *arg2 = (double *) 0 ;
   int *arg3 = (int *) 0 ;
@@ -11118,7 +11386,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_set_offset(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_set_offset(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -11172,7 +11440,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_set_scale(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_set_scale(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -11226,7 +11494,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_statistics(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_statistics(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   int arg2 ;
   int arg3 ;
@@ -11328,7 +11596,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_compute_statistics(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_compute_statistics(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   bool arg2 ;
   double *arg3 = (double *) NULL ;
@@ -11443,7 +11711,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_set_statistics(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_set_statistics(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   double arg2 ;
   double arg3 ;
@@ -11518,7 +11786,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_overview_count(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_overview_count(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -11561,7 +11829,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_overview(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_overview(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
@@ -11612,7 +11880,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_checksum(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_checksum(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   int arg2 = (int) 0 ;
   int arg3 = (int) 0 ;
@@ -11628,7 +11896,7 @@ _wrap_Band_checksum(int argc, VALUE *argv, VALUE self) {
   int res4 = 0 ;
   void *argp5 = 0 ;
   int res5 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","xoff","yoff","xsize","ysize", NULL 
   };
   int result;
@@ -11698,7 +11966,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_compute_raster_min_max(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_compute_raster_min_max(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   double *arg2 ;
   int arg3 = (int) 0 ;
@@ -11768,7 +12036,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_compute_band_stats(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_compute_band_stats(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   double *arg2 ;
   int arg3 = (int) 1 ;
@@ -11838,7 +12106,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_fill(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_fill(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   double arg2 ;
   double arg3 = (double) 0.0 ;
@@ -11899,7 +12167,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_read_raster(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_read_raster(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   int arg2 ;
   int arg3 ;
@@ -11934,7 +12202,7 @@ _wrap_Band_read_raster(int argc, VALUE *argv, VALUE self) {
   int res11 = 0 ;
   void *argp12 = 0 ;
   int res12 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","xoff","yoff","xsize","ysize","buf_xsize","buf_ysize","buf_type","buf_pixel_space","buf_line_space", NULL 
   };
   CPLErr result;
@@ -12052,7 +12320,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_write_raster(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_write_raster(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   int arg2 ;
   int arg3 ;
@@ -12089,7 +12357,7 @@ _wrap_Band_write_raster(int argc, VALUE *argv, VALUE self) {
   int res11 = 0 ;
   void *argp12 = 0 ;
   int res12 = 0 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","xoff","yoff","xsize","ysize","buf_len","buf_xsize","buf_ysize","buf_type","buf_pixel_space","buf_line_space", NULL 
   };
   CPLErr result;
@@ -12192,7 +12460,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_flush_cache(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_flush_cache(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12232,7 +12500,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_raster_color_table(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_raster_color_table(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12275,7 +12543,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_color_table(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_color_table(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12318,7 +12586,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_set_raster_color_table(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_set_raster_color_table(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   GDALColorTableShadow *arg2 = (GDALColorTableShadow *) 0 ;
   void *argp1 = 0 ;
@@ -12369,7 +12637,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_set_color_table(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_set_color_table(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   GDALColorTableShadow *arg2 = (GDALColorTableShadow *) 0 ;
   void *argp1 = 0 ;
@@ -12420,7 +12688,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_default_rat(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_default_rat(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12463,7 +12731,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_set_default_rat(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_set_default_rat(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   GDALRasterAttributeTableShadow *arg2 = (GDALRasterAttributeTableShadow *) 0 ;
   void *argp1 = 0 ;
@@ -12514,7 +12782,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_mask_band(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_mask_band(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12557,7 +12825,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_mask_flags(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_mask_flags(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -12600,7 +12868,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_create_mask_band(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_create_mask_band(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
@@ -12651,7 +12919,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_histogram(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_histogram(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   double arg2 = (double) -0.5 ;
   double arg3 = (double) 255.5 ;
@@ -12678,7 +12946,7 @@ _wrap_Band_get_histogram(int argc, VALUE *argv, VALUE self) {
   void *argp8 ;
   int res8 = 0 ;
   int res9 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","min","max","buckets","panHistogram","include_out_of_range","approx_ok","callback","callback_data", NULL 
   };
   CPLErr result;
@@ -12781,7 +13049,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_default_histogram(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_default_histogram(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   double *arg2 = (double *) NULL ;
   double *arg3 = (double *) NULL ;
@@ -12805,7 +13073,7 @@ _wrap_Band_get_default_histogram(int argc, VALUE *argv, VALUE self) {
   void *argp7 ;
   int res7 = 0 ;
   int res8 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "self","min_ret","max_ret","buckets_ret","ppanHistogram","force","callback","callback_data", NULL 
   };
   CPLErr result;
@@ -12901,7 +13169,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_set_default_histogram(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_set_default_histogram(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   double arg2 ;
   double arg3 ;
@@ -12976,7 +13244,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_has_arbitrary_overviews(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_has_arbitrary_overviews(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -13019,7 +13287,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_get_category_names(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_get_category_names(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -13077,7 +13345,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Band_set_category_names(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Band_set_category_names(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   char **arg2 = (char **) 0 ;
   void *argp1 = 0 ;
@@ -13143,14 +13411,14 @@ fail:
 }
 
 
-swig_class SwigClassColorTable;
+static swig_class SwigClassColorTable;
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 SWIGINTERN VALUE
-_wrap_ColorTable_allocate(VALUE self) {
+_gdal_wrap_ColorTable_allocate(VALUE self) {
 #else
   SWIGINTERN VALUE
-  _wrap_ColorTable_allocate(int argc, VALUE *argv, VALUE self) {
+  _gdal_wrap_ColorTable_allocate(int argc, VALUE *argv, VALUE self) {
 #endif
     
     
@@ -13163,9 +13431,9 @@ _wrap_ColorTable_allocate(VALUE self) {
   
 
 SWIGINTERN VALUE
-_wrap_new_ColorTable(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_new_ColorTable(int argc, VALUE *argv, VALUE self) {
   GDALPaletteInterp arg1 = (GDALPaletteInterp) GPI_RGB ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "palette", NULL 
   };
   GDALColorTableShadow *result = 0 ;
@@ -13215,7 +13483,7 @@ free_GDALColorTableShadow(GDALColorTableShadow *arg1) {
 }
 
 SWIGINTERN VALUE
-_wrap_ColorTable_clone(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_ColorTable_clone(int argc, VALUE *argv, VALUE self) {
   GDALColorTableShadow *arg1 = (GDALColorTableShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -13258,7 +13526,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_ColorTable_get_palette_interpretation(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_ColorTable_get_palette_interpretation(int argc, VALUE *argv, VALUE self) {
   GDALColorTableShadow *arg1 = (GDALColorTableShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -13301,7 +13569,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_ColorTable_get_count(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_ColorTable_get_count(int argc, VALUE *argv, VALUE self) {
   GDALColorTableShadow *arg1 = (GDALColorTableShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -13344,7 +13612,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_ColorTable_get_color_entry(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_ColorTable_get_color_entry(int argc, VALUE *argv, VALUE self) {
   GDALColorTableShadow *arg1 = (GDALColorTableShadow *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
@@ -13395,7 +13663,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_ColorTable_get_color_entry_as_rgb(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_ColorTable_get_color_entry_as_rgb(int argc, VALUE *argv, VALUE self) {
   GDALColorTableShadow *arg1 = (GDALColorTableShadow *) 0 ;
   int arg2 ;
   GDALColorEntry *arg3 = (GDALColorEntry *) 0 ;
@@ -13454,7 +13722,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_ColorTable_set_color_entry(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_ColorTable_set_color_entry(int argc, VALUE *argv, VALUE self) {
   GDALColorTableShadow *arg1 = (GDALColorTableShadow *) 0 ;
   int arg2 ;
   GDALColorEntry *arg3 = (GDALColorEntry *) 0 ;
@@ -13510,7 +13778,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_ColorTable_create_color_ramp(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_ColorTable_create_color_ramp(int argc, VALUE *argv, VALUE self) {
   GDALColorTableShadow *arg1 = (GDALColorTableShadow *) 0 ;
   int arg2 ;
   GDALColorEntry *arg3 = (GDALColorEntry *) 0 ;
@@ -13581,14 +13849,14 @@ fail:
 }
 
 
-swig_class SwigClassRasterAttributeTable;
+static swig_class SwigClassRasterAttributeTable;
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 SWIGINTERN VALUE
-_wrap_RasterAttributeTable_allocate(VALUE self) {
+_gdal_wrap_RasterAttributeTable_allocate(VALUE self) {
 #else
   SWIGINTERN VALUE
-  _wrap_RasterAttributeTable_allocate(int argc, VALUE *argv, VALUE self) {
+  _gdal_wrap_RasterAttributeTable_allocate(int argc, VALUE *argv, VALUE self) {
 #endif
     
     
@@ -13601,7 +13869,7 @@ _wrap_RasterAttributeTable_allocate(VALUE self) {
   
 
 SWIGINTERN VALUE
-_wrap_new_RasterAttributeTable(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_new_RasterAttributeTable(int argc, VALUE *argv, VALUE self) {
   GDALRasterAttributeTableShadow *result = 0 ;
   
   if ((argc < 0) || (argc > 0)) {
@@ -13643,7 +13911,7 @@ free_GDALRasterAttributeTableShadow(GDALRasterAttributeTableShadow *arg1) {
 }
 
 SWIGINTERN VALUE
-_wrap_RasterAttributeTable_clone(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_RasterAttributeTable_clone(int argc, VALUE *argv, VALUE self) {
   GDALRasterAttributeTableShadow *arg1 = (GDALRasterAttributeTableShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -13686,7 +13954,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_RasterAttributeTable_get_column_count(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_RasterAttributeTable_get_column_count(int argc, VALUE *argv, VALUE self) {
   GDALRasterAttributeTableShadow *arg1 = (GDALRasterAttributeTableShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -13729,7 +13997,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_RasterAttributeTable_get_name_of_col(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_RasterAttributeTable_get_name_of_col(int argc, VALUE *argv, VALUE self) {
   GDALRasterAttributeTableShadow *arg1 = (GDALRasterAttributeTableShadow *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
@@ -13780,7 +14048,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_RasterAttributeTable_get_usage_of_col(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_RasterAttributeTable_get_usage_of_col(int argc, VALUE *argv, VALUE self) {
   GDALRasterAttributeTableShadow *arg1 = (GDALRasterAttributeTableShadow *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
@@ -13831,7 +14099,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_RasterAttributeTable_get_type_of_col(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_RasterAttributeTable_get_type_of_col(int argc, VALUE *argv, VALUE self) {
   GDALRasterAttributeTableShadow *arg1 = (GDALRasterAttributeTableShadow *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
@@ -13882,7 +14150,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_RasterAttributeTable_get_col_of_usage(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_RasterAttributeTable_get_col_of_usage(int argc, VALUE *argv, VALUE self) {
   GDALRasterAttributeTableShadow *arg1 = (GDALRasterAttributeTableShadow *) 0 ;
   GDALRATFieldUsage arg2 ;
   void *argp1 = 0 ;
@@ -13933,7 +14201,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_RasterAttributeTable_get_row_count(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_RasterAttributeTable_get_row_count(int argc, VALUE *argv, VALUE self) {
   GDALRasterAttributeTableShadow *arg1 = (GDALRasterAttributeTableShadow *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -13976,7 +14244,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_RasterAttributeTable_get_value_as_string(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_RasterAttributeTable_get_value_as_string(int argc, VALUE *argv, VALUE self) {
   GDALRasterAttributeTableShadow *arg1 = (GDALRasterAttributeTableShadow *) 0 ;
   int arg2 ;
   int arg3 ;
@@ -14035,7 +14303,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_RasterAttributeTable_get_value_as_int(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_RasterAttributeTable_get_value_as_int(int argc, VALUE *argv, VALUE self) {
   GDALRasterAttributeTableShadow *arg1 = (GDALRasterAttributeTableShadow *) 0 ;
   int arg2 ;
   int arg3 ;
@@ -14094,7 +14362,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_RasterAttributeTable_get_value_as_double(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_RasterAttributeTable_get_value_as_double(int argc, VALUE *argv, VALUE self) {
   GDALRasterAttributeTableShadow *arg1 = (GDALRasterAttributeTableShadow *) 0 ;
   int arg2 ;
   int arg3 ;
@@ -14153,7 +14421,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_RasterAttributeTable_set_value_as_string(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_RasterAttributeTable_set_value_as_string(int argc, VALUE *argv, VALUE self) {
   GDALRasterAttributeTableShadow *arg1 = (GDALRasterAttributeTableShadow *) 0 ;
   int arg2 ;
   int arg3 ;
@@ -14220,7 +14488,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_RasterAttributeTable_set_value_as_int(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_RasterAttributeTable_set_value_as_int(int argc, VALUE *argv, VALUE self) {
   GDALRasterAttributeTableShadow *arg1 = (GDALRasterAttributeTableShadow *) 0 ;
   int arg2 ;
   int arg3 ;
@@ -14284,7 +14552,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_RasterAttributeTable_set_value_as_double(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_RasterAttributeTable_set_value_as_double(int argc, VALUE *argv, VALUE self) {
   GDALRasterAttributeTableShadow *arg1 = (GDALRasterAttributeTableShadow *) 0 ;
   int arg2 ;
   int arg3 ;
@@ -14348,7 +14616,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_RasterAttributeTable_set_row_count(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_RasterAttributeTable_set_row_count(int argc, VALUE *argv, VALUE self) {
   GDALRasterAttributeTableShadow *arg1 = (GDALRasterAttributeTableShadow *) 0 ;
   int arg2 ;
   void *argp1 = 0 ;
@@ -14396,7 +14664,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_RasterAttributeTable_create_column(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_RasterAttributeTable_create_column(int argc, VALUE *argv, VALUE self) {
   GDALRasterAttributeTableShadow *arg1 = (GDALRasterAttributeTableShadow *) 0 ;
   char *arg2 = (char *) 0 ;
   GDALRATFieldType arg3 ;
@@ -14466,7 +14734,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_RasterAttributeTable_get_linear_binning(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_RasterAttributeTable_get_linear_binning(int argc, VALUE *argv, VALUE self) {
   GDALRasterAttributeTableShadow *arg1 = (GDALRasterAttributeTableShadow *) 0 ;
   double *arg2 = (double *) 0 ;
   double *arg3 = (double *) 0 ;
@@ -14529,7 +14797,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_RasterAttributeTable_set_linear_binning(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_RasterAttributeTable_set_linear_binning(int argc, VALUE *argv, VALUE self) {
   GDALRasterAttributeTableShadow *arg1 = (GDALRasterAttributeTableShadow *) 0 ;
   double arg2 ;
   double arg3 ;
@@ -14588,7 +14856,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_RasterAttributeTable_get_row_of_value(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_RasterAttributeTable_get_row_of_value(int argc, VALUE *argv, VALUE self) {
   GDALRasterAttributeTableShadow *arg1 = (GDALRasterAttributeTableShadow *) 0 ;
   double arg2 ;
   void *argp1 = 0 ;
@@ -14639,7 +14907,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_TermProgress_nocb(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_TermProgress_nocb(int argc, VALUE *argv, VALUE self) {
   double arg1 ;
   char *arg2 = (char *) NULL ;
   void *arg3 = (void *) NULL ;
@@ -14649,7 +14917,7 @@ _wrap_TermProgress_nocb(int argc, VALUE *argv, VALUE self) {
   char *buf2 = 0 ;
   int alloc2 = 0 ;
   int res3 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "dfProgress","pszMessage","pData", NULL 
   };
   int result;
@@ -14706,7 +14974,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_compute_median_cut_pct(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_compute_median_cut_pct(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   GDALRasterBandShadow *arg2 = (GDALRasterBandShadow *) 0 ;
   GDALRasterBandShadow *arg3 = (GDALRasterBandShadow *) 0 ;
@@ -14727,7 +14995,7 @@ _wrap_compute_median_cut_pct(int argc, VALUE *argv, VALUE self) {
   void *argp6 ;
   int res6 = 0 ;
   int res7 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "red","green","blue","num_colors","colors","callback","callback_data", NULL 
   };
   int result;
@@ -14828,7 +15096,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_dither_rgb_2pct(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_dither_rgb_2pct(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   GDALRasterBandShadow *arg2 = (GDALRasterBandShadow *) 0 ;
   GDALRasterBandShadow *arg3 = (GDALRasterBandShadow *) 0 ;
@@ -14849,7 +15117,7 @@ _wrap_dither_rgb_2pct(int argc, VALUE *argv, VALUE self) {
   void *argp6 ;
   int res6 = 0 ;
   int res7 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "red","green","blue","target","colors","callback","callback_data", NULL 
   };
   int result;
@@ -14955,7 +15223,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_reproject_image(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_reproject_image(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   GDALDatasetShadow *arg2 = (GDALDatasetShadow *) 0 ;
   char *arg3 = (char *) NULL ;
@@ -15093,7 +15361,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_compute_proximity(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_compute_proximity(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   GDALRasterBandShadow *arg2 = (GDALRasterBandShadow *) 0 ;
   char **arg3 = (char **) NULL ;
@@ -15106,7 +15374,7 @@ _wrap_compute_proximity(int argc, VALUE *argv, VALUE self) {
   void *argp4 ;
   int res4 = 0 ;
   int res5 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "srcBand","proximityBand","options","callback","callback_data", NULL 
   };
   int result;
@@ -15207,7 +15475,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_rasterize_layer(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_rasterize_layer(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   int arg2 ;
   int *arg3 = (int *) 0 ;
@@ -15232,7 +15500,7 @@ _wrap_rasterize_layer(int argc, VALUE *argv, VALUE self) {
   void *argp10 ;
   int res10 = 0 ;
   int res11 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "dataset","bands","layer","pfnTransformer","pTransformArg","burn_values","burn_values_list","options","callback","callback_data", NULL 
   };
   int result;
@@ -15390,7 +15658,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_polygonize(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_polygonize(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   GDALRasterBandShadow *arg2 = (GDALRasterBandShadow *) 0 ;
   OGRLayerShadow *arg3 = (OGRLayerShadow *) 0 ;
@@ -15409,7 +15677,7 @@ _wrap_polygonize(int argc, VALUE *argv, VALUE self) {
   void *argp6 ;
   int res6 = 0 ;
   int res7 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "srcBand","maskBand","outLayer","iPixValField","options","callback","callback_data", NULL 
   };
   int result;
@@ -15520,7 +15788,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_fill_nodata(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_fill_nodata(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   GDALRasterBandShadow *arg2 = (GDALRasterBandShadow *) 0 ;
   double arg3 ;
@@ -15539,7 +15807,7 @@ _wrap_fill_nodata(int argc, VALUE *argv, VALUE self) {
   void *argp6 ;
   int res6 = 0 ;
   int res7 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "targetBand","maskBand","maxSearchDist","smoothingIterations","options","callback","callback_data", NULL 
   };
   int result;
@@ -15645,7 +15913,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_sieve_filter(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_sieve_filter(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   GDALRasterBandShadow *arg2 = (GDALRasterBandShadow *) 0 ;
   GDALRasterBandShadow *arg3 = (GDALRasterBandShadow *) 0 ;
@@ -15667,7 +15935,7 @@ _wrap_sieve_filter(int argc, VALUE *argv, VALUE self) {
   void *argp7 ;
   int res7 = 0 ;
   int res8 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "srcBand","maskBand","dstBand","threshold","connectedness","options","callback","callback_data", NULL 
   };
   int result;
@@ -15785,7 +16053,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_regenerate_overviews(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_regenerate_overviews(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   int arg2 ;
   GDALRasterBandShadow **arg3 = (GDALRasterBandShadow **) 0 ;
@@ -15804,7 +16072,7 @@ _wrap_regenerate_overviews(int argc, VALUE *argv, VALUE self) {
   void *argp5 ;
   int res5 = 0 ;
   int res6 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "srcBand","overviewBandCount","overviewBands","resampling","callback","callback_data", NULL 
   };
   int result;
@@ -15889,7 +16157,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_regenerate_overview(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_regenerate_overview(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   GDALRasterBandShadow *arg2 = (GDALRasterBandShadow *) 0 ;
   char *arg3 = (char *) "average" ;
@@ -15905,7 +16173,7 @@ _wrap_regenerate_overview(int argc, VALUE *argv, VALUE self) {
   void *argp4 ;
   int res4 = 0 ;
   int res5 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "srcBand","overviewBand","resampling","callback","callback_data", NULL 
   };
   int result;
@@ -15990,7 +16258,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_contour_generate(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_contour_generate(int argc, VALUE *argv, VALUE self) {
   GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
   double arg2 ;
   double arg3 ;
@@ -16026,7 +16294,7 @@ _wrap_contour_generate(int argc, VALUE *argv, VALUE self) {
   void *argp11 ;
   int res11 = 0 ;
   int res12 ;
-  char *kwnames[] = {
+  const char *kwnames[] = {
     "srcBand","contourInterval","contourBase","fixedLevelCount","fixedLevels","useNoData","noDataValue","dstLayer","idField","elevField","callback","callback_data", NULL 
   };
   int result;
@@ -16142,7 +16410,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_auto_create_warped_vrt(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_auto_create_warped_vrt(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   char *arg2 = (char *) 0 ;
   char *arg3 = (char *) 0 ;
@@ -16232,14 +16500,14 @@ fail:
 }
 
 
-swig_class SwigClassTransformer;
+static swig_class SwigClassTransformer;
 
 #ifdef HAVE_RB_DEFINE_ALLOC_FUNC
 SWIGINTERN VALUE
-_wrap_Transformer_allocate(VALUE self) {
+_gdal_wrap_Transformer_allocate(VALUE self) {
 #else
   SWIGINTERN VALUE
-  _wrap_Transformer_allocate(int argc, VALUE *argv, VALUE self) {
+  _gdal_wrap_Transformer_allocate(int argc, VALUE *argv, VALUE self) {
 #endif
     
     
@@ -16252,7 +16520,7 @@ _wrap_Transformer_allocate(VALUE self) {
   
 
 SWIGINTERN VALUE
-_wrap_new_Transformer(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_new_Transformer(int argc, VALUE *argv, VALUE self) {
   GDALDatasetShadow *arg1 = (GDALDatasetShadow *) 0 ;
   GDALDatasetShadow *arg2 = (GDALDatasetShadow *) 0 ;
   char **arg3 = (char **) 0 ;
@@ -16334,7 +16602,7 @@ free_GDALTransformerInfoShadow(GDALTransformerInfoShadow *arg1) {
 }
 
 SWIGINTERN VALUE
-_wrap_Transformer_transform_point__SWIG_0(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Transformer_transform_point__SWIG_0(int argc, VALUE *argv, VALUE self) {
   GDALTransformerInfoShadow *arg1 = (GDALTransformerInfoShadow *) 0 ;
   int arg2 ;
   double *arg3 ;
@@ -16423,7 +16691,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Transformer_transform_point__SWIG_1(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Transformer_transform_point__SWIG_1(int argc, VALUE *argv, VALUE self) {
   GDALTransformerInfoShadow *arg1 = (GDALTransformerInfoShadow *) 0 ;
   double *arg2 ;
   int arg3 ;
@@ -16518,7 +16786,7 @@ fail:
 }
 
 
-SWIGINTERN VALUE _wrap_Transformer_transform_point(int nargs, VALUE *args, VALUE self) {
+SWIGINTERN VALUE _gdal_wrap_Transformer_transform_point(int nargs, VALUE *args, VALUE self) {
   int argc;
   VALUE argv[6];
   int ii;
@@ -16544,7 +16812,7 @@ SWIGINTERN VALUE _wrap_Transformer_transform_point(int nargs, VALUE *args, VALUE
         int res = SWIG_ConvertPtr(argv[2], &vptr, SWIGTYPE_p_double, 0);
         _v = SWIG_CheckState(res);
         if (_v) {
-          return _wrap_Transformer_transform_point__SWIG_0(nargs, args, self);
+          return _gdal_wrap_Transformer_transform_point__SWIG_0(nargs, args, self);
         }
       }
     }
@@ -16571,14 +16839,14 @@ SWIGINTERN VALUE _wrap_Transformer_transform_point(int nargs, VALUE *args, VALUE
           }
           if (_v) {
             if (argc <= 4) {
-              return _wrap_Transformer_transform_point__SWIG_1(nargs, args, self);
+              return _gdal_wrap_Transformer_transform_point__SWIG_1(nargs, args, self);
             }
             {
               int res = SWIG_AsVal_double(argv[4], NULL);
               _v = SWIG_CheckState(res);
             }
             if (_v) {
-              return _wrap_Transformer_transform_point__SWIG_1(nargs, args, self);
+              return _gdal_wrap_Transformer_transform_point__SWIG_1(nargs, args, self);
             }
           }
         }
@@ -16596,7 +16864,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Transformer_transform_points(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Transformer_transform_points(int argc, VALUE *argv, VALUE self) {
   GDALTransformerInfoShadow *arg1 = (GDALTransformerInfoShadow *) 0 ;
   int arg2 ;
   int arg3 ;
@@ -16687,7 +16955,142 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdalapply_geo_transform(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_Transformer_transform_geolocations(int argc, VALUE *argv, VALUE self) {
+  GDALTransformerInfoShadow *arg1 = (GDALTransformerInfoShadow *) 0 ;
+  GDALRasterBandShadow *arg2 = (GDALRasterBandShadow *) 0 ;
+  GDALRasterBandShadow *arg3 = (GDALRasterBandShadow *) 0 ;
+  GDALRasterBandShadow *arg4 = (GDALRasterBandShadow *) 0 ;
+  GDALProgressFunc arg5 = (GDALProgressFunc) NULL ;
+  void *arg6 = (void *) NULL ;
+  char **arg7 = (char **) NULL ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  void *argp2 = 0 ;
+  int res2 = 0 ;
+  void *argp3 = 0 ;
+  int res3 = 0 ;
+  void *argp4 = 0 ;
+  int res4 = 0 ;
+  void *argp5 ;
+  int res5 = 0 ;
+  int res6 ;
+  const char *kwnames[] = {
+    "self","xBand","yBand","zBand","callback","callback_data","options", NULL 
+  };
+  int result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 3) || (argc > 6)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_GDALTransformerInfoShadow, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "GDALTransformerInfoShadow *","TransformGeolocations", 1, self )); 
+  }
+  arg1 = reinterpret_cast< GDALTransformerInfoShadow * >(argp1);
+  res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_GDALRasterBandShadow, 0 |  0 );
+  if (!SWIG_IsOK(res2)) {
+    SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "GDALRasterBandShadow *","TransformGeolocations", 2, argv[0] )); 
+  }
+  arg2 = reinterpret_cast< GDALRasterBandShadow * >(argp2);
+  res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_GDALRasterBandShadow, 0 |  0 );
+  if (!SWIG_IsOK(res3)) {
+    SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "GDALRasterBandShadow *","TransformGeolocations", 3, argv[1] )); 
+  }
+  arg3 = reinterpret_cast< GDALRasterBandShadow * >(argp3);
+  res4 = SWIG_ConvertPtr(argv[2], &argp4,SWIGTYPE_p_GDALRasterBandShadow, 0 |  0 );
+  if (!SWIG_IsOK(res4)) {
+    SWIG_exception_fail(SWIG_ArgError(res4), Ruby_Format_TypeError( "", "GDALRasterBandShadow *","TransformGeolocations", 4, argv[2] )); 
+  }
+  arg4 = reinterpret_cast< GDALRasterBandShadow * >(argp4);
+  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","TransformGeolocations", 5, argv[3] )); 
+      }  
+      if (!argp5) {
+        SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "GDALProgressFunc","TransformGeolocations", 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 *","TransformGeolocations", 6, argv[4] )); 
+    }
+  }
+  if (argc > 5) {
+    {
+      /* %typemap(in) char **options */
+      
+      /* Check if is a list */
+      Check_Type(argv[5], T_ARRAY);
+      
+      int size = RARRAY_LEN(argv[5]);
+      for (int i = 0; i < size; i++) {
+        VALUE item = rb_ary_entry(argv[5], i);
+        char *pszItem = StringValuePtr(item);
+        arg7 = CSLAddString( arg7, pszItem );
+      }
+    }
+  }
+  {
+    if (!arg2) {
+      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+    }
+  }
+  {
+    if (!arg3) {
+      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+    }
+  }
+  {
+    if (!arg4) {
+      SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
+    }
+  }
+  {
+    CPLErrorReset();
+    result = (int)GDALTransformerInfoShadow_TransformGeolocations(arg1,arg2,arg3,arg4,arg5,arg6,arg7);
+    CPLErr eclass = CPLGetLastErrorType();
+    if ( eclass == CE_Failure || eclass == CE_Fatal ) {
+      SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
+      
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  }
+  vresult = SWIG_From_int(static_cast< int >(result));
+  {
+    /* %typemap(freearg) char **options */
+    
+    CSLDestroy( arg7 );
+  }
+  return vresult;
+fail:
+  {
+    /* %typemap(freearg) char **options */
+    
+    CSLDestroy( arg7 );
+  }
+  return Qnil;
+}
+
+
+SWIGINTERN VALUE
+_gdal_wrap_gdalapply_geo_transform(int argc, VALUE *argv, VALUE self) {
   double *arg1 ;
   double arg2 ;
   double arg3 ;
@@ -16782,7 +17185,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdalinv_geo_transform(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdalinv_geo_transform(int argc, VALUE *argv, VALUE self) {
   double *arg1 ;
   double *arg2 ;
   double temp1[6] ;
@@ -16861,7 +17264,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdalversion_info(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdalversion_info(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) "VERSION_NUM" ;
   int res1 ;
   char *buf1 = 0 ;
@@ -16909,7 +17312,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_all_register(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_all_register(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
@@ -16940,7 +17343,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gdaldestroy_driver_manager(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_gdaldestroy_driver_manager(int argc, VALUE *argv, VALUE self) {
   if ((argc < 0) || (argc > 0)) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
   }
@@ -16971,7 +17374,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_get_cache_max(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_get_cache_max(int argc, VALUE *argv, VALUE self) {
   int result;
   VALUE vresult = Qnil;
   
@@ -17006,7 +17409,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_get_cache_used(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_get_cache_used(int argc, VALUE *argv, VALUE self) {
   int result;
   VALUE vresult = Qnil;
   
@@ -17041,7 +17444,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_set_cache_max(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_set_cache_max(int argc, VALUE *argv, VALUE self) {
   int arg1 ;
   int val1 ;
   int ecode1 = 0 ;
@@ -17081,7 +17484,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_get_data_type_size(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_get_data_type_size(int argc, VALUE *argv, VALUE self) {
   GDALDataType arg1 ;
   int result;
   VALUE vresult = Qnil;
@@ -17121,7 +17524,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_data_type_is_complex(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_data_type_is_complex(int argc, VALUE *argv, VALUE self) {
   GDALDataType arg1 ;
   int result;
   VALUE vresult = Qnil;
@@ -17161,7 +17564,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_get_data_type_name(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_get_data_type_name(int argc, VALUE *argv, VALUE self) {
   GDALDataType arg1 ;
   char *result = 0 ;
   VALUE vresult = Qnil;
@@ -17201,7 +17604,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_get_data_type_by_name(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_get_data_type_by_name(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
   int res1 ;
   char *buf1 = 0 ;
@@ -17247,7 +17650,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_get_color_interpretation_name(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_get_color_interpretation_name(int argc, VALUE *argv, VALUE self) {
   GDALColorInterp arg1 ;
   char *result = 0 ;
   VALUE vresult = Qnil;
@@ -17287,7 +17690,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_get_palette_interpretation_name(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_get_palette_interpretation_name(int argc, VALUE *argv, VALUE self) {
   GDALPaletteInterp arg1 ;
   char *result = 0 ;
   VALUE vresult = Qnil;
@@ -17327,7 +17730,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_dec_to_dms(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_dec_to_dms(int argc, VALUE *argv, VALUE self) {
   double arg1 ;
   char *arg2 = (char *) 0 ;
   int arg3 = (int) 2 ;
@@ -17391,7 +17794,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_packed_dms_to_dec(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_packed_dms_to_dec(int argc, VALUE *argv, VALUE self) {
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
@@ -17434,7 +17837,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_dec_to_packed_dms(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_dec_to_packed_dms(int argc, VALUE *argv, VALUE self) {
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
@@ -17477,7 +17880,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_parse_xml_string(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_parse_xml_string(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
   int res1 ;
   char *buf1 = 0 ;
@@ -17532,7 +17935,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_serialize_xml_tree(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_serialize_xml_tree(int argc, VALUE *argv, VALUE self) {
   CPLXMLNode *arg1 = (CPLXMLNode *) 0 ;
   char *result = 0 ;
   VALUE vresult = Qnil;
@@ -17590,7 +17993,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_get_driver_count(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_get_driver_count(int argc, VALUE *argv, VALUE self) {
   int result;
   VALUE vresult = Qnil;
   
@@ -17625,7 +18028,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_get_driver_by_name(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_get_driver_by_name(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
   int res1 ;
   char *buf1 = 0 ;
@@ -17676,7 +18079,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_get_driver(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_get_driver(int argc, VALUE *argv, VALUE self) {
   int arg1 ;
   int val1 ;
   int ecode1 = 0 ;
@@ -17719,7 +18122,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_open(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_open(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
   GDALAccess arg2 = (GDALAccess) GA_ReadOnly ;
   int res1 ;
@@ -17772,7 +18175,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_open_shared(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_open_shared(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
   GDALAccess arg2 = (GDALAccess) GA_ReadOnly ;
   int res1 ;
@@ -17825,7 +18228,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_identify_driver(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_identify_driver(int argc, VALUE *argv, VALUE self) {
   char *arg1 = (char *) 0 ;
   char **arg2 = (char **) NULL ;
   int res1 ;
@@ -17897,7 +18300,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_general_cmd_line_processor(int argc, VALUE *argv, VALUE self) {
+_gdal_wrap_general_cmd_line_processor(int argc, VALUE *argv, VALUE self) {
   char **arg1 = (char **) 0 ;
   int arg2 = (int) 0 ;
   int val2 ;
@@ -18097,18 +18500,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
@@ -18118,17 +18521,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
@@ -18152,9 +18555,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) {
@@ -18173,27 +18574,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 */
@@ -18207,7 +18604,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
@@ -18234,7 +18631,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
@@ -18357,129 +18754,134 @@ SWIGEXPORT void Init_gdal(void) {
     GDALAllRegister();
   }
   
-  rb_define_module_function(mGdal, "use_exceptions", VALUEFUNC(_wrap_use_exceptions), -1);
-  rb_define_module_function(mGdal, "dont_use_exceptions", VALUEFUNC(_wrap_dont_use_exceptions), -1);
-  rb_define_module_function(mGdal, "debug", VALUEFUNC(_wrap_debug), -1);
-  rb_define_module_function(mGdal, "error", VALUEFUNC(_wrap_error), -1);
-  rb_define_module_function(mGdal, "push_error_handler", VALUEFUNC(_wrap_push_error_handler), -1);
-  rb_define_module_function(mGdal, "pop_error_handler", VALUEFUNC(_wrap_pop_error_handler), -1);
-  rb_define_module_function(mGdal, "error_reset", VALUEFUNC(_wrap_error_reset), -1);
-  rb_define_module_function(mGdal, "escape_string", VALUEFUNC(_wrap_escape_string), -1);
-  rb_define_module_function(mGdal, "get_last_error_no", VALUEFUNC(_wrap_get_last_error_no), -1);
-  rb_define_module_function(mGdal, "get_last_error_type", VALUEFUNC(_wrap_get_last_error_type), -1);
-  rb_define_module_function(mGdal, "get_last_error_msg", VALUEFUNC(_wrap_get_last_error_msg), -1);
-  rb_define_module_function(mGdal, "push_finder_location", VALUEFUNC(_wrap_push_finder_location), -1);
-  rb_define_module_function(mGdal, "pop_finder_location", VALUEFUNC(_wrap_pop_finder_location), -1);
-  rb_define_module_function(mGdal, "finder_clean", VALUEFUNC(_wrap_finder_clean), -1);
-  rb_define_module_function(mGdal, "find_file", VALUEFUNC(_wrap_find_file), -1);
-  rb_define_module_function(mGdal, "read_dir", VALUEFUNC(_wrap_read_dir), -1);
-  rb_define_module_function(mGdal, "set_config_option", VALUEFUNC(_wrap_set_config_option), -1);
-  rb_define_module_function(mGdal, "get_config_option", VALUEFUNC(_wrap_get_config_option), -1);
-  rb_define_module_function(mGdal, "binary_to_hex", VALUEFUNC(_wrap_binary_to_hex), -1);
-  rb_define_module_function(mGdal, "hex_to_binary", VALUEFUNC(_wrap_hex_to_binary), -1);
+  rb_define_module_function(mGdal, "use_exceptions", VALUEFUNC(_gdal_wrap_use_exceptions), -1);
+  rb_define_module_function(mGdal, "dont_use_exceptions", VALUEFUNC(_gdal_wrap_dont_use_exceptions), -1);
+  rb_define_module_function(mGdal, "debug", VALUEFUNC(_gdal_wrap_debug), -1);
+  rb_define_module_function(mGdal, "set_error_handler", VALUEFUNC(_gdal_wrap_set_error_handler), -1);
+  rb_define_module_function(mGdal, "error", VALUEFUNC(_gdal_wrap_error), -1);
+  rb_define_module_function(mGdal, "goa_2get_authorization_url", VALUEFUNC(_gdal_wrap_goa_2get_authorization_url), -1);
+  rb_define_module_function(mGdal, "goa_2get_refresh_token", VALUEFUNC(_gdal_wrap_goa_2get_refresh_token), -1);
+  rb_define_module_function(mGdal, "goa_2get_access_token", VALUEFUNC(_gdal_wrap_goa_2get_access_token), -1);
+  rb_define_module_function(mGdal, "push_error_handler", VALUEFUNC(_gdal_wrap_push_error_handler), -1);
+  rb_define_module_function(mGdal, "pop_error_handler", VALUEFUNC(_gdal_wrap_pop_error_handler), -1);
+  rb_define_module_function(mGdal, "error_reset", VALUEFUNC(_gdal_wrap_error_reset), -1);
+  rb_define_module_function(mGdal, "escape_string", VALUEFUNC(_gdal_wrap_escape_string), -1);
+  rb_define_module_function(mGdal, "get_last_error_no", VALUEFUNC(_gdal_wrap_get_last_error_no), -1);
+  rb_define_module_function(mGdal, "get_last_error_type", VALUEFUNC(_gdal_wrap_get_last_error_type), -1);
+  rb_define_module_function(mGdal, "get_last_error_msg", VALUEFUNC(_gdal_wrap_get_last_error_msg), -1);
+  rb_define_module_function(mGdal, "push_finder_location", VALUEFUNC(_gdal_wrap_push_finder_location), -1);
+  rb_define_module_function(mGdal, "pop_finder_location", VALUEFUNC(_gdal_wrap_pop_finder_location), -1);
+  rb_define_module_function(mGdal, "finder_clean", VALUEFUNC(_gdal_wrap_finder_clean), -1);
+  rb_define_module_function(mGdal, "find_file", VALUEFUNC(_gdal_wrap_find_file), -1);
+  rb_define_module_function(mGdal, "read_dir", VALUEFUNC(_gdal_wrap_read_dir), -1);
+  rb_define_module_function(mGdal, "read_dir_recursive", VALUEFUNC(_gdal_wrap_read_dir_recursive), -1);
+  rb_define_module_function(mGdal, "set_config_option", VALUEFUNC(_gdal_wrap_set_config_option), -1);
+  rb_define_module_function(mGdal, "get_config_option", VALUEFUNC(_gdal_wrap_get_config_option), -1);
+  rb_define_module_function(mGdal, "binary_to_hex", VALUEFUNC(_gdal_wrap_binary_to_hex), -1);
+  rb_define_module_function(mGdal, "hex_to_binary", VALUEFUNC(_gdal_wrap_hex_to_binary), -1);
   
   SwigClassMajorObject.klass = rb_define_class_under(mGdal, "MajorObject", rb_cObject);
   SWIG_TypeClientData(SWIGTYPE_p_GDALMajorObjectShadow, (void *) &SwigClassMajorObject);
   rb_undef_alloc_func(SwigClassMajorObject.klass);
-  rb_define_method(SwigClassMajorObject.klass, "get_description", VALUEFUNC(_wrap_MajorObject_get_description), -1);
-  rb_define_method(SwigClassMajorObject.klass, "set_description", VALUEFUNC(_wrap_MajorObject_set_description), -1);
-  rb_define_method(SwigClassMajorObject.klass, "get_metadata_dict", VALUEFUNC(_wrap_MajorObject_get_metadata_dict), -1);
-  rb_define_method(SwigClassMajorObject.klass, "get_metadata_list", VALUEFUNC(_wrap_MajorObject_get_metadata_list), -1);
-  rb_define_method(SwigClassMajorObject.klass, "set_metadata", VALUEFUNC(_wrap_MajorObject_set_metadata), -1);
-  rb_define_method(SwigClassMajorObject.klass, "get_metadata_item", VALUEFUNC(_wrap_MajorObject_get_metadata_item), -1);
-  rb_define_method(SwigClassMajorObject.klass, "set_metadata_item", VALUEFUNC(_wrap_MajorObject_set_metadata_item), -1);
+  rb_define_method(SwigClassMajorObject.klass, "get_description", VALUEFUNC(_gdal_wrap_MajorObject_get_description), -1);
+  rb_define_method(SwigClassMajorObject.klass, "set_description", VALUEFUNC(_gdal_wrap_MajorObject_set_description), -1);
+  rb_define_method(SwigClassMajorObject.klass, "get_metadata_dict", VALUEFUNC(_gdal_wrap_MajorObject_get_metadata_dict), -1);
+  rb_define_method(SwigClassMajorObject.klass, "get_metadata_list", VALUEFUNC(_gdal_wrap_MajorObject_get_metadata_list), -1);
+  rb_define_method(SwigClassMajorObject.klass, "set_metadata", VALUEFUNC(_gdal_wrap_MajorObject_set_metadata), -1);
+  rb_define_method(SwigClassMajorObject.klass, "get_metadata_item", VALUEFUNC(_gdal_wrap_MajorObject_get_metadata_item), -1);
+  rb_define_method(SwigClassMajorObject.klass, "set_metadata_item", VALUEFUNC(_gdal_wrap_MajorObject_set_metadata_item), -1);
   SwigClassMajorObject.mark = 0;
   SwigClassMajorObject.trackObjects = 0;
   
   SwigClassDriver.klass = rb_define_class_under(mGdal, "Driver", ((swig_class *) SWIGTYPE_p_GDALMajorObjectShadow->clientdata)->klass);
   SWIG_TypeClientData(SWIGTYPE_p_GDALDriverShadow, (void *) &SwigClassDriver);
   rb_undef_alloc_func(SwigClassDriver.klass);
-  rb_define_method(SwigClassDriver.klass, "ShortName", VALUEFUNC(_wrap_Driver_ShortName_get), -1);
-  rb_define_method(SwigClassDriver.klass, "LongName", VALUEFUNC(_wrap_Driver_LongName_get), -1);
-  rb_define_method(SwigClassDriver.klass, "HelpTopic", VALUEFUNC(_wrap_Driver_HelpTopic_get), -1);
-  rb_define_method(SwigClassDriver.klass, "create", VALUEFUNC(_wrap_Driver_create), -1);
-  rb_define_method(SwigClassDriver.klass, "create_copy", VALUEFUNC(_wrap_Driver_create_copy), -1);
-  rb_define_method(SwigClassDriver.klass, "delete", VALUEFUNC(_wrap_Driver_delete), -1);
-  rb_define_method(SwigClassDriver.klass, "rename", VALUEFUNC(_wrap_Driver_rename), -1);
-  rb_define_method(SwigClassDriver.klass, "copy_files", VALUEFUNC(_wrap_Driver_copy_files), -1);
-  rb_define_method(SwigClassDriver.klass, "register", VALUEFUNC(_wrap_Driver_register), -1);
-  rb_define_method(SwigClassDriver.klass, "deregister", VALUEFUNC(_wrap_Driver_deregister), -1);
+  rb_define_method(SwigClassDriver.klass, "ShortName", VALUEFUNC(_gdal_wrap_Driver_ShortName_get), -1);
+  rb_define_method(SwigClassDriver.klass, "LongName", VALUEFUNC(_gdal_wrap_Driver_LongName_get), -1);
+  rb_define_method(SwigClassDriver.klass, "HelpTopic", VALUEFUNC(_gdal_wrap_Driver_HelpTopic_get), -1);
+  rb_define_method(SwigClassDriver.klass, "create", VALUEFUNC(_gdal_wrap_Driver_create), -1);
+  rb_define_method(SwigClassDriver.klass, "create_copy", VALUEFUNC(_gdal_wrap_Driver_create_copy), -1);
+  rb_define_method(SwigClassDriver.klass, "delete", VALUEFUNC(_gdal_wrap_Driver_delete), -1);
+  rb_define_method(SwigClassDriver.klass, "rename", VALUEFUNC(_gdal_wrap_Driver_rename), -1);
+  rb_define_method(SwigClassDriver.klass, "copy_files", VALUEFUNC(_gdal_wrap_Driver_copy_files), -1);
+  rb_define_method(SwigClassDriver.klass, "register", VALUEFUNC(_gdal_wrap_Driver_register), -1);
+  rb_define_method(SwigClassDriver.klass, "deregister", VALUEFUNC(_gdal_wrap_Driver_deregister), -1);
   SwigClassDriver.mark = 0;
   SwigClassDriver.trackObjects = 0;
   
   SwigClassColorEntry.klass = rb_define_class_under(mGdal, "ColorEntry", rb_cObject);
   SWIG_TypeClientData(SWIGTYPE_p_GDALColorEntry, (void *) &SwigClassColorEntry);
-  rb_define_alloc_func(SwigClassColorEntry.klass, _wrap_ColorEntry_allocate);
-  rb_define_method(SwigClassColorEntry.klass, "initialize", VALUEFUNC(_wrap_new_ColorEntry), -1);
-  rb_define_method(SwigClassColorEntry.klass, "c1=", VALUEFUNC(_wrap_ColorEntry_c1_set), -1);
-  rb_define_method(SwigClassColorEntry.klass, "c1", VALUEFUNC(_wrap_ColorEntry_c1_get), -1);
-  rb_define_method(SwigClassColorEntry.klass, "c2=", VALUEFUNC(_wrap_ColorEntry_c2_set), -1);
-  rb_define_method(SwigClassColorEntry.klass, "c2", VALUEFUNC(_wrap_ColorEntry_c2_get), -1);
-  rb_define_method(SwigClassColorEntry.klass, "c3=", VALUEFUNC(_wrap_ColorEntry_c3_set), -1);
-  rb_define_method(SwigClassColorEntry.klass, "c3", VALUEFUNC(_wrap_ColorEntry_c3_get), -1);
-  rb_define_method(SwigClassColorEntry.klass, "c4=", VALUEFUNC(_wrap_ColorEntry_c4_set), -1);
-  rb_define_method(SwigClassColorEntry.klass, "c4", VALUEFUNC(_wrap_ColorEntry_c4_get), -1);
+  rb_define_alloc_func(SwigClassColorEntry.klass, _gdal_wrap_ColorEntry_allocate);
+  rb_define_method(SwigClassColorEntry.klass, "initialize", VALUEFUNC(_gdal_wrap_new_ColorEntry), -1);
+  rb_define_method(SwigClassColorEntry.klass, "c1=", VALUEFUNC(_gdal_wrap_ColorEntry_c1_set), -1);
+  rb_define_method(SwigClassColorEntry.klass, "c1", VALUEFUNC(_gdal_wrap_ColorEntry_c1_get), -1);
+  rb_define_method(SwigClassColorEntry.klass, "c2=", VALUEFUNC(_gdal_wrap_ColorEntry_c2_set), -1);
+  rb_define_method(SwigClassColorEntry.klass, "c2", VALUEFUNC(_gdal_wrap_ColorEntry_c2_get), -1);
+  rb_define_method(SwigClassColorEntry.klass, "c3=", VALUEFUNC(_gdal_wrap_ColorEntry_c3_set), -1);
+  rb_define_method(SwigClassColorEntry.klass, "c3", VALUEFUNC(_gdal_wrap_ColorEntry_c3_get), -1);
+  rb_define_method(SwigClassColorEntry.klass, "c4=", VALUEFUNC(_gdal_wrap_ColorEntry_c4_set), -1);
+  rb_define_method(SwigClassColorEntry.klass, "c4", VALUEFUNC(_gdal_wrap_ColorEntry_c4_get), -1);
   SwigClassColorEntry.mark = 0;
   SwigClassColorEntry.destroy = (void (*)(void *)) free_GDALColorEntry;
   SwigClassColorEntry.trackObjects = 0;
   
   SwigClassGCP.klass = rb_define_class_under(mGdal, "GCP", rb_cObject);
   SWIG_TypeClientData(SWIGTYPE_p_GDAL_GCP, (void *) &SwigClassGCP);
-  rb_define_alloc_func(SwigClassGCP.klass, _wrap_GCP_allocate);
-  rb_define_method(SwigClassGCP.klass, "initialize", VALUEFUNC(_wrap_new_GCP), -1);
-  rb_define_method(SwigClassGCP.klass, "GCPX=", VALUEFUNC(_wrap_GCP_GCPX_set), -1);
-  rb_define_method(SwigClassGCP.klass, "GCPX", VALUEFUNC(_wrap_GCP_GCPX_get), -1);
-  rb_define_method(SwigClassGCP.klass, "GCPY=", VALUEFUNC(_wrap_GCP_GCPY_set), -1);
-  rb_define_method(SwigClassGCP.klass, "GCPY", VALUEFUNC(_wrap_GCP_GCPY_get), -1);
-  rb_define_method(SwigClassGCP.klass, "GCPZ=", VALUEFUNC(_wrap_GCP_GCPZ_set), -1);
-  rb_define_method(SwigClassGCP.klass, "GCPZ", VALUEFUNC(_wrap_GCP_GCPZ_get), -1);
-  rb_define_method(SwigClassGCP.klass, "GCPPixel=", VALUEFUNC(_wrap_GCP_GCPPixel_set), -1);
-  rb_define_method(SwigClassGCP.klass, "GCPPixel", VALUEFUNC(_wrap_GCP_GCPPixel_get), -1);
-  rb_define_method(SwigClassGCP.klass, "GCPLine=", VALUEFUNC(_wrap_GCP_GCPLine_set), -1);
-  rb_define_method(SwigClassGCP.klass, "GCPLine", VALUEFUNC(_wrap_GCP_GCPLine_get), -1);
-  rb_define_method(SwigClassGCP.klass, "Info=", VALUEFUNC(_wrap_GCP_Info_set), -1);
-  rb_define_method(SwigClassGCP.klass, "Info", VALUEFUNC(_wrap_GCP_Info_get), -1);
-  rb_define_method(SwigClassGCP.klass, "Id=", VALUEFUNC(_wrap_GCP_Id_set), -1);
-  rb_define_method(SwigClassGCP.klass, "Id", VALUEFUNC(_wrap_GCP_Id_get), -1);
+  rb_define_alloc_func(SwigClassGCP.klass, _gdal_wrap_GCP_allocate);
+  rb_define_method(SwigClassGCP.klass, "initialize", VALUEFUNC(_gdal_wrap_new_GCP), -1);
+  rb_define_method(SwigClassGCP.klass, "GCPX=", VALUEFUNC(_gdal_wrap_GCP_GCPX_set), -1);
+  rb_define_method(SwigClassGCP.klass, "GCPX", VALUEFUNC(_gdal_wrap_GCP_GCPX_get), -1);
+  rb_define_method(SwigClassGCP.klass, "GCPY=", VALUEFUNC(_gdal_wrap_GCP_GCPY_set), -1);
+  rb_define_method(SwigClassGCP.klass, "GCPY", VALUEFUNC(_gdal_wrap_GCP_GCPY_get), -1);
+  rb_define_method(SwigClassGCP.klass, "GCPZ=", VALUEFUNC(_gdal_wrap_GCP_GCPZ_set), -1);
+  rb_define_method(SwigClassGCP.klass, "GCPZ", VALUEFUNC(_gdal_wrap_GCP_GCPZ_get), -1);
+  rb_define_method(SwigClassGCP.klass, "GCPPixel=", VALUEFUNC(_gdal_wrap_GCP_GCPPixel_set), -1);
+  rb_define_method(SwigClassGCP.klass, "GCPPixel", VALUEFUNC(_gdal_wrap_GCP_GCPPixel_get), -1);
+  rb_define_method(SwigClassGCP.klass, "GCPLine=", VALUEFUNC(_gdal_wrap_GCP_GCPLine_set), -1);
+  rb_define_method(SwigClassGCP.klass, "GCPLine", VALUEFUNC(_gdal_wrap_GCP_GCPLine_get), -1);
+  rb_define_method(SwigClassGCP.klass, "Info=", VALUEFUNC(_gdal_wrap_GCP_Info_set), -1);
+  rb_define_method(SwigClassGCP.klass, "Info", VALUEFUNC(_gdal_wrap_GCP_Info_get), -1);
+  rb_define_method(SwigClassGCP.klass, "Id=", VALUEFUNC(_gdal_wrap_GCP_Id_set), -1);
+  rb_define_method(SwigClassGCP.klass, "Id", VALUEFUNC(_gdal_wrap_GCP_Id_get), -1);
   SwigClassGCP.mark = 0;
   SwigClassGCP.destroy = (void (*)(void *)) free_GDAL_GCP;
   SwigClassGCP.trackObjects = 0;
-  rb_define_module_function(mGdal, "gdal_gcp_gcpx_get", VALUEFUNC(_wrap_gdal_gcp_gcpx_get), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_gcpx_set", VALUEFUNC(_wrap_gdal_gcp_gcpx_set), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_gcpy_get", VALUEFUNC(_wrap_gdal_gcp_gcpy_get), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_gcpy_set", VALUEFUNC(_wrap_gdal_gcp_gcpy_set), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_gcpz_get", VALUEFUNC(_wrap_gdal_gcp_gcpz_get), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_gcpz_set", VALUEFUNC(_wrap_gdal_gcp_gcpz_set), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_gcppixel_get", VALUEFUNC(_wrap_gdal_gcp_gcppixel_get), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_gcppixel_set", VALUEFUNC(_wrap_gdal_gcp_gcppixel_set), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_gcpline_get", VALUEFUNC(_wrap_gdal_gcp_gcpline_get), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_gcpline_set", VALUEFUNC(_wrap_gdal_gcp_gcpline_set), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_info_get", VALUEFUNC(_wrap_gdal_gcp_info_get), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_info_set", VALUEFUNC(_wrap_gdal_gcp_info_set), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_id_get", VALUEFUNC(_wrap_gdal_gcp_id_get), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_id_set", VALUEFUNC(_wrap_gdal_gcp_id_set), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_get_gcpx", VALUEFUNC(_wrap_gdal_gcp_get_gcpx), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_set_gcpx", VALUEFUNC(_wrap_gdal_gcp_set_gcpx), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_get_gcpy", VALUEFUNC(_wrap_gdal_gcp_get_gcpy), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_set_gcpy", VALUEFUNC(_wrap_gdal_gcp_set_gcpy), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_get_gcpz", VALUEFUNC(_wrap_gdal_gcp_get_gcpz), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_set_gcpz", VALUEFUNC(_wrap_gdal_gcp_set_gcpz), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_get_gcppixel", VALUEFUNC(_wrap_gdal_gcp_get_gcppixel), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_set_gcppixel", VALUEFUNC(_wrap_gdal_gcp_set_gcppixel), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_get_gcpline", VALUEFUNC(_wrap_gdal_gcp_get_gcpline), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_set_gcpline", VALUEFUNC(_wrap_gdal_gcp_set_gcpline), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_get_info", VALUEFUNC(_wrap_gdal_gcp_get_info), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_set_info", VALUEFUNC(_wrap_gdal_gcp_set_info), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_get_id", VALUEFUNC(_wrap_gdal_gcp_get_id), -1);
-  rb_define_module_function(mGdal, "gdal_gcp_set_id", VALUEFUNC(_wrap_gdal_gcp_set_id), -1);
-  rb_define_module_function(mGdal, "gcps_to_geo_transform", VALUEFUNC(_wrap_gcps_to_geo_transform), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_gcpx_get", VALUEFUNC(_gdal_wrap_gdal_gcp_gcpx_get), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_gcpx_set", VALUEFUNC(_gdal_wrap_gdal_gcp_gcpx_set), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_gcpy_get", VALUEFUNC(_gdal_wrap_gdal_gcp_gcpy_get), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_gcpy_set", VALUEFUNC(_gdal_wrap_gdal_gcp_gcpy_set), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_gcpz_get", VALUEFUNC(_gdal_wrap_gdal_gcp_gcpz_get), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_gcpz_set", VALUEFUNC(_gdal_wrap_gdal_gcp_gcpz_set), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_gcppixel_get", VALUEFUNC(_gdal_wrap_gdal_gcp_gcppixel_get), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_gcppixel_set", VALUEFUNC(_gdal_wrap_gdal_gcp_gcppixel_set), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_gcpline_get", VALUEFUNC(_gdal_wrap_gdal_gcp_gcpline_get), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_gcpline_set", VALUEFUNC(_gdal_wrap_gdal_gcp_gcpline_set), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_info_get", VALUEFUNC(_gdal_wrap_gdal_gcp_info_get), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_info_set", VALUEFUNC(_gdal_wrap_gdal_gcp_info_set), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_id_get", VALUEFUNC(_gdal_wrap_gdal_gcp_id_get), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_id_set", VALUEFUNC(_gdal_wrap_gdal_gcp_id_set), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_get_gcpx", VALUEFUNC(_gdal_wrap_gdal_gcp_get_gcpx), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_set_gcpx", VALUEFUNC(_gdal_wrap_gdal_gcp_set_gcpx), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_get_gcpy", VALUEFUNC(_gdal_wrap_gdal_gcp_get_gcpy), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_set_gcpy", VALUEFUNC(_gdal_wrap_gdal_gcp_set_gcpy), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_get_gcpz", VALUEFUNC(_gdal_wrap_gdal_gcp_get_gcpz), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_set_gcpz", VALUEFUNC(_gdal_wrap_gdal_gcp_set_gcpz), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_get_gcppixel", VALUEFUNC(_gdal_wrap_gdal_gcp_get_gcppixel), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_set_gcppixel", VALUEFUNC(_gdal_wrap_gdal_gcp_set_gcppixel), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_get_gcpline", VALUEFUNC(_gdal_wrap_gdal_gcp_get_gcpline), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_set_gcpline", VALUEFUNC(_gdal_wrap_gdal_gcp_set_gcpline), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_get_info", VALUEFUNC(_gdal_wrap_gdal_gcp_get_info), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_set_info", VALUEFUNC(_gdal_wrap_gdal_gcp_set_info), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_get_id", VALUEFUNC(_gdal_wrap_gdal_gcp_get_id), -1);
+  rb_define_module_function(mGdal, "gdal_gcp_set_id", VALUEFUNC(_gdal_wrap_gdal_gcp_set_id), -1);
+  rb_define_module_function(mGdal, "gcps_to_geo_transform", VALUEFUNC(_gdal_wrap_gcps_to_geo_transform), -1);
   
   SwigClassAsyncReader.klass = rb_define_class_under(mGdal, "AsyncReader", rb_cObject);
   SWIG_TypeClientData(SWIGTYPE_p_GDALAsyncReaderShadow, (void *) &SwigClassAsyncReader);
   rb_undef_alloc_func(SwigClassAsyncReader.klass);
-  rb_define_method(SwigClassAsyncReader.klass, "get_next_updated_region", VALUEFUNC(_wrap_AsyncReader_get_next_updated_region), -1);
-  rb_define_method(SwigClassAsyncReader.klass, "lock_buffer", VALUEFUNC(_wrap_AsyncReader_lock_buffer), -1);
-  rb_define_method(SwigClassAsyncReader.klass, "unlock_buffer", VALUEFUNC(_wrap_AsyncReader_unlock_buffer), -1);
+  rb_define_method(SwigClassAsyncReader.klass, "get_next_updated_region", VALUEFUNC(_gdal_wrap_AsyncReader_get_next_updated_region), -1);
+  rb_define_method(SwigClassAsyncReader.klass, "lock_buffer", VALUEFUNC(_gdal_wrap_AsyncReader_lock_buffer), -1);
+  rb_define_method(SwigClassAsyncReader.klass, "unlock_buffer", VALUEFUNC(_gdal_wrap_AsyncReader_unlock_buffer), -1);
   SwigClassAsyncReader.mark = 0;
   SwigClassAsyncReader.destroy = (void (*)(void *)) free_GDALAsyncReaderShadow;
   SwigClassAsyncReader.trackObjects = 0;
@@ -18487,27 +18889,27 @@ SWIGEXPORT void Init_gdal(void) {
   SwigClassDataset.klass = rb_define_class_under(mGdal, "Dataset", ((swig_class *) SWIGTYPE_p_GDALMajorObjectShadow->clientdata)->klass);
   SWIG_TypeClientData(SWIGTYPE_p_GDALDatasetShadow, (void *) &SwigClassDataset);
   rb_undef_alloc_func(SwigClassDataset.klass);
-  rb_define_method(SwigClassDataset.klass, "RasterXSize", VALUEFUNC(_wrap_Dataset_RasterXSize_get), -1);
-  rb_define_method(SwigClassDataset.klass, "RasterYSize", VALUEFUNC(_wrap_Dataset_RasterYSize_get), -1);
-  rb_define_method(SwigClassDataset.klass, "RasterCount", VALUEFUNC(_wrap_Dataset_RasterCount_get), -1);
-  rb_define_method(SwigClassDataset.klass, "get_driver", VALUEFUNC(_wrap_Dataset_get_driver), -1);
-  rb_define_method(SwigClassDataset.klass, "get_raster_band", VALUEFUNC(_wrap_Dataset_get_raster_band), -1);
-  rb_define_method(SwigClassDataset.klass, "get_projection", VALUEFUNC(_wrap_Dataset_get_projection), -1);
-  rb_define_method(SwigClassDataset.klass, "get_projection_ref", VALUEFUNC(_wrap_Dataset_get_projection_ref), -1);
-  rb_define_method(SwigClassDataset.klass, "set_projection", VALUEFUNC(_wrap_Dataset_set_projection), -1);
-  rb_define_method(SwigClassDataset.klass, "get_geo_transform", VALUEFUNC(_wrap_Dataset_get_geo_transform), -1);
-  rb_define_method(SwigClassDataset.klass, "set_geo_transform", VALUEFUNC(_wrap_Dataset_set_geo_transform), -1);
-  rb_define_method(SwigClassDataset.klass, "build_overviews", VALUEFUNC(_wrap_Dataset_build_overviews), -1);
-  rb_define_method(SwigClassDataset.klass, "get_gcpcount", VALUEFUNC(_wrap_Dataset_get_gcpcount), -1);
-  rb_define_method(SwigClassDataset.klass, "get_gcpprojection", VALUEFUNC(_wrap_Dataset_get_gcpprojection), -1);
-  rb_define_method(SwigClassDataset.klass, "get_gcps", VALUEFUNC(_wrap_Dataset_get_gcps), -1);
-  rb_define_method(SwigClassDataset.klass, "set_gcps", VALUEFUNC(_wrap_Dataset_set_gcps), -1);
-  rb_define_method(SwigClassDataset.klass, "flush_cache", VALUEFUNC(_wrap_Dataset_flush_cache), -1);
-  rb_define_method(SwigClassDataset.klass, "add_band", VALUEFUNC(_wrap_Dataset_add_band), -1);
-  rb_define_method(SwigClassDataset.klass, "create_mask_band", VALUEFUNC(_wrap_Dataset_create_mask_band), -1);
-  rb_define_method(SwigClassDataset.klass, "get_file_list", VALUEFUNC(_wrap_Dataset_get_file_list), -1);
-  rb_define_method(SwigClassDataset.klass, "write_raster", VALUEFUNC(_wrap_Dataset_write_raster), -1);
-  rb_define_method(SwigClassDataset.klass, "read_raster", VALUEFUNC(_wrap_Dataset_read_raster), -1);
+  rb_define_method(SwigClassDataset.klass, "RasterXSize", VALUEFUNC(_gdal_wrap_Dataset_RasterXSize_get), -1);
+  rb_define_method(SwigClassDataset.klass, "RasterYSize", VALUEFUNC(_gdal_wrap_Dataset_RasterYSize_get), -1);
+  rb_define_method(SwigClassDataset.klass, "RasterCount", VALUEFUNC(_gdal_wrap_Dataset_RasterCount_get), -1);
+  rb_define_method(SwigClassDataset.klass, "get_driver", VALUEFUNC(_gdal_wrap_Dataset_get_driver), -1);
+  rb_define_method(SwigClassDataset.klass, "get_raster_band", VALUEFUNC(_gdal_wrap_Dataset_get_raster_band), -1);
+  rb_define_method(SwigClassDataset.klass, "get_projection", VALUEFUNC(_gdal_wrap_Dataset_get_projection), -1);
+  rb_define_method(SwigClassDataset.klass, "get_projection_ref", VALUEFUNC(_gdal_wrap_Dataset_get_projection_ref), -1);
+  rb_define_method(SwigClassDataset.klass, "set_projection", VALUEFUNC(_gdal_wrap_Dataset_set_projection), -1);
+  rb_define_method(SwigClassDataset.klass, "get_geo_transform", VALUEFUNC(_gdal_wrap_Dataset_get_geo_transform), -1);
+  rb_define_method(SwigClassDataset.klass, "set_geo_transform", VALUEFUNC(_gdal_wrap_Dataset_set_geo_transform), -1);
+  rb_define_method(SwigClassDataset.klass, "build_overviews", VALUEFUNC(_gdal_wrap_Dataset_build_overviews), -1);
+  rb_define_method(SwigClassDataset.klass, "get_gcpcount", VALUEFUNC(_gdal_wrap_Dataset_get_gcpcount), -1);
+  rb_define_method(SwigClassDataset.klass, "get_gcpprojection", VALUEFUNC(_gdal_wrap_Dataset_get_gcpprojection), -1);
+  rb_define_method(SwigClassDataset.klass, "get_gcps", VALUEFUNC(_gdal_wrap_Dataset_get_gcps), -1);
+  rb_define_method(SwigClassDataset.klass, "set_gcps", VALUEFUNC(_gdal_wrap_Dataset_set_gcps), -1);
+  rb_define_method(SwigClassDataset.klass, "flush_cache", VALUEFUNC(_gdal_wrap_Dataset_flush_cache), -1);
+  rb_define_method(SwigClassDataset.klass, "add_band", VALUEFUNC(_gdal_wrap_Dataset_add_band), -1);
+  rb_define_method(SwigClassDataset.klass, "create_mask_band", VALUEFUNC(_gdal_wrap_Dataset_create_mask_band), -1);
+  rb_define_method(SwigClassDataset.klass, "get_file_list", VALUEFUNC(_gdal_wrap_Dataset_get_file_list), -1);
+  rb_define_method(SwigClassDataset.klass, "write_raster", VALUEFUNC(_gdal_wrap_Dataset_write_raster), -1);
+  rb_define_method(SwigClassDataset.klass, "read_raster", VALUEFUNC(_gdal_wrap_Dataset_read_raster), -1);
   SwigClassDataset.mark = 0;
   SwigClassDataset.destroy = (void (*)(void *)) free_GDALDatasetShadow;
   SwigClassDataset.trackObjects = 0;
@@ -18515,146 +18917,147 @@ SWIGEXPORT void Init_gdal(void) {
   SwigClassBand.klass = rb_define_class_under(mGdal, "Band", ((swig_class *) SWIGTYPE_p_GDALMajorObjectShadow->clientdata)->klass);
   SWIG_TypeClientData(SWIGTYPE_p_GDALRasterBandShadow, (void *) &SwigClassBand);
   rb_undef_alloc_func(SwigClassBand.klass);
-  rb_define_method(SwigClassBand.klass, "XSize", VALUEFUNC(_wrap_Band_XSize_get), -1);
-  rb_define_method(SwigClassBand.klass, "YSize", VALUEFUNC(_wrap_Band_YSize_get), -1);
-  rb_define_method(SwigClassBand.klass, "DataType", VALUEFUNC(_wrap_Band_DataType_get), -1);
-  rb_define_method(SwigClassBand.klass, "get_band", VALUEFUNC(_wrap_Band_get_band), -1);
-  rb_define_method(SwigClassBand.klass, "get_block_size", VALUEFUNC(_wrap_Band_get_block_size), -1);
-  rb_define_method(SwigClassBand.klass, "get_color_interpretation", VALUEFUNC(_wrap_Band_get_color_interpretation), -1);
-  rb_define_method(SwigClassBand.klass, "get_raster_color_interpretation", VALUEFUNC(_wrap_Band_get_raster_color_interpretation), -1);
-  rb_define_method(SwigClassBand.klass, "set_color_interpretation", VALUEFUNC(_wrap_Band_set_color_interpretation), -1);
-  rb_define_method(SwigClassBand.klass, "set_raster_color_interpretation", VALUEFUNC(_wrap_Band_set_raster_color_interpretation), -1);
-  rb_define_method(SwigClassBand.klass, "get_no_data_value", VALUEFUNC(_wrap_Band_get_no_data_value), -1);
-  rb_define_method(SwigClassBand.klass, "set_no_data_value", VALUEFUNC(_wrap_Band_set_no_data_value), -1);
-  rb_define_method(SwigClassBand.klass, "get_unit_type", VALUEFUNC(_wrap_Band_get_unit_type), -1);
-  rb_define_method(SwigClassBand.klass, "set_unit_type", VALUEFUNC(_wrap_Band_set_unit_type), -1);
-  rb_define_method(SwigClassBand.klass, "get_raster_category_names", VALUEFUNC(_wrap_Band_get_raster_category_names), -1);
-  rb_define_method(SwigClassBand.klass, "set_raster_category_names", VALUEFUNC(_wrap_Band_set_raster_category_names), -1);
-  rb_define_method(SwigClassBand.klass, "get_minimum", VALUEFUNC(_wrap_Band_get_minimum), -1);
-  rb_define_method(SwigClassBand.klass, "get_maximum", VALUEFUNC(_wrap_Band_get_maximum), -1);
-  rb_define_method(SwigClassBand.klass, "get_offset", VALUEFUNC(_wrap_Band_get_offset), -1);
-  rb_define_method(SwigClassBand.klass, "get_scale", VALUEFUNC(_wrap_Band_get_scale), -1);
-  rb_define_method(SwigClassBand.klass, "set_offset", VALUEFUNC(_wrap_Band_set_offset), -1);
-  rb_define_method(SwigClassBand.klass, "set_scale", VALUEFUNC(_wrap_Band_set_scale), -1);
-  rb_define_method(SwigClassBand.klass, "get_statistics", VALUEFUNC(_wrap_Band_get_statistics), -1);
-  rb_define_method(SwigClassBand.klass, "compute_statistics", VALUEFUNC(_wrap_Band_compute_statistics), -1);
-  rb_define_method(SwigClassBand.klass, "set_statistics", VALUEFUNC(_wrap_Band_set_statistics), -1);
-  rb_define_method(SwigClassBand.klass, "get_overview_count", VALUEFUNC(_wrap_Band_get_overview_count), -1);
-  rb_define_method(SwigClassBand.klass, "get_overview", VALUEFUNC(_wrap_Band_get_overview), -1);
-  rb_define_method(SwigClassBand.klass, "checksum", VALUEFUNC(_wrap_Band_checksum), -1);
-  rb_define_method(SwigClassBand.klass, "compute_raster_min_max", VALUEFUNC(_wrap_Band_compute_raster_min_max), -1);
-  rb_define_method(SwigClassBand.klass, "compute_band_stats", VALUEFUNC(_wrap_Band_compute_band_stats), -1);
-  rb_define_method(SwigClassBand.klass, "fill", VALUEFUNC(_wrap_Band_fill), -1);
-  rb_define_method(SwigClassBand.klass, "read_raster", VALUEFUNC(_wrap_Band_read_raster), -1);
-  rb_define_method(SwigClassBand.klass, "write_raster", VALUEFUNC(_wrap_Band_write_raster), -1);
-  rb_define_method(SwigClassBand.klass, "flush_cache", VALUEFUNC(_wrap_Band_flush_cache), -1);
-  rb_define_method(SwigClassBand.klass, "get_raster_color_table", VALUEFUNC(_wrap_Band_get_raster_color_table), -1);
-  rb_define_method(SwigClassBand.klass, "get_color_table", VALUEFUNC(_wrap_Band_get_color_table), -1);
-  rb_define_method(SwigClassBand.klass, "set_raster_color_table", VALUEFUNC(_wrap_Band_set_raster_color_table), -1);
-  rb_define_method(SwigClassBand.klass, "set_color_table", VALUEFUNC(_wrap_Band_set_color_table), -1);
-  rb_define_method(SwigClassBand.klass, "get_default_rat", VALUEFUNC(_wrap_Band_get_default_rat), -1);
-  rb_define_method(SwigClassBand.klass, "set_default_rat", VALUEFUNC(_wrap_Band_set_default_rat), -1);
-  rb_define_method(SwigClassBand.klass, "get_mask_band", VALUEFUNC(_wrap_Band_get_mask_band), -1);
-  rb_define_method(SwigClassBand.klass, "get_mask_flags", VALUEFUNC(_wrap_Band_get_mask_flags), -1);
-  rb_define_method(SwigClassBand.klass, "create_mask_band", VALUEFUNC(_wrap_Band_create_mask_band), -1);
-  rb_define_method(SwigClassBand.klass, "get_histogram", VALUEFUNC(_wrap_Band_get_histogram), -1);
-  rb_define_method(SwigClassBand.klass, "get_default_histogram", VALUEFUNC(_wrap_Band_get_default_histogram), -1);
-  rb_define_method(SwigClassBand.klass, "set_default_histogram", VALUEFUNC(_wrap_Band_set_default_histogram), -1);
-  rb_define_method(SwigClassBand.klass, "has_arbitrary_overviews", VALUEFUNC(_wrap_Band_has_arbitrary_overviews), -1);
-  rb_define_method(SwigClassBand.klass, "get_category_names", VALUEFUNC(_wrap_Band_get_category_names), -1);
-  rb_define_method(SwigClassBand.klass, "set_category_names", VALUEFUNC(_wrap_Band_set_category_names), -1);
+  rb_define_method(SwigClassBand.klass, "XSize", VALUEFUNC(_gdal_wrap_Band_XSize_get), -1);
+  rb_define_method(SwigClassBand.klass, "YSize", VALUEFUNC(_gdal_wrap_Band_YSize_get), -1);
+  rb_define_method(SwigClassBand.klass, "DataType", VALUEFUNC(_gdal_wrap_Band_DataType_get), -1);
+  rb_define_method(SwigClassBand.klass, "get_band", VALUEFUNC(_gdal_wrap_Band_get_band), -1);
+  rb_define_method(SwigClassBand.klass, "get_block_size", VALUEFUNC(_gdal_wrap_Band_get_block_size), -1);
+  rb_define_method(SwigClassBand.klass, "get_color_interpretation", VALUEFUNC(_gdal_wrap_Band_get_color_interpretation), -1);
+  rb_define_method(SwigClassBand.klass, "get_raster_color_interpretation", VALUEFUNC(_gdal_wrap_Band_get_raster_color_interpretation), -1);
+  rb_define_method(SwigClassBand.klass, "set_color_interpretation", VALUEFUNC(_gdal_wrap_Band_set_color_interpretation), -1);
+  rb_define_method(SwigClassBand.klass, "set_raster_color_interpretation", VALUEFUNC(_gdal_wrap_Band_set_raster_color_interpretation), -1);
+  rb_define_method(SwigClassBand.klass, "get_no_data_value", VALUEFUNC(_gdal_wrap_Band_get_no_data_value), -1);
+  rb_define_method(SwigClassBand.klass, "set_no_data_value", VALUEFUNC(_gdal_wrap_Band_set_no_data_value), -1);
+  rb_define_method(SwigClassBand.klass, "get_unit_type", VALUEFUNC(_gdal_wrap_Band_get_unit_type), -1);
+  rb_define_method(SwigClassBand.klass, "set_unit_type", VALUEFUNC(_gdal_wrap_Band_set_unit_type), -1);
+  rb_define_method(SwigClassBand.klass, "get_raster_category_names", VALUEFUNC(_gdal_wrap_Band_get_raster_category_names), -1);
+  rb_define_method(SwigClassBand.klass, "set_raster_category_names", VALUEFUNC(_gdal_wrap_Band_set_raster_category_names), -1);
+  rb_define_method(SwigClassBand.klass, "get_minimum", VALUEFUNC(_gdal_wrap_Band_get_minimum), -1);
+  rb_define_method(SwigClassBand.klass, "get_maximum", VALUEFUNC(_gdal_wrap_Band_get_maximum), -1);
+  rb_define_method(SwigClassBand.klass, "get_offset", VALUEFUNC(_gdal_wrap_Band_get_offset), -1);
+  rb_define_method(SwigClassBand.klass, "get_scale", VALUEFUNC(_gdal_wrap_Band_get_scale), -1);
+  rb_define_method(SwigClassBand.klass, "set_offset", VALUEFUNC(_gdal_wrap_Band_set_offset), -1);
+  rb_define_method(SwigClassBand.klass, "set_scale", VALUEFUNC(_gdal_wrap_Band_set_scale), -1);
+  rb_define_method(SwigClassBand.klass, "get_statistics", VALUEFUNC(_gdal_wrap_Band_get_statistics), -1);
+  rb_define_method(SwigClassBand.klass, "compute_statistics", VALUEFUNC(_gdal_wrap_Band_compute_statistics), -1);
+  rb_define_method(SwigClassBand.klass, "set_statistics", VALUEFUNC(_gdal_wrap_Band_set_statistics), -1);
+  rb_define_method(SwigClassBand.klass, "get_overview_count", VALUEFUNC(_gdal_wrap_Band_get_overview_count), -1);
+  rb_define_method(SwigClassBand.klass, "get_overview", VALUEFUNC(_gdal_wrap_Band_get_overview), -1);
+  rb_define_method(SwigClassBand.klass, "checksum", VALUEFUNC(_gdal_wrap_Band_checksum), -1);
+  rb_define_method(SwigClassBand.klass, "compute_raster_min_max", VALUEFUNC(_gdal_wrap_Band_compute_raster_min_max), -1);
+  rb_define_method(SwigClassBand.klass, "compute_band_stats", VALUEFUNC(_gdal_wrap_Band_compute_band_stats), -1);
+  rb_define_method(SwigClassBand.klass, "fill", VALUEFUNC(_gdal_wrap_Band_fill), -1);
+  rb_define_method(SwigClassBand.klass, "read_raster", VALUEFUNC(_gdal_wrap_Band_read_raster), -1);
+  rb_define_method(SwigClassBand.klass, "write_raster", VALUEFUNC(_gdal_wrap_Band_write_raster), -1);
+  rb_define_method(SwigClassBand.klass, "flush_cache", VALUEFUNC(_gdal_wrap_Band_flush_cache), -1);
+  rb_define_method(SwigClassBand.klass, "get_raster_color_table", VALUEFUNC(_gdal_wrap_Band_get_raster_color_table), -1);
+  rb_define_method(SwigClassBand.klass, "get_color_table", VALUEFUNC(_gdal_wrap_Band_get_color_table), -1);
+  rb_define_method(SwigClassBand.klass, "set_raster_color_table", VALUEFUNC(_gdal_wrap_Band_set_raster_color_table), -1);
+  rb_define_method(SwigClassBand.klass, "set_color_table", VALUEFUNC(_gdal_wrap_Band_set_color_table), -1);
+  rb_define_method(SwigClassBand.klass, "get_default_rat", VALUEFUNC(_gdal_wrap_Band_get_default_rat), -1);
+  rb_define_method(SwigClassBand.klass, "set_default_rat", VALUEFUNC(_gdal_wrap_Band_set_default_rat), -1);
+  rb_define_method(SwigClassBand.klass, "get_mask_band", VALUEFUNC(_gdal_wrap_Band_get_mask_band), -1);
+  rb_define_method(SwigClassBand.klass, "get_mask_flags", VALUEFUNC(_gdal_wrap_Band_get_mask_flags), -1);
+  rb_define_method(SwigClassBand.klass, "create_mask_band", VALUEFUNC(_gdal_wrap_Band_create_mask_band), -1);
+  rb_define_method(SwigClassBand.klass, "get_histogram", VALUEFUNC(_gdal_wrap_Band_get_histogram), -1);
+  rb_define_method(SwigClassBand.klass, "get_default_histogram", VALUEFUNC(_gdal_wrap_Band_get_default_histogram), -1);
+  rb_define_method(SwigClassBand.klass, "set_default_histogram", VALUEFUNC(_gdal_wrap_Band_set_default_histogram), -1);
+  rb_define_method(SwigClassBand.klass, "has_arbitrary_overviews", VALUEFUNC(_gdal_wrap_Band_has_arbitrary_overviews), -1);
+  rb_define_method(SwigClassBand.klass, "get_category_names", VALUEFUNC(_gdal_wrap_Band_get_category_names), -1);
+  rb_define_method(SwigClassBand.klass, "set_category_names", VALUEFUNC(_gdal_wrap_Band_set_category_names), -1);
   SwigClassBand.mark = 0;
   SwigClassBand.trackObjects = 0;
   
   SwigClassColorTable.klass = rb_define_class_under(mGdal, "ColorTable", rb_cObject);
   SWIG_TypeClientData(SWIGTYPE_p_GDALColorTableShadow, (void *) &SwigClassColorTable);
-  rb_define_alloc_func(SwigClassColorTable.klass, _wrap_ColorTable_allocate);
-  rb_define_method(SwigClassColorTable.klass, "initialize", VALUEFUNC(_wrap_new_ColorTable), -1);
-  rb_define_method(SwigClassColorTable.klass, "clone", VALUEFUNC(_wrap_ColorTable_clone), -1);
-  rb_define_method(SwigClassColorTable.klass, "get_palette_interpretation", VALUEFUNC(_wrap_ColorTable_get_palette_interpretation), -1);
-  rb_define_method(SwigClassColorTable.klass, "get_count", VALUEFUNC(_wrap_ColorTable_get_count), -1);
-  rb_define_method(SwigClassColorTable.klass, "get_color_entry", VALUEFUNC(_wrap_ColorTable_get_color_entry), -1);
-  rb_define_method(SwigClassColorTable.klass, "get_color_entry_as_rgb", VALUEFUNC(_wrap_ColorTable_get_color_entry_as_rgb), -1);
-  rb_define_method(SwigClassColorTable.klass, "set_color_entry", VALUEFUNC(_wrap_ColorTable_set_color_entry), -1);
-  rb_define_method(SwigClassColorTable.klass, "create_color_ramp", VALUEFUNC(_wrap_ColorTable_create_color_ramp), -1);
+  rb_define_alloc_func(SwigClassColorTable.klass, _gdal_wrap_ColorTable_allocate);
+  rb_define_method(SwigClassColorTable.klass, "initialize", VALUEFUNC(_gdal_wrap_new_ColorTable), -1);
+  rb_define_method(SwigClassColorTable.klass, "clone", VALUEFUNC(_gdal_wrap_ColorTable_clone), -1);
+  rb_define_method(SwigClassColorTable.klass, "get_palette_interpretation", VALUEFUNC(_gdal_wrap_ColorTable_get_palette_interpretation), -1);
+  rb_define_method(SwigClassColorTable.klass, "get_count", VALUEFUNC(_gdal_wrap_ColorTable_get_count), -1);
+  rb_define_method(SwigClassColorTable.klass, "get_color_entry", VALUEFUNC(_gdal_wrap_ColorTable_get_color_entry), -1);
+  rb_define_method(SwigClassColorTable.klass, "get_color_entry_as_rgb", VALUEFUNC(_gdal_wrap_ColorTable_get_color_entry_as_rgb), -1);
+  rb_define_method(SwigClassColorTable.klass, "set_color_entry", VALUEFUNC(_gdal_wrap_ColorTable_set_color_entry), -1);
+  rb_define_method(SwigClassColorTable.klass, "create_color_ramp", VALUEFUNC(_gdal_wrap_ColorTable_create_color_ramp), -1);
   SwigClassColorTable.mark = 0;
   SwigClassColorTable.destroy = (void (*)(void *)) free_GDALColorTableShadow;
   SwigClassColorTable.trackObjects = 0;
   
   SwigClassRasterAttributeTable.klass = rb_define_class_under(mGdal, "RasterAttributeTable", rb_cObject);
   SWIG_TypeClientData(SWIGTYPE_p_GDALRasterAttributeTableShadow, (void *) &SwigClassRasterAttributeTable);
-  rb_define_alloc_func(SwigClassRasterAttributeTable.klass, _wrap_RasterAttributeTable_allocate);
-  rb_define_method(SwigClassRasterAttributeTable.klass, "initialize", VALUEFUNC(_wrap_new_RasterAttributeTable), -1);
-  rb_define_method(SwigClassRasterAttributeTable.klass, "clone", VALUEFUNC(_wrap_RasterAttributeTable_clone), -1);
-  rb_define_method(SwigClassRasterAttributeTable.klass, "get_column_count", VALUEFUNC(_wrap_RasterAttributeTable_get_column_count), -1);
-  rb_define_method(SwigClassRasterAttributeTable.klass, "get_name_of_col", VALUEFUNC(_wrap_RasterAttributeTable_get_name_of_col), -1);
-  rb_define_method(SwigClassRasterAttributeTable.klass, "get_usage_of_col", VALUEFUNC(_wrap_RasterAttributeTable_get_usage_of_col), -1);
-  rb_define_method(SwigClassRasterAttributeTable.klass, "get_type_of_col", VALUEFUNC(_wrap_RasterAttributeTable_get_type_of_col), -1);
-  rb_define_method(SwigClassRasterAttributeTable.klass, "get_col_of_usage", VALUEFUNC(_wrap_RasterAttributeTable_get_col_of_usage), -1);
-  rb_define_method(SwigClassRasterAttributeTable.klass, "get_row_count", VALUEFUNC(_wrap_RasterAttributeTable_get_row_count), -1);
-  rb_define_method(SwigClassRasterAttributeTable.klass, "get_value_as_string", VALUEFUNC(_wrap_RasterAttributeTable_get_value_as_string), -1);
-  rb_define_method(SwigClassRasterAttributeTable.klass, "get_value_as_int", VALUEFUNC(_wrap_RasterAttributeTable_get_value_as_int), -1);
-  rb_define_method(SwigClassRasterAttributeTable.klass, "get_value_as_double", VALUEFUNC(_wrap_RasterAttributeTable_get_value_as_double), -1);
-  rb_define_method(SwigClassRasterAttributeTable.klass, "set_value_as_string", VALUEFUNC(_wrap_RasterAttributeTable_set_value_as_string), -1);
-  rb_define_method(SwigClassRasterAttributeTable.klass, "set_value_as_int", VALUEFUNC(_wrap_RasterAttributeTable_set_value_as_int), -1);
-  rb_define_method(SwigClassRasterAttributeTable.klass, "set_value_as_double", VALUEFUNC(_wrap_RasterAttributeTable_set_value_as_double), -1);
-  rb_define_method(SwigClassRasterAttributeTable.klass, "set_row_count", VALUEFUNC(_wrap_RasterAttributeTable_set_row_count), -1);
-  rb_define_method(SwigClassRasterAttributeTable.klass, "create_column", VALUEFUNC(_wrap_RasterAttributeTable_create_column), -1);
-  rb_define_method(SwigClassRasterAttributeTable.klass, "get_linear_binning", VALUEFUNC(_wrap_RasterAttributeTable_get_linear_binning), -1);
-  rb_define_method(SwigClassRasterAttributeTable.klass, "set_linear_binning", VALUEFUNC(_wrap_RasterAttributeTable_set_linear_binning), -1);
-  rb_define_method(SwigClassRasterAttributeTable.klass, "get_row_of_value", VALUEFUNC(_wrap_RasterAttributeTable_get_row_of_value), -1);
+  rb_define_alloc_func(SwigClassRasterAttributeTable.klass, _gdal_wrap_RasterAttributeTable_allocate);
+  rb_define_method(SwigClassRasterAttributeTable.klass, "initialize", VALUEFUNC(_gdal_wrap_new_RasterAttributeTable), -1);
+  rb_define_method(SwigClassRasterAttributeTable.klass, "clone", VALUEFUNC(_gdal_wrap_RasterAttributeTable_clone), -1);
+  rb_define_method(SwigClassRasterAttributeTable.klass, "get_column_count", VALUEFUNC(_gdal_wrap_RasterAttributeTable_get_column_count), -1);
+  rb_define_method(SwigClassRasterAttributeTable.klass, "get_name_of_col", VALUEFUNC(_gdal_wrap_RasterAttributeTable_get_name_of_col), -1);
+  rb_define_method(SwigClassRasterAttributeTable.klass, "get_usage_of_col", VALUEFUNC(_gdal_wrap_RasterAttributeTable_get_usage_of_col), -1);
+  rb_define_method(SwigClassRasterAttributeTable.klass, "get_type_of_col", VALUEFUNC(_gdal_wrap_RasterAttributeTable_get_type_of_col), -1);
+  rb_define_method(SwigClassRasterAttributeTable.klass, "get_col_of_usage", VALUEFUNC(_gdal_wrap_RasterAttributeTable_get_col_of_usage), -1);
+  rb_define_method(SwigClassRasterAttributeTable.klass, "get_row_count", VALUEFUNC(_gdal_wrap_RasterAttributeTable_get_row_count), -1);
+  rb_define_method(SwigClassRasterAttributeTable.klass, "get_value_as_string", VALUEFUNC(_gdal_wrap_RasterAttributeTable_get_value_as_string), -1);
+  rb_define_method(SwigClassRasterAttributeTable.klass, "get_value_as_int", VALUEFUNC(_gdal_wrap_RasterAttributeTable_get_value_as_int), -1);
+  rb_define_method(SwigClassRasterAttributeTable.klass, "get_value_as_double", VALUEFUNC(_gdal_wrap_RasterAttributeTable_get_value_as_double), -1);
+  rb_define_method(SwigClassRasterAttributeTable.klass, "set_value_as_string", VALUEFUNC(_gdal_wrap_RasterAttributeTable_set_value_as_string), -1);
+  rb_define_method(SwigClassRasterAttributeTable.klass, "set_value_as_int", VALUEFUNC(_gdal_wrap_RasterAttributeTable_set_value_as_int), -1);
+  rb_define_method(SwigClassRasterAttributeTable.klass, "set_value_as_double", VALUEFUNC(_gdal_wrap_RasterAttributeTable_set_value_as_double), -1);
+  rb_define_method(SwigClassRasterAttributeTable.klass, "set_row_count", VALUEFUNC(_gdal_wrap_RasterAttributeTable_set_row_count), -1);
+  rb_define_method(SwigClassRasterAttributeTable.klass, "create_column", VALUEFUNC(_gdal_wrap_RasterAttributeTable_create_column), -1);
+  rb_define_method(SwigClassRasterAttributeTable.klass, "get_linear_binning", VALUEFUNC(_gdal_wrap_RasterAttributeTable_get_linear_binning), -1);
+  rb_define_method(SwigClassRasterAttributeTable.klass, "set_linear_binning", VALUEFUNC(_gdal_wrap_RasterAttributeTable_set_linear_binning), -1);
+  rb_define_method(SwigClassRasterAttributeTable.klass, "get_row_of_value", VALUEFUNC(_gdal_wrap_RasterAttributeTable_get_row_of_value), -1);
   SwigClassRasterAttributeTable.mark = 0;
   SwigClassRasterAttributeTable.destroy = (void (*)(void *)) free_GDALRasterAttributeTableShadow;
   SwigClassRasterAttributeTable.trackObjects = 0;
-  rb_define_module_function(mGdal, "TermProgress_nocb", VALUEFUNC(_wrap_TermProgress_nocb), -1);
+  rb_define_module_function(mGdal, "TermProgress_nocb", VALUEFUNC(_gdal_wrap_TermProgress_nocb), -1);
   rb_define_const(mGdal, "TermProgress", SWIG_NewFunctionPtrObj((void *)(int (*)(double,char const *,void *))(GDALTermProgress), SWIGTYPE_p_f_double_p_q_const__char_p_void__int));
-  rb_define_module_function(mGdal, "compute_median_cut_pct", VALUEFUNC(_wrap_compute_median_cut_pct), -1);
-  rb_define_module_function(mGdal, "dither_rgb_2pct", VALUEFUNC(_wrap_dither_rgb_2pct), -1);
-  rb_define_module_function(mGdal, "reproject_image", VALUEFUNC(_wrap_reproject_image), -1);
-  rb_define_module_function(mGdal, "compute_proximity", VALUEFUNC(_wrap_compute_proximity), -1);
-  rb_define_module_function(mGdal, "rasterize_layer", VALUEFUNC(_wrap_rasterize_layer), -1);
-  rb_define_module_function(mGdal, "polygonize", VALUEFUNC(_wrap_polygonize), -1);
-  rb_define_module_function(mGdal, "fill_nodata", VALUEFUNC(_wrap_fill_nodata), -1);
-  rb_define_module_function(mGdal, "sieve_filter", VALUEFUNC(_wrap_sieve_filter), -1);
-  rb_define_module_function(mGdal, "regenerate_overviews", VALUEFUNC(_wrap_regenerate_overviews), -1);
-  rb_define_module_function(mGdal, "regenerate_overview", VALUEFUNC(_wrap_regenerate_overview), -1);
-  rb_define_module_function(mGdal, "contour_generate", VALUEFUNC(_wrap_contour_generate), -1);
-  rb_define_module_function(mGdal, "auto_create_warped_vrt", VALUEFUNC(_wrap_auto_create_warped_vrt), -1);
+  rb_define_module_function(mGdal, "compute_median_cut_pct", VALUEFUNC(_gdal_wrap_compute_median_cut_pct), -1);
+  rb_define_module_function(mGdal, "dither_rgb_2pct", VALUEFUNC(_gdal_wrap_dither_rgb_2pct), -1);
+  rb_define_module_function(mGdal, "reproject_image", VALUEFUNC(_gdal_wrap_reproject_image), -1);
+  rb_define_module_function(mGdal, "compute_proximity", VALUEFUNC(_gdal_wrap_compute_proximity), -1);
+  rb_define_module_function(mGdal, "rasterize_layer", VALUEFUNC(_gdal_wrap_rasterize_layer), -1);
+  rb_define_module_function(mGdal, "polygonize", VALUEFUNC(_gdal_wrap_polygonize), -1);
+  rb_define_module_function(mGdal, "fill_nodata", VALUEFUNC(_gdal_wrap_fill_nodata), -1);
+  rb_define_module_function(mGdal, "sieve_filter", VALUEFUNC(_gdal_wrap_sieve_filter), -1);
+  rb_define_module_function(mGdal, "regenerate_overviews", VALUEFUNC(_gdal_wrap_regenerate_overviews), -1);
+  rb_define_module_function(mGdal, "regenerate_overview", VALUEFUNC(_gdal_wrap_regenerate_overview), -1);
+  rb_define_module_function(mGdal, "contour_generate", VALUEFUNC(_gdal_wrap_contour_generate), -1);
+  rb_define_module_function(mGdal, "auto_create_warped_vrt", VALUEFUNC(_gdal_wrap_auto_create_warped_vrt), -1);
   
   SwigClassTransformer.klass = rb_define_class_under(mGdal, "Transformer", rb_cObject);
   SWIG_TypeClientData(SWIGTYPE_p_GDALTransformerInfoShadow, (void *) &SwigClassTransformer);
-  rb_define_alloc_func(SwigClassTransformer.klass, _wrap_Transformer_allocate);
-  rb_define_method(SwigClassTransformer.klass, "initialize", VALUEFUNC(_wrap_new_Transformer), -1);
-  rb_define_method(SwigClassTransformer.klass, "transform_point", VALUEFUNC(_wrap_Transformer_transform_point), -1);
-  rb_define_method(SwigClassTransformer.klass, "transform_points", VALUEFUNC(_wrap_Transformer_transform_points), -1);
+  rb_define_alloc_func(SwigClassTransformer.klass, _gdal_wrap_Transformer_allocate);
+  rb_define_method(SwigClassTransformer.klass, "initialize", VALUEFUNC(_gdal_wrap_new_Transformer), -1);
+  rb_define_method(SwigClassTransformer.klass, "transform_point", VALUEFUNC(_gdal_wrap_Transformer_transform_point), -1);
+  rb_define_method(SwigClassTransformer.klass, "transform_points", VALUEFUNC(_gdal_wrap_Transformer_transform_points), -1);
+  rb_define_method(SwigClassTransformer.klass, "transform_geolocations", VALUEFUNC(_gdal_wrap_Transformer_transform_geolocations), -1);
   SwigClassTransformer.mark = 0;
   SwigClassTransformer.destroy = (void (*)(void *)) free_GDALTransformerInfoShadow;
   SwigClassTransformer.trackObjects = 0;
-  rb_define_module_function(mGdal, "gdalapply_geo_transform", VALUEFUNC(_wrap_gdalapply_geo_transform), -1);
-  rb_define_module_function(mGdal, "gdalinv_geo_transform", VALUEFUNC(_wrap_gdalinv_geo_transform), -1);
-  rb_define_module_function(mGdal, "gdalversion_info", VALUEFUNC(_wrap_gdalversion_info), -1);
-  rb_define_module_function(mGdal, "all_register", VALUEFUNC(_wrap_all_register), -1);
-  rb_define_module_function(mGdal, "gdaldestroy_driver_manager", VALUEFUNC(_wrap_gdaldestroy_driver_manager), -1);
-  rb_define_module_function(mGdal, "get_cache_max", VALUEFUNC(_wrap_get_cache_max), -1);
-  rb_define_module_function(mGdal, "get_cache_used", VALUEFUNC(_wrap_get_cache_used), -1);
-  rb_define_module_function(mGdal, "set_cache_max", VALUEFUNC(_wrap_set_cache_max), -1);
-  rb_define_module_function(mGdal, "get_data_type_size", VALUEFUNC(_wrap_get_data_type_size), -1);
-  rb_define_module_function(mGdal, "data_type_is_complex", VALUEFUNC(_wrap_data_type_is_complex), -1);
-  rb_define_module_function(mGdal, "get_data_type_name", VALUEFUNC(_wrap_get_data_type_name), -1);
-  rb_define_module_function(mGdal, "get_data_type_by_name", VALUEFUNC(_wrap_get_data_type_by_name), -1);
-  rb_define_module_function(mGdal, "get_color_interpretation_name", VALUEFUNC(_wrap_get_color_interpretation_name), -1);
-  rb_define_module_function(mGdal, "get_palette_interpretation_name", VALUEFUNC(_wrap_get_palette_interpretation_name), -1);
-  rb_define_module_function(mGdal, "dec_to_dms", VALUEFUNC(_wrap_dec_to_dms), -1);
-  rb_define_module_function(mGdal, "packed_dms_to_dec", VALUEFUNC(_wrap_packed_dms_to_dec), -1);
-  rb_define_module_function(mGdal, "dec_to_packed_dms", VALUEFUNC(_wrap_dec_to_packed_dms), -1);
-  rb_define_module_function(mGdal, "parse_xml_string", VALUEFUNC(_wrap_parse_xml_string), -1);
-  rb_define_module_function(mGdal, "serialize_xml_tree", VALUEFUNC(_wrap_serialize_xml_tree), -1);
-  rb_define_module_function(mGdal, "get_driver_count", VALUEFUNC(_wrap_get_driver_count), -1);
-  rb_define_module_function(mGdal, "get_driver_by_name", VALUEFUNC(_wrap_get_driver_by_name), -1);
-  rb_define_module_function(mGdal, "get_driver", VALUEFUNC(_wrap_get_driver), -1);
-  rb_define_module_function(mGdal, "open", VALUEFUNC(_wrap_open), -1);
-  rb_define_module_function(mGdal, "open_shared", VALUEFUNC(_wrap_open_shared), -1);
-  rb_define_module_function(mGdal, "identify_driver", VALUEFUNC(_wrap_identify_driver), -1);
-  rb_define_module_function(mGdal, "general_cmd_line_processor", VALUEFUNC(_wrap_general_cmd_line_processor), -1);
+  rb_define_module_function(mGdal, "gdalapply_geo_transform", VALUEFUNC(_gdal_wrap_gdalapply_geo_transform), -1);
+  rb_define_module_function(mGdal, "gdalinv_geo_transform", VALUEFUNC(_gdal_wrap_gdalinv_geo_transform), -1);
+  rb_define_module_function(mGdal, "gdalversion_info", VALUEFUNC(_gdal_wrap_gdalversion_info), -1);
+  rb_define_module_function(mGdal, "all_register", VALUEFUNC(_gdal_wrap_all_register), -1);
+  rb_define_module_function(mGdal, "gdaldestroy_driver_manager", VALUEFUNC(_gdal_wrap_gdaldestroy_driver_manager), -1);
+  rb_define_module_function(mGdal, "get_cache_max", VALUEFUNC(_gdal_wrap_get_cache_max), -1);
+  rb_define_module_function(mGdal, "get_cache_used", VALUEFUNC(_gdal_wrap_get_cache_used), -1);
+  rb_define_module_function(mGdal, "set_cache_max", VALUEFUNC(_gdal_wrap_set_cache_max), -1);
+  rb_define_module_function(mGdal, "get_data_type_size", VALUEFUNC(_gdal_wrap_get_data_type_size), -1);
+  rb_define_module_function(mGdal, "data_type_is_complex", VALUEFUNC(_gdal_wrap_data_type_is_complex), -1);
+  rb_define_module_function(mGdal, "get_data_type_name", VALUEFUNC(_gdal_wrap_get_data_type_name), -1);
+  rb_define_module_function(mGdal, "get_data_type_by_name", VALUEFUNC(_gdal_wrap_get_data_type_by_name), -1);
+  rb_define_module_function(mGdal, "get_color_interpretation_name", VALUEFUNC(_gdal_wrap_get_color_interpretation_name), -1);
+  rb_define_module_function(mGdal, "get_palette_interpretation_name", VALUEFUNC(_gdal_wrap_get_palette_interpretation_name), -1);
+  rb_define_module_function(mGdal, "dec_to_dms", VALUEFUNC(_gdal_wrap_dec_to_dms), -1);
+  rb_define_module_function(mGdal, "packed_dms_to_dec", VALUEFUNC(_gdal_wrap_packed_dms_to_dec), -1);
+  rb_define_module_function(mGdal, "dec_to_packed_dms", VALUEFUNC(_gdal_wrap_dec_to_packed_dms), -1);
+  rb_define_module_function(mGdal, "parse_xml_string", VALUEFUNC(_gdal_wrap_parse_xml_string), -1);
+  rb_define_module_function(mGdal, "serialize_xml_tree", VALUEFUNC(_gdal_wrap_serialize_xml_tree), -1);
+  rb_define_module_function(mGdal, "get_driver_count", VALUEFUNC(_gdal_wrap_get_driver_count), -1);
+  rb_define_module_function(mGdal, "get_driver_by_name", VALUEFUNC(_gdal_wrap_get_driver_by_name), -1);
+  rb_define_module_function(mGdal, "get_driver", VALUEFUNC(_gdal_wrap_get_driver), -1);
+  rb_define_module_function(mGdal, "open", VALUEFUNC(_gdal_wrap_open), -1);
+  rb_define_module_function(mGdal, "open_shared", VALUEFUNC(_gdal_wrap_open_shared), -1);
+  rb_define_module_function(mGdal, "identify_driver", VALUEFUNC(_gdal_wrap_identify_driver), -1);
+  rb_define_module_function(mGdal, "general_cmd_line_processor", VALUEFUNC(_gdal_wrap_general_cmd_line_processor), -1);
 }