gdal 0.0.7 → 1.0.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,5 +1,8 @@
1
1
  require 'mkmf'
2
2
 
3
+ # see https://github.com/zhm/gdal-ruby/issues/5
4
+ require_relative '../ruby-2.2-patch'
5
+
3
6
  raise 'gdal-config not found.' if `which gdal-config`.empty?
4
7
 
5
8
  dir_config 'gdal',
@@ -1,11 +1,11 @@
1
1
  /* ----------------------------------------------------------------------------
2
2
  * This file was automatically generated by SWIG (http://www.swig.org).
3
- * Version 2.0.4
4
- *
5
- * This file is not intended to be easily readable and contains a number of
3
+ * Version 3.0.5
4
+ *
5
+ * This file is not intended to be easily readable and contains a number of
6
6
  * coding conventions designed to improve portability and efficiency. Do not make
7
- * changes to this file unless you know what you are doing--modify the SWIG
8
- * interface file instead.
7
+ * changes to this file unless you know what you are doing--modify the SWIG
8
+ * interface file instead.
9
9
  * ----------------------------------------------------------------------------- */
10
10
 
11
11
  #define SWIGRUBY
@@ -65,28 +65,28 @@ template <typename T> T SwigValueInit() {
65
65
  #ifndef SWIGUNUSED
66
66
  # if defined(__GNUC__)
67
67
  # if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
68
- # define SWIGUNUSED __attribute__ ((__unused__))
68
+ # define SWIGUNUSED __attribute__ ((__unused__))
69
69
  # else
70
70
  # define SWIGUNUSED
71
71
  # endif
72
72
  # elif defined(__ICC)
73
- # define SWIGUNUSED __attribute__ ((__unused__))
73
+ # define SWIGUNUSED __attribute__ ((__unused__))
74
74
  # else
75
- # define SWIGUNUSED
75
+ # define SWIGUNUSED
76
76
  # endif
77
77
  #endif
78
78
 
79
79
  #ifndef SWIG_MSC_UNSUPPRESS_4505
80
80
  # if defined(_MSC_VER)
81
81
  # pragma warning(disable : 4505) /* unreferenced local function has been removed */
82
- # endif
82
+ # endif
83
83
  #endif
84
84
 
85
85
  #ifndef SWIGUNUSEDPARM
86
86
  # ifdef __cplusplus
87
87
  # define SWIGUNUSEDPARM(p)
88
88
  # else
89
- # define SWIGUNUSEDPARM(p) p SWIGUNUSED
89
+ # define SWIGUNUSEDPARM(p) p SWIGUNUSED
90
90
  # endif
91
91
  #endif
92
92
 
@@ -129,7 +129,7 @@ template <typename T> T SwigValueInit() {
129
129
  # define SWIGSTDCALL __stdcall
130
130
  # else
131
131
  # define SWIGSTDCALL
132
- # endif
132
+ # endif
133
133
  #endif
134
134
 
135
135
  /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -174,28 +174,28 @@ template <typename T> T SwigValueInit() {
174
174
  #ifndef SWIGUNUSED
175
175
  # if defined(__GNUC__)
176
176
  # if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
177
- # define SWIGUNUSED __attribute__ ((__unused__))
177
+ # define SWIGUNUSED __attribute__ ((__unused__))
178
178
  # else
179
179
  # define SWIGUNUSED
180
180
  # endif
181
181
  # elif defined(__ICC)
182
- # define SWIGUNUSED __attribute__ ((__unused__))
182
+ # define SWIGUNUSED __attribute__ ((__unused__))
183
183
  # else
184
- # define SWIGUNUSED
184
+ # define SWIGUNUSED
185
185
  # endif
186
186
  #endif
187
187
 
188
188
  #ifndef SWIG_MSC_UNSUPPRESS_4505
189
189
  # if defined(_MSC_VER)
190
190
  # pragma warning(disable : 4505) /* unreferenced local function has been removed */
191
- # endif
191
+ # endif
192
192
  #endif
193
193
 
194
194
  #ifndef SWIGUNUSEDPARM
195
195
  # ifdef __cplusplus
196
196
  # define SWIGUNUSEDPARM(p)
197
197
  # else
198
- # define SWIGUNUSEDPARM(p) p SWIGUNUSED
198
+ # define SWIGUNUSEDPARM(p) p SWIGUNUSED
199
199
  # endif
200
200
  #endif
201
201
 
@@ -238,7 +238,7 @@ template <typename T> T SwigValueInit() {
238
238
  # define SWIGSTDCALL __stdcall
239
239
  # else
240
240
  # define SWIGSTDCALL
241
- # endif
241
+ # endif
242
242
  #endif
243
243
 
244
244
  /* Deal with Microsoft's attempt at deprecating C standard runtime functions */
@@ -276,7 +276,7 @@ template <typename T> T SwigValueInit() {
276
276
  You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
277
277
  creating a static or dynamic library from the SWIG runtime code.
278
278
  In 99.9% of the cases, SWIG just needs to declare them as 'static'.
279
-
279
+
280
280
  But only do this if strictly necessary, ie, if you have problems
281
281
  with your compiler or suchlike.
282
282
  */
@@ -302,16 +302,16 @@ template <typename T> T SwigValueInit() {
302
302
  #define SWIG_POINTER_OWN 0x1
303
303
 
304
304
 
305
- /*
305
+ /*
306
306
  Flags/methods for returning states.
307
-
308
- The SWIG conversion methods, as ConvertPtr, return an integer
307
+
308
+ The SWIG conversion methods, as ConvertPtr, return an integer
309
309
  that tells if the conversion was successful or not. And if not,
310
310
  an error code can be returned (see swigerrors.swg for the codes).
311
-
311
+
312
312
  Use the following macros/flags to set or process the returning
313
313
  states.
314
-
314
+
315
315
  In old versions of SWIG, code such as the following was usually written:
316
316
 
317
317
  if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
@@ -344,23 +344,23 @@ template <typename T> T SwigValueInit() {
344
344
  } else {
345
345
  // fail code
346
346
  }
347
-
347
+
348
348
  I.e., now SWIG_ConvertPtr can return new objects and you can
349
349
  identify the case and take care of the deallocation. Of course that
350
350
  also requires SWIG_ConvertPtr to return new result values, such as
351
351
 
352
- int SWIG_ConvertPtr(obj, ptr,...) {
353
- if (<obj is ok>) {
354
- if (<need new object>) {
355
- *ptr = <ptr to new allocated object>;
356
- return SWIG_NEWOBJ;
357
- } else {
358
- *ptr = <ptr to old object>;
359
- return SWIG_OLDOBJ;
360
- }
361
- } else {
362
- return SWIG_BADOBJ;
363
- }
352
+ int SWIG_ConvertPtr(obj, ptr,...) {
353
+ if (<obj is ok>) {
354
+ if (<need new object>) {
355
+ *ptr = <ptr to new allocated object>;
356
+ return SWIG_NEWOBJ;
357
+ } else {
358
+ *ptr = <ptr to old object>;
359
+ return SWIG_OLDOBJ;
360
+ }
361
+ } else {
362
+ return SWIG_BADOBJ;
363
+ }
364
364
  }
365
365
 
366
366
  Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
@@ -374,17 +374,17 @@ template <typename T> T SwigValueInit() {
374
374
  int fooi(int);
375
375
 
376
376
  and you call
377
-
377
+
378
378
  food(1) // cast rank '1' (1 -> 1.0)
379
379
  fooi(1) // cast rank '0'
380
380
 
381
381
  just use the SWIG_AddCast()/SWIG_CheckState()
382
382
  */
383
383
 
384
- #define SWIG_OK (0)
384
+ #define SWIG_OK (0)
385
385
  #define SWIG_ERROR (-1)
386
386
  #define SWIG_IsOK(r) (r >= 0)
387
- #define SWIG_ArgError(r) ((r != SWIG_ERROR) ? r : SWIG_TypeError)
387
+ #define SWIG_ArgError(r) ((r != SWIG_ERROR) ? r : SWIG_TypeError)
388
388
 
389
389
  /* The CastRankLimit says how many bits are used for the cast rank */
390
390
  #define SWIG_CASTRANKLIMIT (1 << 8)
@@ -415,14 +415,14 @@ template <typename T> T SwigValueInit() {
415
415
  # endif
416
416
  # define SWIG_CASTRANKMASK ((SWIG_CASTRANKLIMIT) -1)
417
417
  # define SWIG_CastRank(r) (r & SWIG_CASTRANKMASK)
418
- SWIGINTERNINLINE int SWIG_AddCast(int r) {
418
+ SWIGINTERNINLINE int SWIG_AddCast(int r) {
419
419
  return SWIG_IsOK(r) ? ((SWIG_CastRank(r) < SWIG_MAXCASTRANK) ? (r + 1) : SWIG_ERROR) : r;
420
420
  }
421
- SWIGINTERNINLINE int SWIG_CheckState(int r) {
422
- return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
421
+ SWIGINTERNINLINE int SWIG_CheckState(int r) {
422
+ return SWIG_IsOK(r) ? SWIG_CastRank(r) + 1 : 0;
423
423
  }
424
424
  #else /* no cast-rank mode */
425
- # define SWIG_AddCast
425
+ # define SWIG_AddCast(r) (r)
426
426
  # define SWIG_CheckState(r) (SWIG_IsOK(r) ? 1 : 0)
427
427
  #endif
428
428
 
@@ -466,7 +466,7 @@ typedef struct swig_module_info {
466
466
  void *clientdata; /* Language specific module data */
467
467
  } swig_module_info;
468
468
 
469
- /*
469
+ /*
470
470
  Compare two type names skipping the space characters, therefore
471
471
  "char*" == "char *" and "Class<int>" == "Class<int >", etc.
472
472
 
@@ -486,18 +486,18 @@ SWIG_TypeNameComp(const char *f1, const char *l1,
486
486
 
487
487
  /*
488
488
  Check type equivalence in a name list like <name1>|<name2>|...
489
- Return 0 if not equal, 1 if equal
489
+ Return 0 if equal, -1 if nb < tb, 1 if nb > tb
490
490
  */
491
491
  SWIGRUNTIME int
492
- SWIG_TypeEquiv(const char *nb, const char *tb) {
493
- int equiv = 0;
492
+ SWIG_TypeCmp(const char *nb, const char *tb) {
493
+ int equiv = 1;
494
494
  const char* te = tb + strlen(tb);
495
495
  const char* ne = nb;
496
- while (!equiv && *ne) {
496
+ while (equiv != 0 && *ne) {
497
497
  for (nb = ne; *ne; ++ne) {
498
498
  if (*ne == '|') break;
499
499
  }
500
- equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
500
+ equiv = SWIG_TypeNameComp(nb, ne, tb, te);
501
501
  if (*ne) ++ne;
502
502
  }
503
503
  return equiv;
@@ -505,24 +505,13 @@ SWIG_TypeEquiv(const char *nb, const char *tb) {
505
505
 
506
506
  /*
507
507
  Check type equivalence in a name list like <name1>|<name2>|...
508
- Return 0 if equal, -1 if nb < tb, 1 if nb > tb
508
+ Return 0 if not equal, 1 if equal
509
509
  */
510
510
  SWIGRUNTIME int
511
- SWIG_TypeCompare(const char *nb, const char *tb) {
512
- int equiv = 0;
513
- const char* te = tb + strlen(tb);
514
- const char* ne = nb;
515
- while (!equiv && *ne) {
516
- for (nb = ne; *ne; ++ne) {
517
- if (*ne == '|') break;
518
- }
519
- equiv = (SWIG_TypeNameComp(nb, ne, tb, te) == 0) ? 1 : 0;
520
- if (*ne) ++ne;
521
- }
522
- return equiv;
511
+ SWIG_TypeEquiv(const char *nb, const char *tb) {
512
+ return SWIG_TypeCmp(nb, tb) == 0 ? 1 : 0;
523
513
  }
524
514
 
525
-
526
515
  /*
527
516
  Check the typename
528
517
  */
@@ -550,7 +539,7 @@ SWIG_TypeCheck(const char *c, swig_type_info *ty) {
550
539
  return 0;
551
540
  }
552
541
 
553
- /*
542
+ /*
554
543
  Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
555
544
  */
556
545
  SWIGRUNTIME swig_cast_info *
@@ -585,7 +574,7 @@ SWIG_TypeCast(swig_cast_info *ty, void *ptr, int *newmemory) {
585
574
  return ((!ty) || (!ty->converter)) ? ptr : (*ty->converter)(ptr, newmemory);
586
575
  }
587
576
 
588
- /*
577
+ /*
589
578
  Dynamic pointer casting. Down an inheritance hierarchy
590
579
  */
591
580
  SWIGRUNTIME swig_type_info *
@@ -629,7 +618,7 @@ SWIG_TypePrettyName(const swig_type_info *type) {
629
618
  return type->name;
630
619
  }
631
620
 
632
- /*
621
+ /*
633
622
  Set the clientdata field for a type
634
623
  */
635
624
  SWIGRUNTIME void
@@ -637,14 +626,14 @@ SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
637
626
  swig_cast_info *cast = ti->cast;
638
627
  /* if (ti->clientdata == clientdata) return; */
639
628
  ti->clientdata = clientdata;
640
-
629
+
641
630
  while (cast) {
642
631
  if (!cast->converter) {
643
632
  swig_type_info *tc = cast->type;
644
633
  if (!tc->clientdata) {
645
634
  SWIG_TypeClientData(tc, clientdata);
646
635
  }
647
- }
636
+ }
648
637
  cast = cast->next;
649
638
  }
650
639
  }
@@ -653,31 +642,31 @@ SWIG_TypeNewClientData(swig_type_info *ti, void *clientdata) {
653
642
  SWIG_TypeClientData(ti, clientdata);
654
643
  ti->owndata = 1;
655
644
  }
656
-
645
+
657
646
  /*
658
647
  Search for a swig_type_info structure only by mangled name
659
648
  Search is a O(log #types)
660
-
661
- We start searching at module start, and finish searching when start == end.
649
+
650
+ We start searching at module start, and finish searching when start == end.
662
651
  Note: if start == end at the beginning of the function, we go all the way around
663
652
  the circular list.
664
653
  */
665
654
  SWIGRUNTIME swig_type_info *
666
- SWIG_MangledTypeQueryModule(swig_module_info *start,
667
- swig_module_info *end,
655
+ SWIG_MangledTypeQueryModule(swig_module_info *start,
656
+ swig_module_info *end,
668
657
  const char *name) {
669
658
  swig_module_info *iter = start;
670
659
  do {
671
660
  if (iter->size) {
672
- register size_t l = 0;
673
- register size_t r = iter->size - 1;
661
+ size_t l = 0;
662
+ size_t r = iter->size - 1;
674
663
  do {
675
664
  /* since l+r >= 0, we can (>> 1) instead (/ 2) */
676
- register size_t i = (l + r) >> 1;
665
+ size_t i = (l + r) >> 1;
677
666
  const char *iname = iter->types[i]->name;
678
667
  if (iname) {
679
- register int compare = strcmp(name, iname);
680
- if (compare == 0) {
668
+ int compare = strcmp(name, iname);
669
+ if (compare == 0) {
681
670
  return iter->types[i];
682
671
  } else if (compare < 0) {
683
672
  if (i) {
@@ -702,14 +691,14 @@ SWIG_MangledTypeQueryModule(swig_module_info *start,
702
691
  Search for a swig_type_info structure for either a mangled name or a human readable name.
703
692
  It first searches the mangled names of the types, which is a O(log #types)
704
693
  If a type is not found it then searches the human readable names, which is O(#types).
705
-
706
- We start searching at module start, and finish searching when start == end.
694
+
695
+ We start searching at module start, and finish searching when start == end.
707
696
  Note: if start == end at the beginning of the function, we go all the way around
708
697
  the circular list.
709
698
  */
710
699
  SWIGRUNTIME swig_type_info *
711
- SWIG_TypeQueryModule(swig_module_info *start,
712
- swig_module_info *end,
700
+ SWIG_TypeQueryModule(swig_module_info *start,
701
+ swig_module_info *end,
713
702
  const char *name) {
714
703
  /* STEP 1: Search the name field using binary search */
715
704
  swig_type_info *ret = SWIG_MangledTypeQueryModule(start, end, name);
@@ -720,7 +709,7 @@ SWIG_TypeQueryModule(swig_module_info *start,
720
709
  of the str field (the human readable name) */
721
710
  swig_module_info *iter = start;
722
711
  do {
723
- register size_t i = 0;
712
+ size_t i = 0;
724
713
  for (; i < iter->size; ++i) {
725
714
  if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name)))
726
715
  return iter->types[i];
@@ -728,56 +717,56 @@ SWIG_TypeQueryModule(swig_module_info *start,
728
717
  iter = iter->next;
729
718
  } while (iter != end);
730
719
  }
731
-
720
+
732
721
  /* neither found a match */
733
722
  return 0;
734
723
  }
735
724
 
736
- /*
725
+ /*
737
726
  Pack binary data into a string
738
727
  */
739
728
  SWIGRUNTIME char *
740
729
  SWIG_PackData(char *c, void *ptr, size_t sz) {
741
730
  static const char hex[17] = "0123456789abcdef";
742
- register const unsigned char *u = (unsigned char *) ptr;
743
- register const unsigned char *eu = u + sz;
731
+ const unsigned char *u = (unsigned char *) ptr;
732
+ const unsigned char *eu = u + sz;
744
733
  for (; u != eu; ++u) {
745
- register unsigned char uu = *u;
734
+ unsigned char uu = *u;
746
735
  *(c++) = hex[(uu & 0xf0) >> 4];
747
736
  *(c++) = hex[uu & 0xf];
748
737
  }
749
738
  return c;
750
739
  }
751
740
 
752
- /*
741
+ /*
753
742
  Unpack binary data from a string
754
743
  */
755
744
  SWIGRUNTIME const char *
756
745
  SWIG_UnpackData(const char *c, void *ptr, size_t sz) {
757
- register unsigned char *u = (unsigned char *) ptr;
758
- register const unsigned char *eu = u + sz;
746
+ unsigned char *u = (unsigned char *) ptr;
747
+ const unsigned char *eu = u + sz;
759
748
  for (; u != eu; ++u) {
760
- register char d = *(c++);
761
- register unsigned char uu;
749
+ char d = *(c++);
750
+ unsigned char uu;
762
751
  if ((d >= '0') && (d <= '9'))
763
752
  uu = ((d - '0') << 4);
764
753
  else if ((d >= 'a') && (d <= 'f'))
765
754
  uu = ((d - ('a'-10)) << 4);
766
- else
755
+ else
767
756
  return (char *) 0;
768
757
  d = *(c++);
769
758
  if ((d >= '0') && (d <= '9'))
770
759
  uu |= (d - '0');
771
760
  else if ((d >= 'a') && (d <= 'f'))
772
761
  uu |= (d - ('a'-10));
773
- else
762
+ else
774
763
  return (char *) 0;
775
764
  *u = uu;
776
765
  }
777
766
  return c;
778
767
  }
779
768
 
780
- /*
769
+ /*
781
770
  Pack 'void *' into a string buffer.
782
771
  */
783
772
  SWIGRUNTIME char *
@@ -837,18 +826,18 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
837
826
  #endif
838
827
 
839
828
  /* Errors in SWIG */
840
- #define SWIG_UnknownError -1
841
- #define SWIG_IOError -2
842
- #define SWIG_RuntimeError -3
843
- #define SWIG_IndexError -4
844
- #define SWIG_TypeError -5
845
- #define SWIG_DivisionByZero -6
846
- #define SWIG_OverflowError -7
847
- #define SWIG_SyntaxError -8
848
- #define SWIG_ValueError -9
829
+ #define SWIG_UnknownError -1
830
+ #define SWIG_IOError -2
831
+ #define SWIG_RuntimeError -3
832
+ #define SWIG_IndexError -4
833
+ #define SWIG_TypeError -5
834
+ #define SWIG_DivisionByZero -6
835
+ #define SWIG_OverflowError -7
836
+ #define SWIG_SyntaxError -8
837
+ #define SWIG_ValueError -9
849
838
  #define SWIG_SystemError -10
850
839
  #define SWIG_AttributeError -11
851
- #define SWIG_MemoryError -12
840
+ #define SWIG_MemoryError -12
852
841
  #define SWIG_NullReferenceError -13
853
842
 
854
843
 
@@ -1398,7 +1387,7 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
1398
1387
 
1399
1388
  /* Runtime API */
1400
1389
 
1401
- #define SWIG_GetModule(clientdata) SWIG_Ruby_GetModule()
1390
+ #define SWIG_GetModule(clientdata) SWIG_Ruby_GetModule(clientdata)
1402
1391
  #define SWIG_SetModule(clientdata, pointer) SWIG_Ruby_SetModule(pointer)
1403
1392
 
1404
1393
 
@@ -1514,14 +1503,13 @@ SWIG_Ruby_InitRuntime(void)
1514
1503
  SWIGRUNTIME void
1515
1504
  SWIG_Ruby_define_class(swig_type_info *type)
1516
1505
  {
1517
- VALUE klass;
1518
1506
  char *klass_name = (char *) malloc(4 + strlen(type->name) + 1);
1519
1507
  sprintf(klass_name, "TYPE%s", type->name);
1520
1508
  if (NIL_P(_cSWIG_Pointer)) {
1521
1509
  _cSWIG_Pointer = rb_define_class_under(_mSWIG, "Pointer", rb_cObject);
1522
1510
  rb_undef_method(CLASS_OF(_cSWIG_Pointer), "new");
1523
1511
  }
1524
- klass = rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
1512
+ rb_define_class_under(_mSWIG, klass_name, _cSWIG_Pointer);
1525
1513
  free((void *) klass_name);
1526
1514
  }
1527
1515
 
@@ -1552,7 +1540,7 @@ SWIG_Ruby_NewPointerObj(void *ptr, swig_type_info *type, int flags)
1552
1540
  downcast methods. */
1553
1541
  if (obj != Qnil) {
1554
1542
  VALUE value = rb_iv_get(obj, "@__swigtype__");
1555
- char* type_name = RSTRING_PTR(value);
1543
+ const char* type_name = RSTRING_PTR(value);
1556
1544
 
1557
1545
  if (strcmp(type->name, type_name) == 0) {
1558
1546
  return obj;
@@ -1734,7 +1722,7 @@ SWIG_Ruby_ConvertPacked(VALUE obj, void *ptr, int sz, swig_type_info *ty) {
1734
1722
  }
1735
1723
 
1736
1724
  SWIGRUNTIME swig_module_info *
1737
- SWIG_Ruby_GetModule(void)
1725
+ SWIG_Ruby_GetModule(void *SWIGUNUSEDPARM(clientdata))
1738
1726
  {
1739
1727
  VALUE pointer;
1740
1728
  swig_module_info *ret = 0;
@@ -1774,7 +1762,7 @@ SWIG_Ruby_SetModule(swig_module_info *pointer)
1774
1762
  SWIGINTERN
1775
1763
  int SWIG_Ruby_isCallable( VALUE proc )
1776
1764
  {
1777
- if ( rb_respond_to( proc, swig_call_id ) == Qtrue )
1765
+ if ( rb_respond_to( proc, swig_call_id ) )
1778
1766
  return 1;
1779
1767
  return 0;
1780
1768
  }
@@ -1787,7 +1775,7 @@ int SWIG_Ruby_isCallable( VALUE proc )
1787
1775
  SWIGINTERN
1788
1776
  int SWIG_Ruby_arity( VALUE proc, int minimal )
1789
1777
  {
1790
- if ( rb_respond_to( proc, swig_arity_id ) == Qtrue )
1778
+ if ( rb_respond_to( proc, swig_arity_id ) )
1791
1779
  {
1792
1780
  VALUE num = rb_funcall( proc, swig_arity_id, 0 );
1793
1781
  int arity = NUM2INT(num);
@@ -1816,25 +1804,27 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
1816
1804
 
1817
1805
  /* -------- TYPES TABLE (BEGIN) -------- */
1818
1806
 
1819
- #define SWIGTYPE_p_GIntBig swig_types[0]
1820
- #define SWIGTYPE_p_OGRDataSourceShadow swig_types[1]
1821
- #define SWIGTYPE_p_OGRDriverShadow swig_types[2]
1822
- #define SWIGTYPE_p_OGRFeatureDefnShadow swig_types[3]
1823
- #define SWIGTYPE_p_OGRFeatureShadow swig_types[4]
1824
- #define SWIGTYPE_p_OGRFieldDefnShadow swig_types[5]
1825
- #define SWIGTYPE_p_OGRGeometryShadow swig_types[6]
1826
- #define SWIGTYPE_p_OGRLayerShadow swig_types[7]
1827
- #define SWIGTYPE_p_OSRCoordinateTransformationShadow swig_types[8]
1828
- #define SWIGTYPE_p_OSRSpatialReferenceShadow swig_types[9]
1829
- #define SWIGTYPE_p_char swig_types[10]
1830
- #define SWIGTYPE_p_double swig_types[11]
1831
- #define SWIGTYPE_p_int swig_types[12]
1832
- #define SWIGTYPE_p_p_char swig_types[13]
1833
- #define SWIGTYPE_p_p_double swig_types[14]
1834
- #define SWIGTYPE_p_p_int swig_types[15]
1835
- #define SWIGTYPE_p_p_p_char swig_types[16]
1836
- static swig_type_info *swig_types[18];
1837
- static swig_module_info swig_module = {swig_types, 17, 0, 0, 0, 0};
1807
+ #define SWIGTYPE_p_GDALProgressFunc swig_types[0]
1808
+ #define SWIGTYPE_p_GIntBig swig_types[1]
1809
+ #define SWIGTYPE_p_OGRDataSourceShadow swig_types[2]
1810
+ #define SWIGTYPE_p_OGRDriverShadow swig_types[3]
1811
+ #define SWIGTYPE_p_OGRFeatureDefnShadow swig_types[4]
1812
+ #define SWIGTYPE_p_OGRFeatureShadow swig_types[5]
1813
+ #define SWIGTYPE_p_OGRFieldDefnShadow swig_types[6]
1814
+ #define SWIGTYPE_p_OGRGeometryShadow swig_types[7]
1815
+ #define SWIGTYPE_p_OGRLayerShadow swig_types[8]
1816
+ #define SWIGTYPE_p_OSRCoordinateTransformationShadow swig_types[9]
1817
+ #define SWIGTYPE_p_OSRSpatialReferenceShadow swig_types[10]
1818
+ #define SWIGTYPE_p_char swig_types[11]
1819
+ #define SWIGTYPE_p_double swig_types[12]
1820
+ #define SWIGTYPE_p_f_double_p_q_const__char_p_void__int swig_types[13]
1821
+ #define SWIGTYPE_p_int swig_types[14]
1822
+ #define SWIGTYPE_p_p_char swig_types[15]
1823
+ #define SWIGTYPE_p_p_double swig_types[16]
1824
+ #define SWIGTYPE_p_p_int swig_types[17]
1825
+ #define SWIGTYPE_p_p_p_char swig_types[18]
1826
+ static swig_type_info *swig_types[20];
1827
+ static swig_module_info swig_module = {swig_types, 19, 0, 0, 0, 0};
1838
1828
  #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
1839
1829
  #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
1840
1830
 
@@ -1849,7 +1839,7 @@ static VALUE mOgr;
1849
1839
  #define SWIG_RUBY_THREAD_END_BLOCK
1850
1840
 
1851
1841
 
1852
- #define SWIGVERSION 0x020004
1842
+ #define SWIGVERSION 0x030005
1853
1843
  #define SWIG_VERSION SWIGVERSION
1854
1844
 
1855
1845
 
@@ -1958,7 +1948,7 @@ SWIG_FromCharPtr(const char *cptr)
1958
1948
  extern "C" {
1959
1949
  #endif
1960
1950
 
1961
- // Ruby 1.9 changed the file name of this header
1951
+ /* Ruby 1.9 changed the file name of this header */
1962
1952
  #ifdef HAVE_RUBY_IO_H
1963
1953
  #include "ruby/io.h"
1964
1954
  #else
@@ -2034,11 +2024,7 @@ SWIGINTERN int
2034
2024
  SWIG_AsCharPtrAndSize(VALUE obj, char** cptr, size_t* psize, int *alloc)
2035
2025
  {
2036
2026
  if (TYPE(obj) == T_STRING) {
2037
- #if defined(StringValuePtr)
2038
2027
  char *cstr = StringValuePtr(obj);
2039
- #else
2040
- char *cstr = STR2CSTR(obj);
2041
- #endif
2042
2028
  size_t size = RSTRING_LEN(obj) + 1;
2043
2029
  if (cptr) {
2044
2030
  if (alloc) {
@@ -2086,7 +2072,7 @@ SWIG_ruby_failed(void)
2086
2072
  }
2087
2073
 
2088
2074
 
2089
- /*@SWIG:/usr/local/Cellar/swig/2.0.4/share/swig/2.0.4/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
2075
+ /*@SWIG:/usr/local/Cellar/swig/3.0.5/share/swig/3.0.5/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
2090
2076
  SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
2091
2077
  {
2092
2078
  VALUE obj = args[0];
@@ -2131,12 +2117,15 @@ SWIG_AsVal_int (VALUE obj, int *val)
2131
2117
  }
2132
2118
 
2133
2119
  SWIGINTERN OGRDataSourceShadow *OGRDriverShadow_Open(OGRDriverShadow *self,char const *utf8_path,int update=0){
2120
+ CPLErrorReset();
2134
2121
  OGRDataSourceShadow* ds = (OGRDataSourceShadow*) OGR_Dr_Open(self, utf8_path, update);
2135
2122
  if( CPLGetLastErrorType() == CE_Failure && ds != NULL )
2136
2123
  {
2137
- CPLDebug( "SWIG",
2138
- "OGR_Dr_Open() succeeded, but an error is posted, so we destroy"
2139
- " the datasource and fail at swig level." );
2124
+ CPLDebug(
2125
+ "SWIG",
2126
+ "OGR_Dr_Open() succeeded, but an error is posted, so we destroy"
2127
+ " the datasource and fail at swig level.\nError:%s",
2128
+ CPLGetLastErrorMsg() );
2140
2129
  OGRReleaseDataSource(ds);
2141
2130
  ds = NULL;
2142
2131
  }
@@ -2238,13 +2227,13 @@ SWIGINTERN void OGRLayerShadow_SetSpatialFilter(OGRLayerShadow *self,OGRGeometry
2238
2227
  OGR_L_SetSpatialFilter (self, filter);
2239
2228
  }
2240
2229
 
2241
- /*@SWIG:/usr/local/Cellar/swig/2.0.4/share/swig/2.0.4/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
2230
+ /*@SWIG:/usr/local/Cellar/swig/3.0.5/share/swig/3.0.5/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
2242
2231
  SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
2243
2232
  {
2244
2233
  VALUE obj = args[0];
2245
2234
  VALUE type = TYPE(obj);
2246
2235
  double *res = (double *)(args[1]);
2247
- *res = NUM2DBL(obj);
2236
+ *res = NUM2DBL(obj); (void)type;
2248
2237
  return obj;
2249
2238
  }
2250
2239
  /*@SWIG@*/
@@ -2369,6 +2358,27 @@ SWIGINTERN GIntBig OGRLayerShadow_GetFeaturesRead(OGRLayerShadow *self){
2369
2358
  SWIGINTERN OGRErr OGRLayerShadow_SetIgnoredFields(OGRLayerShadow *self,char const **options){
2370
2359
  return OGR_L_SetIgnoredFields( self, options );
2371
2360
  }
2361
+ SWIGINTERN OGRErr OGRLayerShadow_Intersection(OGRLayerShadow *self,OGRLayerShadow *method_layer,OGRLayerShadow *result_layer,char **options=NULL,GDALProgressFunc callback=NULL,void *callback_data=NULL){
2362
+ return OGR_L_Intersection( self, method_layer, result_layer, options, callback, callback_data );
2363
+ }
2364
+ SWIGINTERN OGRErr OGRLayerShadow_Union(OGRLayerShadow *self,OGRLayerShadow *method_layer,OGRLayerShadow *result_layer,char **options=NULL,GDALProgressFunc callback=NULL,void *callback_data=NULL){
2365
+ return OGR_L_Union( self, method_layer, result_layer, options, callback, callback_data );
2366
+ }
2367
+ SWIGINTERN OGRErr OGRLayerShadow_SymDifference(OGRLayerShadow *self,OGRLayerShadow *method_layer,OGRLayerShadow *result_layer,char **options=NULL,GDALProgressFunc callback=NULL,void *callback_data=NULL){
2368
+ return OGR_L_SymDifference( self, method_layer, result_layer, options, callback, callback_data );
2369
+ }
2370
+ SWIGINTERN OGRErr OGRLayerShadow_Identity(OGRLayerShadow *self,OGRLayerShadow *method_layer,OGRLayerShadow *result_layer,char **options=NULL,GDALProgressFunc callback=NULL,void *callback_data=NULL){
2371
+ return OGR_L_Identity( self, method_layer, result_layer, options, callback, callback_data );
2372
+ }
2373
+ SWIGINTERN OGRErr OGRLayerShadow_Update(OGRLayerShadow *self,OGRLayerShadow *method_layer,OGRLayerShadow *result_layer,char **options=NULL,GDALProgressFunc callback=NULL,void *callback_data=NULL){
2374
+ return OGR_L_Update( self, method_layer, result_layer, options, callback, callback_data );
2375
+ }
2376
+ SWIGINTERN OGRErr OGRLayerShadow_Clip(OGRLayerShadow *self,OGRLayerShadow *method_layer,OGRLayerShadow *result_layer,char **options=NULL,GDALProgressFunc callback=NULL,void *callback_data=NULL){
2377
+ return OGR_L_Clip( self, method_layer, result_layer, options, callback, callback_data );
2378
+ }
2379
+ SWIGINTERN OGRErr OGRLayerShadow_Erase(OGRLayerShadow *self,OGRLayerShadow *method_layer,OGRLayerShadow *result_layer,char **options=NULL,GDALProgressFunc callback=NULL,void *callback_data=NULL){
2380
+ return OGR_L_Erase( self, method_layer, result_layer, options, callback, callback_data );
2381
+ }
2372
2382
  SWIGINTERN void OGRLayerShadow_each(OGRLayerShadow *self){
2373
2383
  OGRFeatureShadow* feature = NULL;
2374
2384
 
@@ -2881,6 +2891,13 @@ OGRGeometryShadow* ForceToPolygon( OGRGeometryShadow *geom_in ) {
2881
2891
  }
2882
2892
 
2883
2893
 
2894
+ OGRGeometryShadow* ForceToLineString( OGRGeometryShadow *geom_in ) {
2895
+ if (geom_in == NULL)
2896
+ return NULL;
2897
+ return (OGRGeometryShadow* )OGR_G_ForceToLineString( OGR_G_Clone(geom_in) );
2898
+ }
2899
+
2900
+
2884
2901
  OGRGeometryShadow* ForceToMultiPolygon( OGRGeometryShadow *geom_in ) {
2885
2902
  if (geom_in == NULL)
2886
2903
  return NULL;
@@ -3121,6 +3138,9 @@ SWIGINTERN OGRGeometryShadow *OGRGeometryShadow_Centroid(OGRGeometryShadow *self
3121
3138
  OGR_G_Centroid( self, pt );
3122
3139
  return pt;
3123
3140
  }
3141
+ SWIGINTERN OGRGeometryShadow *OGRGeometryShadow_PointOnSurface(OGRGeometryShadow *self){
3142
+ return (OGRGeometryShadow*) OGR_G_PointOnSurface( self );
3143
+ }
3124
3144
  SWIGINTERN int OGRGeometryShadow_WkbSize(OGRGeometryShadow *self){
3125
3145
  return OGR_G_WkbSize(self);
3126
3146
  }
@@ -3208,6 +3228,11 @@ OGRDriverShadow* GetDriver(int driver_number) {
3208
3228
  }
3209
3229
 
3210
3230
 
3231
+ int GDALTermProgress_nocb( double dfProgress, const char * pszMessage=NULL, void *pData=NULL ) {
3232
+ return GDALTermProgress( dfProgress, pszMessage, pData);
3233
+ }
3234
+
3235
+
3211
3236
  /*
3212
3237
  Document-method: Gdal::Ogr.use_exceptions
3213
3238
 
@@ -3259,14 +3284,14 @@ fail:
3259
3284
 
3260
3285
 
3261
3286
  */
3262
- swig_class SwigClassDriver;
3287
+ static swig_class SwigClassDriver;
3263
3288
 
3264
3289
 
3265
3290
  /*
3266
3291
  Document-method: Gdal::Ogr::Driver.name
3267
3292
 
3268
3293
  call-seq:
3269
- name -> char
3294
+ name -> char const *
3270
3295
 
3271
3296
  Get value of attribute.
3272
3297
 
@@ -3319,7 +3344,7 @@ fail:
3319
3344
  Document-method: Gdal::Ogr::Driver.create_data_source
3320
3345
 
3321
3346
  call-seq:
3322
- create_data_source(char utf8_path, char options=0) -> DataSource
3347
+ create_data_source(char const * utf8_path, char ** options=None) -> DataSource
3323
3348
 
3324
3349
  An instance method.
3325
3350
 
@@ -3334,7 +3359,7 @@ _wrap_Driver_create_data_source(int argc, VALUE *argv, VALUE self) {
3334
3359
  int res2 ;
3335
3360
  char *buf2 = 0 ;
3336
3361
  int alloc2 = 0 ;
3337
- char *kwnames[] = {
3362
+ const char *kwnames[] = {
3338
3363
  "self","utf8_path","options", NULL
3339
3364
  };
3340
3365
  OGRDataSourceShadow *result = 0 ;
@@ -3412,7 +3437,7 @@ fail:
3412
3437
  Document-method: Gdal::Ogr::Driver.copy_data_source
3413
3438
 
3414
3439
  call-seq:
3415
- copy_data_source(DataSource copy_ds, char utf8_path, char options=0) -> DataSource
3440
+ copy_data_source(DataSource copy_ds, char const * utf8_path, char ** options=None) -> DataSource
3416
3441
 
3417
3442
  An instance method.
3418
3443
 
@@ -3430,7 +3455,7 @@ _wrap_Driver_copy_data_source(int argc, VALUE *argv, VALUE self) {
3430
3455
  int res3 ;
3431
3456
  char *buf3 = 0 ;
3432
3457
  int alloc3 = 0 ;
3433
- char *kwnames[] = {
3458
+ const char *kwnames[] = {
3434
3459
  "self","copy_ds","utf8_path","options", NULL
3435
3460
  };
3436
3461
  OGRDataSourceShadow *result = 0 ;
@@ -3513,7 +3538,7 @@ fail:
3513
3538
  Document-method: Gdal::Ogr::Driver.open
3514
3539
 
3515
3540
  call-seq:
3516
- open(char utf8_path, int update=0) -> DataSource
3541
+ open(char const * utf8_path, int update=0) -> DataSource
3517
3542
 
3518
3543
  An instance method.
3519
3544
 
@@ -3530,7 +3555,7 @@ _wrap_Driver_open(int argc, VALUE *argv, VALUE self) {
3530
3555
  int alloc2 = 0 ;
3531
3556
  int val3 ;
3532
3557
  int ecode3 = 0 ;
3533
- char *kwnames[] = {
3558
+ const char *kwnames[] = {
3534
3559
  "self","utf8_path","update", NULL
3535
3560
  };
3536
3561
  OGRDataSourceShadow *result = 0 ;
@@ -3590,7 +3615,7 @@ fail:
3590
3615
  Document-method: Gdal::Ogr::Driver.delete_data_source
3591
3616
 
3592
3617
  call-seq:
3593
- delete_data_source(char utf8_path) -> int
3618
+ delete_data_source(char const * utf8_path) -> int
3594
3619
 
3595
3620
  An instance method.
3596
3621
 
@@ -3654,7 +3679,7 @@ fail:
3654
3679
  Document-method: Gdal::Ogr::Driver.test_capability
3655
3680
 
3656
3681
  call-seq:
3657
- test_capability(char cap) -> bool
3682
+ test_capability(char const * cap) -> bool
3658
3683
 
3659
3684
  An instance method.
3660
3685
 
@@ -3723,7 +3748,7 @@ fail:
3723
3748
  Document-method: Gdal::Ogr::Driver.get_name
3724
3749
 
3725
3750
  call-seq:
3726
- get_name -> char
3751
+ get_name -> char const *
3727
3752
 
3728
3753
  An instance method.
3729
3754
 
@@ -3879,14 +3904,14 @@ fail:
3879
3904
 
3880
3905
 
3881
3906
  */
3882
- swig_class SwigClassDataSource;
3907
+ static swig_class SwigClassDataSource;
3883
3908
 
3884
3909
 
3885
3910
  /*
3886
3911
  Document-method: Gdal::Ogr::DataSource.name
3887
3912
 
3888
3913
  call-seq:
3889
- name -> char
3914
+ name -> char const *
3890
3915
 
3891
3916
  Get value of attribute.
3892
3917
 
@@ -4159,7 +4184,7 @@ fail:
4159
4184
  Document-method: Gdal::Ogr::DataSource.get_name
4160
4185
 
4161
4186
  call-seq:
4162
- get_name -> char
4187
+ get_name -> char const *
4163
4188
 
4164
4189
  An instance method.
4165
4190
 
@@ -4346,8 +4371,8 @@ fail:
4346
4371
  Document-method: Gdal::Ogr::DataSource.create_layer
4347
4372
 
4348
4373
  call-seq:
4349
- create_layer(char name, SpatialReference srs=nil, OGRwkbGeometryType geom_type=WKBUNKNOWN,
4350
- char options=0) -> Layer
4374
+ create_layer(char const * name, SpatialReference srs=nil, OGRwkbGeometryType geom_type=WKBUNKNOWN,
4375
+ char ** options=None) -> Layer
4351
4376
 
4352
4377
  An instance method.
4353
4378
 
@@ -4366,7 +4391,7 @@ _wrap_DataSource_create_layer(int argc, VALUE *argv, VALUE self) {
4366
4391
  int alloc2 = 0 ;
4367
4392
  void *argp3 = 0 ;
4368
4393
  int res3 = 0 ;
4369
- char *kwnames[] = {
4394
+ const char *kwnames[] = {
4370
4395
  "self","name","srs","geom_type","options", NULL
4371
4396
  };
4372
4397
  OGRLayerShadow *result = 0 ;
@@ -4462,7 +4487,7 @@ fail:
4462
4487
  Document-method: Gdal::Ogr::DataSource.copy_layer
4463
4488
 
4464
4489
  call-seq:
4465
- copy_layer(Layer src_layer, char new_name, char options=0) -> Layer
4490
+ copy_layer(Layer src_layer, char const * new_name, char ** options=None) -> Layer
4466
4491
 
4467
4492
  An instance method.
4468
4493
 
@@ -4480,7 +4505,7 @@ _wrap_DataSource_copy_layer(int argc, VALUE *argv, VALUE self) {
4480
4505
  int res3 ;
4481
4506
  char *buf3 = 0 ;
4482
4507
  int alloc3 = 0 ;
4483
- char *kwnames[] = {
4508
+ const char *kwnames[] = {
4484
4509
  "self","src_layer","new_name","options", NULL
4485
4510
  };
4486
4511
  OGRLayerShadow *result = 0 ;
@@ -4568,7 +4593,7 @@ fail:
4568
4593
  Document-method: Gdal::Ogr::DataSource.test_capability
4569
4594
 
4570
4595
  call-seq:
4571
- test_capability(char cap) -> bool
4596
+ test_capability(char const * cap) -> bool
4572
4597
 
4573
4598
  An instance method.
4574
4599
 
@@ -4637,7 +4662,7 @@ fail:
4637
4662
  Document-method: Gdal::Ogr::DataSource.execute_sql
4638
4663
 
4639
4664
  call-seq:
4640
- execute_sql(char statement, Geometry spatialFilter=nil, char dialect="") -> Layer
4665
+ execute_sql(char const * statement, Geometry spatialFilter=nil, char const * dialect="") -> Layer
4641
4666
 
4642
4667
  An instance method.
4643
4668
 
@@ -4658,7 +4683,7 @@ _wrap_DataSource_execute_sql(int argc, VALUE *argv, VALUE self) {
4658
4683
  int res4 ;
4659
4684
  char *buf4 = 0 ;
4660
4685
  int alloc4 = 0 ;
4661
- char *kwnames[] = {
4686
+ const char *kwnames[] = {
4662
4687
  "self","statement","spatialFilter","dialect", NULL
4663
4688
  };
4664
4689
  OGRLayerShadow *result = 0 ;
@@ -4846,7 +4871,7 @@ fail:
4846
4871
 
4847
4872
 
4848
4873
  */
4849
- swig_class SwigClassLayer;
4874
+ static swig_class SwigClassLayer;
4850
4875
 
4851
4876
 
4852
4877
  /*
@@ -5099,7 +5124,7 @@ fail:
5099
5124
  Document-method: Gdal::Ogr::Layer.set_attribute_filter
5100
5125
 
5101
5126
  call-seq:
5102
- set_attribute_filter(char filter_string) -> OGRErr
5127
+ set_attribute_filter(char * filter_string) -> OGRErr
5103
5128
 
5104
5129
  An instance method.
5105
5130
 
@@ -5223,7 +5248,7 @@ fail:
5223
5248
  Document-method: Gdal::Ogr::Layer.get_name
5224
5249
 
5225
5250
  call-seq:
5226
- get_name -> char
5251
+ get_name -> char const *
5227
5252
 
5228
5253
  An instance method.
5229
5254
 
@@ -5329,7 +5354,7 @@ fail:
5329
5354
  Document-method: Gdal::Ogr::Layer.get_geometry_column
5330
5355
 
5331
5356
  call-seq:
5332
- get_geometry_column -> char
5357
+ get_geometry_column -> char const *
5333
5358
 
5334
5359
  An instance method.
5335
5360
 
@@ -5382,7 +5407,7 @@ fail:
5382
5407
  Document-method: Gdal::Ogr::Layer.get_fidcolumn
5383
5408
 
5384
5409
  call-seq:
5385
- get_fidcolumn -> char
5410
+ get_fidcolumn -> char const *
5386
5411
 
5387
5412
  An instance method.
5388
5413
 
@@ -5972,7 +5997,7 @@ _wrap_Layer_get_feature_count(int argc, VALUE *argv, VALUE self) {
5972
5997
  int res1 = 0 ;
5973
5998
  int val2 ;
5974
5999
  int ecode2 = 0 ;
5975
- char *kwnames[] = {
6000
+ const char *kwnames[] = {
5976
6001
  "self","force", NULL
5977
6002
  };
5978
6003
  int result;
@@ -6040,7 +6065,7 @@ _wrap_Layer_get_extent(int argc, VALUE *argv, VALUE self) {
6040
6065
  double argout2[4] ;
6041
6066
  int val3 ;
6042
6067
  int ecode3 = 0 ;
6043
- char *kwnames[] = {
6068
+ const char *kwnames[] = {
6044
6069
  "self","force", NULL
6045
6070
  };
6046
6071
  OGRErr result;
@@ -6120,7 +6145,7 @@ fail:
6120
6145
  Document-method: Gdal::Ogr::Layer.test_capability
6121
6146
 
6122
6147
  call-seq:
6123
- test_capability(char cap) -> bool
6148
+ test_capability(char const * cap) -> bool
6124
6149
 
6125
6150
  An instance method.
6126
6151
 
@@ -6205,7 +6230,7 @@ _wrap_Layer_create_field(int argc, VALUE *argv, VALUE self) {
6205
6230
  int res2 = 0 ;
6206
6231
  int val3 ;
6207
6232
  int ecode3 = 0 ;
6208
- char *kwnames[] = {
6233
+ const char *kwnames[] = {
6209
6234
  "self","field_def","approx_ok", NULL
6210
6235
  };
6211
6236
  OGRErr result;
@@ -6874,14 +6899,879 @@ _wrap_Layer_get_features_read(int argc, VALUE *argv, VALUE self) {
6874
6899
  if ((argc < 0) || (argc > 0)) {
6875
6900
  rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
6876
6901
  }
6877
- res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
6878
- if (!SWIG_IsOK(res1)) {
6879
- SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","GetFeaturesRead", 1, self ));
6902
+ res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
6903
+ if (!SWIG_IsOK(res1)) {
6904
+ SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","GetFeaturesRead", 1, self ));
6905
+ }
6906
+ arg1 = reinterpret_cast< OGRLayerShadow * >(argp1);
6907
+ {
6908
+ CPLErrorReset();
6909
+ result = OGRLayerShadow_GetFeaturesRead(arg1);
6910
+ CPLErr eclass = CPLGetLastErrorType();
6911
+ if ( eclass == CE_Failure || eclass == CE_Fatal ) {
6912
+ SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
6913
+
6914
+ }
6915
+
6916
+
6917
+
6918
+
6919
+
6920
+
6921
+
6922
+
6923
+
6924
+
6925
+
6926
+ }
6927
+ vresult = SWIG_NewPointerObj((new GIntBig(static_cast< const GIntBig& >(result))), SWIGTYPE_p_GIntBig, SWIG_POINTER_OWN | 0 );
6928
+ return vresult;
6929
+ fail:
6930
+ return Qnil;
6931
+ }
6932
+
6933
+
6934
+
6935
+ /*
6936
+ Document-method: Gdal::Ogr::Layer.set_ignored_fields
6937
+
6938
+ call-seq:
6939
+ set_ignored_fields(char const ** options) -> OGRErr
6940
+
6941
+ An instance method.
6942
+
6943
+ */
6944
+ SWIGINTERN VALUE
6945
+ _wrap_Layer_set_ignored_fields(int argc, VALUE *argv, VALUE self) {
6946
+ OGRLayerShadow *arg1 = (OGRLayerShadow *) 0 ;
6947
+ char **arg2 = (char **) 0 ;
6948
+ void *argp1 = 0 ;
6949
+ int res1 = 0 ;
6950
+ OGRErr result;
6951
+ VALUE vresult = Qnil;
6952
+
6953
+ if ((argc < 1) || (argc > 1)) {
6954
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
6955
+ }
6956
+ res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
6957
+ if (!SWIG_IsOK(res1)) {
6958
+ SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","SetIgnoredFields", 1, self ));
6959
+ }
6960
+ arg1 = reinterpret_cast< OGRLayerShadow * >(argp1);
6961
+ {
6962
+ /* %typemap(in) char **options */
6963
+
6964
+ /* Check if is a list */
6965
+ Check_Type(argv[0], T_ARRAY);
6966
+
6967
+ int size = RARRAY_LEN(argv[0]);
6968
+ for (int i = 0; i < size; i++) {
6969
+ VALUE item = rb_ary_entry(argv[0], i);
6970
+ char *pszItem = StringValuePtr(item);
6971
+ arg2 = CSLAddString( arg2, pszItem );
6972
+ }
6973
+ }
6974
+ {
6975
+ CPLErrorReset();
6976
+ result = (OGRErr)OGRLayerShadow_SetIgnoredFields(arg1,(char const **)arg2);
6977
+ CPLErr eclass = CPLGetLastErrorType();
6978
+ if ( eclass == CE_Failure || eclass == CE_Fatal ) {
6979
+ SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
6980
+
6981
+ }
6982
+
6983
+
6984
+
6985
+
6986
+
6987
+
6988
+
6989
+
6990
+
6991
+
6992
+
6993
+ }
6994
+ {
6995
+ /* %typemap(out) OGRErr */
6996
+ if (result != 0) {
6997
+ rb_raise(rb_eRuntimeError, OGRErrMessages(result));
6998
+ }
6999
+ }
7000
+ {
7001
+ /* %typemap(freearg) char **options */
7002
+
7003
+ CSLDestroy( arg2 );
7004
+ }
7005
+ {
7006
+ /* %typemap(ret) OGRErr */
7007
+ if (vresult == Qnil) {
7008
+ vresult = INT2NUM(0);
7009
+ }
7010
+ } return vresult;
7011
+ fail:
7012
+ {
7013
+ /* %typemap(freearg) char **options */
7014
+
7015
+ CSLDestroy( arg2 );
7016
+ }
7017
+ return Qnil;
7018
+ }
7019
+
7020
+
7021
+
7022
+ /*
7023
+ Document-method: Gdal::Ogr::Layer.intersection
7024
+
7025
+ call-seq:
7026
+ intersection(Layer method_layer, Layer result_layer, char ** options=nil, GDALProgressFunc callback=0,
7027
+ void * callback_data=nil) -> OGRErr
7028
+
7029
+ An instance method.
7030
+
7031
+ */
7032
+ SWIGINTERN VALUE
7033
+ _wrap_Layer_intersection(int argc, VALUE *argv, VALUE self) {
7034
+ OGRLayerShadow *arg1 = (OGRLayerShadow *) 0 ;
7035
+ OGRLayerShadow *arg2 = (OGRLayerShadow *) 0 ;
7036
+ OGRLayerShadow *arg3 = (OGRLayerShadow *) 0 ;
7037
+ char **arg4 = (char **) NULL ;
7038
+ GDALProgressFunc arg5 = (GDALProgressFunc) NULL ;
7039
+ void *arg6 = (void *) NULL ;
7040
+ void *argp1 = 0 ;
7041
+ int res1 = 0 ;
7042
+ void *argp2 = 0 ;
7043
+ int res2 = 0 ;
7044
+ void *argp3 = 0 ;
7045
+ int res3 = 0 ;
7046
+ void *argp5 ;
7047
+ int res5 = 0 ;
7048
+ int res6 ;
7049
+ const char *kwnames[] = {
7050
+ "self","method_layer","result_layer","options","callback","callback_data", NULL
7051
+ };
7052
+ OGRErr result;
7053
+ VALUE vresult = Qnil;
7054
+
7055
+ if ((argc < 2) || (argc > 5)) {
7056
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
7057
+ }
7058
+ res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
7059
+ if (!SWIG_IsOK(res1)) {
7060
+ SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","Intersection", 1, self ));
7061
+ }
7062
+ arg1 = reinterpret_cast< OGRLayerShadow * >(argp1);
7063
+ res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
7064
+ if (!SWIG_IsOK(res2)) {
7065
+ SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "OGRLayerShadow *","Intersection", 2, argv[0] ));
7066
+ }
7067
+ arg2 = reinterpret_cast< OGRLayerShadow * >(argp2);
7068
+ res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
7069
+ if (!SWIG_IsOK(res3)) {
7070
+ SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "OGRLayerShadow *","Intersection", 3, argv[1] ));
7071
+ }
7072
+ arg3 = reinterpret_cast< OGRLayerShadow * >(argp3);
7073
+ if (argc > 2) {
7074
+ {
7075
+ /* %typemap(in) char **options */
7076
+
7077
+ /* Check if is a list */
7078
+ Check_Type(argv[2], T_ARRAY);
7079
+
7080
+ int size = RARRAY_LEN(argv[2]);
7081
+ for (int i = 0; i < size; i++) {
7082
+ VALUE item = rb_ary_entry(argv[2], i);
7083
+ char *pszItem = StringValuePtr(item);
7084
+ arg4 = CSLAddString( arg4, pszItem );
7085
+ }
7086
+ }
7087
+ }
7088
+ if (argc > 3) {
7089
+ {
7090
+ res5 = SWIG_ConvertPtr(argv[3], &argp5, SWIGTYPE_p_GDALProgressFunc, 0 );
7091
+ if (!SWIG_IsOK(res5)) {
7092
+ SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "GDALProgressFunc","Intersection", 5, argv[3] ));
7093
+ }
7094
+ if (!argp5) {
7095
+ SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "GDALProgressFunc","Intersection", 5, argv[3]));
7096
+ } else {
7097
+ arg5 = *(reinterpret_cast< GDALProgressFunc * >(argp5));
7098
+ }
7099
+ }
7100
+ }
7101
+ if (argc > 4) {
7102
+ res6 = SWIG_ConvertPtr(argv[4],SWIG_as_voidptrptr(&arg6), 0, 0);
7103
+ if (!SWIG_IsOK(res6)) {
7104
+ SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "void *","Intersection", 6, argv[4] ));
7105
+ }
7106
+ }
7107
+ {
7108
+ CPLErrorReset();
7109
+ result = (OGRErr)OGRLayerShadow_Intersection(arg1,arg2,arg3,arg4,arg5,arg6);
7110
+ CPLErr eclass = CPLGetLastErrorType();
7111
+ if ( eclass == CE_Failure || eclass == CE_Fatal ) {
7112
+ SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
7113
+
7114
+ }
7115
+
7116
+
7117
+
7118
+
7119
+
7120
+
7121
+
7122
+
7123
+
7124
+
7125
+
7126
+ }
7127
+ {
7128
+ /* %typemap(out) OGRErr */
7129
+ if (result != 0) {
7130
+ rb_raise(rb_eRuntimeError, OGRErrMessages(result));
7131
+ }
7132
+ }
7133
+ {
7134
+ /* %typemap(freearg) char **options */
7135
+
7136
+ CSLDestroy( arg4 );
7137
+ }
7138
+ {
7139
+ /* %typemap(ret) OGRErr */
7140
+ if (vresult == Qnil) {
7141
+ vresult = INT2NUM(0);
7142
+ }
7143
+ } return vresult;
7144
+ fail:
7145
+ {
7146
+ /* %typemap(freearg) char **options */
7147
+
7148
+ CSLDestroy( arg4 );
7149
+ }
7150
+ return Qnil;
7151
+ }
7152
+
7153
+
7154
+
7155
+ /*
7156
+ Document-method: Gdal::Ogr::Layer.union
7157
+
7158
+ call-seq:
7159
+ union(Layer method_layer, Layer result_layer, char ** options=nil, GDALProgressFunc callback=0,
7160
+ void * callback_data=nil) -> OGRErr
7161
+
7162
+ An instance method.
7163
+
7164
+ */
7165
+ SWIGINTERN VALUE
7166
+ _wrap_Layer_union(int argc, VALUE *argv, VALUE self) {
7167
+ OGRLayerShadow *arg1 = (OGRLayerShadow *) 0 ;
7168
+ OGRLayerShadow *arg2 = (OGRLayerShadow *) 0 ;
7169
+ OGRLayerShadow *arg3 = (OGRLayerShadow *) 0 ;
7170
+ char **arg4 = (char **) NULL ;
7171
+ GDALProgressFunc arg5 = (GDALProgressFunc) NULL ;
7172
+ void *arg6 = (void *) NULL ;
7173
+ void *argp1 = 0 ;
7174
+ int res1 = 0 ;
7175
+ void *argp2 = 0 ;
7176
+ int res2 = 0 ;
7177
+ void *argp3 = 0 ;
7178
+ int res3 = 0 ;
7179
+ void *argp5 ;
7180
+ int res5 = 0 ;
7181
+ int res6 ;
7182
+ const char *kwnames[] = {
7183
+ "self","method_layer","result_layer","options","callback","callback_data", NULL
7184
+ };
7185
+ OGRErr result;
7186
+ VALUE vresult = Qnil;
7187
+
7188
+ if ((argc < 2) || (argc > 5)) {
7189
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
7190
+ }
7191
+ res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
7192
+ if (!SWIG_IsOK(res1)) {
7193
+ SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","Union", 1, self ));
7194
+ }
7195
+ arg1 = reinterpret_cast< OGRLayerShadow * >(argp1);
7196
+ res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
7197
+ if (!SWIG_IsOK(res2)) {
7198
+ SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "OGRLayerShadow *","Union", 2, argv[0] ));
7199
+ }
7200
+ arg2 = reinterpret_cast< OGRLayerShadow * >(argp2);
7201
+ res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
7202
+ if (!SWIG_IsOK(res3)) {
7203
+ SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "OGRLayerShadow *","Union", 3, argv[1] ));
7204
+ }
7205
+ arg3 = reinterpret_cast< OGRLayerShadow * >(argp3);
7206
+ if (argc > 2) {
7207
+ {
7208
+ /* %typemap(in) char **options */
7209
+
7210
+ /* Check if is a list */
7211
+ Check_Type(argv[2], T_ARRAY);
7212
+
7213
+ int size = RARRAY_LEN(argv[2]);
7214
+ for (int i = 0; i < size; i++) {
7215
+ VALUE item = rb_ary_entry(argv[2], i);
7216
+ char *pszItem = StringValuePtr(item);
7217
+ arg4 = CSLAddString( arg4, pszItem );
7218
+ }
7219
+ }
7220
+ }
7221
+ if (argc > 3) {
7222
+ {
7223
+ res5 = SWIG_ConvertPtr(argv[3], &argp5, SWIGTYPE_p_GDALProgressFunc, 0 );
7224
+ if (!SWIG_IsOK(res5)) {
7225
+ SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "GDALProgressFunc","Union", 5, argv[3] ));
7226
+ }
7227
+ if (!argp5) {
7228
+ SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "GDALProgressFunc","Union", 5, argv[3]));
7229
+ } else {
7230
+ arg5 = *(reinterpret_cast< GDALProgressFunc * >(argp5));
7231
+ }
7232
+ }
7233
+ }
7234
+ if (argc > 4) {
7235
+ res6 = SWIG_ConvertPtr(argv[4],SWIG_as_voidptrptr(&arg6), 0, 0);
7236
+ if (!SWIG_IsOK(res6)) {
7237
+ SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "void *","Union", 6, argv[4] ));
7238
+ }
7239
+ }
7240
+ {
7241
+ CPLErrorReset();
7242
+ result = (OGRErr)OGRLayerShadow_Union(arg1,arg2,arg3,arg4,arg5,arg6);
7243
+ CPLErr eclass = CPLGetLastErrorType();
7244
+ if ( eclass == CE_Failure || eclass == CE_Fatal ) {
7245
+ SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
7246
+
7247
+ }
7248
+
7249
+
7250
+
7251
+
7252
+
7253
+
7254
+
7255
+
7256
+
7257
+
7258
+
7259
+ }
7260
+ {
7261
+ /* %typemap(out) OGRErr */
7262
+ if (result != 0) {
7263
+ rb_raise(rb_eRuntimeError, OGRErrMessages(result));
7264
+ }
7265
+ }
7266
+ {
7267
+ /* %typemap(freearg) char **options */
7268
+
7269
+ CSLDestroy( arg4 );
7270
+ }
7271
+ {
7272
+ /* %typemap(ret) OGRErr */
7273
+ if (vresult == Qnil) {
7274
+ vresult = INT2NUM(0);
7275
+ }
7276
+ } return vresult;
7277
+ fail:
7278
+ {
7279
+ /* %typemap(freearg) char **options */
7280
+
7281
+ CSLDestroy( arg4 );
7282
+ }
7283
+ return Qnil;
7284
+ }
7285
+
7286
+
7287
+
7288
+ /*
7289
+ Document-method: Gdal::Ogr::Layer.sym_difference
7290
+
7291
+ call-seq:
7292
+ sym_difference(Layer method_layer, Layer result_layer, char ** options=nil, GDALProgressFunc callback=0,
7293
+ void * callback_data=nil) -> OGRErr
7294
+
7295
+ An instance method.
7296
+
7297
+ */
7298
+ SWIGINTERN VALUE
7299
+ _wrap_Layer_sym_difference(int argc, VALUE *argv, VALUE self) {
7300
+ OGRLayerShadow *arg1 = (OGRLayerShadow *) 0 ;
7301
+ OGRLayerShadow *arg2 = (OGRLayerShadow *) 0 ;
7302
+ OGRLayerShadow *arg3 = (OGRLayerShadow *) 0 ;
7303
+ char **arg4 = (char **) NULL ;
7304
+ GDALProgressFunc arg5 = (GDALProgressFunc) NULL ;
7305
+ void *arg6 = (void *) NULL ;
7306
+ void *argp1 = 0 ;
7307
+ int res1 = 0 ;
7308
+ void *argp2 = 0 ;
7309
+ int res2 = 0 ;
7310
+ void *argp3 = 0 ;
7311
+ int res3 = 0 ;
7312
+ void *argp5 ;
7313
+ int res5 = 0 ;
7314
+ int res6 ;
7315
+ const char *kwnames[] = {
7316
+ "self","method_layer","result_layer","options","callback","callback_data", NULL
7317
+ };
7318
+ OGRErr result;
7319
+ VALUE vresult = Qnil;
7320
+
7321
+ if ((argc < 2) || (argc > 5)) {
7322
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
7323
+ }
7324
+ res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
7325
+ if (!SWIG_IsOK(res1)) {
7326
+ SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","SymDifference", 1, self ));
7327
+ }
7328
+ arg1 = reinterpret_cast< OGRLayerShadow * >(argp1);
7329
+ res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
7330
+ if (!SWIG_IsOK(res2)) {
7331
+ SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "OGRLayerShadow *","SymDifference", 2, argv[0] ));
7332
+ }
7333
+ arg2 = reinterpret_cast< OGRLayerShadow * >(argp2);
7334
+ res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
7335
+ if (!SWIG_IsOK(res3)) {
7336
+ SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "OGRLayerShadow *","SymDifference", 3, argv[1] ));
7337
+ }
7338
+ arg3 = reinterpret_cast< OGRLayerShadow * >(argp3);
7339
+ if (argc > 2) {
7340
+ {
7341
+ /* %typemap(in) char **options */
7342
+
7343
+ /* Check if is a list */
7344
+ Check_Type(argv[2], T_ARRAY);
7345
+
7346
+ int size = RARRAY_LEN(argv[2]);
7347
+ for (int i = 0; i < size; i++) {
7348
+ VALUE item = rb_ary_entry(argv[2], i);
7349
+ char *pszItem = StringValuePtr(item);
7350
+ arg4 = CSLAddString( arg4, pszItem );
7351
+ }
7352
+ }
7353
+ }
7354
+ if (argc > 3) {
7355
+ {
7356
+ res5 = SWIG_ConvertPtr(argv[3], &argp5, SWIGTYPE_p_GDALProgressFunc, 0 );
7357
+ if (!SWIG_IsOK(res5)) {
7358
+ SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "GDALProgressFunc","SymDifference", 5, argv[3] ));
7359
+ }
7360
+ if (!argp5) {
7361
+ SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "GDALProgressFunc","SymDifference", 5, argv[3]));
7362
+ } else {
7363
+ arg5 = *(reinterpret_cast< GDALProgressFunc * >(argp5));
7364
+ }
7365
+ }
7366
+ }
7367
+ if (argc > 4) {
7368
+ res6 = SWIG_ConvertPtr(argv[4],SWIG_as_voidptrptr(&arg6), 0, 0);
7369
+ if (!SWIG_IsOK(res6)) {
7370
+ SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "void *","SymDifference", 6, argv[4] ));
7371
+ }
7372
+ }
7373
+ {
7374
+ CPLErrorReset();
7375
+ result = (OGRErr)OGRLayerShadow_SymDifference(arg1,arg2,arg3,arg4,arg5,arg6);
7376
+ CPLErr eclass = CPLGetLastErrorType();
7377
+ if ( eclass == CE_Failure || eclass == CE_Fatal ) {
7378
+ SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
7379
+
7380
+ }
7381
+
7382
+
7383
+
7384
+
7385
+
7386
+
7387
+
7388
+
7389
+
7390
+
7391
+
7392
+ }
7393
+ {
7394
+ /* %typemap(out) OGRErr */
7395
+ if (result != 0) {
7396
+ rb_raise(rb_eRuntimeError, OGRErrMessages(result));
7397
+ }
7398
+ }
7399
+ {
7400
+ /* %typemap(freearg) char **options */
7401
+
7402
+ CSLDestroy( arg4 );
7403
+ }
7404
+ {
7405
+ /* %typemap(ret) OGRErr */
7406
+ if (vresult == Qnil) {
7407
+ vresult = INT2NUM(0);
7408
+ }
7409
+ } return vresult;
7410
+ fail:
7411
+ {
7412
+ /* %typemap(freearg) char **options */
7413
+
7414
+ CSLDestroy( arg4 );
7415
+ }
7416
+ return Qnil;
7417
+ }
7418
+
7419
+
7420
+
7421
+ /*
7422
+ Document-method: Gdal::Ogr::Layer.identity
7423
+
7424
+ call-seq:
7425
+ identity(Layer method_layer, Layer result_layer, char ** options=nil, GDALProgressFunc callback=0,
7426
+ void * callback_data=nil) -> OGRErr
7427
+
7428
+ An instance method.
7429
+
7430
+ */
7431
+ SWIGINTERN VALUE
7432
+ _wrap_Layer_identity(int argc, VALUE *argv, VALUE self) {
7433
+ OGRLayerShadow *arg1 = (OGRLayerShadow *) 0 ;
7434
+ OGRLayerShadow *arg2 = (OGRLayerShadow *) 0 ;
7435
+ OGRLayerShadow *arg3 = (OGRLayerShadow *) 0 ;
7436
+ char **arg4 = (char **) NULL ;
7437
+ GDALProgressFunc arg5 = (GDALProgressFunc) NULL ;
7438
+ void *arg6 = (void *) NULL ;
7439
+ void *argp1 = 0 ;
7440
+ int res1 = 0 ;
7441
+ void *argp2 = 0 ;
7442
+ int res2 = 0 ;
7443
+ void *argp3 = 0 ;
7444
+ int res3 = 0 ;
7445
+ void *argp5 ;
7446
+ int res5 = 0 ;
7447
+ int res6 ;
7448
+ const char *kwnames[] = {
7449
+ "self","method_layer","result_layer","options","callback","callback_data", NULL
7450
+ };
7451
+ OGRErr result;
7452
+ VALUE vresult = Qnil;
7453
+
7454
+ if ((argc < 2) || (argc > 5)) {
7455
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
7456
+ }
7457
+ res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
7458
+ if (!SWIG_IsOK(res1)) {
7459
+ SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","Identity", 1, self ));
7460
+ }
7461
+ arg1 = reinterpret_cast< OGRLayerShadow * >(argp1);
7462
+ res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
7463
+ if (!SWIG_IsOK(res2)) {
7464
+ SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "OGRLayerShadow *","Identity", 2, argv[0] ));
7465
+ }
7466
+ arg2 = reinterpret_cast< OGRLayerShadow * >(argp2);
7467
+ res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
7468
+ if (!SWIG_IsOK(res3)) {
7469
+ SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "OGRLayerShadow *","Identity", 3, argv[1] ));
7470
+ }
7471
+ arg3 = reinterpret_cast< OGRLayerShadow * >(argp3);
7472
+ if (argc > 2) {
7473
+ {
7474
+ /* %typemap(in) char **options */
7475
+
7476
+ /* Check if is a list */
7477
+ Check_Type(argv[2], T_ARRAY);
7478
+
7479
+ int size = RARRAY_LEN(argv[2]);
7480
+ for (int i = 0; i < size; i++) {
7481
+ VALUE item = rb_ary_entry(argv[2], i);
7482
+ char *pszItem = StringValuePtr(item);
7483
+ arg4 = CSLAddString( arg4, pszItem );
7484
+ }
7485
+ }
7486
+ }
7487
+ if (argc > 3) {
7488
+ {
7489
+ res5 = SWIG_ConvertPtr(argv[3], &argp5, SWIGTYPE_p_GDALProgressFunc, 0 );
7490
+ if (!SWIG_IsOK(res5)) {
7491
+ SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "GDALProgressFunc","Identity", 5, argv[3] ));
7492
+ }
7493
+ if (!argp5) {
7494
+ SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "GDALProgressFunc","Identity", 5, argv[3]));
7495
+ } else {
7496
+ arg5 = *(reinterpret_cast< GDALProgressFunc * >(argp5));
7497
+ }
7498
+ }
7499
+ }
7500
+ if (argc > 4) {
7501
+ res6 = SWIG_ConvertPtr(argv[4],SWIG_as_voidptrptr(&arg6), 0, 0);
7502
+ if (!SWIG_IsOK(res6)) {
7503
+ SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "void *","Identity", 6, argv[4] ));
7504
+ }
7505
+ }
7506
+ {
7507
+ CPLErrorReset();
7508
+ result = (OGRErr)OGRLayerShadow_Identity(arg1,arg2,arg3,arg4,arg5,arg6);
7509
+ CPLErr eclass = CPLGetLastErrorType();
7510
+ if ( eclass == CE_Failure || eclass == CE_Fatal ) {
7511
+ SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
7512
+
7513
+ }
7514
+
7515
+
7516
+
7517
+
7518
+
7519
+
7520
+
7521
+
7522
+
7523
+
7524
+
7525
+ }
7526
+ {
7527
+ /* %typemap(out) OGRErr */
7528
+ if (result != 0) {
7529
+ rb_raise(rb_eRuntimeError, OGRErrMessages(result));
7530
+ }
7531
+ }
7532
+ {
7533
+ /* %typemap(freearg) char **options */
7534
+
7535
+ CSLDestroy( arg4 );
7536
+ }
7537
+ {
7538
+ /* %typemap(ret) OGRErr */
7539
+ if (vresult == Qnil) {
7540
+ vresult = INT2NUM(0);
7541
+ }
7542
+ } return vresult;
7543
+ fail:
7544
+ {
7545
+ /* %typemap(freearg) char **options */
7546
+
7547
+ CSLDestroy( arg4 );
7548
+ }
7549
+ return Qnil;
7550
+ }
7551
+
7552
+
7553
+
7554
+ /*
7555
+ Document-method: Gdal::Ogr::Layer.update
7556
+
7557
+ call-seq:
7558
+ update(Layer method_layer, Layer result_layer, char ** options=nil, GDALProgressFunc callback=0,
7559
+ void * callback_data=nil) -> OGRErr
7560
+
7561
+ An instance method.
7562
+
7563
+ */
7564
+ SWIGINTERN VALUE
7565
+ _wrap_Layer_update(int argc, VALUE *argv, VALUE self) {
7566
+ OGRLayerShadow *arg1 = (OGRLayerShadow *) 0 ;
7567
+ OGRLayerShadow *arg2 = (OGRLayerShadow *) 0 ;
7568
+ OGRLayerShadow *arg3 = (OGRLayerShadow *) 0 ;
7569
+ char **arg4 = (char **) NULL ;
7570
+ GDALProgressFunc arg5 = (GDALProgressFunc) NULL ;
7571
+ void *arg6 = (void *) NULL ;
7572
+ void *argp1 = 0 ;
7573
+ int res1 = 0 ;
7574
+ void *argp2 = 0 ;
7575
+ int res2 = 0 ;
7576
+ void *argp3 = 0 ;
7577
+ int res3 = 0 ;
7578
+ void *argp5 ;
7579
+ int res5 = 0 ;
7580
+ int res6 ;
7581
+ const char *kwnames[] = {
7582
+ "self","method_layer","result_layer","options","callback","callback_data", NULL
7583
+ };
7584
+ OGRErr result;
7585
+ VALUE vresult = Qnil;
7586
+
7587
+ if ((argc < 2) || (argc > 5)) {
7588
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
7589
+ }
7590
+ res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
7591
+ if (!SWIG_IsOK(res1)) {
7592
+ SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","Update", 1, self ));
7593
+ }
7594
+ arg1 = reinterpret_cast< OGRLayerShadow * >(argp1);
7595
+ res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
7596
+ if (!SWIG_IsOK(res2)) {
7597
+ SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "OGRLayerShadow *","Update", 2, argv[0] ));
7598
+ }
7599
+ arg2 = reinterpret_cast< OGRLayerShadow * >(argp2);
7600
+ res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
7601
+ if (!SWIG_IsOK(res3)) {
7602
+ SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "OGRLayerShadow *","Update", 3, argv[1] ));
7603
+ }
7604
+ arg3 = reinterpret_cast< OGRLayerShadow * >(argp3);
7605
+ if (argc > 2) {
7606
+ {
7607
+ /* %typemap(in) char **options */
7608
+
7609
+ /* Check if is a list */
7610
+ Check_Type(argv[2], T_ARRAY);
7611
+
7612
+ int size = RARRAY_LEN(argv[2]);
7613
+ for (int i = 0; i < size; i++) {
7614
+ VALUE item = rb_ary_entry(argv[2], i);
7615
+ char *pszItem = StringValuePtr(item);
7616
+ arg4 = CSLAddString( arg4, pszItem );
7617
+ }
7618
+ }
7619
+ }
7620
+ if (argc > 3) {
7621
+ {
7622
+ res5 = SWIG_ConvertPtr(argv[3], &argp5, SWIGTYPE_p_GDALProgressFunc, 0 );
7623
+ if (!SWIG_IsOK(res5)) {
7624
+ SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "GDALProgressFunc","Update", 5, argv[3] ));
7625
+ }
7626
+ if (!argp5) {
7627
+ SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "GDALProgressFunc","Update", 5, argv[3]));
7628
+ } else {
7629
+ arg5 = *(reinterpret_cast< GDALProgressFunc * >(argp5));
7630
+ }
7631
+ }
7632
+ }
7633
+ if (argc > 4) {
7634
+ res6 = SWIG_ConvertPtr(argv[4],SWIG_as_voidptrptr(&arg6), 0, 0);
7635
+ if (!SWIG_IsOK(res6)) {
7636
+ SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "void *","Update", 6, argv[4] ));
7637
+ }
7638
+ }
7639
+ {
7640
+ CPLErrorReset();
7641
+ result = (OGRErr)OGRLayerShadow_Update(arg1,arg2,arg3,arg4,arg5,arg6);
7642
+ CPLErr eclass = CPLGetLastErrorType();
7643
+ if ( eclass == CE_Failure || eclass == CE_Fatal ) {
7644
+ SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
7645
+
7646
+ }
7647
+
7648
+
7649
+
7650
+
7651
+
7652
+
7653
+
7654
+
7655
+
7656
+
7657
+
7658
+ }
7659
+ {
7660
+ /* %typemap(out) OGRErr */
7661
+ if (result != 0) {
7662
+ rb_raise(rb_eRuntimeError, OGRErrMessages(result));
7663
+ }
7664
+ }
7665
+ {
7666
+ /* %typemap(freearg) char **options */
7667
+
7668
+ CSLDestroy( arg4 );
7669
+ }
7670
+ {
7671
+ /* %typemap(ret) OGRErr */
7672
+ if (vresult == Qnil) {
7673
+ vresult = INT2NUM(0);
7674
+ }
7675
+ } return vresult;
7676
+ fail:
7677
+ {
7678
+ /* %typemap(freearg) char **options */
7679
+
7680
+ CSLDestroy( arg4 );
7681
+ }
7682
+ return Qnil;
7683
+ }
7684
+
7685
+
7686
+
7687
+ /*
7688
+ Document-method: Gdal::Ogr::Layer.clip
7689
+
7690
+ call-seq:
7691
+ clip(Layer method_layer, Layer result_layer, char ** options=nil, GDALProgressFunc callback=0,
7692
+ void * callback_data=nil) -> OGRErr
7693
+
7694
+ An instance method.
7695
+
7696
+ */
7697
+ SWIGINTERN VALUE
7698
+ _wrap_Layer_clip(int argc, VALUE *argv, VALUE self) {
7699
+ OGRLayerShadow *arg1 = (OGRLayerShadow *) 0 ;
7700
+ OGRLayerShadow *arg2 = (OGRLayerShadow *) 0 ;
7701
+ OGRLayerShadow *arg3 = (OGRLayerShadow *) 0 ;
7702
+ char **arg4 = (char **) NULL ;
7703
+ GDALProgressFunc arg5 = (GDALProgressFunc) NULL ;
7704
+ void *arg6 = (void *) NULL ;
7705
+ void *argp1 = 0 ;
7706
+ int res1 = 0 ;
7707
+ void *argp2 = 0 ;
7708
+ int res2 = 0 ;
7709
+ void *argp3 = 0 ;
7710
+ int res3 = 0 ;
7711
+ void *argp5 ;
7712
+ int res5 = 0 ;
7713
+ int res6 ;
7714
+ const char *kwnames[] = {
7715
+ "self","method_layer","result_layer","options","callback","callback_data", NULL
7716
+ };
7717
+ OGRErr result;
7718
+ VALUE vresult = Qnil;
7719
+
7720
+ if ((argc < 2) || (argc > 5)) {
7721
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
7722
+ }
7723
+ res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
7724
+ if (!SWIG_IsOK(res1)) {
7725
+ SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","Clip", 1, self ));
7726
+ }
7727
+ arg1 = reinterpret_cast< OGRLayerShadow * >(argp1);
7728
+ res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
7729
+ if (!SWIG_IsOK(res2)) {
7730
+ SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "OGRLayerShadow *","Clip", 2, argv[0] ));
7731
+ }
7732
+ arg2 = reinterpret_cast< OGRLayerShadow * >(argp2);
7733
+ res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
7734
+ if (!SWIG_IsOK(res3)) {
7735
+ SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "OGRLayerShadow *","Clip", 3, argv[1] ));
7736
+ }
7737
+ arg3 = reinterpret_cast< OGRLayerShadow * >(argp3);
7738
+ if (argc > 2) {
7739
+ {
7740
+ /* %typemap(in) char **options */
7741
+
7742
+ /* Check if is a list */
7743
+ Check_Type(argv[2], T_ARRAY);
7744
+
7745
+ int size = RARRAY_LEN(argv[2]);
7746
+ for (int i = 0; i < size; i++) {
7747
+ VALUE item = rb_ary_entry(argv[2], i);
7748
+ char *pszItem = StringValuePtr(item);
7749
+ arg4 = CSLAddString( arg4, pszItem );
7750
+ }
7751
+ }
7752
+ }
7753
+ if (argc > 3) {
7754
+ {
7755
+ res5 = SWIG_ConvertPtr(argv[3], &argp5, SWIGTYPE_p_GDALProgressFunc, 0 );
7756
+ if (!SWIG_IsOK(res5)) {
7757
+ SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "GDALProgressFunc","Clip", 5, argv[3] ));
7758
+ }
7759
+ if (!argp5) {
7760
+ SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "GDALProgressFunc","Clip", 5, argv[3]));
7761
+ } else {
7762
+ arg5 = *(reinterpret_cast< GDALProgressFunc * >(argp5));
7763
+ }
7764
+ }
7765
+ }
7766
+ if (argc > 4) {
7767
+ res6 = SWIG_ConvertPtr(argv[4],SWIG_as_voidptrptr(&arg6), 0, 0);
7768
+ if (!SWIG_IsOK(res6)) {
7769
+ SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "void *","Clip", 6, argv[4] ));
7770
+ }
6880
7771
  }
6881
- arg1 = reinterpret_cast< OGRLayerShadow * >(argp1);
6882
7772
  {
6883
7773
  CPLErrorReset();
6884
- result = OGRLayerShadow_GetFeaturesRead(arg1);
7774
+ result = (OGRErr)OGRLayerShadow_Clip(arg1,arg2,arg3,arg4,arg5,arg6);
6885
7775
  CPLErr eclass = CPLGetLastErrorType();
6886
7776
  if ( eclass == CE_Failure || eclass == CE_Fatal ) {
6887
7777
  SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
@@ -6899,56 +7789,122 @@ _wrap_Layer_get_features_read(int argc, VALUE *argv, VALUE self) {
6899
7789
 
6900
7790
 
6901
7791
  }
6902
- vresult = SWIG_NewPointerObj((new GIntBig(static_cast< const GIntBig& >(result))), SWIGTYPE_p_GIntBig, SWIG_POINTER_OWN | 0 );
6903
- return vresult;
7792
+ {
7793
+ /* %typemap(out) OGRErr */
7794
+ if (result != 0) {
7795
+ rb_raise(rb_eRuntimeError, OGRErrMessages(result));
7796
+ }
7797
+ }
7798
+ {
7799
+ /* %typemap(freearg) char **options */
7800
+
7801
+ CSLDestroy( arg4 );
7802
+ }
7803
+ {
7804
+ /* %typemap(ret) OGRErr */
7805
+ if (vresult == Qnil) {
7806
+ vresult = INT2NUM(0);
7807
+ }
7808
+ } return vresult;
6904
7809
  fail:
7810
+ {
7811
+ /* %typemap(freearg) char **options */
7812
+
7813
+ CSLDestroy( arg4 );
7814
+ }
6905
7815
  return Qnil;
6906
7816
  }
6907
7817
 
6908
7818
 
6909
7819
 
6910
7820
  /*
6911
- Document-method: Gdal::Ogr::Layer.set_ignored_fields
7821
+ Document-method: Gdal::Ogr::Layer.erase
6912
7822
 
6913
7823
  call-seq:
6914
- set_ignored_fields(char options) -> OGRErr
7824
+ erase(Layer method_layer, Layer result_layer, char ** options=nil, GDALProgressFunc callback=0,
7825
+ void * callback_data=nil) -> OGRErr
6915
7826
 
6916
7827
  An instance method.
6917
7828
 
6918
7829
  */
6919
7830
  SWIGINTERN VALUE
6920
- _wrap_Layer_set_ignored_fields(int argc, VALUE *argv, VALUE self) {
7831
+ _wrap_Layer_erase(int argc, VALUE *argv, VALUE self) {
6921
7832
  OGRLayerShadow *arg1 = (OGRLayerShadow *) 0 ;
6922
- char **arg2 = (char **) 0 ;
7833
+ OGRLayerShadow *arg2 = (OGRLayerShadow *) 0 ;
7834
+ OGRLayerShadow *arg3 = (OGRLayerShadow *) 0 ;
7835
+ char **arg4 = (char **) NULL ;
7836
+ GDALProgressFunc arg5 = (GDALProgressFunc) NULL ;
7837
+ void *arg6 = (void *) NULL ;
6923
7838
  void *argp1 = 0 ;
6924
7839
  int res1 = 0 ;
7840
+ void *argp2 = 0 ;
7841
+ int res2 = 0 ;
7842
+ void *argp3 = 0 ;
7843
+ int res3 = 0 ;
7844
+ void *argp5 ;
7845
+ int res5 = 0 ;
7846
+ int res6 ;
7847
+ const char *kwnames[] = {
7848
+ "self","method_layer","result_layer","options","callback","callback_data", NULL
7849
+ };
6925
7850
  OGRErr result;
6926
7851
  VALUE vresult = Qnil;
6927
7852
 
6928
- if ((argc < 1) || (argc > 1)) {
6929
- rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
7853
+ if ((argc < 2) || (argc > 5)) {
7854
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
6930
7855
  }
6931
7856
  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
6932
7857
  if (!SWIG_IsOK(res1)) {
6933
- SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","SetIgnoredFields", 1, self ));
7858
+ SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRLayerShadow *","Erase", 1, self ));
6934
7859
  }
6935
7860
  arg1 = reinterpret_cast< OGRLayerShadow * >(argp1);
6936
- {
6937
- /* %typemap(in) char **options */
6938
-
6939
- /* Check if is a list */
6940
- Check_Type(argv[0], T_ARRAY);
6941
-
6942
- int size = RARRAY_LEN(argv[0]);
6943
- for (int i = 0; i < size; i++) {
6944
- VALUE item = rb_ary_entry(argv[0], i);
6945
- char *pszItem = StringValuePtr(item);
6946
- arg2 = CSLAddString( arg2, pszItem );
7861
+ res2 = SWIG_ConvertPtr(argv[0], &argp2,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
7862
+ if (!SWIG_IsOK(res2)) {
7863
+ SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "OGRLayerShadow *","Erase", 2, argv[0] ));
7864
+ }
7865
+ arg2 = reinterpret_cast< OGRLayerShadow * >(argp2);
7866
+ res3 = SWIG_ConvertPtr(argv[1], &argp3,SWIGTYPE_p_OGRLayerShadow, 0 | 0 );
7867
+ if (!SWIG_IsOK(res3)) {
7868
+ SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "OGRLayerShadow *","Erase", 3, argv[1] ));
7869
+ }
7870
+ arg3 = reinterpret_cast< OGRLayerShadow * >(argp3);
7871
+ if (argc > 2) {
7872
+ {
7873
+ /* %typemap(in) char **options */
7874
+
7875
+ /* Check if is a list */
7876
+ Check_Type(argv[2], T_ARRAY);
7877
+
7878
+ int size = RARRAY_LEN(argv[2]);
7879
+ for (int i = 0; i < size; i++) {
7880
+ VALUE item = rb_ary_entry(argv[2], i);
7881
+ char *pszItem = StringValuePtr(item);
7882
+ arg4 = CSLAddString( arg4, pszItem );
7883
+ }
7884
+ }
7885
+ }
7886
+ if (argc > 3) {
7887
+ {
7888
+ res5 = SWIG_ConvertPtr(argv[3], &argp5, SWIGTYPE_p_GDALProgressFunc, 0 );
7889
+ if (!SWIG_IsOK(res5)) {
7890
+ SWIG_exception_fail(SWIG_ArgError(res5), Ruby_Format_TypeError( "", "GDALProgressFunc","Erase", 5, argv[3] ));
7891
+ }
7892
+ if (!argp5) {
7893
+ SWIG_exception_fail(SWIG_ValueError, Ruby_Format_TypeError("invalid null reference ", "GDALProgressFunc","Erase", 5, argv[3]));
7894
+ } else {
7895
+ arg5 = *(reinterpret_cast< GDALProgressFunc * >(argp5));
7896
+ }
7897
+ }
7898
+ }
7899
+ if (argc > 4) {
7900
+ res6 = SWIG_ConvertPtr(argv[4],SWIG_as_voidptrptr(&arg6), 0, 0);
7901
+ if (!SWIG_IsOK(res6)) {
7902
+ SWIG_exception_fail(SWIG_ArgError(res6), Ruby_Format_TypeError( "", "void *","Erase", 6, argv[4] ));
6947
7903
  }
6948
7904
  }
6949
7905
  {
6950
7906
  CPLErrorReset();
6951
- result = (OGRErr)OGRLayerShadow_SetIgnoredFields(arg1,(char const **)arg2);
7907
+ result = (OGRErr)OGRLayerShadow_Erase(arg1,arg2,arg3,arg4,arg5,arg6);
6952
7908
  CPLErr eclass = CPLGetLastErrorType();
6953
7909
  if ( eclass == CE_Failure || eclass == CE_Fatal ) {
6954
7910
  SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
@@ -6975,7 +7931,7 @@ _wrap_Layer_set_ignored_fields(int argc, VALUE *argv, VALUE self) {
6975
7931
  {
6976
7932
  /* %typemap(freearg) char **options */
6977
7933
 
6978
- CSLDestroy( arg2 );
7934
+ CSLDestroy( arg4 );
6979
7935
  }
6980
7936
  {
6981
7937
  /* %typemap(ret) OGRErr */
@@ -6987,7 +7943,7 @@ fail:
6987
7943
  {
6988
7944
  /* %typemap(freearg) char **options */
6989
7945
 
6990
- CSLDestroy( arg2 );
7946
+ CSLDestroy( arg4 );
6991
7947
  }
6992
7948
  return Qnil;
6993
7949
  }
@@ -7050,7 +8006,7 @@ fail:
7050
8006
 
7051
8007
 
7052
8008
  */
7053
- swig_class SwigClassFeature;
8009
+ static swig_class SwigClassFeature;
7054
8010
 
7055
8011
  SWIGINTERN void delete_OGRFeatureShadow(OGRFeatureShadow *self){
7056
8012
  OGR_F_Destroy(self);
@@ -7092,7 +8048,7 @@ _wrap_new_Feature(int argc, VALUE *argv, VALUE self) {
7092
8048
  OGRFeatureDefnShadow *arg1 = (OGRFeatureDefnShadow *) 0 ;
7093
8049
  void *argp1 = 0 ;
7094
8050
  int res1 = 0 ;
7095
- char *kwnames[] = {
8051
+ const char *kwnames[] = {
7096
8052
  "feature_def", NULL
7097
8053
  };
7098
8054
  OGRFeatureShadow *result = 0 ;
@@ -7561,7 +8517,7 @@ fail:
7561
8517
 
7562
8518
  call-seq:
7563
8519
  get_field_defn_ref(int id) -> FieldDefn
7564
- get_field_defn_ref(char name) -> FieldDefn
8520
+ get_field_defn_ref(char const * name) -> FieldDefn
7565
8521
 
7566
8522
  An instance method.
7567
8523
 
@@ -7730,8 +8686,8 @@ fail:
7730
8686
  Document-method: Gdal::Ogr::Feature.get_field_as_string
7731
8687
 
7732
8688
  call-seq:
7733
- get_field_as_string(int id) -> char
7734
- get_field_as_string(char name) -> char
8689
+ get_field_as_string(int id) -> char const *
8690
+ get_field_as_string(char const * name) -> char const
7735
8691
 
7736
8692
  An instance method.
7737
8693
 
@@ -7901,7 +8857,7 @@ fail:
7901
8857
 
7902
8858
  call-seq:
7903
8859
  get_field_as_integer(int id) -> int
7904
- get_field_as_integer(char name) -> int
8860
+ get_field_as_integer(char const * name) -> int
7905
8861
 
7906
8862
  An instance method.
7907
8863
 
@@ -8071,7 +9027,7 @@ fail:
8071
9027
 
8072
9028
  call-seq:
8073
9029
  get_field_as_double(int id) -> double
8074
- get_field_as_double(char name) -> double
9030
+ get_field_as_double(char const * name) -> double
8075
9031
 
8076
9032
  An instance method.
8077
9033
 
@@ -8370,7 +9326,7 @@ fail:
8370
9326
  Document-method: Gdal::Ogr::Feature.get_field_as_integer_list
8371
9327
 
8372
9328
  call-seq:
8373
- get_field_as_integer_list(int id, int nLen, int pList)
9329
+ get_field_as_integer_list(int id, int * nLen, int const ** pList)
8374
9330
 
8375
9331
  An instance method.
8376
9332
 
@@ -8444,7 +9400,7 @@ fail:
8444
9400
  Document-method: Gdal::Ogr::Feature.get_field_as_double_list
8445
9401
 
8446
9402
  call-seq:
8447
- get_field_as_double_list(int id, int nLen, double pList)
9403
+ get_field_as_double_list(int id, int * nLen, double const ** pList)
8448
9404
 
8449
9405
  An instance method.
8450
9406
 
@@ -8518,7 +9474,7 @@ fail:
8518
9474
  Document-method: Gdal::Ogr::Feature.get_field_as_string_list
8519
9475
 
8520
9476
  call-seq:
8521
- get_field_as_string_list(int id, char pList)
9477
+ get_field_as_string_list(int id, char *** pList)
8522
9478
 
8523
9479
  An instance method.
8524
9480
 
@@ -8585,7 +9541,7 @@ fail:
8585
9541
 
8586
9542
  call-seq:
8587
9543
  is_field_set(int id) -> bool
8588
- is_field_set(char name) -> bool
9544
+ is_field_set(char const * name) -> bool
8589
9545
 
8590
9546
  An instance method.
8591
9547
 
@@ -8754,7 +9710,7 @@ fail:
8754
9710
  Document-method: Gdal::Ogr::Feature.get_field_index
8755
9711
 
8756
9712
  call-seq:
8757
- get_field_index(char name) -> int
9713
+ get_field_index(char const * name) -> int
8758
9714
 
8759
9715
  An instance method.
8760
9716
 
@@ -8998,7 +9954,7 @@ fail:
8998
9954
 
8999
9955
  call-seq:
9000
9956
  unset_field(int id)
9001
- unset_field(char name)
9957
+ unset_field(char const * name)
9002
9958
 
9003
9959
  An instance method.
9004
9960
 
@@ -9161,16 +10117,15 @@ fail:
9161
10117
  Document-method: Gdal::Ogr::Feature.set_field
9162
10118
 
9163
10119
  call-seq:
9164
- set_field(int id, char value)
9165
- set_field(char name, char value)
10120
+ set_field(int id, char const * value)
10121
+ set_field(char const * name, char const * value)
9166
10122
  set_field(int id, int value)
9167
- set_field(char name, int value)
10123
+ set_field(char const * name, int value)
9168
10124
  set_field(int id, double value)
9169
- set_field(char name, double value)
9170
- set_field(int id, int year, int month, int day, int hour, int minute,
9171
- int second, int tzflag)
9172
- set_field(char name, int year, int month, int day, int hour,
9173
- int minute, int second, int tzflag)
10125
+ set_field(char const * name, double value)
10126
+ set_field(int id, int year, int month, int day, int hour, int minute, int second, int tzflag)
10127
+ set_field(char const * name, int year, int month, int day, int hour, int minute, int second,
10128
+ int tzflag)
9174
10129
 
9175
10130
  An instance method.
9176
10131
 
@@ -10108,7 +11063,7 @@ fail:
10108
11063
  Document-method: Gdal::Ogr::Feature.set_field_double_list
10109
11064
 
10110
11065
  call-seq:
10111
- set_field_double_list(int id, int nList, double pList)
11066
+ set_field_double_list(int id, int nList, double * pList)
10112
11067
 
10113
11068
  An instance method.
10114
11069
 
@@ -10182,7 +11137,7 @@ fail:
10182
11137
  Document-method: Gdal::Ogr::Feature.set_field_string_list
10183
11138
 
10184
11139
  call-seq:
10185
- set_field_string_list(int id, char pList)
11140
+ set_field_string_list(int id, char ** pList)
10186
11141
 
10187
11142
  An instance method.
10188
11143
 
@@ -10280,7 +11235,7 @@ _wrap_Feature_set_from(int argc, VALUE *argv, VALUE self) {
10280
11235
  int res2 = 0 ;
10281
11236
  int val3 ;
10282
11237
  int ecode3 = 0 ;
10283
- char *kwnames[] = {
11238
+ const char *kwnames[] = {
10284
11239
  "self","other","forgiving", NULL
10285
11240
  };
10286
11241
  OGRErr result;
@@ -10470,7 +11425,7 @@ fail:
10470
11425
  Document-method: Gdal::Ogr::Feature.get_style_string
10471
11426
 
10472
11427
  call-seq:
10473
- get_style_string -> char
11428
+ get_style_string -> char const *
10474
11429
 
10475
11430
  An instance method.
10476
11431
 
@@ -10523,7 +11478,7 @@ fail:
10523
11478
  Document-method: Gdal::Ogr::Feature.set_style_string
10524
11479
 
10525
11480
  call-seq:
10526
- set_style_string(char the_string)
11481
+ set_style_string(char const * the_string)
10527
11482
 
10528
11483
  An instance method.
10529
11484
 
@@ -10585,7 +11540,7 @@ fail:
10585
11540
 
10586
11541
  call-seq:
10587
11542
  get_field_type(int id) -> OGRFieldType
10588
- get_field_type(char name) -> OGRFieldType
11543
+ get_field_type(char const * name) -> OGRFieldType
10589
11544
 
10590
11545
  An instance method.
10591
11546
 
@@ -10812,7 +11767,7 @@ fail:
10812
11767
 
10813
11768
 
10814
11769
  */
10815
- swig_class SwigClassFeatureDefn;
11770
+ static swig_class SwigClassFeatureDefn;
10816
11771
 
10817
11772
  SWIGINTERN void delete_OGRFeatureDefnShadow(OGRFeatureDefnShadow *self){
10818
11773
  /*OGR_FD_Destroy(self);*/
@@ -10845,7 +11800,7 @@ _wrap_FeatureDefn_allocate(VALUE self) {
10845
11800
  Document-method: Gdal::Ogr::FeatureDefn.new
10846
11801
 
10847
11802
  call-seq:
10848
- FeatureDefn.new(char name_null_ok=nil)
11803
+ FeatureDefn.new(char const * name_null_ok=nil)
10849
11804
 
10850
11805
  Class constructor.
10851
11806
 
@@ -10856,7 +11811,7 @@ _wrap_new_FeatureDefn(int argc, VALUE *argv, VALUE self) {
10856
11811
  int res1 ;
10857
11812
  char *buf1 = 0 ;
10858
11813
  int alloc1 = 0 ;
10859
- char *kwnames[] = {
11814
+ const char *kwnames[] = {
10860
11815
  "name_null_ok", NULL
10861
11816
  };
10862
11817
  OGRFeatureDefnShadow *result = 0 ;
@@ -10905,7 +11860,7 @@ fail:
10905
11860
  Document-method: Gdal::Ogr::FeatureDefn.get_name
10906
11861
 
10907
11862
  call-seq:
10908
- get_name -> char
11863
+ get_name -> char const *
10909
11864
 
10910
11865
  An instance method.
10911
11866
 
@@ -11072,7 +12027,7 @@ fail:
11072
12027
  Document-method: Gdal::Ogr::FeatureDefn.get_field_index
11073
12028
 
11074
12029
  call-seq:
11075
- get_field_index(char name) -> int
12030
+ get_field_index(char const * name) -> int
11076
12031
 
11077
12032
  An instance method.
11078
12033
 
@@ -11590,7 +12545,7 @@ fail:
11590
12545
 
11591
12546
 
11592
12547
  */
11593
- swig_class SwigClassFieldDefn;
12548
+ static swig_class SwigClassFieldDefn;
11594
12549
 
11595
12550
  SWIGINTERN void delete_OGRFieldDefnShadow(OGRFieldDefnShadow *self){
11596
12551
  OGR_Fld_Destroy(self);
@@ -11622,7 +12577,7 @@ _wrap_FieldDefn_allocate(VALUE self) {
11622
12577
  Document-method: Gdal::Ogr::FieldDefn.new
11623
12578
 
11624
12579
  call-seq:
11625
- FieldDefn.new(char name_null_ok="unnamed", OGRFieldType field_type=OFTSTRING)
12580
+ FieldDefn.new(char const * name_null_ok="unnamed", OGRFieldType field_type=OFTSTRING)
11626
12581
 
11627
12582
  Class constructor.
11628
12583
 
@@ -11634,7 +12589,7 @@ _wrap_new_FieldDefn(int argc, VALUE *argv, VALUE self) {
11634
12589
  int res1 ;
11635
12590
  char *buf1 = 0 ;
11636
12591
  int alloc1 = 0 ;
11637
- char *kwnames[] = {
12592
+ const char *kwnames[] = {
11638
12593
  "name_null_ok","field_type", NULL
11639
12594
  };
11640
12595
  OGRFieldDefnShadow *result = 0 ;
@@ -11689,7 +12644,7 @@ fail:
11689
12644
  Document-method: Gdal::Ogr::FieldDefn.get_name
11690
12645
 
11691
12646
  call-seq:
11692
- get_name -> char
12647
+ get_name -> char const *
11693
12648
 
11694
12649
  An instance method.
11695
12650
 
@@ -11742,7 +12697,7 @@ fail:
11742
12697
  Document-method: Gdal::Ogr::FieldDefn.get_name_ref
11743
12698
 
11744
12699
  call-seq:
11745
- get_name_ref -> char
12700
+ get_name_ref -> char const *
11746
12701
 
11747
12702
  An instance method.
11748
12703
 
@@ -11795,7 +12750,7 @@ fail:
11795
12750
  Document-method: Gdal::Ogr::FieldDefn.set_name
11796
12751
 
11797
12752
  call-seq:
11798
- set_name(char name)
12753
+ set_name(char const * name)
11799
12754
 
11800
12755
  An instance method.
11801
12756
 
@@ -12299,7 +13254,7 @@ fail:
12299
13254
  Document-method: Gdal::Ogr::FieldDefn.get_type_name
12300
13255
 
12301
13256
  call-seq:
12302
- get_type_name -> char
13257
+ get_type_name -> char const *
12303
13258
 
12304
13259
  An instance method.
12305
13260
 
@@ -12352,7 +13307,7 @@ fail:
12352
13307
  Document-method: Gdal::Ogr::FieldDefn.get_field_type_name
12353
13308
 
12354
13309
  call-seq:
12355
- get_field_type_name(OGRFieldType type) -> char
13310
+ get_field_type_name(OGRFieldType type) -> char const *
12356
13311
 
12357
13312
  An instance method.
12358
13313
 
@@ -12537,7 +13492,7 @@ _wrap_create_geometry_from_wkb(int argc, VALUE *argv, VALUE self) {
12537
13492
  int alloc1 = 0 ;
12538
13493
  void *argp3 = 0 ;
12539
13494
  int res3 = 0 ;
12540
- char *kwnames[] = {
13495
+ const char *kwnames[] = {
12541
13496
  "len","reference", NULL
12542
13497
  };
12543
13498
  OGRGeometryShadow *result = 0 ;
@@ -12591,7 +13546,7 @@ fail:
12591
13546
  Document-method: Gdal::Ogr.create_geometry_from_wkt
12592
13547
 
12593
13548
  call-seq:
12594
- create_geometry_from_wkt(char val, SpatialReference reference=nil) -> Geometry
13549
+ create_geometry_from_wkt(char ** val, SpatialReference reference=nil) -> Geometry
12595
13550
 
12596
13551
  A module function.
12597
13552
 
@@ -12603,7 +13558,7 @@ _wrap_create_geometry_from_wkt(int argc, VALUE *argv, VALUE self) {
12603
13558
  char *val1 = 0 ;
12604
13559
  void *argp2 = 0 ;
12605
13560
  int res2 = 0 ;
12606
- char *kwnames[] = {
13561
+ const char *kwnames[] = {
12607
13562
  "val","reference", NULL
12608
13563
  };
12609
13564
  OGRGeometryShadow *result = 0 ;
@@ -12657,7 +13612,7 @@ fail:
12657
13612
  Document-method: Gdal::Ogr.create_geometry_from_gml
12658
13613
 
12659
13614
  call-seq:
12660
- create_geometry_from_gml(char input_string) -> Geometry
13615
+ create_geometry_from_gml(char const * input_string) -> Geometry
12661
13616
 
12662
13617
  A module function.
12663
13618
 
@@ -12713,7 +13668,7 @@ fail:
12713
13668
  Document-method: Gdal::Ogr.create_geometry_from_json
12714
13669
 
12715
13670
  call-seq:
12716
- create_geometry_from_json(char input_string) -> Geometry
13671
+ create_geometry_from_json(char const * input_string) -> Geometry
12717
13672
 
12718
13673
  A module function.
12719
13674
 
@@ -12769,8 +13724,7 @@ fail:
12769
13724
  Document-method: Gdal::Ogr.build_polygon_from_edges
12770
13725
 
12771
13726
  call-seq:
12772
- build_polygon_from_edges(Geometry hLineCollection, int bBestEffort=0, int bAutoClose=0,
12773
- double dfTolerance=0) -> Geometry
13727
+ build_polygon_from_edges(Geometry hLineCollection, int bBestEffort=0, int bAutoClose=0, double dfTolerance=0) -> Geometry
12774
13728
 
12775
13729
  A module function.
12776
13730
 
@@ -12789,7 +13743,7 @@ _wrap_build_polygon_from_edges(int argc, VALUE *argv, VALUE self) {
12789
13743
  int ecode3 = 0 ;
12790
13744
  double val4 ;
12791
13745
  int ecode4 = 0 ;
12792
- char *kwnames[] = {
13746
+ const char *kwnames[] = {
12793
13747
  "hLineCollection","bBestEffort","bAutoClose","dfTolerance", NULL
12794
13748
  };
12795
13749
  OGRGeometryShadow *result = 0 ;
@@ -12856,10 +13810,8 @@ fail:
12856
13810
  Document-method: Gdal::Ogr.approximate_arc_angles
12857
13811
 
12858
13812
  call-seq:
12859
- approximate_arc_angles(double dfCenterX, double dfCenterY, double dfZ, double dfPrimaryRadius,
12860
- double dfSecondaryAxis,
12861
- double dfRotation, double dfStartAngle, double dfEndAngle,
12862
- double dfMaxAngleStepSizeDegrees) -> Geometry
13813
+ approximate_arc_angles(double dfCenterX, double dfCenterY, double dfZ, double dfPrimaryRadius, double dfSecondaryAxis,
13814
+ double dfRotation, double dfStartAngle, double dfEndAngle, double dfMaxAngleStepSizeDegrees) -> Geometry
12863
13815
 
12864
13816
  A module function.
12865
13817
 
@@ -12893,7 +13845,7 @@ _wrap_approximate_arc_angles(int argc, VALUE *argv, VALUE self) {
12893
13845
  int ecode8 = 0 ;
12894
13846
  double val9 ;
12895
13847
  int ecode9 = 0 ;
12896
- char *kwnames[] = {
13848
+ const char *kwnames[] = {
12897
13849
  "dfCenterX","dfCenterY","dfZ","dfPrimaryRadius","dfSecondaryAxis","dfRotation","dfStartAngle","dfEndAngle","dfMaxAngleStepSizeDegrees", NULL
12898
13850
  };
12899
13851
  OGRGeometryShadow *result = 0 ;
@@ -13019,6 +13971,59 @@ _wrap_force_to_polygon(int argc, VALUE *argv, VALUE self) {
13019
13971
 
13020
13972
 
13021
13973
 
13974
+ }
13975
+ vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OGRGeometryShadow, SWIG_POINTER_OWN | 0 );
13976
+ return vresult;
13977
+ fail:
13978
+ return Qnil;
13979
+ }
13980
+
13981
+
13982
+
13983
+ /*
13984
+ Document-method: Gdal::Ogr.force_to_line_string
13985
+
13986
+ call-seq:
13987
+ force_to_line_string(Geometry geom_in) -> Geometry
13988
+
13989
+ A module function.
13990
+
13991
+ */
13992
+ SWIGINTERN VALUE
13993
+ _wrap_force_to_line_string(int argc, VALUE *argv, VALUE self) {
13994
+ OGRGeometryShadow *arg1 = (OGRGeometryShadow *) 0 ;
13995
+ void *argp1 = 0 ;
13996
+ int res1 = 0 ;
13997
+ OGRGeometryShadow *result = 0 ;
13998
+ VALUE vresult = Qnil;
13999
+
14000
+ if ((argc < 1) || (argc > 1)) {
14001
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
14002
+ }
14003
+ res1 = SWIG_ConvertPtr(argv[0], &argp1,SWIGTYPE_p_OGRGeometryShadow, 0 | 0 );
14004
+ if (!SWIG_IsOK(res1)) {
14005
+ SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRGeometryShadow *","ForceToLineString", 1, argv[0] ));
14006
+ }
14007
+ arg1 = reinterpret_cast< OGRGeometryShadow * >(argp1);
14008
+ {
14009
+ CPLErrorReset();
14010
+ result = (OGRGeometryShadow *)ForceToLineString(arg1);
14011
+ CPLErr eclass = CPLGetLastErrorType();
14012
+ if ( eclass == CE_Failure || eclass == CE_Fatal ) {
14013
+ SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
14014
+
14015
+ }
14016
+
14017
+
14018
+
14019
+
14020
+
14021
+
14022
+
14023
+
14024
+
14025
+
14026
+
13022
14027
  }
13023
14028
  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OGRGeometryShadow, SWIG_POINTER_OWN | 0 );
13024
14029
  return vresult;
@@ -13194,7 +14199,7 @@ fail:
13194
14199
 
13195
14200
 
13196
14201
  */
13197
- swig_class SwigClassGeometry;
14202
+ static swig_class SwigClassGeometry;
13198
14203
 
13199
14204
  SWIGINTERN void delete_OGRGeometryShadow(OGRGeometryShadow *self){
13200
14205
  OGR_G_DestroyGeometry( self );
@@ -13226,8 +14231,7 @@ _wrap_Geometry_allocate(VALUE self) {
13226
14231
  Document-method: Gdal::Ogr::Geometry.new
13227
14232
 
13228
14233
  call-seq:
13229
- Geometry.new(OGRwkbGeometryType type=WKBUNKNOWN, char wkt=0, int wkb=0,
13230
- char gml=0)
14234
+ Geometry.new(OGRwkbGeometryType type=WKBUNKNOWN, char * wkt=None, int wkb=0, char * gml=None)
13231
14235
 
13232
14236
  Class constructor.
13233
14237
 
@@ -13249,7 +14253,7 @@ _wrap_new_Geometry(int argc, VALUE *argv, VALUE self) {
13249
14253
  int res5 ;
13250
14254
  char *buf5 = 0 ;
13251
14255
  int alloc5 = 0 ;
13252
- char *kwnames[] = {
14256
+ const char *kwnames[] = {
13253
14257
  "type","wkt","wkb","gml", NULL
13254
14258
  };
13255
14259
  OGRGeometryShadow *result = 0 ;
@@ -13429,7 +14433,7 @@ _wrap_Geometry_export_to_wkb(int argc, VALUE *argv, VALUE self) {
13429
14433
  int res1 = 0 ;
13430
14434
  int nLen2 = 0 ;
13431
14435
  char *pBuf2 = 0 ;
13432
- char *kwnames[] = {
14436
+ const char *kwnames[] = {
13433
14437
  "self","byte_order", NULL
13434
14438
  };
13435
14439
  OGRErr result;
@@ -13512,7 +14516,7 @@ fail:
13512
14516
  Document-method: Gdal::Ogr::Geometry.export_to_gml
13513
14517
 
13514
14518
  call-seq:
13515
- export_to_gml -> char
14519
+ export_to_gml -> char const *
13516
14520
 
13517
14521
  An instance method.
13518
14522
 
@@ -13565,7 +14569,7 @@ fail:
13565
14569
  Document-method: Gdal::Ogr::Geometry.export_to_kml
13566
14570
 
13567
14571
  call-seq:
13568
- export_to_kml(char altitude_mode=nil) -> char
14572
+ export_to_kml(char const * altitude_mode=nil) -> char const *
13569
14573
 
13570
14574
  An instance method.
13571
14575
 
@@ -13631,7 +14635,7 @@ fail:
13631
14635
  Document-method: Gdal::Ogr::Geometry.export_to_json
13632
14636
 
13633
14637
  call-seq:
13634
- export_to_json -> char
14638
+ export_to_json -> char const *
13635
14639
 
13636
14640
  An instance method.
13637
14641
 
@@ -13703,7 +14707,7 @@ _wrap_Geometry_add_point(int argc, VALUE *argv, VALUE self) {
13703
14707
  int ecode3 = 0 ;
13704
14708
  double val4 ;
13705
14709
  int ecode4 = 0 ;
13706
- char *kwnames[] = {
14710
+ const char *kwnames[] = {
13707
14711
  "self","x","y","z", NULL
13708
14712
  };
13709
14713
 
@@ -14085,7 +15089,7 @@ fail:
14085
15089
  Document-method: Gdal::Ogr::Geometry.get_geometry_name
14086
15090
 
14087
15091
  call-seq:
14088
- get_geometry_name -> char
15092
+ get_geometry_name -> char const *
14089
15093
 
14090
15094
  An instance method.
14091
15095
 
@@ -14363,7 +15367,7 @@ _wrap_Geometry_get_x(int argc, VALUE *argv, VALUE self) {
14363
15367
  int res1 = 0 ;
14364
15368
  int val2 ;
14365
15369
  int ecode2 = 0 ;
14366
- char *kwnames[] = {
15370
+ const char *kwnames[] = {
14367
15371
  "self","point", NULL
14368
15372
  };
14369
15373
  double result;
@@ -14429,7 +15433,7 @@ _wrap_Geometry_get_y(int argc, VALUE *argv, VALUE self) {
14429
15433
  int res1 = 0 ;
14430
15434
  int val2 ;
14431
15435
  int ecode2 = 0 ;
14432
- char *kwnames[] = {
15436
+ const char *kwnames[] = {
14433
15437
  "self","point", NULL
14434
15438
  };
14435
15439
  double result;
@@ -14495,7 +15499,7 @@ _wrap_Geometry_get_z(int argc, VALUE *argv, VALUE self) {
14495
15499
  int res1 = 0 ;
14496
15500
  int val2 ;
14497
15501
  int ecode2 = 0 ;
14498
- char *kwnames[] = {
15502
+ const char *kwnames[] = {
14499
15503
  "self","point", NULL
14500
15504
  };
14501
15505
  double result;
@@ -14783,7 +15787,7 @@ _wrap_Geometry_set_point(int argc, VALUE *argv, VALUE self) {
14783
15787
  int ecode4 = 0 ;
14784
15788
  double val5 ;
14785
15789
  int ecode5 = 0 ;
14786
- char *kwnames[] = {
15790
+ const char *kwnames[] = {
14787
15791
  "self","point","x","y","z", NULL
14788
15792
  };
14789
15793
 
@@ -14867,7 +15871,7 @@ _wrap_Geometry_set_point_2d(int argc, VALUE *argv, VALUE self) {
14867
15871
  int ecode3 = 0 ;
14868
15872
  double val4 ;
14869
15873
  int ecode4 = 0 ;
14870
- char *kwnames[] = {
15874
+ const char *kwnames[] = {
14871
15875
  "self","point","x","y", NULL
14872
15876
  };
14873
15877
 
@@ -15283,7 +16287,7 @@ _wrap_Geometry_buffer(int argc, VALUE *argv, VALUE self) {
15283
16287
  int ecode2 = 0 ;
15284
16288
  int val3 ;
15285
16289
  int ecode3 = 0 ;
15286
- char *kwnames[] = {
16290
+ const char *kwnames[] = {
15287
16291
  "self","distance","quadsecs", NULL
15288
16292
  };
15289
16293
  OGRGeometryShadow *result = 0 ;
@@ -17313,6 +18317,59 @@ _wrap_Geometry_centroid(int argc, VALUE *argv, VALUE self) {
17313
18317
 
17314
18318
 
17315
18319
 
18320
+ }
18321
+ vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OGRGeometryShadow, SWIG_POINTER_OWN | 0 );
18322
+ return vresult;
18323
+ fail:
18324
+ return Qnil;
18325
+ }
18326
+
18327
+
18328
+
18329
+ /*
18330
+ Document-method: Gdal::Ogr::Geometry.point_on_surface
18331
+
18332
+ call-seq:
18333
+ point_on_surface -> Geometry
18334
+
18335
+ An instance method.
18336
+
18337
+ */
18338
+ SWIGINTERN VALUE
18339
+ _wrap_Geometry_point_on_surface(int argc, VALUE *argv, VALUE self) {
18340
+ OGRGeometryShadow *arg1 = (OGRGeometryShadow *) 0 ;
18341
+ void *argp1 = 0 ;
18342
+ int res1 = 0 ;
18343
+ OGRGeometryShadow *result = 0 ;
18344
+ VALUE vresult = Qnil;
18345
+
18346
+ if ((argc < 0) || (argc > 0)) {
18347
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
18348
+ }
18349
+ res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_OGRGeometryShadow, 0 | 0 );
18350
+ if (!SWIG_IsOK(res1)) {
18351
+ SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "OGRGeometryShadow *","PointOnSurface", 1, self ));
18352
+ }
18353
+ arg1 = reinterpret_cast< OGRGeometryShadow * >(argp1);
18354
+ {
18355
+ CPLErrorReset();
18356
+ result = (OGRGeometryShadow *)OGRGeometryShadow_PointOnSurface(arg1);
18357
+ CPLErr eclass = CPLGetLastErrorType();
18358
+ if ( eclass == CE_Failure || eclass == CE_Fatal ) {
18359
+ SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
18360
+
18361
+ }
18362
+
18363
+
18364
+
18365
+
18366
+
18367
+
18368
+
18369
+
18370
+
18371
+
18372
+
17316
18373
  }
17317
18374
  vresult = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_OGRGeometryShadow, SWIG_POINTER_OWN | 0 );
17318
18375
  return vresult;
@@ -17737,7 +18794,7 @@ fail:
17737
18794
  Document-method: Gdal::Ogr.GeometryTypeToName
17738
18795
 
17739
18796
  call-seq:
17740
- GeometryTypeToName(OGRwkbGeometryType eType) -> char
18797
+ GeometryTypeToName(OGRwkbGeometryType eType) -> char const *
17741
18798
 
17742
18799
  A module function.
17743
18800
 
@@ -17787,7 +18844,7 @@ fail:
17787
18844
  Document-method: Gdal::Ogr.GetFieldTypeName
17788
18845
 
17789
18846
  call-seq:
17790
- GetFieldTypeName(OGRFieldType type) -> char
18847
+ GetFieldTypeName(OGRFieldType type) -> char const *
17791
18848
 
17792
18849
  A module function.
17793
18850
 
@@ -17890,7 +18947,7 @@ fail:
17890
18947
  Document-method: Gdal::Ogr.open
17891
18948
 
17892
18949
  call-seq:
17893
- open(char utf8_path, int update=0) -> DataSource
18950
+ open(char const * utf8_path, int update=0) -> DataSource
17894
18951
 
17895
18952
  A module function.
17896
18953
 
@@ -17904,7 +18961,7 @@ _wrap_open(int argc, VALUE *argv, VALUE self) {
17904
18961
  int alloc1 = 0 ;
17905
18962
  int val2 ;
17906
18963
  int ecode2 = 0 ;
17907
- char *kwnames[] = {
18964
+ const char *kwnames[] = {
17908
18965
  "utf8_path","update", NULL
17909
18966
  };
17910
18967
  OGRDataSourceShadow *result = 0 ;
@@ -17959,7 +19016,7 @@ fail:
17959
19016
  Document-method: Gdal::Ogr.open_shared
17960
19017
 
17961
19018
  call-seq:
17962
- open_shared(char utf8_path, int update=0) -> DataSource
19019
+ open_shared(char const * utf8_path, int update=0) -> DataSource
17963
19020
 
17964
19021
  A module function.
17965
19022
 
@@ -17973,7 +19030,7 @@ _wrap_open_shared(int argc, VALUE *argv, VALUE self) {
17973
19030
  int alloc1 = 0 ;
17974
19031
  int val2 ;
17975
19032
  int ecode2 = 0 ;
17976
- char *kwnames[] = {
19033
+ const char *kwnames[] = {
17977
19034
  "utf8_path","update", NULL
17978
19035
  };
17979
19036
  OGRDataSourceShadow *result = 0 ;
@@ -18028,7 +19085,7 @@ fail:
18028
19085
  Document-method: Gdal::Ogr.get_driver_by_name
18029
19086
 
18030
19087
  call-seq:
18031
- get_driver_by_name(char name) -> Driver
19088
+ get_driver_by_name(char const * name) -> Driver
18032
19089
 
18033
19090
  A module function.
18034
19091
 
@@ -18142,7 +19199,7 @@ fail:
18142
19199
  Document-method: Gdal::Ogr.general_cmd_line_processor
18143
19200
 
18144
19201
  call-seq:
18145
- general_cmd_line_processor(char papszArgv, int nOptions=0) -> char
19202
+ general_cmd_line_processor(char ** papszArgv, int nOptions=0) -> char **
18146
19203
 
18147
19204
  A module function.
18148
19205
 
@@ -18232,8 +19289,86 @@ fail:
18232
19289
 
18233
19290
 
18234
19291
 
19292
+ /*
19293
+ Document-method: Gdal::Ogr.TermProgress_nocb
19294
+
19295
+ call-seq:
19296
+ TermProgress_nocb(double dfProgress, char const * pszMessage=nil, void * pData=nil) -> int
19297
+
19298
+ A module function.
19299
+
19300
+ */
19301
+ SWIGINTERN VALUE
19302
+ _wrap_TermProgress_nocb(int argc, VALUE *argv, VALUE self) {
19303
+ double arg1 ;
19304
+ char *arg2 = (char *) NULL ;
19305
+ void *arg3 = (void *) NULL ;
19306
+ double val1 ;
19307
+ int ecode1 = 0 ;
19308
+ int res2 ;
19309
+ char *buf2 = 0 ;
19310
+ int alloc2 = 0 ;
19311
+ int res3 ;
19312
+ const char *kwnames[] = {
19313
+ "dfProgress","pszMessage","pData", NULL
19314
+ };
19315
+ int result;
19316
+ VALUE vresult = Qnil;
19317
+
19318
+ if ((argc < 1) || (argc > 3)) {
19319
+ rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
19320
+ }
19321
+ ecode1 = SWIG_AsVal_double(argv[0], &val1);
19322
+ if (!SWIG_IsOK(ecode1)) {
19323
+ SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "double","GDALTermProgress_nocb", 1, argv[0] ));
19324
+ }
19325
+ arg1 = static_cast< double >(val1);
19326
+ if (argc > 1) {
19327
+ res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
19328
+ if (!SWIG_IsOK(res2)) {
19329
+ SWIG_exception_fail(SWIG_ArgError(res2), Ruby_Format_TypeError( "", "char const *","GDALTermProgress_nocb", 2, argv[1] ));
19330
+ }
19331
+ arg2 = reinterpret_cast< char * >(buf2);
19332
+ }
19333
+ if (argc > 2) {
19334
+ res3 = SWIG_ConvertPtr(argv[2],SWIG_as_voidptrptr(&arg3), 0, 0);
19335
+ if (!SWIG_IsOK(res3)) {
19336
+ SWIG_exception_fail(SWIG_ArgError(res3), Ruby_Format_TypeError( "", "void *","GDALTermProgress_nocb", 3, argv[2] ));
19337
+ }
19338
+ }
19339
+ {
19340
+ CPLErrorReset();
19341
+ result = (int)GDALTermProgress_nocb(arg1,(char const *)arg2,arg3);
19342
+ CPLErr eclass = CPLGetLastErrorType();
19343
+ if ( eclass == CE_Failure || eclass == CE_Fatal ) {
19344
+ SWIG_exception( SWIG_RuntimeError, CPLGetLastErrorMsg() );
19345
+
19346
+ }
19347
+
19348
+
19349
+
19350
+
19351
+
19352
+
19353
+
19354
+
19355
+
19356
+
19357
+
19358
+ }
19359
+ vresult = SWIG_From_int(static_cast< int >(result));
19360
+ if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
19361
+ return vresult;
19362
+ fail:
19363
+ if (alloc2 == SWIG_NEWOBJ) delete[] buf2;
19364
+ return Qnil;
19365
+ }
19366
+
19367
+
19368
+
18235
19369
  /* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
18236
19370
 
19371
+ static swig_type_info _swigt__p_GDALProgressFunc = {"_p_GDALProgressFunc", "GDALProgressFunc *", 0, 0, (void*)0, 0};
18237
19372
  static swig_type_info _swigt__p_GIntBig = {"_p_GIntBig", "GIntBig *", 0, 0, (void*)0, 0};
18238
19373
  static swig_type_info _swigt__p_OGRDataSourceShadow = {"_p_OGRDataSourceShadow", "OGRDataSourceShadow *", 0, 0, (void*)0, 0};
18239
19374
  static swig_type_info _swigt__p_OGRDriverShadow = {"_p_OGRDriverShadow", "OGRDriverShadow *", 0, 0, (void*)0, 0};
@@ -18246,6 +19381,7 @@ static swig_type_info _swigt__p_OSRCoordinateTransformationShadow = {"_p_OSRCoor
18246
19381
  static swig_type_info _swigt__p_OSRSpatialReferenceShadow = {"_p_OSRSpatialReferenceShadow", "OSRSpatialReferenceShadow *", 0, 0, (void*)0, 0};
18247
19382
  static swig_type_info _swigt__p_char = {"_p_char", "char *|retStringAndCPLFree *", 0, 0, (void*)0, 0};
18248
19383
  static swig_type_info _swigt__p_double = {"_p_double", "double *", 0, 0, (void*)0, 0};
19384
+ static swig_type_info _swigt__p_f_double_p_q_const__char_p_void__int = {"_p_f_double_p_q_const__char_p_void__int", "int (*)(double,char const *,void *)", 0, 0, (void*)0, 0};
18249
19385
  static swig_type_info _swigt__p_int = {"_p_int", "OGRFieldType *|int *|OGRwkbGeometryType *|OGRJustification *|OGRwkbByteOrder *|OGRErr *", 0, 0, (void*)0, 0};
18250
19386
  static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0};
18251
19387
  static swig_type_info _swigt__p_p_double = {"_p_p_double", "double **", 0, 0, (void*)0, 0};
@@ -18253,6 +19389,7 @@ static swig_type_info _swigt__p_p_int = {"_p_p_int", "int **", 0, 0, (void*)0, 0
18253
19389
  static swig_type_info _swigt__p_p_p_char = {"_p_p_p_char", "char ***", 0, 0, (void*)0, 0};
18254
19390
 
18255
19391
  static swig_type_info *swig_type_initial[] = {
19392
+ &_swigt__p_GDALProgressFunc,
18256
19393
  &_swigt__p_GIntBig,
18257
19394
  &_swigt__p_OGRDataSourceShadow,
18258
19395
  &_swigt__p_OGRDriverShadow,
@@ -18265,6 +19402,7 @@ static swig_type_info *swig_type_initial[] = {
18265
19402
  &_swigt__p_OSRSpatialReferenceShadow,
18266
19403
  &_swigt__p_char,
18267
19404
  &_swigt__p_double,
19405
+ &_swigt__p_f_double_p_q_const__char_p_void__int,
18268
19406
  &_swigt__p_int,
18269
19407
  &_swigt__p_p_char,
18270
19408
  &_swigt__p_p_double,
@@ -18272,6 +19410,7 @@ static swig_type_info *swig_type_initial[] = {
18272
19410
  &_swigt__p_p_p_char,
18273
19411
  };
18274
19412
 
19413
+ static swig_cast_info _swigc__p_GDALProgressFunc[] = { {&_swigt__p_GDALProgressFunc, 0, 0, 0},{0, 0, 0, 0}};
18275
19414
  static swig_cast_info _swigc__p_GIntBig[] = { {&_swigt__p_GIntBig, 0, 0, 0},{0, 0, 0, 0}};
18276
19415
  static swig_cast_info _swigc__p_OGRDataSourceShadow[] = { {&_swigt__p_OGRDataSourceShadow, 0, 0, 0},{0, 0, 0, 0}};
18277
19416
  static swig_cast_info _swigc__p_OGRDriverShadow[] = { {&_swigt__p_OGRDriverShadow, 0, 0, 0},{0, 0, 0, 0}};
@@ -18284,6 +19423,7 @@ static swig_cast_info _swigc__p_OSRCoordinateTransformationShadow[] = { {&_swig
18284
19423
  static swig_cast_info _swigc__p_OSRSpatialReferenceShadow[] = { {&_swigt__p_OSRSpatialReferenceShadow, 0, 0, 0},{0, 0, 0, 0}};
18285
19424
  static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
18286
19425
  static swig_cast_info _swigc__p_double[] = { {&_swigt__p_double, 0, 0, 0},{0, 0, 0, 0}};
19426
+ static swig_cast_info _swigc__p_f_double_p_q_const__char_p_void__int[] = { {&_swigt__p_f_double_p_q_const__char_p_void__int, 0, 0, 0},{0, 0, 0, 0}};
18287
19427
  static swig_cast_info _swigc__p_int[] = { {&_swigt__p_int, 0, 0, 0},{0, 0, 0, 0}};
18288
19428
  static swig_cast_info _swigc__p_p_char[] = { {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}};
18289
19429
  static swig_cast_info _swigc__p_p_double[] = { {&_swigt__p_p_double, 0, 0, 0},{0, 0, 0, 0}};
@@ -18291,6 +19431,7 @@ static swig_cast_info _swigc__p_p_int[] = { {&_swigt__p_p_int, 0, 0, 0},{0, 0,
18291
19431
  static swig_cast_info _swigc__p_p_p_char[] = { {&_swigt__p_p_p_char, 0, 0, 0},{0, 0, 0, 0}};
18292
19432
 
18293
19433
  static swig_cast_info *swig_cast_initial[] = {
19434
+ _swigc__p_GDALProgressFunc,
18294
19435
  _swigc__p_GIntBig,
18295
19436
  _swigc__p_OGRDataSourceShadow,
18296
19437
  _swigc__p_OGRDriverShadow,
@@ -18303,6 +19444,7 @@ static swig_cast_info *swig_cast_initial[] = {
18303
19444
  _swigc__p_OSRSpatialReferenceShadow,
18304
19445
  _swigc__p_char,
18305
19446
  _swigc__p_double,
19447
+ _swigc__p_f_double_p_q_const__char_p_void__int,
18306
19448
  _swigc__p_int,
18307
19449
  _swigc__p_p_char,
18308
19450
  _swigc__p_p_double,
@@ -18315,18 +19457,18 @@ static swig_cast_info *swig_cast_initial[] = {
18315
19457
 
18316
19458
  /* -----------------------------------------------------------------------------
18317
19459
  * Type initialization:
18318
- * This problem is tough by the requirement that no dynamic
18319
- * memory is used. Also, since swig_type_info structures store pointers to
19460
+ * This problem is tough by the requirement that no dynamic
19461
+ * memory is used. Also, since swig_type_info structures store pointers to
18320
19462
  * swig_cast_info structures and swig_cast_info structures store pointers back
18321
- * to swig_type_info structures, we need some lookup code at initialization.
18322
- * The idea is that swig generates all the structures that are needed.
18323
- * The runtime then collects these partially filled structures.
18324
- * The SWIG_InitializeModule function takes these initial arrays out of
19463
+ * to swig_type_info structures, we need some lookup code at initialization.
19464
+ * The idea is that swig generates all the structures that are needed.
19465
+ * The runtime then collects these partially filled structures.
19466
+ * The SWIG_InitializeModule function takes these initial arrays out of
18325
19467
  * swig_module, and does all the lookup, filling in the swig_module.types
18326
19468
  * array with the correct data and linking the correct swig_cast_info
18327
19469
  * structures together.
18328
19470
  *
18329
- * The generated swig_type_info structures are assigned staticly to an initial
19471
+ * The generated swig_type_info structures are assigned statically to an initial
18330
19472
  * array. We just loop through that array, and handle each type individually.
18331
19473
  * First we lookup if this type has been already loaded, and if so, use the
18332
19474
  * loaded structure instead of the generated one. Then we have to fill in the
@@ -18336,17 +19478,17 @@ static swig_cast_info *swig_cast_initial[] = {
18336
19478
  * a column is one of the swig_cast_info structures for that type.
18337
19479
  * The cast_initial array is actually an array of arrays, because each row has
18338
19480
  * a variable number of columns. So to actually build the cast linked list,
18339
- * we find the array of casts associated with the type, and loop through it
19481
+ * we find the array of casts associated with the type, and loop through it
18340
19482
  * adding the casts to the list. The one last trick we need to do is making
18341
19483
  * sure the type pointer in the swig_cast_info struct is correct.
18342
19484
  *
18343
- * First off, we lookup the cast->type name to see if it is already loaded.
19485
+ * First off, we lookup the cast->type name to see if it is already loaded.
18344
19486
  * There are three cases to handle:
18345
19487
  * 1) If the cast->type has already been loaded AND the type we are adding
18346
19488
  * casting info to has not been loaded (it is in this module), THEN we
18347
19489
  * replace the cast->type pointer with the type pointer that has already
18348
19490
  * been loaded.
18349
- * 2) If BOTH types (the one we are adding casting info to, and the
19491
+ * 2) If BOTH types (the one we are adding casting info to, and the
18350
19492
  * cast->type) are loaded, THEN the cast info has already been loaded by
18351
19493
  * the previous module so we just ignore it.
18352
19494
  * 3) Finally, if cast->type has not already been loaded, then we add that
@@ -18370,9 +19512,7 @@ SWIGRUNTIME void
18370
19512
  SWIG_InitializeModule(void *clientdata) {
18371
19513
  size_t i;
18372
19514
  swig_module_info *module_head, *iter;
18373
- int found, init;
18374
-
18375
- clientdata = clientdata;
19515
+ int init;
18376
19516
 
18377
19517
  /* check to see if the circular list has been setup, if not, set it up */
18378
19518
  if (swig_module.next==0) {
@@ -18391,27 +19531,23 @@ SWIG_InitializeModule(void *clientdata) {
18391
19531
  /* This is the first module loaded for this interpreter */
18392
19532
  /* so set the swig module into the interpreter */
18393
19533
  SWIG_SetModule(clientdata, &swig_module);
18394
- module_head = &swig_module;
18395
19534
  } else {
18396
19535
  /* the interpreter has loaded a SWIG module, but has it loaded this one? */
18397
- found=0;
18398
19536
  iter=module_head;
18399
19537
  do {
18400
19538
  if (iter==&swig_module) {
18401
- found=1;
18402
- break;
19539
+ /* Our module is already in the list, so there's nothing more to do. */
19540
+ return;
18403
19541
  }
18404
19542
  iter=iter->next;
18405
19543
  } while (iter!= module_head);
18406
19544
 
18407
- /* if the is found in the list, then all is done and we may leave */
18408
- if (found) return;
18409
- /* otherwise we must add out module into the list */
19545
+ /* otherwise we must add our module into the list */
18410
19546
  swig_module.next = module_head->next;
18411
19547
  module_head->next = &swig_module;
18412
19548
  }
18413
19549
 
18414
- /* When multiple interpeters are used, a module could have already been initialized in
19550
+ /* When multiple interpreters are used, a module could have already been initialized in
18415
19551
  a different interpreter, but not yet have a pointer in this interpreter.
18416
19552
  In this case, we do not want to continue adding types... everything should be
18417
19553
  set up already */
@@ -18425,7 +19561,7 @@ SWIG_InitializeModule(void *clientdata) {
18425
19561
  swig_type_info *type = 0;
18426
19562
  swig_type_info *ret;
18427
19563
  swig_cast_info *cast;
18428
-
19564
+
18429
19565
  #ifdef SWIGRUNTIME_DEBUG
18430
19566
  printf("SWIG_InitializeModule: type %d %s\n", i, swig_module.type_initial[i]->name);
18431
19567
  #endif
@@ -18452,7 +19588,7 @@ SWIG_InitializeModule(void *clientdata) {
18452
19588
  /* Insert casting types */
18453
19589
  cast = swig_module.cast_initial[i];
18454
19590
  while (cast->type) {
18455
-
19591
+
18456
19592
  /* Don't need to add information already in the list */
18457
19593
  ret = 0;
18458
19594
  #ifdef SWIGRUNTIME_DEBUG
@@ -18714,6 +19850,13 @@ SWIGEXPORT void Init_ogr(void) {
18714
19850
  rb_define_method(SwigClassLayer.klass, "get_spatial_ref", VALUEFUNC(_wrap_Layer_get_spatial_ref), -1);
18715
19851
  rb_define_method(SwigClassLayer.klass, "get_features_read", VALUEFUNC(_wrap_Layer_get_features_read), -1);
18716
19852
  rb_define_method(SwigClassLayer.klass, "set_ignored_fields", VALUEFUNC(_wrap_Layer_set_ignored_fields), -1);
19853
+ rb_define_method(SwigClassLayer.klass, "intersection", VALUEFUNC(_wrap_Layer_intersection), -1);
19854
+ rb_define_method(SwigClassLayer.klass, "union", VALUEFUNC(_wrap_Layer_union), -1);
19855
+ rb_define_method(SwigClassLayer.klass, "sym_difference", VALUEFUNC(_wrap_Layer_sym_difference), -1);
19856
+ rb_define_method(SwigClassLayer.klass, "identity", VALUEFUNC(_wrap_Layer_identity), -1);
19857
+ rb_define_method(SwigClassLayer.klass, "update", VALUEFUNC(_wrap_Layer_update), -1);
19858
+ rb_define_method(SwigClassLayer.klass, "clip", VALUEFUNC(_wrap_Layer_clip), -1);
19859
+ rb_define_method(SwigClassLayer.klass, "erase", VALUEFUNC(_wrap_Layer_erase), -1);
18717
19860
  rb_define_method(SwigClassLayer.klass, "each", VALUEFUNC(_wrap_Layer_each), -1);
18718
19861
  SwigClassLayer.mark = 0;
18719
19862
  SwigClassLayer.trackObjects = 0;
@@ -18806,6 +19949,7 @@ SWIGEXPORT void Init_ogr(void) {
18806
19949
  rb_define_module_function(mOgr, "build_polygon_from_edges", VALUEFUNC(_wrap_build_polygon_from_edges), -1);
18807
19950
  rb_define_module_function(mOgr, "approximate_arc_angles", VALUEFUNC(_wrap_approximate_arc_angles), -1);
18808
19951
  rb_define_module_function(mOgr, "force_to_polygon", VALUEFUNC(_wrap_force_to_polygon), -1);
19952
+ rb_define_module_function(mOgr, "force_to_line_string", VALUEFUNC(_wrap_force_to_line_string), -1);
18809
19953
  rb_define_module_function(mOgr, "force_to_multi_polygon", VALUEFUNC(_wrap_force_to_multi_polygon), -1);
18810
19954
  rb_define_module_function(mOgr, "force_to_multi_point", VALUEFUNC(_wrap_force_to_multi_point), -1);
18811
19955
  rb_define_module_function(mOgr, "force_to_multi_line_string", VALUEFUNC(_wrap_force_to_multi_line_string), -1);
@@ -18877,6 +20021,7 @@ SWIGEXPORT void Init_ogr(void) {
18877
20021
  rb_define_method(SwigClassGeometry.klass, "get_envelope", VALUEFUNC(_wrap_Geometry_get_envelope), -1);
18878
20022
  rb_define_method(SwigClassGeometry.klass, "get_envelope_3d", VALUEFUNC(_wrap_Geometry_get_envelope_3d), -1);
18879
20023
  rb_define_method(SwigClassGeometry.klass, "centroid", VALUEFUNC(_wrap_Geometry_centroid), -1);
20024
+ rb_define_method(SwigClassGeometry.klass, "point_on_surface", VALUEFUNC(_wrap_Geometry_point_on_surface), -1);
18880
20025
  rb_define_method(SwigClassGeometry.klass, "wkb_size", VALUEFUNC(_wrap_Geometry_wkb_size), -1);
18881
20026
  rb_define_method(SwigClassGeometry.klass, "get_coordinate_dimension", VALUEFUNC(_wrap_Geometry_get_coordinate_dimension), -1);
18882
20027
  rb_define_method(SwigClassGeometry.klass, "set_coordinate_dimension", VALUEFUNC(_wrap_Geometry_set_coordinate_dimension), -1);
@@ -18896,5 +20041,7 @@ SWIGEXPORT void Init_ogr(void) {
18896
20041
  rb_define_module_function(mOgr, "get_driver_by_name", VALUEFUNC(_wrap_get_driver_by_name), -1);
18897
20042
  rb_define_module_function(mOgr, "get_driver", VALUEFUNC(_wrap_get_driver), -1);
18898
20043
  rb_define_module_function(mOgr, "general_cmd_line_processor", VALUEFUNC(_wrap_general_cmd_line_processor), -1);
20044
+ rb_define_module_function(mOgr, "TermProgress_nocb", VALUEFUNC(_wrap_TermProgress_nocb), -1);
20045
+ rb_define_const(mOgr, "TermProgress", SWIG_NewFunctionPtrObj((void *)(int (*)(double,char const *,void *))(GDALTermProgress), SWIGTYPE_p_f_double_p_q_const__char_p_void__int));
18899
20046
  }
18900
20047