Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: swig/include/php/typemaps_php.i
- ===================================================================
- --- swig/include/php/typemaps_php.i (revision 21891)
- +++ swig/include/php/typemaps_php.i (working copy)
- @@ -60,46 +60,21 @@
- RETVAL_NULL();
- }
- -/*
- - * Another output typemap which will raise an
- - * exception on error. If there is no error,
- - * and no other argout typemaps create a return value,
- - * then it will return 0.
- - */
- -%fragment("OGRErrMessages","header") %{
- -static char *
- -OGRErrMessages( int rc ) {
- - switch( rc ) {
- - case 0:
- - return "OGR Error 0: None";
- - case 1:
- - return "OGR Error 1: Not enough data";
- - case 2:
- - return "OGR Error 2: Unsupported geometry type";
- - case 3:
- - return "OGR Error 3: Unsupported operation";
- - case 4:
- - return "OGR Error 4: Corrupt data";
- - case 5:
- - return "OGR Error 5: General Error";
- - case 6:
- - return "OGR Error 6: Unsupported SRS";
- - default:
- - return "OGR Error: Unknown";
- - }
- -}
- -%}
- -%typemap(out) OGRErr
- +%include "ogr_error_map.i"
- +
- +%typemap(out,fragment="OGRErrMessages") OGRErr
- {
- /* %typemap(out) OGRErr */
- if (result != 0 ) {
- SWIG_PHP_Error(E_ERROR,OGRErrMessages(result));
- }
- }
- -%typemap(ret,fragment="OGRErrMessages") OGRErr
- +%typemap(ret) OGRErr
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- %fragment("CreateTupleFromDoubleArray","header") %{
- @@ -378,6 +353,25 @@
- }
- }
- +/* Almost same as %typemap(out) char **options */
- +/* but we CSLDestroy the char** pointer at the end */
- +%typemap(out) char **CSL
- +{
- + /* %typemap(out) char ** -> ( string ) */
- + char **stringarray = $1;
- + if ( stringarray == NULL ) {
- + RETVAL_NULL();
- + }
- + else {
- + int len = CSLCount( stringarray );
- + array_init($result);
- + for ( int i = 0; i < len; ++i, ++stringarray ) {
- + add_next_index_string( $result, *stringarray, 1 );
- + }
- + }
- + CSLDestroy($1);
- +}
- +
- /*
- * Typemaps map mutable char ** arguments from PyStrings. Does not
- * return the modified argument
- Index: swig/include/osr.i
- ===================================================================
- --- swig/include/osr.i (revision 21891)
- +++ swig/include/osr.i (working copy)
- @@ -88,7 +88,7 @@
- %include osr_python.i
- #elif defined(SWIGRUBY)
- %include typemaps_ruby.i
- -#elif defined(SWIGPHP4)
- +#elif defined(SWIGPHP)
- %include typemaps_php.i
- #elif defined(SWIGCSHARP)
- %include osr_csharp.i
- Index: swig/include/gdal.i
- ===================================================================
- --- swig/include/gdal.i (revision 21891)
- +++ swig/include/gdal.i (working copy)
- @@ -178,7 +178,7 @@
- %include "gdal_python.i"
- #elif defined(SWIGRUBY)
- %include "gdal_ruby.i"
- -#elif defined(SWIGPHP4)
- +#elif defined(SWIGPHP)
- %include "gdal_php.i"
- #elif defined(SWIGCSHARP)
- %include "gdal_csharp.i"
- Index: swig/include/ogr.i
- ===================================================================
- --- swig/include/ogr.i (revision 21891)
- +++ swig/include/ogr.i (working copy)
- @@ -265,7 +265,7 @@
- %include ogr_python.i
- #elif defined(SWIGRUBY)
- %include ogr_ruby.i
- -#elif defined(SWIGPHP4)
- +#elif defined(SWIGPHP)
- %include ogr_php.i
- #elif defined(SWIGCSHARP)
- %include ogr_csharp.i
- Index: swig/php/php_osr.h
- ===================================================================
- --- swig/php/php_osr.h (revision 21891)
- +++ swig/php/php_osr.h (working copy)
- @@ -1,6 +1,6 @@
- /* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- - * Version 1.3.40
- + * Version 2.0.1
- *
- * This file is not intended to be easily readable and contains a number of
- * coding conventions designed to improve portability and efficiency. Do not make
- Index: swig/php/gdal_wrap.cpp
- ===================================================================
- --- swig/php/gdal_wrap.cpp (revision 21891)
- +++ swig/php/gdal_wrap.cpp (working copy)
- @@ -1,6 +1,6 @@
- /* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- - * Version 1.3.40
- + * Version 2.0.1
- *
- * This file is not intended to be easily readable and contains a number of
- * coding conventions designed to improve portability and efficiency. Do not make
- @@ -196,7 +196,7 @@
- /*
- Flags/methods for returning states.
- - The SWIG conversion methods, as ConvertPtr, return and integer
- + The SWIG conversion methods, as ConvertPtr, return an integer
- that tells if the conversion was successful or not. And if not,
- an error code can be returned (see swigerrors.swg for the codes).
- @@ -728,9 +728,6 @@
- #endif
- /* -----------------------------------------------------------------------------
- - * See the LICENSE file for information on copyright, usage and redistribution
- - * of SWIG, and the README file for authors - http://www.swig.org/release.html.
- - *
- * phprun.swg
- *
- * PHP runtime library
- @@ -741,6 +738,7 @@
- #endif
- #include "zend.h"
- #include "zend_API.h"
- +#include "zend_exceptions.h"
- #include "php.h"
- #include "ext/standard/php_string.h"
- @@ -755,17 +753,17 @@
- #endif
- #ifndef Z_SET_ISREF_P
- -// For PHP < 5.3
- +/* For PHP < 5.3 */
- # define Z_SET_ISREF_P(z) (z)->is_ref = 1
- #endif
- #ifndef Z_SET_REFCOUNT_P
- -// For PHP < 5.3
- +/* For PHP < 5.3 */
- # define Z_SET_REFCOUNT_P(z, rc) (z)->refcount = (rc)
- #endif
- #define SWIG_LONG_CONSTANT(N, V) zend_register_long_constant((char*)#N, sizeof(#N), V, CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC)
- #define SWIG_DOUBLE_CONSTANT(N, V) zend_register_double_constant((char*)#N, sizeof(#N), V, CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC)
- -#define SWIG_STRING_CONSTANT(N, V) zend_register_stringl_constant((char*)#N, sizeof(#N), V, strlen(V), CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC)
- +#define SWIG_STRING_CONSTANT(N, V) zend_register_stringl_constant((char*)#N, sizeof(#N), (char*)(V), strlen(V), CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC)
- #define SWIG_CHAR_CONSTANT(N, V) do {\
- static char swig_char = (V);\
- zend_register_stringl_constant((char*)#N, sizeof(#N), &swig_char, 1, CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC);\
- @@ -1263,6 +1261,9 @@
- SWIGINTERN int GDALDriverShadow_Rename(GDALDriverShadow *self,char const *newName,char const *oldName){
- return GDALRenameDataset( self, newName, oldName );
- }
- +SWIGINTERN int GDALDriverShadow_CopyFiles(GDALDriverShadow *self,char const *newName,char const *oldName){
- + return GDALCopyDatasetFiles( self, newName, oldName );
- + }
- SWIGINTERN int GDALDriverShadow_Register(GDALDriverShadow *self){
- return GDALRegisterDriver( self );
- }
- @@ -2078,6 +2079,12 @@
- SWIGINTERN bool GDALRasterBandShadow_HasArbitraryOverviews(GDALRasterBandShadow *self){
- return (GDALHasArbitraryOverviews( self ) != 0) ? true : false;
- }
- +SWIGINTERN char **GDALRasterBandShadow_GetCategoryNames(GDALRasterBandShadow *self){
- + return GDALGetRasterCategoryNames( self );
- + }
- +SWIGINTERN CPLErr GDALRasterBandShadow_SetCategoryNames(GDALRasterBandShadow *self,char **papszCategoryNames){
- + return GDALSetRasterCategoryNames( self, papszCategoryNames );
- + }
- GDALDataType GDALRasterBandShadow_DataType_get( GDALRasterBandShadow *h ) {
- return GDALGetRasterDataType( h );
- @@ -2596,8 +2603,8 @@
- static swig_type_info _swigt__p_p_GDAL_GCP = {"_p_p_GDAL_GCP", "GDAL_GCP **", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0};
- static swig_type_info _swigt__p_p_int = {"_p_p_int", "int **", 0, 0, (void*)0, 0};
- -static swig_type_info _swigt__p_p_void = {"_p_p_void", "FILE **|void **", 0, 0, (void*)0, 0};
- -static swig_type_info _swigt__p_void = {"_p_void", "FILE *|void *", 0, 0, (void*)0, 0};
- +static swig_type_info _swigt__p_p_void = {"_p_p_void", "VSILFILE **|void **", 0, 0, (void*)0, 0};
- +static swig_type_info _swigt__p_void = {"_p_void", "VSILFILE *|void *", 0, 0, (void*)0, 0};
- static swig_type_info *swig_type_initial[] = {
- &_swigt__p_CPLErrorHandler,
- @@ -2724,7 +2731,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -2734,7 +2741,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -2747,7 +2754,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2764,7 +2771,7 @@
- WRONG_PARAM_COUNT;
- if(arg_count > 0) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -2780,7 +2787,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2798,21 +2805,21 @@
- WRONG_PARAM_COUNT;
- if(arg_count > 0) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[0]);
- arg1 = (CPLErr) Z_LVAL_PP(args[0]);
- /*@SWIG@*/;
- }
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- }
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[2])->type==IS_NULL) {
- arg3 = (char *) 0;
- } else {
- @@ -2826,7 +2833,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2850,7 +2857,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2897,7 +2904,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2911,7 +2918,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2936,7 +2943,7 @@
- arg1 = Z_STRLEN_PP(args[0]);
- }
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg3 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -2952,7 +2959,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2970,7 +2977,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2988,7 +2995,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3010,7 +3017,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3024,7 +3031,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -3037,7 +3044,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3051,7 +3058,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3065,7 +3072,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3081,7 +3088,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -3091,7 +3098,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -3110,7 +3117,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3125,7 +3132,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -3135,12 +3142,24 @@
- /*@SWIG@*/;
- result = (char **)VSIReadDir((char const *)arg1);
- -
- - SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_p_char, 0);
- -
- + {
- + /* %typemap(out) char ** -> ( string ) */
- + char **stringarray = result;
- + if ( stringarray == NULL ) {
- + RETVAL_NULL();
- + }
- + else {
- + int len = CSLCount( stringarray );
- + array_init(return_value);
- + for ( int i = 0; i < len; ++i, ++stringarray ) {
- + add_next_index_string( return_value, *stringarray, 1 );
- + }
- + }
- + CSLDestroy(result);
- + }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3155,7 +3174,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -3165,7 +3184,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -3183,7 +3202,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3201,7 +3220,7 @@
- WRONG_PARAM_COUNT;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -3211,7 +3230,7 @@
- /*@SWIG@*/;
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -3236,7 +3255,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3252,7 +3271,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[0]);
- arg1 = (int) Z_LVAL_PP(args[0]);
- /*@SWIG@*/;
- @@ -3272,7 +3291,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3288,7 +3307,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -3308,7 +3327,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3324,7 +3343,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -3334,7 +3353,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -3348,7 +3367,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3363,7 +3382,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -3383,7 +3402,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3401,7 +3420,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3417,7 +3436,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -3427,7 +3446,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -3438,7 +3457,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3453,7 +3472,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -3468,7 +3487,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3484,7 +3503,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -3494,7 +3513,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -3509,7 +3528,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3517,7 +3536,7 @@
- char *arg1 = (char *) 0 ;
- char *arg2 = (char *) 0 ;
- zval **args[2];
- - FILE *result = 0 ;
- + VSILFILE *result = 0 ;
- SWIG_ResetError();
- if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_array_ex(2, args) != SUCCESS) {
- @@ -3525,7 +3544,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -3535,7 +3554,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -3544,18 +3563,18 @@
- }
- /*@SWIG@*/;
- - result = (FILE *)VSIFOpenL((char const *)arg1,(char const *)arg2);
- + result = (VSILFILE *)VSIFOpenL((char const *)arg1,(char const *)arg2);
- SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_void, 0);
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- ZEND_NAMED_FUNCTION(_wrap_VSIFCloseL) {
- - FILE *arg1 = (FILE *) 0 ;
- + VSILFILE *arg1 = (VSILFILE *) 0 ;
- zval **args[1];
- SWIG_ResetError();
- @@ -3575,12 +3594,12 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- ZEND_NAMED_FUNCTION(_wrap_VSIFSeekL) {
- - FILE *arg1 = (FILE *) 0 ;
- + VSILFILE *arg1 = (VSILFILE *) 0 ;
- long arg2 ;
- int arg3 ;
- zval **args[3];
- @@ -3600,13 +3619,13 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (long) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -3617,12 +3636,12 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- ZEND_NAMED_FUNCTION(_wrap_VSIFTellL) {
- - FILE *arg1 = (FILE *) 0 ;
- + VSILFILE *arg1 = (VSILFILE *) 0 ;
- zval **args[1];
- long result;
- @@ -3645,7 +3664,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3653,7 +3672,7 @@
- char *arg1 = (char *) 0 ;
- int arg2 ;
- int arg3 ;
- - FILE *arg4 = (FILE *) 0 ;
- + VSILFILE *arg4 = (VSILFILE *) 0 ;
- zval **args[4];
- int result;
- @@ -3663,7 +3682,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -3673,13 +3692,13 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -3698,7 +3717,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3728,7 +3747,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3749,7 +3768,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -3762,7 +3781,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3786,7 +3805,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -3816,7 +3835,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3840,7 +3859,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -3867,7 +3886,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3908,7 +3927,7 @@
- */
- }
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[2])->type==IS_NULL) {
- arg3 = (char *) 0;
- } else {
- @@ -3932,7 +3951,7 @@
- /* %typemap(freearg) char **dict */
- CSLDestroy( arg2 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3957,7 +3976,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -3967,7 +3986,7 @@
- /*@SWIG@*/;
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[2])->type==IS_NULL) {
- arg3 = (char *) 0;
- } else {
- @@ -3983,7 +4002,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4062,7 +4081,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -4072,7 +4091,7 @@
- /*@SWIG@*/;
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[2])->type==IS_NULL) {
- arg3 = (char *) 0;
- } else {
- @@ -4097,7 +4116,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4123,7 +4142,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -4133,7 +4152,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[2])->type==IS_NULL) {
- arg3 = (char *) 0;
- } else {
- @@ -4143,7 +4162,7 @@
- /*@SWIG@*/;
- if(arg_count > 3) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[3])->type==IS_NULL) {
- arg4 = (char *) 0;
- } else {
- @@ -4164,7 +4183,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4194,7 +4213,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4224,7 +4243,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4254,7 +4273,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4283,7 +4302,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -4293,26 +4312,26 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (int) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- if(arg_count > 4) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[4]);
- arg5 = (int) Z_LVAL_PP(args[4]);
- /*@SWIG@*/;
- }
- if(arg_count > 5) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[5]);
- arg6 = (GDALDataType) Z_LVAL_PP(args[5]);
- /*@SWIG@*/;
- @@ -4347,7 +4366,7 @@
- /* %typemap(freearg) char **options */
- CSLDestroy( arg7 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4377,7 +4396,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -4392,7 +4411,7 @@
- }
- }
- if(arg_count > 3) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (int) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -4450,7 +4469,7 @@
- /* %typemap(freearg) char **options */
- CSLDestroy( arg5 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4472,7 +4491,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -4487,7 +4506,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4510,7 +4529,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -4520,7 +4539,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[2])->type==IS_NULL) {
- arg3 = (char *) 0;
- } else {
- @@ -4545,10 +4564,68 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- +ZEND_NAMED_FUNCTION(_wrap_Driver_CopyFiles) {
- + GDALDriverShadow *arg1 = (GDALDriverShadow *) 0 ;
- + char *arg2 = (char *) 0 ;
- + char *arg3 = (char *) 0 ;
- + zval **args[3];
- + int result;
- +
- + SWIG_ResetError();
- + if(ZEND_NUM_ARGS() != 3 || zend_get_parameters_array_ex(3, args) != SUCCESS) {
- + WRONG_PARAM_COUNT;
- + }
- +
- + {
- + if(SWIG_ConvertPtr(*args[0], (void **) &arg1, SWIGTYPE_p_GDALDriverShadow, 0) < 0) {
- + SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of Driver_CopyFiles. Expected SWIGTYPE_p_GDALDriverShadow");
- + }
- + }
- + if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- +
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- + if ((*args[1])->type==IS_NULL) {
- + arg2 = (char *) 0;
- + } else {
- + convert_to_string_ex(args[1]);
- + arg2 = (char *) Z_STRVAL_PP(args[1]);
- + }
- + /*@SWIG@*/;
- +
- +
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- + if ((*args[2])->type==IS_NULL) {
- + arg3 = (char *) 0;
- + } else {
- + convert_to_string_ex(args[2]);
- + arg3 = (char *) Z_STRVAL_PP(args[2]);
- + }
- + /*@SWIG@*/;
- +
- + {
- + if (!arg2) {
- + SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
- + }
- + }
- + {
- + if (!arg3) {
- + SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
- + }
- + }
- + result = (int)GDALDriverShadow_CopyFiles(arg1,(char const *)arg2,(char const *)arg3);
- + {
- + ZVAL_LONG(return_value,result);
- + }
- + return;
- +fail:
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- +}
- +
- +
- ZEND_NAMED_FUNCTION(_wrap_Driver_Register) {
- GDALDriverShadow *arg1 = (GDALDriverShadow *) 0 ;
- zval **args[1];
- @@ -4571,7 +4648,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4594,7 +4671,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4618,7 +4695,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (short) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -4627,7 +4704,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4656,7 +4733,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4680,7 +4757,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (short) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -4689,7 +4766,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4718,7 +4795,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4742,7 +4819,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (short) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -4751,7 +4828,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4780,7 +4857,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4804,7 +4881,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (short) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -4813,7 +4890,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4842,7 +4919,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4865,7 +4942,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4884,7 +4961,7 @@
- delete arg1;
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4905,7 +4982,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -4914,7 +4991,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4940,7 +5017,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4961,7 +5038,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -4970,7 +5047,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4996,7 +5073,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5017,7 +5094,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -5026,7 +5103,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5052,7 +5129,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5073,7 +5150,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -5082,7 +5159,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5108,7 +5185,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5129,7 +5206,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -5138,7 +5215,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5164,7 +5241,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5185,7 +5262,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -5194,14 +5271,11 @@
- }
- /*@SWIG@*/;
- -
- - /* char* Info memberin typemap */
- GDAL_GCP_Info_set(arg1,arg2);
- -
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5231,7 +5305,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5252,7 +5326,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -5261,14 +5335,11 @@
- }
- /*@SWIG@*/;
- -
- - /* char* Info memberin typemap */
- GDAL_GCP_Id_set(arg1,arg2);
- -
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5298,7 +5369,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5321,42 +5392,42 @@
- WRONG_PARAM_COUNT;
- if(arg_count > 0) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[0]);
- arg1 = (double) Z_DVAL_PP(args[0]);
- /*@SWIG@*/;
- }
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- }
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- }
- if(arg_count > 3) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- }
- if(arg_count > 4) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- }
- if(arg_count > 5) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[5])->type==IS_NULL) {
- arg6 = (char *) 0;
- } else {
- @@ -5367,7 +5438,7 @@
- }
- if(arg_count > 6) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[6])->type==IS_NULL) {
- arg7 = (char *) 0;
- } else {
- @@ -5383,7 +5454,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5402,7 +5473,7 @@
- delete_GDAL_GCP(arg1);
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5432,7 +5503,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5452,7 +5523,7 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -5466,7 +5537,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5496,7 +5567,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5516,7 +5587,7 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -5530,7 +5601,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5560,7 +5631,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5580,7 +5651,7 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -5594,7 +5665,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5624,7 +5695,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5644,7 +5715,7 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -5658,7 +5729,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5688,7 +5759,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5708,7 +5779,7 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -5722,7 +5793,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5756,7 +5827,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5776,7 +5847,7 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -5794,7 +5865,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5828,7 +5899,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5848,7 +5919,7 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -5866,7 +5937,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5896,7 +5967,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5916,7 +5987,7 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -5930,7 +6001,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5960,7 +6031,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5980,7 +6051,7 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -5994,7 +6065,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6024,7 +6095,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6044,7 +6115,7 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -6058,7 +6129,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6088,7 +6159,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6108,7 +6179,7 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -6122,7 +6193,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6152,7 +6223,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6172,7 +6243,7 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -6186,7 +6257,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6220,7 +6291,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6240,7 +6311,7 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -6258,7 +6329,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6292,7 +6363,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6312,7 +6383,7 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -6330,7 +6401,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6359,7 +6430,7 @@
- /* %typemap(in,numinputs=1) (int nGCPs, GDAL_GCP const *pGCPs ) */
- }
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg4 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -6393,7 +6464,7 @@
- free( (void*) arg2 );
- }
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6412,7 +6483,7 @@
- delete_GDALAsyncReaderShadow(arg1);
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6446,7 +6517,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -6481,7 +6552,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6503,7 +6574,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -6514,7 +6585,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6537,7 +6608,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6563,7 +6634,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6589,7 +6660,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6615,7 +6686,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6634,7 +6705,7 @@
- delete_GDALDatasetShadow(arg1);
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6660,7 +6731,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6682,7 +6753,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -6693,7 +6764,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6723,7 +6794,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6753,7 +6824,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6775,7 +6846,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -6795,7 +6866,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6829,7 +6900,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6865,7 +6936,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6894,7 +6965,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -6959,7 +7030,7 @@
- free((void*) arg4);
- }
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6985,7 +7056,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7015,7 +7086,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7068,7 +7139,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7096,7 +7167,7 @@
- /* %typemap(in,numinputs=1) (int nGCPs, GDAL_GCP const *pGCPs ) */
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[2])->type==IS_NULL) {
- arg4 = (char *) 0;
- } else {
- @@ -7123,7 +7194,7 @@
- free( (void*) arg3 );
- }
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7146,7 +7217,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7171,7 +7242,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (GDALDataType) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -7206,7 +7277,7 @@
- /* %typemap(freearg) char **options */
- CSLDestroy( arg3 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7228,7 +7299,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -7239,7 +7310,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7260,12 +7331,24 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- result = (char **)GDALDatasetShadow_GetFileList(arg1);
- -
- - SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_p_char, 0);
- -
- + {
- + /* %typemap(out) char ** -> ( string ) */
- + char **stringarray = result;
- + if ( stringarray == NULL ) {
- + RETVAL_NULL();
- + }
- + else {
- + int len = CSLCount( stringarray );
- + array_init(return_value);
- + for ( int i = 0; i < len; ++i, ++stringarray ) {
- + add_next_index_string( return_value, *stringarray, 1 );
- + }
- + }
- + CSLDestroy(result);
- + }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7308,25 +7391,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (int) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[4]);
- arg5 = (int) Z_LVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -7440,7 +7523,7 @@
- free((void*) arg12);
- }
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7490,25 +7573,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (int) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[4]);
- arg5 = (int) Z_LVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -7632,7 +7715,7 @@
- free((void*) arg12);
- }
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7658,7 +7741,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7684,7 +7767,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7710,7 +7793,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7736,7 +7819,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7777,7 +7860,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7803,7 +7886,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7829,7 +7912,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7851,7 +7934,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (GDALColorInterp) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -7862,7 +7945,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7884,7 +7967,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (GDALColorInterp) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -7895,7 +7978,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7936,7 +8019,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7958,7 +8041,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -7969,7 +8052,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7999,7 +8082,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8021,7 +8104,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -8036,7 +8119,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8073,7 +8156,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8121,7 +8204,7 @@
- /* %typemap(freearg) char **options */
- CSLDestroy( arg2 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8162,7 +8245,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8203,7 +8286,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8244,7 +8327,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8285,7 +8368,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8307,7 +8390,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -8318,7 +8401,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8340,7 +8423,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -8351,7 +8434,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8386,13 +8469,13 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -8427,7 +8510,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8466,7 +8549,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,2,CONVERT_BOOL_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,2,CONVERT_BOOL_IN@*/
- convert_to_boolean_ex(args[1]);
- arg2 = (bool) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -8519,7 +8602,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8544,25 +8627,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -8573,7 +8656,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8599,7 +8682,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8621,7 +8704,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -8632,7 +8715,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8661,14 +8744,14 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- }
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -8702,7 +8785,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8731,7 +8814,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg3 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -8746,7 +8829,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8775,7 +8858,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg3 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -8790,7 +8873,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8815,13 +8898,13 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -8833,7 +8916,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8879,25 +8962,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (int) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[4]);
- arg5 = (int) Z_LVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -8979,7 +9062,7 @@
- free( *arg7 );
- }
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9018,25 +9101,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (int) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[4]);
- arg5 = (int) Z_LVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -9108,7 +9191,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9131,7 +9214,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9157,7 +9240,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9183,7 +9266,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9215,7 +9298,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9247,7 +9330,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9273,7 +9356,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9305,7 +9388,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9331,7 +9414,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9357,7 +9440,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9379,7 +9462,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -9390,7 +9473,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9422,21 +9505,21 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- }
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- }
- if(arg_count > 3) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (int) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -9450,14 +9533,14 @@
- }
- }
- if(arg_count > 5) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[5]);
- arg6 = (int) Z_LVAL_PP(args[5]);
- /*@SWIG@*/;
- }
- if(arg_count > 6) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[6]);
- arg7 = (int) Z_LVAL_PP(args[6]);
- /*@SWIG@*/;
- @@ -9487,7 +9570,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9546,7 +9629,7 @@
- }
- }
- if(arg_count > 5) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[5]);
- arg6 = (int) Z_LVAL_PP(args[5]);
- /*@SWIG@*/;
- @@ -9576,7 +9659,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9601,19 +9684,19 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (int) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -9629,7 +9712,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9655,10 +9738,95 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- +ZEND_NAMED_FUNCTION(_wrap_Band_GetCategoryNames) {
- + GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
- + zval **args[1];
- + char **result = 0 ;
- +
- + SWIG_ResetError();
- + if(ZEND_NUM_ARGS() != 1 || zend_get_parameters_array_ex(1, args) != SUCCESS) {
- + WRONG_PARAM_COUNT;
- + }
- +
- + {
- + if(SWIG_ConvertPtr(*args[0], (void **) &arg1, SWIGTYPE_p_GDALRasterBandShadow, 0) < 0) {
- + SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of Band_GetCategoryNames. Expected SWIGTYPE_p_GDALRasterBandShadow");
- + }
- + }
- + if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- + result = (char **)GDALRasterBandShadow_GetCategoryNames(arg1);
- + {
- + /* %typemap(out) char ** -> ( string ) */
- + char **stringarray = result;
- + if ( stringarray == NULL ) {
- + RETVAL_NULL();
- + }
- + else {
- + int len = CSLCount( stringarray );
- + array_init(return_value);
- + for ( int i = 0; i < len; ++i, ++stringarray ) {
- + add_next_index_string( return_value, *stringarray, 1 );
- + }
- + }
- + }
- + return;
- +fail:
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- +}
- +
- +
- +ZEND_NAMED_FUNCTION(_wrap_Band_SetCategoryNames) {
- + GDALRasterBandShadow *arg1 = (GDALRasterBandShadow *) 0 ;
- + char **arg2 = (char **) 0 ;
- + zval **args[2];
- + CPLErr result;
- +
- + SWIG_ResetError();
- + if(ZEND_NUM_ARGS() != 2 || zend_get_parameters_array_ex(2, args) != SUCCESS) {
- + WRONG_PARAM_COUNT;
- + }
- +
- + {
- + if(SWIG_ConvertPtr(*args[0], (void **) &arg1, SWIGTYPE_p_GDALRasterBandShadow, 0) < 0) {
- + SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of Band_SetCategoryNames. Expected SWIGTYPE_p_GDALRasterBandShadow");
- + }
- + }
- + if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- + {
- + /* %typemap(in) char **options */
- + zend_error(E_ERROR,"Typemap (in) char **options not properly defined");
- + // int size = PySequence_Size(args[1]);
- + // for (int i = 0; i < size; i++) {
- + // char *pszItem = NULL;
- + // if ( ! PyArg_Parse( PySequence_GetItem(args[1],i), "s", &pszItem ) ) {
- + // PyErr_SetString(PyExc_TypeError,"sequence must contain strings");
- + // SWIG_fail;
- + // }
- + // arg2 = CSLAddString( arg2, pszItem );
- + // }
- + }
- + result = (CPLErr)GDALRasterBandShadow_SetCategoryNames(arg1,arg2);
- + {
- + ZVAL_LONG(return_value,result);
- + }
- + {
- + /* %typemap(freearg) char **options */
- + CSLDestroy( arg2 );
- + }
- + return;
- +fail:
- + {
- + /* %typemap(freearg) char **options */
- + CSLDestroy( arg2 );
- + }
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- +}
- +
- +
- ZEND_NAMED_FUNCTION(_wrap_new_ColorTable) {
- GDALPaletteInterp arg1 = (GDALPaletteInterp) GPI_RGB ;
- zval **args[1];
- @@ -9672,7 +9840,7 @@
- WRONG_PARAM_COUNT;
- if(arg_count > 0) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[0]);
- arg1 = (GDALPaletteInterp) Z_LVAL_PP(args[0]);
- /*@SWIG@*/;
- @@ -9684,7 +9852,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9703,7 +9871,7 @@
- delete_GDALColorTableShadow(arg1);
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9729,7 +9897,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9755,7 +9923,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9781,7 +9949,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9803,7 +9971,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -9819,7 +9987,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9842,7 +10010,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -9861,7 +10029,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9883,7 +10051,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -9900,7 +10068,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9924,7 +10092,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -9938,7 +10106,7 @@
- arg3 = &ce;
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (int) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -9955,7 +10123,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9973,7 +10141,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9992,7 +10160,7 @@
- delete_GDALRasterAttributeTableShadow(arg1);
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10018,7 +10186,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10044,7 +10212,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10066,7 +10234,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -10081,7 +10249,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10103,7 +10271,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -10114,7 +10282,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10136,7 +10304,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -10147,7 +10315,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10169,7 +10337,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (GDALRATFieldUsage) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -10180,7 +10348,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10206,7 +10374,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10229,13 +10397,13 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -10250,7 +10418,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10273,13 +10441,13 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -10290,7 +10458,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10313,13 +10481,13 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -10330,7 +10498,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10353,13 +10521,13 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -10373,7 +10541,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10396,19 +10564,19 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (int) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -10417,7 +10585,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10440,19 +10608,19 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -10461,7 +10629,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10482,7 +10650,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -10491,7 +10659,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10515,7 +10683,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -10525,13 +10693,13 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (GDALRATFieldType) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (GDALRATFieldUsage) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -10542,7 +10710,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10586,7 +10754,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10609,13 +10777,13 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -10626,7 +10794,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10648,7 +10816,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -10659,7 +10827,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10678,13 +10846,13 @@
- WRONG_PARAM_COUNT;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[0]);
- arg1 = (double) Z_DVAL_PP(args[0]);
- /*@SWIG@*/;
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -10710,7 +10878,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10749,7 +10917,7 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (int) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -10803,7 +10971,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10900,7 +11068,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10936,7 +11104,7 @@
- }
- }
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[2])->type==IS_NULL) {
- arg3 = (char *) 0;
- } else {
- @@ -10947,7 +11115,7 @@
- }
- if(arg_count > 3) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[3])->type==IS_NULL) {
- arg4 = (char *) 0;
- } else {
- @@ -10958,21 +11126,21 @@
- }
- if(arg_count > 4) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[4]);
- arg5 = (GDALResampleAlg) Z_LVAL_PP(args[4]);
- /*@SWIG@*/;
- }
- if(arg_count > 5) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[5]);
- arg6 = (double) Z_DVAL_PP(args[5]);
- /*@SWIG@*/;
- }
- if(arg_count > 6) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[6]);
- arg7 = (double) Z_DVAL_PP(args[6]);
- /*@SWIG@*/;
- @@ -11012,7 +11180,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -11100,7 +11268,7 @@
- /* %typemap(freearg) char **options */
- CSLDestroy( arg3 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -11175,7 +11343,7 @@
- }
- }
- if(arg_count > 5) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[5]);
- arg7 = (int) Z_LVAL_PP(args[5]);
- /*@SWIG@*/;
- @@ -11257,7 +11425,7 @@
- /* %typemap(freearg) char **options */
- CSLDestroy( arg9 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -11296,7 +11464,7 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (int) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -11358,7 +11526,7 @@
- /* %typemap(freearg) char **options */
- CSLDestroy( arg5 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -11392,13 +11560,13 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (int) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -11455,7 +11623,7 @@
- /* %typemap(freearg) char **options */
- CSLDestroy( arg5 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -11495,13 +11663,13 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (int) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- if(arg_count > 4) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[4]);
- arg5 = (int) Z_LVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -11564,7 +11732,7 @@
- /* %typemap(freearg) char **options */
- CSLDestroy( arg6 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -11592,7 +11760,7 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -11603,7 +11771,7 @@
- }
- }
- if(arg_count > 3) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[3])->type==IS_NULL) {
- arg4 = (char *) 0;
- } else {
- @@ -11642,7 +11810,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -11674,7 +11842,7 @@
- }
- }
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[2])->type==IS_NULL) {
- arg3 = (char *) 0;
- } else {
- @@ -11718,7 +11886,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -11752,19 +11920,19 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (int) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -11775,13 +11943,13 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[5]);
- arg6 = (int) Z_LVAL_PP(args[5]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[6]);
- arg7 = (double) Z_DVAL_PP(args[6]);
- /*@SWIG@*/;
- @@ -11792,13 +11960,13 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[8]);
- arg9 = (int) Z_LVAL_PP(args[8]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[9]);
- arg10 = (int) Z_LVAL_PP(args[9]);
- /*@SWIG@*/;
- @@ -11837,7 +12005,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -11863,7 +12031,7 @@
- }
- }
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -11874,7 +12042,7 @@
- }
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[2])->type==IS_NULL) {
- arg3 = (char *) 0;
- } else {
- @@ -11885,14 +12053,14 @@
- }
- if(arg_count > 3) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (GDALResampleAlg) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- }
- if(arg_count > 4) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -11909,7 +12077,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -11962,7 +12130,7 @@
- /* %typemap(freearg) char **options */
- CSLDestroy( arg3 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -11981,7 +12149,7 @@
- delete_GDALTransformerInfoShadow(arg1);
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12005,7 +12173,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -12029,7 +12197,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12062,25 +12230,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg3 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg4 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg5 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- if(arg_count > 4) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg6 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -12097,7 +12265,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12181,13 +12349,13 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -12218,7 +12386,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12249,13 +12417,13 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -12276,7 +12444,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12316,7 +12484,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12333,7 +12501,7 @@
- WRONG_PARAM_COUNT;
- if(arg_count > 0) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -12353,7 +12521,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12367,7 +12535,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12381,7 +12549,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12399,7 +12567,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12417,7 +12585,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12431,7 +12599,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[0]);
- arg1 = (int) Z_LVAL_PP(args[0]);
- /*@SWIG@*/;
- @@ -12440,7 +12608,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12455,7 +12623,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[0]);
- arg1 = (GDALDataType) Z_LVAL_PP(args[0]);
- /*@SWIG@*/;
- @@ -12466,7 +12634,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12481,7 +12649,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[0]);
- arg1 = (GDALDataType) Z_LVAL_PP(args[0]);
- /*@SWIG@*/;
- @@ -12492,7 +12660,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12507,7 +12675,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[0]);
- arg1 = (GDALDataType) Z_LVAL_PP(args[0]);
- /*@SWIG@*/;
- @@ -12522,7 +12690,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12537,7 +12705,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -12552,7 +12720,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12567,7 +12735,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[0]);
- arg1 = (GDALColorInterp) Z_LVAL_PP(args[0]);
- /*@SWIG@*/;
- @@ -12582,7 +12750,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12597,7 +12765,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[0]);
- arg1 = (GDALPaletteInterp) Z_LVAL_PP(args[0]);
- /*@SWIG@*/;
- @@ -12612,7 +12780,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12631,13 +12799,13 @@
- WRONG_PARAM_COUNT;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[0]);
- arg1 = (double) Z_DVAL_PP(args[0]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -12647,7 +12815,7 @@
- /*@SWIG@*/;
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -12663,7 +12831,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12678,7 +12846,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[0]);
- arg1 = (double) Z_DVAL_PP(args[0]);
- /*@SWIG@*/;
- @@ -12689,7 +12857,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12704,7 +12872,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[0]);
- arg1 = (double) Z_DVAL_PP(args[0]);
- /*@SWIG@*/;
- @@ -12715,7 +12883,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12730,7 +12898,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -12745,7 +12913,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12774,7 +12942,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12792,7 +12960,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12807,7 +12975,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -12827,7 +12995,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12842,7 +13010,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[0]);
- arg1 = (int) Z_LVAL_PP(args[0]);
- /*@SWIG@*/;
- @@ -12853,7 +13021,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12871,7 +13039,7 @@
- WRONG_PARAM_COUNT;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -12881,7 +13049,7 @@
- /*@SWIG@*/;
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (GDALAccess) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -12893,7 +13061,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12911,7 +13079,7 @@
- WRONG_PARAM_COUNT;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -12921,7 +13089,7 @@
- /*@SWIG@*/;
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (GDALAccess) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -12933,7 +13101,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -12951,7 +13119,7 @@
- WRONG_PARAM_COUNT;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -12989,7 +13157,7 @@
- /* %typemap(freearg) char **options */
- CSLDestroy( arg2 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -13020,7 +13188,7 @@
- // }
- }
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -13051,7 +13219,7 @@
- /* %typemap(freearg) char **options */
- CSLDestroy( arg1 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -13198,6 +13366,7 @@
- SWIG_ZEND_NAMED_FE(driver_createcopy,_wrap_Driver_CreateCopy,NULL)
- SWIG_ZEND_NAMED_FE(driver_delete,_wrap_Driver_Delete,NULL)
- SWIG_ZEND_NAMED_FE(driver_rename,_wrap_Driver_Rename,NULL)
- + SWIG_ZEND_NAMED_FE(driver_copyfiles,_wrap_Driver_CopyFiles,NULL)
- SWIG_ZEND_NAMED_FE(driver_register,_wrap_Driver_Register,NULL)
- SWIG_ZEND_NAMED_FE(driver_deregister,_wrap_Driver_Deregister,NULL)
- SWIG_ZEND_NAMED_FE(colorentry_c1_set,_wrap_ColorEntry_c1_set,NULL)
- @@ -13323,6 +13492,8 @@
- SWIG_ZEND_NAMED_FE(band_getdefaulthistogram,_wrap_Band_GetDefaultHistogram,NULL)
- SWIG_ZEND_NAMED_FE(band_setdefaulthistogram,_wrap_Band_SetDefaultHistogram,NULL)
- SWIG_ZEND_NAMED_FE(band_hasarbitraryoverviews,_wrap_Band_HasArbitraryOverviews,NULL)
- + SWIG_ZEND_NAMED_FE(band_getcategorynames,_wrap_Band_GetCategoryNames,NULL)
- + SWIG_ZEND_NAMED_FE(band_setcategorynames,_wrap_Band_SetCategoryNames,NULL)
- SWIG_ZEND_NAMED_FE(new_colortable,_wrap_new_ColorTable,NULL)
- SWIG_ZEND_NAMED_FE(colortable_c_clone,_wrap_ColorTable_c_Clone,NULL)
- SWIG_ZEND_NAMED_FE(colortable_getpaletteinterpretation,_wrap_ColorTable_GetPaletteInterpretation,NULL)
- @@ -13670,6 +13841,11 @@
- SWIG_php_minit {
- SWIG_InitializeModule(0);
- +
- + if (GDALGetDriverCount() == 0 ) {
- + GDALAllRegister();
- + }
- +
- /* oinit subsection */
- ZEND_INIT_MODULE_GLOBALS(gdal, gdal_init_globals, gdal_destroy_globals);
- Index: swig/php/ogr_wrap.cpp
- ===================================================================
- --- swig/php/ogr_wrap.cpp (revision 21891)
- +++ swig/php/ogr_wrap.cpp (working copy)
- @@ -1,6 +1,6 @@
- /* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- - * Version 1.3.40
- + * Version 2.0.1
- *
- * This file is not intended to be easily readable and contains a number of
- * coding conventions designed to improve portability and efficiency. Do not make
- @@ -196,7 +196,7 @@
- /*
- Flags/methods for returning states.
- - The SWIG conversion methods, as ConvertPtr, return and integer
- + The SWIG conversion methods, as ConvertPtr, return an integer
- that tells if the conversion was successful or not. And if not,
- an error code can be returned (see swigerrors.swg for the codes).
- @@ -728,9 +728,6 @@
- #endif
- /* -----------------------------------------------------------------------------
- - * See the LICENSE file for information on copyright, usage and redistribution
- - * of SWIG, and the README file for authors - http://www.swig.org/release.html.
- - *
- * phprun.swg
- *
- * PHP runtime library
- @@ -741,6 +738,7 @@
- #endif
- #include "zend.h"
- #include "zend_API.h"
- +#include "zend_exceptions.h"
- #include "php.h"
- #include "ext/standard/php_string.h"
- @@ -755,17 +753,17 @@
- #endif
- #ifndef Z_SET_ISREF_P
- -// For PHP < 5.3
- +/* For PHP < 5.3 */
- # define Z_SET_ISREF_P(z) (z)->is_ref = 1
- #endif
- #ifndef Z_SET_REFCOUNT_P
- -// For PHP < 5.3
- +/* For PHP < 5.3 */
- # define Z_SET_REFCOUNT_P(z, rc) (z)->refcount = (rc)
- #endif
- #define SWIG_LONG_CONSTANT(N, V) zend_register_long_constant((char*)#N, sizeof(#N), V, CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC)
- #define SWIG_DOUBLE_CONSTANT(N, V) zend_register_double_constant((char*)#N, sizeof(#N), V, CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC)
- -#define SWIG_STRING_CONSTANT(N, V) zend_register_stringl_constant((char*)#N, sizeof(#N), V, strlen(V), CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC)
- +#define SWIG_STRING_CONSTANT(N, V) zend_register_stringl_constant((char*)#N, sizeof(#N), (char*)(V), strlen(V), CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC)
- #define SWIG_CHAR_CONSTANT(N, V) do {\
- static char swig_char = (V);\
- zend_register_stringl_constant((char*)#N, sizeof(#N), &swig_char, 1, CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC);\
- @@ -1155,8 +1153,8 @@
- typedef void OGRFieldDefnShadow;
- #endif
- -SWIGINTERN OGRDataSourceShadow *OGRDriverShadow_CreateDataSource(OGRDriverShadow *self,char const *name,char **options=0){
- - OGRDataSourceShadow *ds = (OGRDataSourceShadow*) OGR_Dr_CreateDataSource( self, name, options);
- +SWIGINTERN OGRDataSourceShadow *OGRDriverShadow_CreateDataSource(OGRDriverShadow *self,char const *utf8_path,char **options=0){
- + OGRDataSourceShadow *ds = (OGRDataSourceShadow*) OGR_Dr_CreateDataSource( self, utf8_path, options);
- return ds;
- }
- SWIGINTERN OGRDataSourceShadow *OGRDriverShadow_CopyDataSource(OGRDriverShadow *self,OGRDataSourceShadow *copy_ds,char const *utf8_path,char **options=0){
- @@ -1167,9 +1165,9 @@
- OGRDataSourceShadow* ds = (OGRDataSourceShadow*) OGR_Dr_Open(self, utf8_path, update);
- return ds;
- }
- -SWIGINTERN int OGRDriverShadow_DeleteDataSource(OGRDriverShadow *self,char const *name){
- +SWIGINTERN int OGRDriverShadow_DeleteDataSource(OGRDriverShadow *self,char const *utf8_path){
- - return OGR_Dr_DeleteDataSource( self, name );
- + return OGR_Dr_DeleteDataSource( self, utf8_path );
- }
- SWIGINTERN bool OGRDriverShadow_TestCapability(OGRDriverShadow *self,char const *cap){
- return (OGR_Dr_TestCapability(self, cap) > 0);
- @@ -1205,23 +1203,29 @@
- return OGR_DS_DeleteLayer(self, index);
- }
- -static char *
- +
- +#include "ogr_core.h"
- +static char const *
- OGRErrMessages( int rc ) {
- switch( rc ) {
- - case 0:
- - return "OGR Error 0: None";
- - case 1:
- - return "OGR Error 1: Not enough data";
- - case 2:
- - return "OGR Error 2: Unsupported geometry type";
- - case 3:
- - return "OGR Error 3: Unsupported operation";
- - case 4:
- - return "OGR Error 4: Corrupt data";
- - case 5:
- - return "OGR Error 5: General Error";
- - case 6:
- - return "OGR Error 6: Unsupported SRS";
- + case OGRERR_NONE:
- + return "OGR Error: None";
- + case OGRERR_NOT_ENOUGH_DATA:
- + return "OGR Error: Not enough data to deserialize";
- + case OGRERR_NOT_ENOUGH_MEMORY:
- + return "OGR Error: Not enough memory";
- + case OGRERR_UNSUPPORTED_GEOMETRY_TYPE:
- + return "OGR Error: Unsupported geometry type";
- + case OGRERR_UNSUPPORTED_OPERATION:
- + return "OGR Error: Unsupported operation";
- + case OGRERR_CORRUPT_DATA:
- + return "OGR Error: Corrupt data";
- + case OGRERR_FAILURE:
- + return "OGR Error: General Error";
- + case OGRERR_UNSUPPORTED_SRS:
- + return "OGR Error: Unsupported SRS";
- + case OGRERR_INVALID_HANDLE:
- + return "OGR Error: Invalid handle";
- default:
- return "OGR Error: Unknown";
- }
- @@ -1564,6 +1568,15 @@
- SWIGINTERN OGRErr OGRFeatureShadow_SetFrom(OGRFeatureShadow *self,OGRFeatureShadow *other,int forgiving=1){
- return OGR_F_SetFrom(self, other, forgiving);
- }
- +SWIGINTERN OGRErr OGRFeatureShadow_SetFromWithMap(OGRFeatureShadow *self,OGRFeatureShadow *other,int forgiving,int nList,int *pList){
- + if (nList != OGR_F_GetFieldCount(other))
- + {
- + CPLError(CE_Failure, CPLE_AppDefined,
- + "The size of map doesn't match with the field count of the source feature");
- + return OGRERR_FAILURE;
- + }
- + return OGR_F_SetFromWithMap(self, other, forgiving, pList);
- + }
- SWIGINTERN char const *OGRFeatureShadow_GetStyleString(OGRFeatureShadow *self){
- return (const char*) OGR_F_GetStyleString(self);
- }
- @@ -1708,7 +1721,7 @@
- OGRGeometryShadow* CreateGeometryFromWkb( int len, char *bin_string,
- OSRSpatialReferenceShadow *reference=NULL ) {
- - OGRGeometryShadow *geom;
- + OGRGeometryH geom = NULL;
- OGRErr err = OGR_G_CreateFromWkb( (unsigned char *) bin_string,
- reference,
- &geom,
- @@ -1724,7 +1737,7 @@
- OGRGeometryShadow* CreateGeometryFromWkt( char **val,
- OSRSpatialReferenceShadow *reference=NULL ) {
- - OGRGeometryShadow *geom;
- + OGRGeometryH geom = NULL;
- OGRErr err = OGR_G_CreateFromWkt(val,
- reference,
- &geom);
- @@ -1768,7 +1781,7 @@
- return NULL;
- }
- - return hPolygon;
- + return (OGRGeometryShadow* )hPolygon;
- }
- @@ -1778,7 +1791,7 @@
- double dfStartAngle, double dfEndAngle,
- double dfMaxAngleStepSizeDegrees ) {
- - return OGR_G_ApproximateArcAngles(
- + return (OGRGeometryShadow* )OGR_G_ApproximateArcAngles(
- dfCenterX, dfCenterY, dfZ,
- dfPrimaryRadius, dfSecondaryAxis, dfRotation,
- dfStartAngle, dfEndAngle, dfMaxAngleStepSizeDegrees );
- @@ -1788,28 +1801,28 @@
- OGRGeometryShadow* ForceToPolygon( OGRGeometryShadow *geom_in ) {
- if (geom_in == NULL)
- return NULL;
- - return OGR_G_ForceToPolygon( OGR_G_Clone(geom_in) );
- + return (OGRGeometryShadow* )OGR_G_ForceToPolygon( OGR_G_Clone(geom_in) );
- }
- OGRGeometryShadow* ForceToMultiPolygon( OGRGeometryShadow *geom_in ) {
- if (geom_in == NULL)
- return NULL;
- - return OGR_G_ForceToMultiPolygon( OGR_G_Clone(geom_in) );
- + return (OGRGeometryShadow* )OGR_G_ForceToMultiPolygon( OGR_G_Clone(geom_in) );
- }
- OGRGeometryShadow* ForceToMultiPoint( OGRGeometryShadow *geom_in ) {
- if (geom_in == NULL)
- return NULL;
- - return OGR_G_ForceToMultiPoint( OGR_G_Clone(geom_in) );
- + return (OGRGeometryShadow* )OGR_G_ForceToMultiPoint( OGR_G_Clone(geom_in) );
- }
- OGRGeometryShadow* ForceToMultiLineString( OGRGeometryShadow *geom_in ) {
- if (geom_in == NULL)
- return NULL;
- - return OGR_G_ForceToMultiLineString( OGR_G_Clone(geom_in) );
- + return (OGRGeometryShadow* )OGR_G_ForceToMultiLineString( OGR_G_Clone(geom_in) );
- }
- SWIGINTERN void delete_OGRGeometryShadow(OGRGeometryShadow *self){
- @@ -2062,9 +2075,9 @@
- }
- - OGRDataSourceShadow* Open( const char *filename, int update =0 ) {
- + OGRDataSourceShadow* Open( const char *utf8_path, int update =0 ) {
- CPLErrorReset();
- - OGRDataSourceShadow* ds = (OGRDataSourceShadow*)OGROpen(filename,update,NULL);
- + OGRDataSourceShadow* ds = (OGRDataSourceShadow*)OGROpen(utf8_path,update,NULL);
- if( CPLGetLastErrorType() == CE_Failure && ds != NULL )
- {
- CPLDebug( "SWIG",
- @@ -2256,7 +2269,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2281,7 +2294,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -2305,11 +2318,6 @@
- // }
- }
- }
- - {
- - if (!arg2) {
- - SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
- - }
- - }
- result = (OGRDataSourceShadow *)OGRDriverShadow_CreateDataSource(arg1,(char const *)arg2,arg3);
- SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_OGRDataSourceShadow, 1);
- @@ -2324,7 +2332,7 @@
- /* %typemap(freearg) char **options */
- CSLDestroy( arg3 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2355,7 +2363,7 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[2])->type==IS_NULL) {
- arg3 = (char *) 0;
- } else {
- @@ -2393,7 +2401,7 @@
- /* %typemap(freearg) char **options */
- CSLDestroy( arg4 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2418,7 +2426,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -2428,7 +2436,7 @@
- /*@SWIG@*/;
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -2440,7 +2448,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2462,7 +2470,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -2471,18 +2479,13 @@
- }
- /*@SWIG@*/;
- - {
- - if (!arg2) {
- - SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
- - }
- - }
- result = (int)OGRDriverShadow_DeleteDataSource(arg1,(char const *)arg2);
- {
- ZVAL_LONG(return_value,result);
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2504,7 +2507,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -2524,7 +2527,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2554,7 +2557,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2577,7 +2580,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2600,7 +2603,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2630,7 +2633,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2649,7 +2652,7 @@
- delete_OGRDataSourceShadow(arg1);
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2675,7 +2678,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2701,7 +2704,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2727,7 +2730,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2753,7 +2756,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2783,7 +2786,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2805,7 +2808,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -2819,11 +2822,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2850,7 +2855,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -2867,7 +2872,7 @@
- }
- }
- if(arg_count > 3) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (OGRwkbGeometryType) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -2907,7 +2912,7 @@
- /* %typemap(freearg) char **options */
- CSLDestroy( arg5 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2938,7 +2943,7 @@
- }
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[2])->type==IS_NULL) {
- arg3 = (char *) 0;
- } else {
- @@ -2981,7 +2986,7 @@
- /* %typemap(freearg) char **options */
- CSLDestroy( arg4 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3005,7 +3010,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -3017,7 +3022,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3039,7 +3044,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -3054,7 +3059,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3076,7 +3081,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -3096,7 +3101,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3122,7 +3127,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -3139,7 +3144,7 @@
- }
- }
- if(arg_count > 3) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[3])->type==IS_NULL) {
- arg4 = (char *) 0;
- } else {
- @@ -3160,7 +3165,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3189,7 +3194,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3215,7 +3220,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3244,7 +3249,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3268,25 +3273,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -3295,7 +3300,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3321,7 +3326,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3343,7 +3348,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -3361,11 +3366,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3388,7 +3395,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3418,7 +3425,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3444,7 +3451,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3474,7 +3481,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3504,7 +3511,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3526,7 +3533,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (long) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -3537,7 +3544,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3563,7 +3570,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3585,7 +3592,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (long) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -3599,11 +3606,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3643,11 +3652,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3687,11 +3698,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3713,7 +3726,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (long) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -3727,11 +3740,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3760,11 +3775,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3790,7 +3807,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3814,7 +3831,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -3826,7 +3843,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3856,7 +3873,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg3 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -3876,11 +3893,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3902,7 +3921,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -3922,7 +3941,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3952,7 +3971,7 @@
- }
- }
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -3972,11 +3991,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4005,11 +4026,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4038,11 +4061,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4071,11 +4096,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4101,7 +4128,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4128,7 +4155,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4175,7 +4202,9 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- @@ -4183,7 +4212,7 @@
- /* %typemap(freearg) char **options */
- CSLDestroy( arg2 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4202,7 +4231,7 @@
- delete_OGRFeatureShadow(arg1);
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4232,7 +4261,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4258,7 +4287,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4293,11 +4322,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4332,11 +4363,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4362,7 +4395,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4388,7 +4421,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4425,7 +4458,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4451,7 +4484,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4473,7 +4506,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -4484,7 +4517,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4506,7 +4539,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -4526,7 +4559,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4587,7 +4620,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -4602,7 +4635,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4624,7 +4657,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -4648,7 +4681,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4709,7 +4742,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -4720,7 +4753,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4742,7 +4775,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -4762,7 +4795,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4823,7 +4856,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -4834,7 +4867,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4856,7 +4889,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -4876,7 +4909,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4957,7 +4990,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -5008,7 +5041,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5031,7 +5064,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -5050,7 +5083,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5073,7 +5106,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -5092,7 +5125,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5114,7 +5147,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -5128,7 +5161,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5150,7 +5183,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -5161,7 +5194,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5183,7 +5216,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -5203,7 +5236,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5264,7 +5297,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -5284,7 +5317,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5310,7 +5343,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5332,7 +5365,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -5346,11 +5379,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5373,7 +5408,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5394,7 +5429,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -5403,7 +5438,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5424,7 +5459,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -5442,7 +5477,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5503,7 +5538,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -5517,7 +5552,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5539,7 +5574,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -5562,7 +5597,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5584,13 +5619,13 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -5599,7 +5634,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5621,7 +5656,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -5631,7 +5666,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -5645,7 +5680,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5667,13 +5702,13 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -5682,7 +5717,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5704,7 +5739,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -5714,7 +5749,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -5728,7 +5763,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5756,49 +5791,49 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (int) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[4]);
- arg5 = (int) Z_LVAL_PP(args[4]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[5]);
- arg6 = (int) Z_LVAL_PP(args[5]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[6]);
- arg7 = (int) Z_LVAL_PP(args[6]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[7]);
- arg8 = (int) Z_LVAL_PP(args[7]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[8]);
- arg9 = (int) Z_LVAL_PP(args[8]);
- /*@SWIG@*/;
- @@ -5807,7 +5842,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5835,7 +5870,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -5845,43 +5880,43 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (int) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[4]);
- arg5 = (int) Z_LVAL_PP(args[4]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[5]);
- arg6 = (int) Z_LVAL_PP(args[5]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[6]);
- arg7 = (int) Z_LVAL_PP(args[6]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[7]);
- arg8 = (int) Z_LVAL_PP(args[7]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[8]);
- arg9 = (int) Z_LVAL_PP(args[8]);
- /*@SWIG@*/;
- @@ -5895,7 +5930,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6101,7 +6136,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -6139,7 +6174,7 @@
- free((void*) arg4);
- }
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6162,13 +6197,13 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -6182,7 +6217,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6204,7 +6239,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -6234,7 +6269,7 @@
- /* %typemap(freearg) char **options */
- CSLDestroy( arg3 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6264,7 +6299,7 @@
- }
- }
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -6284,14 +6319,100 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- +ZEND_NAMED_FUNCTION(_wrap_Feature_SetFromWithMap) {
- + OGRFeatureShadow *arg1 = (OGRFeatureShadow *) 0 ;
- + OGRFeatureShadow *arg2 = (OGRFeatureShadow *) 0 ;
- + int arg3 ;
- + int arg4 ;
- + int *arg5 = (int *) 0 ;
- + zval **args[4];
- + OGRErr result;
- +
- + SWIG_ResetError();
- + if(ZEND_NUM_ARGS() != 4 || zend_get_parameters_array_ex(4, args) != SUCCESS) {
- + WRONG_PARAM_COUNT;
- + }
- +
- + {
- + if(SWIG_ConvertPtr(*args[0], (void **) &arg1, SWIGTYPE_p_OGRFeatureShadow, 0) < 0) {
- + SWIG_PHP_Error(E_ERROR, "Type error in argument 1 of Feature_SetFromWithMap. Expected SWIGTYPE_p_OGRFeatureShadow");
- + }
- + }
- + if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- + {
- + if(SWIG_ConvertPtr(*args[1], (void **) &arg2, SWIGTYPE_p_OGRFeatureShadow, 0) < 0) {
- + SWIG_PHP_Error(E_ERROR, "Type error in argument 2 of Feature_SetFromWithMap. Expected SWIGTYPE_p_OGRFeatureShadow");
- + }
- + }
- +
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- + convert_to_long_ex(args[2]);
- + arg3 = (int) Z_LVAL_PP(args[2]);
- + /*@SWIG@*/;
- +
- + {
- + /* %typemap(in,numinputs=1) (int nList, int* pList)*/
- + zend_error(E_ERROR,"Typemap (in,numinputs=1) (int nList, int*pList) not properly defined");
- + /* check if is List */
- + // if ( !PySequence_Check(args[3]) ) {
- + // PyErr_SetString(PyExc_TypeError, "not a sequence");
- + // SWIG_fail;
- + // }
- + // arg4 = PySequence_Size(args[3]);
- + // arg5 = (int*) malloc(arg4*sizeof(int));
- + // for( int i = 0; i<arg4; i++ ) {
- + // PyObject *o = PySequence_GetItem(args[3],i);
- + // if ( !PyArg_Parse(o,"i",&arg5[i]) ) {
- + // SWIG_fail;
- + // }
- + // }
- + }
- + {
- + if (!arg2) {
- + SWIG_exception(SWIG_ValueError,"Received a NULL pointer.");
- + }
- + }
- + result = (OGRErr)OGRFeatureShadow_SetFromWithMap(arg1,arg2,arg3,arg4,arg5);
- + {
- + /* %typemap(out) OGRErr */
- + if (result != 0 ) {
- + SWIG_PHP_Error(E_ERROR,OGRErrMessages(result));
- + }
- + }
- + {
- + /* %typemap(freearg) (int nList, int* pList) */
- + if (arg5) {
- + free((void*) arg5);
- + }
- + }
- + {
- + /* %typemap(ret) OGRErr */
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- + }
- + return;
- +fail:
- + {
- + /* %typemap(freearg) (int nList, int* pList) */
- + if (arg5) {
- + free((void*) arg5);
- + }
- + }
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- +}
- +
- +
- ZEND_NAMED_FUNCTION(_wrap_Feature_GetStyleString) {
- OGRFeatureShadow *arg1 = (OGRFeatureShadow *) 0 ;
- zval **args[1];
- @@ -6318,7 +6439,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6339,7 +6460,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -6352,7 +6473,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6374,7 +6495,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -6385,7 +6506,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6407,7 +6528,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -6427,7 +6548,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6485,7 +6606,7 @@
- delete_OGRFeatureDefnShadow(arg1);
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6502,7 +6623,7 @@
- WRONG_PARAM_COUNT;
- if(arg_count > 0) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -6518,7 +6639,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6548,7 +6669,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6574,7 +6695,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6596,7 +6717,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -6607,7 +6728,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6629,7 +6750,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -6649,7 +6770,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6683,7 +6804,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6709,7 +6830,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6730,7 +6851,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (OGRwkbGeometryType) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -6739,7 +6860,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6765,7 +6886,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6791,7 +6912,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6812,7 +6933,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -6821,7 +6942,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6847,7 +6968,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6868,7 +6989,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -6877,7 +6998,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6896,7 +7017,7 @@
- delete_OGRFieldDefnShadow(arg1);
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6914,7 +7035,7 @@
- WRONG_PARAM_COUNT;
- if(arg_count > 0) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -6925,7 +7046,7 @@
- }
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (OGRFieldType) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -6937,7 +7058,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6967,7 +7088,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6997,7 +7118,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7018,7 +7139,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -7036,7 +7157,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7062,7 +7183,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7083,7 +7204,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (OGRFieldType) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -7092,7 +7213,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7118,7 +7239,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7139,7 +7260,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (OGRJustification) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -7148,7 +7269,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7174,7 +7295,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7195,7 +7316,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -7204,7 +7325,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7230,7 +7351,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7251,7 +7372,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -7260,7 +7381,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7290,7 +7411,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7312,7 +7433,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (OGRFieldType) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -7327,7 +7448,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7353,7 +7474,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7374,7 +7495,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -7383,7 +7504,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7420,7 +7541,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7456,7 +7577,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7471,7 +7592,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -7486,7 +7607,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7501,7 +7622,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -7516,7 +7637,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7541,21 +7662,21 @@
- }
- }
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- }
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- }
- if(arg_count > 3) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -7567,7 +7688,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7590,55 +7711,55 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[0]);
- arg1 = (double) Z_DVAL_PP(args[0]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[5]);
- arg6 = (double) Z_DVAL_PP(args[5]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[6]);
- arg7 = (double) Z_DVAL_PP(args[6]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[7]);
- arg8 = (double) Z_DVAL_PP(args[7]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[8]);
- arg9 = (double) Z_DVAL_PP(args[8]);
- /*@SWIG@*/;
- @@ -7649,7 +7770,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7674,7 +7795,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7699,7 +7820,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7724,7 +7845,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7749,7 +7870,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7768,7 +7889,7 @@
- delete_OGRGeometryShadow(arg1);
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7789,14 +7910,14 @@
- WRONG_PARAM_COUNT;
- if(arg_count > 0) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[0]);
- arg1 = (OGRwkbGeometryType) Z_LVAL_PP(args[0]);
- /*@SWIG@*/;
- }
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -7815,7 +7936,7 @@
- }
- }
- if(arg_count > 3) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[3])->type==IS_NULL) {
- arg5 = (char *) 0;
- } else {
- @@ -7831,7 +7952,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7883,7 +8004,9 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- @@ -7892,7 +8015,7 @@
- if ( *arg2 )
- CPLFree( *arg2 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7925,7 +8048,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg4 = (OGRwkbByteOrder) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -7950,7 +8073,9 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- @@ -7960,7 +8085,7 @@
- free( *arg3 );
- }
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7990,7 +8115,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8014,7 +8139,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -8034,7 +8159,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8064,7 +8189,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8089,19 +8214,19 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- if(arg_count > 3) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -8111,7 +8236,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8133,13 +8258,13 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -8148,7 +8273,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8188,11 +8313,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8232,11 +8359,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8262,7 +8391,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8288,7 +8417,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8318,7 +8447,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8344,7 +8473,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8370,7 +8499,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8396,7 +8525,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8422,7 +8551,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8446,7 +8575,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -8458,7 +8587,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8482,7 +8611,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -8494,7 +8623,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8518,7 +8647,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -8530,7 +8659,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8559,7 +8688,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -8574,7 +8703,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8603,7 +8732,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -8618,7 +8747,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8644,7 +8773,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8670,25 +8799,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- if(arg_count > 4) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -8698,7 +8827,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8721,19 +8850,19 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -8742,7 +8871,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8764,7 +8893,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -8775,7 +8904,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8797,7 +8926,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -8808,7 +8937,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8834,7 +8963,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8860,7 +8989,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8886,7 +9015,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8911,13 +9040,13 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -8929,7 +9058,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8966,7 +9095,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9003,7 +9132,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9029,7 +9158,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9066,7 +9195,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9103,7 +9232,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9140,7 +9269,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9177,7 +9306,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9200,7 +9329,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9226,7 +9355,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9252,7 +9381,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9278,7 +9407,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9304,7 +9433,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9341,7 +9470,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9378,7 +9507,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9415,7 +9544,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9452,7 +9581,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9489,7 +9618,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9526,7 +9655,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9563,7 +9692,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9600,7 +9729,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9637,7 +9766,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9674,7 +9803,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9714,11 +9843,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9758,11 +9889,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9788,7 +9921,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9817,7 +9950,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9840,7 +9973,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9863,7 +9996,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9884,7 +10017,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -9893,7 +10026,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9927,7 +10060,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9953,7 +10086,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -9979,7 +10112,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10005,7 +10138,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10026,7 +10159,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -10035,7 +10168,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10061,7 +10194,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10079,7 +10212,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10097,7 +10230,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10112,7 +10245,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[0]);
- arg1 = (int) Z_LVAL_PP(args[0]);
- /*@SWIG@*/;
- @@ -10126,11 +10259,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10144,7 +10279,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10159,7 +10294,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[0]);
- arg1 = (OGRwkbGeometryType) Z_LVAL_PP(args[0]);
- /*@SWIG@*/;
- @@ -10174,7 +10309,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10189,7 +10324,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[0]);
- arg1 = (OGRFieldType) Z_LVAL_PP(args[0]);
- /*@SWIG@*/;
- @@ -10204,7 +10339,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10219,7 +10354,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[0]);
- arg1 = (int) Z_LVAL_PP(args[0]);
- /*@SWIG@*/;
- @@ -10230,7 +10365,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10248,7 +10383,7 @@
- WRONG_PARAM_COUNT;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -10258,7 +10393,7 @@
- /*@SWIG@*/;
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -10270,7 +10405,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10288,7 +10423,7 @@
- WRONG_PARAM_COUNT;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -10298,7 +10433,7 @@
- /*@SWIG@*/;
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -10310,7 +10445,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10325,7 +10460,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -10345,7 +10480,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10360,7 +10495,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[0]);
- arg1 = (int) Z_LVAL_PP(args[0]);
- /*@SWIG@*/;
- @@ -10371,7 +10506,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10402,7 +10537,7 @@
- // }
- }
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -10433,7 +10568,7 @@
- /* %typemap(freearg) char **options */
- CSLDestroy( arg1 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -10597,6 +10732,7 @@
- SWIG_ZEND_NAMED_FE(feature_setfielddoublelist,_wrap_Feature_SetFieldDoubleList,NULL)
- SWIG_ZEND_NAMED_FE(feature_setfieldstringlist,_wrap_Feature_SetFieldStringList,NULL)
- SWIG_ZEND_NAMED_FE(feature_setfrom,_wrap_Feature_SetFrom,NULL)
- + SWIG_ZEND_NAMED_FE(feature_setfromwithmap,_wrap_Feature_SetFromWithMap,NULL)
- SWIG_ZEND_NAMED_FE(feature_getstylestring,_wrap_Feature_GetStyleString,NULL)
- SWIG_ZEND_NAMED_FE(feature_setstylestring,_wrap_Feature_SetStyleString,NULL)
- SWIG_ZEND_NAMED_FE(feature_getfieldtype,_wrap_Feature_GetFieldType,NULL)
- @@ -10995,6 +11131,11 @@
- SWIG_php_minit {
- SWIG_InitializeModule(0);
- +
- + if ( OGRGetDriverCount() == 0 ) {
- + OGRRegisterAll();
- + }
- +
- /* oinit subsection */
- ZEND_INIT_MODULE_GLOBALS(ogr, ogr_init_globals, ogr_destroy_globals);
- Index: swig/php/php_gdal.h
- ===================================================================
- --- swig/php/php_gdal.h (revision 21891)
- +++ swig/php/php_gdal.h (working copy)
- @@ -1,6 +1,6 @@
- /* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- - * Version 1.3.40
- + * Version 2.0.1
- *
- * This file is not intended to be easily readable and contains a number of
- * coding conventions designed to improve portability and efficiency. Do not make
- @@ -73,6 +73,7 @@
- ZEND_NAMED_FUNCTION(_wrap_Driver_CreateCopy);
- ZEND_NAMED_FUNCTION(_wrap_Driver_Delete);
- ZEND_NAMED_FUNCTION(_wrap_Driver_Rename);
- +ZEND_NAMED_FUNCTION(_wrap_Driver_CopyFiles);
- ZEND_NAMED_FUNCTION(_wrap_Driver_Register);
- ZEND_NAMED_FUNCTION(_wrap_Driver_Deregister);
- ZEND_NAMED_FUNCTION(_wrap_ColorEntry_c1_set);
- @@ -198,6 +199,8 @@
- ZEND_NAMED_FUNCTION(_wrap_Band_GetDefaultHistogram);
- ZEND_NAMED_FUNCTION(_wrap_Band_SetDefaultHistogram);
- ZEND_NAMED_FUNCTION(_wrap_Band_HasArbitraryOverviews);
- +ZEND_NAMED_FUNCTION(_wrap_Band_GetCategoryNames);
- +ZEND_NAMED_FUNCTION(_wrap_Band_SetCategoryNames);
- ZEND_NAMED_FUNCTION(_wrap_new_ColorTable);
- ZEND_NAMED_FUNCTION(_wrap_ColorTable_c_Clone);
- ZEND_NAMED_FUNCTION(_wrap_ColorTable_GetPaletteInterpretation);
- Index: swig/php/php_ogr.h
- ===================================================================
- --- swig/php/php_ogr.h (revision 21891)
- +++ swig/php/php_ogr.h (working copy)
- @@ -1,6 +1,6 @@
- /* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- - * Version 1.3.40
- + * Version 2.0.1
- *
- * This file is not intended to be easily readable and contains a number of
- * coding conventions designed to improve portability and efficiency. Do not make
- @@ -108,6 +108,7 @@
- ZEND_NAMED_FUNCTION(_wrap_Feature_SetFieldDoubleList);
- ZEND_NAMED_FUNCTION(_wrap_Feature_SetFieldStringList);
- ZEND_NAMED_FUNCTION(_wrap_Feature_SetFrom);
- +ZEND_NAMED_FUNCTION(_wrap_Feature_SetFromWithMap);
- ZEND_NAMED_FUNCTION(_wrap_Feature_GetStyleString);
- ZEND_NAMED_FUNCTION(_wrap_Feature_SetStyleString);
- ZEND_NAMED_FUNCTION(_wrap_Feature_GetFieldType);
- Index: swig/php/GNUmakefile
- ===================================================================
- --- swig/php/GNUmakefile (revision 21891)
- +++ swig/php/GNUmakefile (working copy)
- @@ -13,7 +13,7 @@
- LDFLAGS=-shared
- PHP_INC=`php-config --includes`
- EXTRA_INC=-I../../port -I../../gcore -I../../alg -I../../ogr
- -EXTRA_LIB=
- +EXTRA_LIB=-L../../.libs -lgdal
- all_libs = php_gdal.so php_ogr.so php_gdalconst.so php_osr.so
- @@ -28,17 +28,17 @@
- generate: ${WRAPPERS}
- -build: php_gdal.so
- +build: php_gdal.so php_ogr.so php_gdalconst.so php_osr.so
- # This directive should actually do an install.
- install: build
- php_%.so: %_wrap.o
- - $(CC) $(LDFLAGS) $< -o $@ $(EXTRA_LIB)
- + $(CC) $(EXTRA_LIB) $(LDFLAGS) $< -o $@ $(EXTRA_LIB)
- %.o: %.cpp
- - $(CXX) $(EXTRA_INC) $(PHP_INC) $(CFLAGS) -c $<
- + $(CXX) $(EXTRA_LIB) $(EXTRA_INC) $(PHP_INC) $(CFLAGS) -c $<
- %.o: %.cxx
- - $(CXX) $(EXTRA_INC) $(PHP_INC) $(CFLAGS) -c $<
- + $(CXX) $(EXTRA_LIB) $(EXTRA_INC) $(PHP_INC) $(CFLAGS) -c $<
- %.o: %.c
- - $(CC) $(EXTRA_INC) $(PHP_INC) $(CFLAGS) -c $<
- + $(CC) $(EXTRA_LIB) $(EXTRA_INC) $(PHP_INC) $(CFLAGS) -c $<
- Index: swig/php/osr.php
- ===================================================================
- --- swig/php/osr.php (revision 21891)
- +++ swig/php/osr.php (working copy)
- @@ -2,7 +2,7 @@
- /* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- - * Version 1.3.40
- + * Version 2.0.1
- *
- * This file is not intended to be easily readable and contains a number of
- * coding conventions designed to improve portability and efficiency. Do not make
- @@ -227,6 +227,10 @@
- const SRS_UL_ROD_CONV = SRS_UL_ROD_CONV;
- + const SRS_UL_LINK_Clarke = SRS_UL_LINK_Clarke;
- +
- + const SRS_UL_LINK_Clarke_CONV = SRS_UL_LINK_Clarke_CONV;
- +
- const SRS_UA_DEGREE = SRS_UA_DEGREE;
- const SRS_UA_DEGREE_CONV = SRS_UA_DEGREE_CONV;
- @@ -288,7 +292,7 @@
- return $this->_pData[$var];
- }
- - public function __construct($wkt="") {
- + function __construct($wkt="") {
- if (is_resource($wkt) && get_resource_type($wkt) === '_p_OSRSpatialReferenceShadow') {
- $this->_cPtr=$wkt;
- return;
- @@ -296,339 +300,339 @@
- $this->_cPtr=new_SpatialReference($wkt);
- }
- - public function __str__() {
- + function __str__() {
- return SpatialReference___str__($this->_cPtr);
- }
- - public function IsSame($rhs) {
- + function IsSame($rhs) {
- return SpatialReference_IsSame($this->_cPtr,$rhs);
- }
- - public function IsSameGeogCS($rhs) {
- + function IsSameGeogCS($rhs) {
- return SpatialReference_IsSameGeogCS($this->_cPtr,$rhs);
- }
- - public function IsGeographic() {
- + function IsGeographic() {
- return SpatialReference_IsGeographic($this->_cPtr);
- }
- - public function IsProjected() {
- + function IsProjected() {
- return SpatialReference_IsProjected($this->_cPtr);
- }
- - public function IsLocal() {
- + function IsLocal() {
- return SpatialReference_IsLocal($this->_cPtr);
- }
- - public function EPSGTreatsAsLatLong() {
- + function EPSGTreatsAsLatLong() {
- return SpatialReference_EPSGTreatsAsLatLong($this->_cPtr);
- }
- - public function SetAuthority($pszTargetKey,$pszAuthority,$nCode) {
- + function SetAuthority($pszTargetKey,$pszAuthority,$nCode) {
- return SpatialReference_SetAuthority($this->_cPtr,$pszTargetKey,$pszAuthority,$nCode);
- }
- - public function GetAttrValue($name,$child=0) {
- + function GetAttrValue($name,$child=0) {
- return SpatialReference_GetAttrValue($this->_cPtr,$name,$child);
- }
- - public function SetAttrValue($name,$value) {
- + function SetAttrValue($name,$value) {
- return SpatialReference_SetAttrValue($this->_cPtr,$name,$value);
- }
- - public function SetAngularUnits($name,$to_radians) {
- + function SetAngularUnits($name,$to_radians) {
- return SpatialReference_SetAngularUnits($this->_cPtr,$name,$to_radians);
- }
- - public function GetAngularUnits() {
- + function GetAngularUnits() {
- return SpatialReference_GetAngularUnits($this->_cPtr);
- }
- - public function SetLinearUnits($name,$to_meters) {
- + function SetLinearUnits($name,$to_meters) {
- return SpatialReference_SetLinearUnits($this->_cPtr,$name,$to_meters);
- }
- - public function SetLinearUnitsAndUpdateParameters($name,$to_meters) {
- + function SetLinearUnitsAndUpdateParameters($name,$to_meters) {
- return SpatialReference_SetLinearUnitsAndUpdateParameters($this->_cPtr,$name,$to_meters);
- }
- - public function GetLinearUnits() {
- + function GetLinearUnits() {
- return SpatialReference_GetLinearUnits($this->_cPtr);
- }
- - public function GetLinearUnitsName() {
- + function GetLinearUnitsName() {
- return SpatialReference_GetLinearUnitsName($this->_cPtr);
- }
- - public function GetAuthorityCode($target_key) {
- + function GetAuthorityCode($target_key) {
- return SpatialReference_GetAuthorityCode($this->_cPtr,$target_key);
- }
- - public function GetAuthorityName($target_key) {
- + function GetAuthorityName($target_key) {
- return SpatialReference_GetAuthorityName($this->_cPtr,$target_key);
- }
- - public function SetUTM($zone,$north=1) {
- + function SetUTM($zone,$north=1) {
- return SpatialReference_SetUTM($this->_cPtr,$zone,$north);
- }
- - public function GetUTMZone() {
- + function GetUTMZone() {
- return SpatialReference_GetUTMZone($this->_cPtr);
- }
- - public function SetStatePlane($zone,$is_nad83=1,$unitsname="",$units=0.0) {
- + function SetStatePlane($zone,$is_nad83=1,$unitsname="",$units=0.0) {
- return SpatialReference_SetStatePlane($this->_cPtr,$zone,$is_nad83,$unitsname,$units);
- }
- - public function AutoIdentifyEPSG() {
- + function AutoIdentifyEPSG() {
- return SpatialReference_AutoIdentifyEPSG($this->_cPtr);
- }
- - public function SetProjection($arg) {
- + function SetProjection($arg) {
- return SpatialReference_SetProjection($this->_cPtr,$arg);
- }
- - public function SetProjParm($name,$val) {
- + function SetProjParm($name,$val) {
- return SpatialReference_SetProjParm($this->_cPtr,$name,$val);
- }
- - public function GetProjParm($name,$default_val=0.0) {
- + function GetProjParm($name,$default_val=0.0) {
- return SpatialReference_GetProjParm($this->_cPtr,$name,$default_val);
- }
- - public function SetNormProjParm($name,$val) {
- + function SetNormProjParm($name,$val) {
- return SpatialReference_SetNormProjParm($this->_cPtr,$name,$val);
- }
- - public function GetNormProjParm($name,$default_val=0.0) {
- + function GetNormProjParm($name,$default_val=0.0) {
- return SpatialReference_GetNormProjParm($this->_cPtr,$name,$default_val);
- }
- - public function GetSemiMajor() {
- + function GetSemiMajor() {
- return SpatialReference_GetSemiMajor($this->_cPtr);
- }
- - public function GetSemiMinor() {
- + function GetSemiMinor() {
- return SpatialReference_GetSemiMinor($this->_cPtr);
- }
- - public function GetInvFlattening() {
- + function GetInvFlattening() {
- return SpatialReference_GetInvFlattening($this->_cPtr);
- }
- - public function SetACEA($stdp1,$stdp2,$clat,$clong,$fe,$fn) {
- + function SetACEA($stdp1,$stdp2,$clat,$clong,$fe,$fn) {
- return SpatialReference_SetACEA($this->_cPtr,$stdp1,$stdp2,$clat,$clong,$fe,$fn);
- }
- - public function SetAE($clat,$clong,$fe,$fn) {
- + function SetAE($clat,$clong,$fe,$fn) {
- return SpatialReference_SetAE($this->_cPtr,$clat,$clong,$fe,$fn);
- }
- - public function SetBonne($stdp,$cm,$fe,$fn) {
- + function SetBonne($stdp,$cm,$fe,$fn) {
- return SpatialReference_SetBonne($this->_cPtr,$stdp,$cm,$fe,$fn);
- }
- - public function SetCEA($stdp1,$cm,$fe,$fn) {
- + function SetCEA($stdp1,$cm,$fe,$fn) {
- return SpatialReference_SetCEA($this->_cPtr,$stdp1,$cm,$fe,$fn);
- }
- - public function SetCS($clat,$clong,$fe,$fn) {
- + function SetCS($clat,$clong,$fe,$fn) {
- return SpatialReference_SetCS($this->_cPtr,$clat,$clong,$fe,$fn);
- }
- - public function SetEC($stdp1,$stdp2,$clat,$clong,$fe,$fn) {
- + function SetEC($stdp1,$stdp2,$clat,$clong,$fe,$fn) {
- return SpatialReference_SetEC($this->_cPtr,$stdp1,$stdp2,$clat,$clong,$fe,$fn);
- }
- - public function SetEckertIV($cm,$fe,$fn) {
- + function SetEckertIV($cm,$fe,$fn) {
- return SpatialReference_SetEckertIV($this->_cPtr,$cm,$fe,$fn);
- }
- - public function SetEckertVI($cm,$fe,$fn) {
- + function SetEckertVI($cm,$fe,$fn) {
- return SpatialReference_SetEckertVI($this->_cPtr,$cm,$fe,$fn);
- }
- - public function SetEquirectangular($clat,$clong,$fe,$fn) {
- + function SetEquirectangular($clat,$clong,$fe,$fn) {
- return SpatialReference_SetEquirectangular($this->_cPtr,$clat,$clong,$fe,$fn);
- }
- - public function SetEquirectangular2($clat,$clong,$pseudostdparallellat,$fe,$fn) {
- + function SetEquirectangular2($clat,$clong,$pseudostdparallellat,$fe,$fn) {
- return SpatialReference_SetEquirectangular2($this->_cPtr,$clat,$clong,$pseudostdparallellat,$fe,$fn);
- }
- - public function SetGaussSchreiberTMercator($clat,$clong,$sc,$fe,$fn) {
- + function SetGaussSchreiberTMercator($clat,$clong,$sc,$fe,$fn) {
- return SpatialReference_SetGaussSchreiberTMercator($this->_cPtr,$clat,$clong,$sc,$fe,$fn);
- }
- - public function SetGS($cm,$fe,$fn) {
- + function SetGS($cm,$fe,$fn) {
- return SpatialReference_SetGS($this->_cPtr,$cm,$fe,$fn);
- }
- - public function SetGH($cm,$fe,$fn) {
- + function SetGH($cm,$fe,$fn) {
- return SpatialReference_SetGH($this->_cPtr,$cm,$fe,$fn);
- }
- - public function SetGEOS($cm,$satelliteheight,$fe,$fn) {
- + function SetGEOS($cm,$satelliteheight,$fe,$fn) {
- return SpatialReference_SetGEOS($this->_cPtr,$cm,$satelliteheight,$fe,$fn);
- }
- - public function SetGnomonic($clat,$clong,$fe,$fn) {
- + function SetGnomonic($clat,$clong,$fe,$fn) {
- return SpatialReference_SetGnomonic($this->_cPtr,$clat,$clong,$fe,$fn);
- }
- - public function SetHOM($clat,$clong,$azimuth,$recttoskew,$scale,$fe,$fn) {
- + function SetHOM($clat,$clong,$azimuth,$recttoskew,$scale,$fe,$fn) {
- return SpatialReference_SetHOM($this->_cPtr,$clat,$clong,$azimuth,$recttoskew,$scale,$fe,$fn);
- }
- - public function SetHOM2PNO($clat,$dfLat1,$dfLong1,$dfLat2,$dfLong2,$scale,$fe,$fn) {
- + function SetHOM2PNO($clat,$dfLat1,$dfLong1,$dfLat2,$dfLong2,$scale,$fe,$fn) {
- return SpatialReference_SetHOM2PNO($this->_cPtr,$clat,$dfLat1,$dfLong1,$dfLat2,$dfLong2,$scale,$fe,$fn);
- }
- - public function SetKrovak($clat,$clong,$azimuth,$pseudostdparallellat,$scale,$fe,$fn) {
- + function SetKrovak($clat,$clong,$azimuth,$pseudostdparallellat,$scale,$fe,$fn) {
- return SpatialReference_SetKrovak($this->_cPtr,$clat,$clong,$azimuth,$pseudostdparallellat,$scale,$fe,$fn);
- }
- - public function SetLAEA($clat,$clong,$fe,$fn) {
- + function SetLAEA($clat,$clong,$fe,$fn) {
- return SpatialReference_SetLAEA($this->_cPtr,$clat,$clong,$fe,$fn);
- }
- - public function SetLCC($stdp1,$stdp2,$clat,$clong,$fe,$fn) {
- + function SetLCC($stdp1,$stdp2,$clat,$clong,$fe,$fn) {
- return SpatialReference_SetLCC($this->_cPtr,$stdp1,$stdp2,$clat,$clong,$fe,$fn);
- }
- - public function SetLCC1SP($clat,$clong,$scale,$fe,$fn) {
- + function SetLCC1SP($clat,$clong,$scale,$fe,$fn) {
- return SpatialReference_SetLCC1SP($this->_cPtr,$clat,$clong,$scale,$fe,$fn);
- }
- - public function SetLCCB($stdp1,$stdp2,$clat,$clong,$fe,$fn) {
- + function SetLCCB($stdp1,$stdp2,$clat,$clong,$fe,$fn) {
- return SpatialReference_SetLCCB($this->_cPtr,$stdp1,$stdp2,$clat,$clong,$fe,$fn);
- }
- - public function SetMC($clat,$clong,$fe,$fn) {
- + function SetMC($clat,$clong,$fe,$fn) {
- return SpatialReference_SetMC($this->_cPtr,$clat,$clong,$fe,$fn);
- }
- - public function SetMercator($clat,$clong,$scale,$fe,$fn) {
- + function SetMercator($clat,$clong,$scale,$fe,$fn) {
- return SpatialReference_SetMercator($this->_cPtr,$clat,$clong,$scale,$fe,$fn);
- }
- - public function SetMollweide($cm,$fe,$fn) {
- + function SetMollweide($cm,$fe,$fn) {
- return SpatialReference_SetMollweide($this->_cPtr,$cm,$fe,$fn);
- }
- - public function SetNZMG($clat,$clong,$fe,$fn) {
- + function SetNZMG($clat,$clong,$fe,$fn) {
- return SpatialReference_SetNZMG($this->_cPtr,$clat,$clong,$fe,$fn);
- }
- - public function SetOS($dfOriginLat,$dfCMeridian,$scale,$fe,$fn) {
- + function SetOS($dfOriginLat,$dfCMeridian,$scale,$fe,$fn) {
- return SpatialReference_SetOS($this->_cPtr,$dfOriginLat,$dfCMeridian,$scale,$fe,$fn);
- }
- - public function SetOrthographic($clat,$clong,$fe,$fn) {
- + function SetOrthographic($clat,$clong,$fe,$fn) {
- return SpatialReference_SetOrthographic($this->_cPtr,$clat,$clong,$fe,$fn);
- }
- - public function SetPolyconic($clat,$clong,$fe,$fn) {
- + function SetPolyconic($clat,$clong,$fe,$fn) {
- return SpatialReference_SetPolyconic($this->_cPtr,$clat,$clong,$fe,$fn);
- }
- - public function SetPS($clat,$clong,$scale,$fe,$fn) {
- + function SetPS($clat,$clong,$scale,$fe,$fn) {
- return SpatialReference_SetPS($this->_cPtr,$clat,$clong,$scale,$fe,$fn);
- }
- - public function SetRobinson($clong,$fe,$fn) {
- + function SetRobinson($clong,$fe,$fn) {
- return SpatialReference_SetRobinson($this->_cPtr,$clong,$fe,$fn);
- }
- - public function SetSinusoidal($clong,$fe,$fn) {
- + function SetSinusoidal($clong,$fe,$fn) {
- return SpatialReference_SetSinusoidal($this->_cPtr,$clong,$fe,$fn);
- }
- - public function SetStereographic($clat,$clong,$scale,$fe,$fn) {
- + function SetStereographic($clat,$clong,$scale,$fe,$fn) {
- return SpatialReference_SetStereographic($this->_cPtr,$clat,$clong,$scale,$fe,$fn);
- }
- - public function SetSOC($latitudeoforigin,$cm,$fe,$fn) {
- + function SetSOC($latitudeoforigin,$cm,$fe,$fn) {
- return SpatialReference_SetSOC($this->_cPtr,$latitudeoforigin,$cm,$fe,$fn);
- }
- - public function SetTM($clat,$clong,$scale,$fe,$fn) {
- + function SetTM($clat,$clong,$scale,$fe,$fn) {
- return SpatialReference_SetTM($this->_cPtr,$clat,$clong,$scale,$fe,$fn);
- }
- - public function SetTMVariant($pszVariantName,$clat,$clong,$scale,$fe,$fn) {
- + function SetTMVariant($pszVariantName,$clat,$clong,$scale,$fe,$fn) {
- return SpatialReference_SetTMVariant($this->_cPtr,$pszVariantName,$clat,$clong,$scale,$fe,$fn);
- }
- - public function SetTMG($clat,$clong,$fe,$fn) {
- + function SetTMG($clat,$clong,$fe,$fn) {
- return SpatialReference_SetTMG($this->_cPtr,$clat,$clong,$fe,$fn);
- }
- - public function SetTMSO($clat,$clong,$scale,$fe,$fn) {
- + function SetTMSO($clat,$clong,$scale,$fe,$fn) {
- return SpatialReference_SetTMSO($this->_cPtr,$clat,$clong,$scale,$fe,$fn);
- }
- - public function SetVDG($clong,$fe,$fn) {
- + function SetVDG($clong,$fe,$fn) {
- return SpatialReference_SetVDG($this->_cPtr,$clong,$fe,$fn);
- }
- - public function SetWellKnownGeogCS($name) {
- + function SetWellKnownGeogCS($name) {
- return SpatialReference_SetWellKnownGeogCS($this->_cPtr,$name);
- }
- - public function SetFromUserInput($name) {
- + function SetFromUserInput($name) {
- return SpatialReference_SetFromUserInput($this->_cPtr,$name);
- }
- - public function CopyGeogCSFrom($rhs) {
- + function CopyGeogCSFrom($rhs) {
- return SpatialReference_CopyGeogCSFrom($this->_cPtr,$rhs);
- }
- - public function SetTOWGS84($p1,$p2,$p3,$p4=0.0,$p5=0.0,$p6=0.0,$p7=0.0) {
- + function SetTOWGS84($p1,$p2,$p3,$p4=0.0,$p5=0.0,$p6=0.0,$p7=0.0) {
- return SpatialReference_SetTOWGS84($this->_cPtr,$p1,$p2,$p3,$p4,$p5,$p6,$p7);
- }
- - public function GetTOWGS84() {
- + function GetTOWGS84() {
- return SpatialReference_GetTOWGS84($this->_cPtr);
- }
- - public function SetLocalCS($pszName) {
- + function SetLocalCS($pszName) {
- return SpatialReference_SetLocalCS($this->_cPtr,$pszName);
- }
- - public function SetGeogCS($pszGeogName,$pszDatumName,$pszEllipsoidName,$dfSemiMajor,$dfInvFlattening,$pszPMName="Greenwich",$dfPMOffset=0.0,$pszUnits="degree",$dfConvertToRadians=0.0174532925199433) {
- + function SetGeogCS($pszGeogName,$pszDatumName,$pszEllipsoidName,$dfSemiMajor,$dfInvFlattening,$pszPMName="Greenwich",$dfPMOffset=0.0,$pszUnits="degree",$dfConvertToRadians=0.0174532925199433) {
- return SpatialReference_SetGeogCS($this->_cPtr,$pszGeogName,$pszDatumName,$pszEllipsoidName,$dfSemiMajor,$dfInvFlattening,$pszPMName,$dfPMOffset,$pszUnits,$dfConvertToRadians);
- }
- - public function SetProjCS($name="unnamed") {
- + function SetProjCS($name="unnamed") {
- return SpatialReference_SetProjCS($this->_cPtr,$name);
- }
- - public function ImportFromWkt($ppszInput) {
- + function ImportFromWkt($ppszInput) {
- return SpatialReference_ImportFromWkt($this->_cPtr,$ppszInput);
- }
- - public function ImportFromProj4($ppszInput) {
- + function ImportFromProj4($ppszInput) {
- return SpatialReference_ImportFromProj4($this->_cPtr,$ppszInput);
- }
- - public function ImportFromUrl($url) {
- + function ImportFromUrl($url) {
- return SpatialReference_ImportFromUrl($this->_cPtr,$url);
- }
- - public function ImportFromESRI($ppszInput) {
- + function ImportFromESRI($ppszInput) {
- return SpatialReference_ImportFromESRI($this->_cPtr,$ppszInput);
- }
- - public function ImportFromEPSG($arg) {
- + function ImportFromEPSG($arg) {
- return SpatialReference_ImportFromEPSG($this->_cPtr,$arg);
- }
- - public function ImportFromEPSGA($arg) {
- + function ImportFromEPSGA($arg) {
- return SpatialReference_ImportFromEPSGA($this->_cPtr,$arg);
- }
- - public function ImportFromPCI($proj,$units="METRE",$argin=null) {
- + function ImportFromPCI($proj,$units="METRE",$argin=null) {
- switch (func_num_args()) {
- case 1: case 2: $r=SpatialReference_ImportFromPCI($this->_cPtr,$proj,$units); break;
- default: $r=SpatialReference_ImportFromPCI($this->_cPtr,$proj,$units,$argin);
- @@ -636,7 +640,7 @@
- return $r;
- }
- - public function ImportFromUSGS($proj_code,$zone=0,$argin=null,$datum_code=0) {
- + function ImportFromUSGS($proj_code,$zone=0,$argin=null,$datum_code=0) {
- switch (func_num_args()) {
- case 1: case 2: $r=SpatialReference_ImportFromUSGS($this->_cPtr,$proj_code,$zone); break;
- default: $r=SpatialReference_ImportFromUSGS($this->_cPtr,$proj_code,$zone,$argin,$datum_code);
- @@ -644,47 +648,47 @@
- return $r;
- }
- - public function ImportFromXML($xmlString) {
- + function ImportFromXML($xmlString) {
- return SpatialReference_ImportFromXML($this->_cPtr,$xmlString);
- }
- - public function ImportFromERM($proj,$datum,$units) {
- + function ImportFromERM($proj,$datum,$units) {
- return SpatialReference_ImportFromERM($this->_cPtr,$proj,$datum,$units);
- }
- - public function ImportFromMICoordSys($pszCoordSys) {
- + function ImportFromMICoordSys($pszCoordSys) {
- return SpatialReference_ImportFromMICoordSys($this->_cPtr,$pszCoordSys);
- }
- - public function ExportToWkt() {
- + function ExportToWkt() {
- return SpatialReference_ExportToWkt($this->_cPtr);
- }
- - public function ExportToPrettyWkt($simplify=0) {
- + function ExportToPrettyWkt($simplify=0) {
- return SpatialReference_ExportToPrettyWkt($this->_cPtr,$simplify);
- }
- - public function ExportToProj4() {
- + function ExportToProj4() {
- return SpatialReference_ExportToProj4($this->_cPtr);
- }
- - public function ExportToPCI() {
- + function ExportToPCI() {
- return SpatialReference_ExportToPCI($this->_cPtr);
- }
- - public function ExportToUSGS() {
- + function ExportToUSGS() {
- return SpatialReference_ExportToUSGS($this->_cPtr);
- }
- - public function ExportToXML($dialect="") {
- + function ExportToXML($dialect="") {
- return SpatialReference_ExportToXML($this->_cPtr,$dialect);
- }
- - public function ExportToMICoordSys() {
- + function ExportToMICoordSys() {
- return SpatialReference_ExportToMICoordSys($this->_cPtr);
- }
- - public function CloneGeogCS() {
- + function CloneGeogCS() {
- $r=SpatialReference_CloneGeogCS($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -696,7 +700,7 @@
- return $r;
- }
- - public function c_Clone() {
- + function c_Clone() {
- $r=SpatialReference_c_Clone($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -708,27 +712,27 @@
- return $r;
- }
- - public function Validate() {
- + function Validate() {
- return SpatialReference_Validate($this->_cPtr);
- }
- - public function StripCTParms() {
- + function StripCTParms() {
- return SpatialReference_StripCTParms($this->_cPtr);
- }
- - public function FixupOrdering() {
- + function FixupOrdering() {
- return SpatialReference_FixupOrdering($this->_cPtr);
- }
- - public function Fixup() {
- + function Fixup() {
- return SpatialReference_Fixup($this->_cPtr);
- }
- - public function MorphToESRI() {
- + function MorphToESRI() {
- return SpatialReference_MorphToESRI($this->_cPtr);
- }
- - public function MorphFromESRI() {
- + function MorphFromESRI() {
- return SpatialReference_MorphFromESRI($this->_cPtr);
- }
- }
- @@ -752,7 +756,7 @@
- return $this->_pData[$var];
- }
- - public function __construct($src,$dst) {
- + function __construct($src,$dst) {
- if (is_resource($src) && get_resource_type($src) === '_p_OSRCoordinateTransformationShadow') {
- $this->_cPtr=$src;
- return;
- @@ -760,14 +764,15 @@
- $this->_cPtr=new_CoordinateTransformation($src,$dst);
- }
- - public function TransformPoint($inout_or_x,$y=null,$z=0.0) {
- + function TransformPoint($inout_or_x,$y=null,$z=0.0) {
- switch (func_num_args()) {
- case 1: CoordinateTransformation_TransformPoint($this->_cPtr,$inout_or_x); break;
- default: CoordinateTransformation_TransformPoint($this->_cPtr,$inout_or_x,$y,$z);
- }
- + return $r;
- }
- - public function TransformPoints($nCount,$x,$y,$z) {
- + function TransformPoints($nCount,$x,$y,$z) {
- CoordinateTransformation_TransformPoints($this->_cPtr,$nCount,$x,$y,$z);
- }
- }
- Index: swig/php/gdal.php
- ===================================================================
- --- swig/php/gdal.php (revision 21891)
- +++ swig/php/gdal.php (working copy)
- @@ -2,7 +2,7 @@
- /* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- - * Version 1.3.40
- + * Version 2.0.1
- *
- * This file is not intended to be easily readable and contains a number of
- * coding conventions designed to improve portability and efficiency. Do not make
- @@ -386,7 +386,7 @@
- }
- static function ApplyGeoTransform($padfGeoTransform,$dfPixel,$dfLine) {
- - ApplyGeoTransform($padfGeoTransform,$dfPixel,$dfLine);
- + return ApplyGeoTransform($padfGeoTransform,$dfPixel,$dfLine);
- }
- static function InvGeoTransform($gt_in) {
- @@ -551,32 +551,32 @@
- $this->_cPtr=$h;
- }
- - public function GetDescription() {
- + function GetDescription() {
- return MajorObject_GetDescription($this->_cPtr);
- }
- - public function SetDescription($pszNewDesc) {
- + function SetDescription($pszNewDesc) {
- MajorObject_SetDescription($this->_cPtr,$pszNewDesc);
- }
- - public function GetMetadata_Dict($pszDomain="") {
- + function GetMetadata_Dict($pszDomain="") {
- return MajorObject_GetMetadata_Dict($this->_cPtr,$pszDomain);
- }
- - public function GetMetadata_List($pszDomain="") {
- + function GetMetadata_List($pszDomain="") {
- return MajorObject_GetMetadata_List($this->_cPtr,$pszDomain);
- }
- - public function SetMetadata($papszMetadata_or_pszMetadataString,$pszDomain="") {
- + function SetMetadata($papszMetadata_or_pszMetadataString,$pszDomain="") {
- $r=MajorObject_SetMetadata($this->_cPtr,$papszMetadata_or_pszMetadataString,$pszDomain);
- return $r;
- }
- - public function GetMetadataItem($pszName,$pszDomain="") {
- + function GetMetadataItem($pszName,$pszDomain="") {
- return MajorObject_GetMetadataItem($this->_cPtr,$pszName,$pszDomain);
- }
- - public function SetMetadataItem($pszName,$pszValue,$pszDomain="") {
- + function SetMetadataItem($pszName,$pszValue,$pszDomain="") {
- return MajorObject_SetMetadataItem($this->_cPtr,$pszName,$pszValue,$pszDomain);
- }
- }
- @@ -609,7 +609,7 @@
- $this->_cPtr=$h;
- }
- - public function Create($utf8_path,$xsize,$ysize,$bands=1,$eType=null,$options=null) {
- + function Create($utf8_path,$xsize,$ysize,$bands=1,$eType=null,$options=null) {
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- if (!class_exists($c)) {
- @@ -620,7 +620,7 @@
- return $r;
- }
- - public function CreateCopy($utf8_path,$src,$strict=1,$options=null,$callback=null,$callback_data=null) {
- + function CreateCopy($utf8_path,$src,$strict=1,$options=null,$callback=null,$callback_data=null) {
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- if (!class_exists($c)) {
- @@ -631,19 +631,23 @@
- return $r;
- }
- - public function Delete($utf8_path) {
- + function Delete($utf8_path) {
- return Driver_Delete($this->_cPtr,$utf8_path);
- }
- - public function Rename($newName,$oldName) {
- + function Rename($newName,$oldName) {
- return Driver_Rename($this->_cPtr,$newName,$oldName);
- }
- - public function Register() {
- + function CopyFiles($newName,$oldName) {
- + return Driver_CopyFiles($this->_cPtr,$newName,$oldName);
- + }
- +
- + function Register() {
- return Driver_Register($this->_cPtr);
- }
- - public function Deregister() {
- + function Deregister() {
- Driver_Deregister($this->_cPtr);
- }
- }
- @@ -677,7 +681,7 @@
- return $this->_pData[$var];
- }
- - public function __construct($res=null) {
- + function __construct($res=null) {
- if (is_resource($res) && get_resource_type($res) === '_p_GDALColorEntry') {
- $this->_cPtr=$res;
- return;
- @@ -715,7 +719,7 @@
- return $this->_pData[$var];
- }
- - public function __construct($x=0.0,$y=0.0,$z=0.0,$pixel=0.0,$line=0.0,$info="",$id="") {
- + function __construct($x=0.0,$y=0.0,$z=0.0,$pixel=0.0,$line=0.0,$info="",$id="") {
- if (is_resource($x) && get_resource_type($x) === '_p_GDAL_GCP') {
- $this->_cPtr=$x;
- return;
- @@ -746,15 +750,15 @@
- $this->_cPtr=$h;
- }
- - public function GetNextUpdatedRegion($timeout) {
- + function GetNextUpdatedRegion($timeout) {
- return AsyncReader_GetNextUpdatedRegion($this->_cPtr,$timeout);
- }
- - public function LockBuffer($timeout) {
- + function LockBuffer($timeout) {
- return AsyncReader_LockBuffer($this->_cPtr,$timeout);
- }
- - public function UnlockBuffer() {
- + function UnlockBuffer() {
- AsyncReader_UnlockBuffer($this->_cPtr);
- }
- }
- @@ -787,7 +791,7 @@
- $this->_cPtr=$h;
- }
- - public function GetDriver() {
- + function GetDriver() {
- $r=Dataset_GetDriver($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -799,7 +803,7 @@
- return $r;
- }
- - public function GetRasterBand($nBand) {
- + function GetRasterBand($nBand) {
- $r=Dataset_GetRasterBand($this->_cPtr,$nBand);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -811,27 +815,27 @@
- return $r;
- }
- - public function GetProjection() {
- + function GetProjection() {
- return Dataset_GetProjection($this->_cPtr);
- }
- - public function GetProjectionRef() {
- + function GetProjectionRef() {
- return Dataset_GetProjectionRef($this->_cPtr);
- }
- - public function SetProjection($prj) {
- + function SetProjection($prj) {
- return Dataset_SetProjection($this->_cPtr,$prj);
- }
- - public function GetGeoTransform() {
- - Dataset_GetGeoTransform($this->_cPtr);
- + function GetGeoTransform() {
- + return Dataset_GetGeoTransform($this->_cPtr);
- }
- - public function SetGeoTransform($argin) {
- + function SetGeoTransform($argin) {
- return Dataset_SetGeoTransform($this->_cPtr,$argin);
- }
- - public function BuildOverviews($resampling="NEAREST",$overviewlist=0,$callback=null,$callback_data=null) {
- + function BuildOverviews($resampling="NEAREST",$overviewlist=0,$callback=null,$callback_data=null) {
- switch (func_num_args()) {
- case 0: case 1: case 2: $r=Dataset_BuildOverviews($this->_cPtr,$resampling,$overviewlist); break;
- default: $r=Dataset_BuildOverviews($this->_cPtr,$resampling,$overviewlist,$callback,$callback_data);
- @@ -839,27 +843,27 @@
- return $r;
- }
- - public function GetGCPCount() {
- + function GetGCPCount() {
- return Dataset_GetGCPCount($this->_cPtr);
- }
- - public function GetGCPProjection() {
- + function GetGCPProjection() {
- return Dataset_GetGCPProjection($this->_cPtr);
- }
- - public function GetGCPs() {
- - Dataset_GetGCPs($this->_cPtr);
- + function GetGCPs() {
- + return Dataset_GetGCPs($this->_cPtr);
- }
- - public function SetGCPs($nGCPs,$pszGCPProjection) {
- + function SetGCPs($nGCPs,$pszGCPProjection) {
- return Dataset_SetGCPs($this->_cPtr,$nGCPs,$pszGCPProjection);
- }
- - public function FlushCache() {
- + function FlushCache() {
- Dataset_FlushCache($this->_cPtr);
- }
- - public function AddBand($datatype=null,$options=null) {
- + function AddBand($datatype=null,$options=null) {
- switch (func_num_args()) {
- case 0: $r=Dataset_AddBand($this->_cPtr); break;
- default: $r=Dataset_AddBand($this->_cPtr,$datatype,$options);
- @@ -867,19 +871,19 @@
- return $r;
- }
- - public function CreateMaskBand($nFlags) {
- + function CreateMaskBand($nFlags) {
- return Dataset_CreateMaskBand($this->_cPtr,$nFlags);
- }
- - public function GetFileList() {
- + function GetFileList() {
- return Dataset_GetFileList($this->_cPtr);
- }
- - public function WriteRaster($xoff,$yoff,$xsize,$ysize,$buf_len,$buf_xsize=null,$buf_ysize=null,$buf_type=null,$band_list=0,$buf_pixel_space=null,$buf_line_space=null,$buf_band_space=null) {
- + function WriteRaster($xoff,$yoff,$xsize,$ysize,$buf_len,$buf_xsize=null,$buf_ysize=null,$buf_type=null,$band_list=0,$buf_pixel_space=null,$buf_line_space=null,$buf_band_space=null) {
- return Dataset_WriteRaster($this->_cPtr,$xoff,$yoff,$xsize,$ysize,$buf_len,$buf_xsize,$buf_ysize,$buf_type,$band_list,$buf_pixel_space,$buf_line_space,$buf_band_space);
- }
- - public function ReadRaster($xoff,$yoff,$xsize,$ysize,$buf_xsize=null,$buf_ysize=null,$buf_type=null,$band_list=0,$buf_pixel_space=null,$buf_line_space=null,$buf_band_space=null) {
- + function ReadRaster($xoff,$yoff,$xsize,$ysize,$buf_xsize=null,$buf_ysize=null,$buf_type=null,$band_list=0,$buf_pixel_space=null,$buf_line_space=null,$buf_band_space=null) {
- return Dataset_ReadRaster($this->_cPtr,$xoff,$yoff,$xsize,$ysize,$buf_xsize,$buf_ysize,$buf_type,$band_list,$buf_pixel_space,$buf_line_space,$buf_band_space);
- }
- }
- @@ -912,83 +916,83 @@
- $this->_cPtr=$h;
- }
- - public function GetBand() {
- + function GetBand() {
- return Band_GetBand($this->_cPtr);
- }
- - public function GetBlockSize() {
- - Band_GetBlockSize($this->_cPtr);
- + function GetBlockSize() {
- + return Band_GetBlockSize($this->_cPtr);
- }
- - public function GetColorInterpretation() {
- + function GetColorInterpretation() {
- return Band_GetColorInterpretation($this->_cPtr);
- }
- - public function GetRasterColorInterpretation() {
- + function GetRasterColorInterpretation() {
- return Band_GetRasterColorInterpretation($this->_cPtr);
- }
- - public function SetColorInterpretation($val) {
- + function SetColorInterpretation($val) {
- return Band_SetColorInterpretation($this->_cPtr,$val);
- }
- - public function SetRasterColorInterpretation($val) {
- + function SetRasterColorInterpretation($val) {
- return Band_SetRasterColorInterpretation($this->_cPtr,$val);
- }
- - public function GetNoDataValue() {
- - Band_GetNoDataValue($this->_cPtr);
- + function GetNoDataValue() {
- + return Band_GetNoDataValue($this->_cPtr);
- }
- - public function SetNoDataValue($d) {
- + function SetNoDataValue($d) {
- return Band_SetNoDataValue($this->_cPtr,$d);
- }
- - public function GetUnitType() {
- + function GetUnitType() {
- return Band_GetUnitType($this->_cPtr);
- }
- - public function SetUnitType($val) {
- + function SetUnitType($val) {
- return Band_SetUnitType($this->_cPtr,$val);
- }
- - public function GetRasterCategoryNames() {
- + function GetRasterCategoryNames() {
- return Band_GetRasterCategoryNames($this->_cPtr);
- }
- - public function SetRasterCategoryNames($names) {
- + function SetRasterCategoryNames($names) {
- return Band_SetRasterCategoryNames($this->_cPtr,$names);
- }
- - public function GetMinimum() {
- - Band_GetMinimum($this->_cPtr);
- + function GetMinimum() {
- + return Band_GetMinimum($this->_cPtr);
- }
- - public function GetMaximum() {
- - Band_GetMaximum($this->_cPtr);
- + function GetMaximum() {
- + return Band_GetMaximum($this->_cPtr);
- }
- - public function GetOffset() {
- - Band_GetOffset($this->_cPtr);
- + function GetOffset() {
- + return Band_GetOffset($this->_cPtr);
- }
- - public function GetScale() {
- - Band_GetScale($this->_cPtr);
- + function GetScale() {
- + return Band_GetScale($this->_cPtr);
- }
- - public function SetOffset($val) {
- + function SetOffset($val) {
- return Band_SetOffset($this->_cPtr,$val);
- }
- - public function SetScale($val) {
- + function SetScale($val) {
- return Band_SetScale($this->_cPtr,$val);
- }
- - public function GetStatistics($approx_ok,$force) {
- + function GetStatistics($approx_ok,$force) {
- return Band_GetStatistics($this->_cPtr,$approx_ok,$force);
- }
- - public function ComputeStatistics($approx_ok,$callback=null,$callback_data=null) {
- + function ComputeStatistics($approx_ok,$callback=null,$callback_data=null) {
- switch (func_num_args()) {
- case 1: $r=Band_ComputeStatistics($this->_cPtr,$approx_ok); break;
- default: $r=Band_ComputeStatistics($this->_cPtr,$approx_ok,$callback,$callback_data);
- @@ -996,15 +1000,15 @@
- return $r;
- }
- - public function SetStatistics($min,$max,$mean,$stddev) {
- + function SetStatistics($min,$max,$mean,$stddev) {
- return Band_SetStatistics($this->_cPtr,$min,$max,$mean,$stddev);
- }
- - public function GetOverviewCount() {
- + function GetOverviewCount() {
- return Band_GetOverviewCount($this->_cPtr);
- }
- - public function GetOverview($i) {
- + function GetOverview($i) {
- $r=Band_GetOverview($this->_cPtr,$i);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1016,35 +1020,35 @@
- return $r;
- }
- - public function Checksum($xoff=0,$yoff=0,$xsize=null,$ysize=null) {
- + function Checksum($xoff=0,$yoff=0,$xsize=null,$ysize=null) {
- return Band_Checksum($this->_cPtr,$xoff,$yoff,$xsize,$ysize);
- }
- - public function ComputeRasterMinMax($approx_ok=0) {
- - Band_ComputeRasterMinMax($this->_cPtr,$approx_ok);
- + function ComputeRasterMinMax($approx_ok=0) {
- + return Band_ComputeRasterMinMax($this->_cPtr,$approx_ok);
- }
- - public function ComputeBandStats($samplestep=1) {
- - Band_ComputeBandStats($this->_cPtr,$samplestep);
- + function ComputeBandStats($samplestep=1) {
- + return Band_ComputeBandStats($this->_cPtr,$samplestep);
- }
- - public function Fill($real_fill,$imag_fill=0.0) {
- + function Fill($real_fill,$imag_fill=0.0) {
- return Band_Fill($this->_cPtr,$real_fill,$imag_fill);
- }
- - public function ReadRaster($xoff,$yoff,$xsize,$ysize,$buf_xsize=null,$buf_ysize=null,$buf_type=null,$buf_pixel_space=null,$buf_line_space=null) {
- + function ReadRaster($xoff,$yoff,$xsize,$ysize,$buf_xsize=null,$buf_ysize=null,$buf_type=null,$buf_pixel_space=null,$buf_line_space=null) {
- return Band_ReadRaster($this->_cPtr,$xoff,$yoff,$xsize,$ysize,$buf_xsize,$buf_ysize,$buf_type,$buf_pixel_space,$buf_line_space);
- }
- - public function WriteRaster($xoff,$yoff,$xsize,$ysize,$buf_len,$buf_xsize=null,$buf_ysize=null,$buf_type=null,$buf_pixel_space=null,$buf_line_space=null) {
- + function WriteRaster($xoff,$yoff,$xsize,$ysize,$buf_len,$buf_xsize=null,$buf_ysize=null,$buf_type=null,$buf_pixel_space=null,$buf_line_space=null) {
- return Band_WriteRaster($this->_cPtr,$xoff,$yoff,$xsize,$ysize,$buf_len,$buf_xsize,$buf_ysize,$buf_type,$buf_pixel_space,$buf_line_space);
- }
- - public function FlushCache() {
- + function FlushCache() {
- Band_FlushCache($this->_cPtr);
- }
- - public function GetRasterColorTable() {
- + function GetRasterColorTable() {
- $r=Band_GetRasterColorTable($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1056,7 +1060,7 @@
- return $r;
- }
- - public function GetColorTable() {
- + function GetColorTable() {
- $r=Band_GetColorTable($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1068,15 +1072,15 @@
- return $r;
- }
- - public function SetRasterColorTable($arg) {
- + function SetRasterColorTable($arg) {
- return Band_SetRasterColorTable($this->_cPtr,$arg);
- }
- - public function SetColorTable($arg) {
- + function SetColorTable($arg) {
- return Band_SetColorTable($this->_cPtr,$arg);
- }
- - public function GetDefaultRAT() {
- + function GetDefaultRAT() {
- $r=Band_GetDefaultRAT($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1088,11 +1092,11 @@
- return $r;
- }
- - public function SetDefaultRAT($table) {
- + function SetDefaultRAT($table) {
- return Band_SetDefaultRAT($this->_cPtr,$table);
- }
- - public function GetMaskBand() {
- + function GetMaskBand() {
- $r=Band_GetMaskBand($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1104,15 +1108,15 @@
- return $r;
- }
- - public function GetMaskFlags() {
- + function GetMaskFlags() {
- return Band_GetMaskFlags($this->_cPtr);
- }
- - public function CreateMaskBand($nFlags) {
- + function CreateMaskBand($nFlags) {
- return Band_CreateMaskBand($this->_cPtr,$nFlags);
- }
- - public function GetHistogram($min=-0.5,$max=255.5,$buckets=256,$panHistogram=null,$include_out_of_range=0,$approx_ok=1,$callback=null,$callback_data=null) {
- + function GetHistogram($min=-0.5,$max=255.5,$buckets=256,$panHistogram=null,$include_out_of_range=0,$approx_ok=1,$callback=null,$callback_data=null) {
- switch (func_num_args()) {
- case 0: case 1: case 2: case 3: case 4: case 5: case 6: $r=Band_GetHistogram($this->_cPtr,$min,$max,$buckets,$panHistogram,$include_out_of_range,$approx_ok); break;
- default: $r=Band_GetHistogram($this->_cPtr,$min,$max,$buckets,$panHistogram,$include_out_of_range,$approx_ok,$callback,$callback_data);
- @@ -1120,7 +1124,7 @@
- return $r;
- }
- - public function GetDefaultHistogram($min_ret=null,$max_ret=null,$buckets_ret=null,$ppanHistogram=null,$force=1,$callback=null,$callback_data=null) {
- + function GetDefaultHistogram($min_ret=null,$max_ret=null,$buckets_ret=null,$ppanHistogram=null,$force=1,$callback=null,$callback_data=null) {
- switch (func_num_args()) {
- case 0: case 1: case 2: case 3: case 4: case 5: $r=Band_GetDefaultHistogram($this->_cPtr,$min_ret,$max_ret,$buckets_ret,$ppanHistogram,$force); break;
- default: $r=Band_GetDefaultHistogram($this->_cPtr,$min_ret,$max_ret,$buckets_ret,$ppanHistogram,$force,$callback,$callback_data);
- @@ -1128,13 +1132,21 @@
- return $r;
- }
- - public function SetDefaultHistogram($min,$max,$buckets_in,$panHistogram_in) {
- + function SetDefaultHistogram($min,$max,$buckets_in,$panHistogram_in) {
- return Band_SetDefaultHistogram($this->_cPtr,$min,$max,$buckets_in,$panHistogram_in);
- }
- - public function HasArbitraryOverviews() {
- + function HasArbitraryOverviews() {
- return Band_HasArbitraryOverviews($this->_cPtr);
- }
- +
- + function GetCategoryNames() {
- + return Band_GetCategoryNames($this->_cPtr);
- + }
- +
- + function SetCategoryNames($papszCategoryNames) {
- + return Band_SetCategoryNames($this->_cPtr,$papszCategoryNames);
- + }
- }
- class ColorTable {
- @@ -1156,19 +1168,18 @@
- return $this->_pData[$var];
- }
- - public function __construct($palette=null) {
- + function __construct($palette=null) {
- if (is_resource($palette) && get_resource_type($palette) === '_p_GDALColorTableShadow') {
- $this->_cPtr=$palette;
- return;
- }
- - $this->_cPtr=$r;
- switch (func_num_args()) {
- case 0: $this->_cPtr=new_ColorTable(); break;
- default: $this->_cPtr=new_ColorTable($palette);
- }
- }
- - public function c_Clone() {
- + function c_Clone() {
- $r=ColorTable_c_Clone($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1180,15 +1191,15 @@
- return $r;
- }
- - public function GetPaletteInterpretation() {
- + function GetPaletteInterpretation() {
- return ColorTable_GetPaletteInterpretation($this->_cPtr);
- }
- - public function GetCount() {
- + function GetCount() {
- return ColorTable_GetCount($this->_cPtr);
- }
- - public function GetColorEntry($entry) {
- + function GetColorEntry($entry) {
- $r=ColorTable_GetColorEntry($this->_cPtr,$entry);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1200,15 +1211,15 @@
- return $r;
- }
- - public function GetColorEntryAsRGB($entry,$centry) {
- + function GetColorEntryAsRGB($entry,$centry) {
- return ColorTable_GetColorEntryAsRGB($this->_cPtr,$entry,$centry);
- }
- - public function SetColorEntry($entry,$centry) {
- + function SetColorEntry($entry,$centry) {
- ColorTable_SetColorEntry($this->_cPtr,$entry,$centry);
- }
- - public function CreateColorRamp($nStartIndex,$startcolor,$nEndIndex,$endcolor) {
- + function CreateColorRamp($nStartIndex,$startcolor,$nEndIndex,$endcolor) {
- ColorTable_CreateColorRamp($this->_cPtr,$nStartIndex,$startcolor,$nEndIndex,$endcolor);
- }
- }
- @@ -1232,7 +1243,7 @@
- return $this->_pData[$var];
- }
- - public function __construct($res=null) {
- + function __construct($res=null) {
- if (is_resource($res) && get_resource_type($res) === '_p_GDALRasterAttributeTableShadow') {
- $this->_cPtr=$res;
- return;
- @@ -1240,7 +1251,7 @@
- $this->_cPtr=new_RasterAttributeTable();
- }
- - public function c_Clone() {
- + function c_Clone() {
- $r=RasterAttributeTable_c_Clone($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1252,71 +1263,71 @@
- return $r;
- }
- - public function GetColumnCount() {
- + function GetColumnCount() {
- return RasterAttributeTable_GetColumnCount($this->_cPtr);
- }
- - public function GetNameOfCol($iCol) {
- + function GetNameOfCol($iCol) {
- return RasterAttributeTable_GetNameOfCol($this->_cPtr,$iCol);
- }
- - public function GetUsageOfCol($iCol) {
- + function GetUsageOfCol($iCol) {
- return RasterAttributeTable_GetUsageOfCol($this->_cPtr,$iCol);
- }
- - public function GetTypeOfCol($iCol) {
- + function GetTypeOfCol($iCol) {
- return RasterAttributeTable_GetTypeOfCol($this->_cPtr,$iCol);
- }
- - public function GetColOfUsage($eUsage) {
- + function GetColOfUsage($eUsage) {
- return RasterAttributeTable_GetColOfUsage($this->_cPtr,$eUsage);
- }
- - public function GetRowCount() {
- + function GetRowCount() {
- return RasterAttributeTable_GetRowCount($this->_cPtr);
- }
- - public function GetValueAsString($iRow,$iCol) {
- + function GetValueAsString($iRow,$iCol) {
- return RasterAttributeTable_GetValueAsString($this->_cPtr,$iRow,$iCol);
- }
- - public function GetValueAsInt($iRow,$iCol) {
- + function GetValueAsInt($iRow,$iCol) {
- return RasterAttributeTable_GetValueAsInt($this->_cPtr,$iRow,$iCol);
- }
- - public function GetValueAsDouble($iRow,$iCol) {
- + function GetValueAsDouble($iRow,$iCol) {
- return RasterAttributeTable_GetValueAsDouble($this->_cPtr,$iRow,$iCol);
- }
- - public function SetValueAsString($iRow,$iCol,$pszValue) {
- + function SetValueAsString($iRow,$iCol,$pszValue) {
- RasterAttributeTable_SetValueAsString($this->_cPtr,$iRow,$iCol,$pszValue);
- }
- - public function SetValueAsInt($iRow,$iCol,$nValue) {
- + function SetValueAsInt($iRow,$iCol,$nValue) {
- RasterAttributeTable_SetValueAsInt($this->_cPtr,$iRow,$iCol,$nValue);
- }
- - public function SetValueAsDouble($iRow,$iCol,$dfValue) {
- + function SetValueAsDouble($iRow,$iCol,$dfValue) {
- RasterAttributeTable_SetValueAsDouble($this->_cPtr,$iRow,$iCol,$dfValue);
- }
- - public function SetRowCount($nCount) {
- + function SetRowCount($nCount) {
- RasterAttributeTable_SetRowCount($this->_cPtr,$nCount);
- }
- - public function CreateColumn($pszName,$eType,$eUsage) {
- + function CreateColumn($pszName,$eType,$eUsage) {
- return RasterAttributeTable_CreateColumn($this->_cPtr,$pszName,$eType,$eUsage);
- }
- - public function GetLinearBinning() {
- + function GetLinearBinning() {
- return RasterAttributeTable_GetLinearBinning($this->_cPtr);
- }
- - public function SetLinearBinning($dfRow0Min,$dfBinSize) {
- + function SetLinearBinning($dfRow0Min,$dfBinSize) {
- return RasterAttributeTable_SetLinearBinning($this->_cPtr,$dfRow0Min,$dfBinSize);
- }
- - public function GetRowOfValue($dfValue) {
- + function GetRowOfValue($dfValue) {
- return RasterAttributeTable_GetRowOfValue($this->_cPtr,$dfValue);
- }
- }
- @@ -1340,7 +1351,7 @@
- return $this->_pData[$var];
- }
- - public function __construct($src,$dst,$options) {
- + function __construct($src,$dst,$options) {
- if (is_resource($src) && get_resource_type($src) === '_p_GDALTransformerInfoShadow') {
- $this->_cPtr=$src;
- return;
- @@ -1348,7 +1359,7 @@
- $this->_cPtr=new_Transformer($src,$dst,$options);
- }
- - public function TransformPoint($bDstToSrc,$inout_or_x,$y=null,$z=0.0) {
- + function TransformPoint($bDstToSrc,$inout_or_x,$y=null,$z=0.0) {
- switch (func_num_args()) {
- case 2: $r=Transformer_TransformPoint($this->_cPtr,$bDstToSrc,$inout_or_x); break;
- default: $r=Transformer_TransformPoint($this->_cPtr,$bDstToSrc,$inout_or_x,$y,$z);
- @@ -1356,7 +1367,7 @@
- return $r;
- }
- - public function TransformPoints($bDstToSrc,$nCount,$x,$y,$z,$panSuccess) {
- + function TransformPoints($bDstToSrc,$nCount,$x,$y,$z,$panSuccess) {
- return Transformer_TransformPoints($this->_cPtr,$bDstToSrc,$nCount,$x,$y,$z,$panSuccess);
- }
- }
- Index: swig/php/ogr.php
- ===================================================================
- --- swig/php/ogr.php (revision 21891)
- +++ swig/php/ogr.php (working copy)
- @@ -2,7 +2,7 @@
- /* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- - * Version 1.3.40
- + * Version 2.0.1
- *
- * This file is not intended to be easily readable and contains a number of
- * coding conventions designed to improve portability and efficiency. Do not make
- @@ -289,8 +289,8 @@
- return $r;
- }
- - static function Open($filename,$update=0) {
- - $r=Open($filename,$update);
- + static function Open($utf8_path,$update=0) {
- + $r=Open($utf8_path,$update);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- if (!class_exists($c)) {
- @@ -372,8 +372,8 @@
- $this->_cPtr=$h;
- }
- - public function CreateDataSource($name,$options=null) {
- - $r=Driver_CreateDataSource($this->_cPtr,$name,$options);
- + function CreateDataSource($utf8_path,$options=null) {
- + $r=Driver_CreateDataSource($this->_cPtr,$utf8_path,$options);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- if (!class_exists($c)) {
- @@ -384,7 +384,7 @@
- return $r;
- }
- - public function CopyDataSource($copy_ds,$utf8_path,$options=null) {
- + function CopyDataSource($copy_ds,$utf8_path,$options=null) {
- $r=Driver_CopyDataSource($this->_cPtr,$copy_ds,$utf8_path,$options);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -396,7 +396,7 @@
- return $r;
- }
- - public function Open($utf8_path,$update=0) {
- + function Open($utf8_path,$update=0) {
- $r=Driver_Open($this->_cPtr,$utf8_path,$update);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -408,23 +408,23 @@
- return $r;
- }
- - public function DeleteDataSource($name) {
- - return Driver_DeleteDataSource($this->_cPtr,$name);
- + function DeleteDataSource($utf8_path) {
- + return Driver_DeleteDataSource($this->_cPtr,$utf8_path);
- }
- - public function TestCapability($cap) {
- + function TestCapability($cap) {
- return Driver_TestCapability($this->_cPtr,$cap);
- }
- - public function GetName() {
- + function GetName() {
- return Driver_GetName($this->_cPtr);
- }
- - public function Register() {
- + function Register() {
- Driver_Register($this->_cPtr);
- }
- - public function Deregister() {
- + function Deregister() {
- Driver_Deregister($this->_cPtr);
- }
- }
- @@ -458,19 +458,19 @@
- $this->_cPtr=$h;
- }
- - public function GetRefCount() {
- + function GetRefCount() {
- return DataSource_GetRefCount($this->_cPtr);
- }
- - public function GetSummaryRefCount() {
- + function GetSummaryRefCount() {
- return DataSource_GetSummaryRefCount($this->_cPtr);
- }
- - public function GetLayerCount() {
- + function GetLayerCount() {
- return DataSource_GetLayerCount($this->_cPtr);
- }
- - public function GetDriver() {
- + function GetDriver() {
- $r=DataSource_GetDriver($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -482,15 +482,15 @@
- return $r;
- }
- - public function GetName() {
- + function GetName() {
- return DataSource_GetName($this->_cPtr);
- }
- - public function DeleteLayer($index) {
- + function DeleteLayer($index) {
- return DataSource_DeleteLayer($this->_cPtr,$index);
- }
- - public function CreateLayer($name,$srs=null,$geom_type=null,$options=null) {
- + function CreateLayer($name,$srs=null,$geom_type=null,$options=null) {
- switch (func_num_args()) {
- case 1: case 2: $r=DataSource_CreateLayer($this->_cPtr,$name,$srs); break;
- default: $r=DataSource_CreateLayer($this->_cPtr,$name,$srs,$geom_type,$options);
- @@ -505,7 +505,7 @@
- return $r;
- }
- - public function CopyLayer($src_layer,$new_name,$options=null) {
- + function CopyLayer($src_layer,$new_name,$options=null) {
- $r=DataSource_CopyLayer($this->_cPtr,$src_layer,$new_name,$options);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -517,7 +517,7 @@
- return $r;
- }
- - public function GetLayerByIndex($index=0) {
- + function GetLayerByIndex($index=0) {
- $r=DataSource_GetLayerByIndex($this->_cPtr,$index);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -529,7 +529,7 @@
- return $r;
- }
- - public function GetLayerByName($layer_name) {
- + function GetLayerByName($layer_name) {
- $r=DataSource_GetLayerByName($this->_cPtr,$layer_name);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -541,11 +541,11 @@
- return $r;
- }
- - public function TestCapability($cap) {
- + function TestCapability($cap) {
- return DataSource_TestCapability($this->_cPtr,$cap);
- }
- - public function ExecuteSQL($statement,$spatialFilter=null,$dialect="") {
- + function ExecuteSQL($statement,$spatialFilter=null,$dialect="") {
- $r=DataSource_ExecuteSQL($this->_cPtr,$statement,$spatialFilter,$dialect);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -557,7 +557,7 @@
- return $r;
- }
- - public function ReleaseResultSet($layer) {
- + function ReleaseResultSet($layer) {
- DataSource_ReleaseResultSet($this->_cPtr,$layer);
- }
- }
- @@ -584,19 +584,19 @@
- $this->_cPtr=$h;
- }
- - public function GetRefCount() {
- + function GetRefCount() {
- return Layer_GetRefCount($this->_cPtr);
- }
- - public function SetSpatialFilter($filter) {
- + function SetSpatialFilter($filter) {
- Layer_SetSpatialFilter($this->_cPtr,$filter);
- }
- - public function SetSpatialFilterRect($minx,$miny,$maxx,$maxy) {
- + function SetSpatialFilterRect($minx,$miny,$maxx,$maxy) {
- Layer_SetSpatialFilterRect($this->_cPtr,$minx,$miny,$maxx,$maxy);
- }
- - public function GetSpatialFilter() {
- + function GetSpatialFilter() {
- $r=Layer_GetSpatialFilter($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -608,31 +608,31 @@
- return $r;
- }
- - public function SetAttributeFilter($filter_string) {
- + function SetAttributeFilter($filter_string) {
- return Layer_SetAttributeFilter($this->_cPtr,$filter_string);
- }
- - public function ResetReading() {
- + function ResetReading() {
- Layer_ResetReading($this->_cPtr);
- }
- - public function GetName() {
- + function GetName() {
- return Layer_GetName($this->_cPtr);
- }
- - public function GetGeomType() {
- + function GetGeomType() {
- return Layer_GetGeomType($this->_cPtr);
- }
- - public function GetGeometryColumn() {
- + function GetGeometryColumn() {
- return Layer_GetGeometryColumn($this->_cPtr);
- }
- - public function GetFIDColumn() {
- + function GetFIDColumn() {
- return Layer_GetFIDColumn($this->_cPtr);
- }
- - public function GetFeature($fid) {
- + function GetFeature($fid) {
- $r=Layer_GetFeature($this->_cPtr,$fid);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -644,7 +644,7 @@
- return $r;
- }
- - public function GetNextFeature() {
- + function GetNextFeature() {
- $r=Layer_GetNextFeature($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -656,27 +656,27 @@
- return $r;
- }
- - public function SetNextByIndex($new_index) {
- + function SetNextByIndex($new_index) {
- return Layer_SetNextByIndex($this->_cPtr,$new_index);
- }
- - public function SetFeature($feature) {
- + function SetFeature($feature) {
- return Layer_SetFeature($this->_cPtr,$feature);
- }
- - public function CreateFeature($feature) {
- + function CreateFeature($feature) {
- return Layer_CreateFeature($this->_cPtr,$feature);
- }
- - public function DeleteFeature($fid) {
- + function DeleteFeature($fid) {
- return Layer_DeleteFeature($this->_cPtr,$fid);
- }
- - public function SyncToDisk() {
- + function SyncToDisk() {
- return Layer_SyncToDisk($this->_cPtr);
- }
- - public function GetLayerDefn() {
- + function GetLayerDefn() {
- $r=Layer_GetLayerDefn($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -688,35 +688,35 @@
- return $r;
- }
- - public function GetFeatureCount($force=1) {
- + function GetFeatureCount($force=1) {
- return Layer_GetFeatureCount($this->_cPtr,$force);
- }
- - public function GetExtent($force=1) {
- + function GetExtent($force=1) {
- return Layer_GetExtent($this->_cPtr,$force);
- }
- - public function TestCapability($cap) {
- + function TestCapability($cap) {
- return Layer_TestCapability($this->_cPtr,$cap);
- }
- - public function CreateField($field_def,$approx_ok=1) {
- + function CreateField($field_def,$approx_ok=1) {
- return Layer_CreateField($this->_cPtr,$field_def,$approx_ok);
- }
- - public function StartTransaction() {
- + function StartTransaction() {
- return Layer_StartTransaction($this->_cPtr);
- }
- - public function CommitTransaction() {
- + function CommitTransaction() {
- return Layer_CommitTransaction($this->_cPtr);
- }
- - public function RollbackTransaction() {
- + function RollbackTransaction() {
- return Layer_RollbackTransaction($this->_cPtr);
- }
- - public function GetSpatialRef() {
- + function GetSpatialRef() {
- $r=Layer_GetSpatialRef($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -728,11 +728,11 @@
- return $r;
- }
- - public function GetFeaturesRead() {
- + function GetFeaturesRead() {
- return Layer_GetFeaturesRead($this->_cPtr);
- }
- - public function SetIgnoredFields($options) {
- + function SetIgnoredFields($options) {
- return Layer_SetIgnoredFields($this->_cPtr,$options);
- }
- }
- @@ -756,7 +756,7 @@
- return $this->_pData[$var];
- }
- - public function __construct($feature_def) {
- + function __construct($feature_def) {
- if (is_resource($feature_def) && get_resource_type($feature_def) === '_p_OGRFeatureShadow') {
- $this->_cPtr=$feature_def;
- return;
- @@ -764,7 +764,7 @@
- $this->_cPtr=new_Feature($feature_def);
- }
- - public function GetDefnRef() {
- + function GetDefnRef() {
- $r=Feature_GetDefnRef($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -776,15 +776,15 @@
- return $r;
- }
- - public function SetGeometry($geom) {
- + function SetGeometry($geom) {
- return Feature_SetGeometry($this->_cPtr,$geom);
- }
- - public function SetGeometryDirectly($geom) {
- + function SetGeometryDirectly($geom) {
- return Feature_SetGeometryDirectly($this->_cPtr,$geom);
- }
- - public function GetGeometryRef() {
- + function GetGeometryRef() {
- $r=Feature_GetGeometryRef($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -796,7 +796,7 @@
- return $r;
- }
- - public function c_Clone() {
- + function c_Clone() {
- $r=Feature_c_Clone($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -808,15 +808,15 @@
- return $r;
- }
- - public function Equal($feature) {
- + function Equal($feature) {
- return Feature_Equal($this->_cPtr,$feature);
- }
- - public function GetFieldCount() {
- + function GetFieldCount() {
- return Feature_GetFieldCount($this->_cPtr);
- }
- - public function GetFieldDefnRef($id_or_name) {
- + function GetFieldDefnRef($id_or_name) {
- $r=Feature_GetFieldDefnRef($this->_cPtr,$id_or_name);
- if (!is_resource($r)) return $r;
- switch (get_resource_type($r)) {
- @@ -825,59 +825,59 @@
- }
- }
- - public function GetFieldAsString($id_or_name) {
- + function GetFieldAsString($id_or_name) {
- return Feature_GetFieldAsString($this->_cPtr,$id_or_name);
- }
- - public function GetFieldAsInteger($id_or_name) {
- + function GetFieldAsInteger($id_or_name) {
- return Feature_GetFieldAsInteger($this->_cPtr,$id_or_name);
- }
- - public function GetFieldAsDouble($id_or_name) {
- + function GetFieldAsDouble($id_or_name) {
- return Feature_GetFieldAsDouble($this->_cPtr,$id_or_name);
- }
- - public function GetFieldAsDateTime($id) {
- - Feature_GetFieldAsDateTime($this->_cPtr,$id);
- + function GetFieldAsDateTime($id) {
- + return Feature_GetFieldAsDateTime($this->_cPtr,$id);
- }
- - public function GetFieldAsIntegerList($id,$nLen,$pList) {
- + function GetFieldAsIntegerList($id,$nLen,$pList) {
- Feature_GetFieldAsIntegerList($this->_cPtr,$id,$nLen,$pList);
- }
- - public function GetFieldAsDoubleList($id,$nLen,$pList) {
- + function GetFieldAsDoubleList($id,$nLen,$pList) {
- Feature_GetFieldAsDoubleList($this->_cPtr,$id,$nLen,$pList);
- }
- - public function GetFieldAsStringList($id,$pList) {
- + function GetFieldAsStringList($id,$pList) {
- Feature_GetFieldAsStringList($this->_cPtr,$id,$pList);
- }
- - public function IsFieldSet($id_or_name) {
- + function IsFieldSet($id_or_name) {
- return Feature_IsFieldSet($this->_cPtr,$id_or_name);
- }
- - public function GetFieldIndex($name) {
- + function GetFieldIndex($name) {
- return Feature_GetFieldIndex($this->_cPtr,$name);
- }
- - public function GetFID() {
- + function GetFID() {
- return Feature_GetFID($this->_cPtr);
- }
- - public function SetFID($fid) {
- + function SetFID($fid) {
- return Feature_SetFID($this->_cPtr,$fid);
- }
- - public function DumpReadable() {
- + function DumpReadable() {
- Feature_DumpReadable($this->_cPtr);
- }
- - public function UnsetField($id_or_name) {
- + function UnsetField($id_or_name) {
- Feature_UnsetField($this->_cPtr,$id_or_name);
- }
- - public function SetField($id_or_name,$value_or_year,$month=null,$day=null,$hour=null,$minute=null,$second=null,$tzflag=null) {
- + function SetField($id_or_name,$value_or_year,$month=null,$day=null,$hour=null,$minute=null,$second=null,$tzflag=null) {
- switch (func_num_args()) {
- case 2: Feature_SetField($this->_cPtr,$id_or_name,$value_or_year); break;
- case 3: Feature_SetField($this->_cPtr,$id_or_name,$value_or_year,$month); break;
- @@ -889,31 +889,35 @@
- }
- }
- - public function SetFieldIntegerList($id,$nList) {
- + function SetFieldIntegerList($id,$nList) {
- Feature_SetFieldIntegerList($this->_cPtr,$id,$nList);
- }
- - public function SetFieldDoubleList($id,$nList,$pList) {
- + function SetFieldDoubleList($id,$nList,$pList) {
- Feature_SetFieldDoubleList($this->_cPtr,$id,$nList,$pList);
- }
- - public function SetFieldStringList($id,$pList) {
- + function SetFieldStringList($id,$pList) {
- Feature_SetFieldStringList($this->_cPtr,$id,$pList);
- }
- - public function SetFrom($other,$forgiving=1) {
- + function SetFrom($other,$forgiving=1) {
- return Feature_SetFrom($this->_cPtr,$other,$forgiving);
- }
- - public function GetStyleString() {
- + function SetFromWithMap($other,$forgiving,$nList) {
- + return Feature_SetFromWithMap($this->_cPtr,$other,$forgiving,$nList);
- + }
- +
- + function GetStyleString() {
- return Feature_GetStyleString($this->_cPtr);
- }
- - public function SetStyleString($the_string) {
- + function SetStyleString($the_string) {
- Feature_SetStyleString($this->_cPtr,$the_string);
- }
- - public function GetFieldType($id_or_name) {
- + function GetFieldType($id_or_name) {
- return Feature_GetFieldType($this->_cPtr,$id_or_name);
- }
- }
- @@ -937,27 +941,26 @@
- return $this->_pData[$var];
- }
- - public function __construct($name_null_ok=null) {
- + function __construct($name_null_ok=null) {
- if (is_resource($name_null_ok) && get_resource_type($name_null_ok) === '_p_OGRFeatureDefnShadow') {
- $this->_cPtr=$name_null_ok;
- return;
- }
- - $this->_cPtr=$r;
- switch (func_num_args()) {
- case 0: $this->_cPtr=new_FeatureDefn(); break;
- default: $this->_cPtr=new_FeatureDefn($name_null_ok);
- }
- }
- - public function GetName() {
- + function GetName() {
- return FeatureDefn_GetName($this->_cPtr);
- }
- - public function GetFieldCount() {
- + function GetFieldCount() {
- return FeatureDefn_GetFieldCount($this->_cPtr);
- }
- - public function GetFieldDefn($i) {
- + function GetFieldDefn($i) {
- $r=FeatureDefn_GetFieldDefn($this->_cPtr,$i);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -969,39 +972,39 @@
- return $r;
- }
- - public function GetFieldIndex($name) {
- + function GetFieldIndex($name) {
- return FeatureDefn_GetFieldIndex($this->_cPtr,$name);
- }
- - public function AddFieldDefn($defn) {
- + function AddFieldDefn($defn) {
- FeatureDefn_AddFieldDefn($this->_cPtr,$defn);
- }
- - public function GetGeomType() {
- + function GetGeomType() {
- return FeatureDefn_GetGeomType($this->_cPtr);
- }
- - public function SetGeomType($geom_type) {
- + function SetGeomType($geom_type) {
- FeatureDefn_SetGeomType($this->_cPtr,$geom_type);
- }
- - public function GetReferenceCount() {
- + function GetReferenceCount() {
- return FeatureDefn_GetReferenceCount($this->_cPtr);
- }
- - public function IsGeometryIgnored() {
- + function IsGeometryIgnored() {
- return FeatureDefn_IsGeometryIgnored($this->_cPtr);
- }
- - public function SetGeometryIgnored($bIgnored) {
- + function SetGeometryIgnored($bIgnored) {
- FeatureDefn_SetGeometryIgnored($this->_cPtr,$bIgnored);
- }
- - public function IsStyleIgnored() {
- + function IsStyleIgnored() {
- return FeatureDefn_IsStyleIgnored($this->_cPtr);
- }
- - public function SetStyleIgnored($bIgnored) {
- + function SetStyleIgnored($bIgnored) {
- FeatureDefn_SetStyleIgnored($this->_cPtr,$bIgnored);
- }
- }
- @@ -1025,75 +1028,74 @@
- return $this->_pData[$var];
- }
- - public function __construct($name_null_ok="unnamed",$field_type=null) {
- + function __construct($name_null_ok="unnamed",$field_type=null) {
- if (is_resource($name_null_ok) && get_resource_type($name_null_ok) === '_p_OGRFieldDefnShadow') {
- $this->_cPtr=$name_null_ok;
- return;
- }
- - $this->_cPtr=$r;
- switch (func_num_args()) {
- case 0: case 1: $this->_cPtr=new_FieldDefn($name_null_ok); break;
- default: $this->_cPtr=new_FieldDefn($name_null_ok,$field_type);
- }
- }
- - public function GetName() {
- + function GetName() {
- return FieldDefn_GetName($this->_cPtr);
- }
- - public function GetNameRef() {
- + function GetNameRef() {
- return FieldDefn_GetNameRef($this->_cPtr);
- }
- - public function SetName($name) {
- + function SetName($name) {
- FieldDefn_SetName($this->_cPtr,$name);
- }
- - public function GetType() {
- + function GetType() {
- return FieldDefn_GetType($this->_cPtr);
- }
- - public function SetType($type) {
- + function SetType($type) {
- FieldDefn_SetType($this->_cPtr,$type);
- }
- - public function GetJustify() {
- + function GetJustify() {
- return FieldDefn_GetJustify($this->_cPtr);
- }
- - public function SetJustify($justify) {
- + function SetJustify($justify) {
- FieldDefn_SetJustify($this->_cPtr,$justify);
- }
- - public function GetWidth() {
- + function GetWidth() {
- return FieldDefn_GetWidth($this->_cPtr);
- }
- - public function SetWidth($width) {
- + function SetWidth($width) {
- FieldDefn_SetWidth($this->_cPtr,$width);
- }
- - public function GetPrecision() {
- + function GetPrecision() {
- return FieldDefn_GetPrecision($this->_cPtr);
- }
- - public function SetPrecision($precision) {
- + function SetPrecision($precision) {
- FieldDefn_SetPrecision($this->_cPtr,$precision);
- }
- - public function GetTypeName() {
- + function GetTypeName() {
- return FieldDefn_GetTypeName($this->_cPtr);
- }
- - public function GetFieldTypeName($type) {
- + function GetFieldTypeName($type) {
- return FieldDefn_GetFieldTypeName($this->_cPtr,$type);
- }
- - public function IsIgnored() {
- + function IsIgnored() {
- return FieldDefn_IsIgnored($this->_cPtr);
- }
- - public function SetIgnored($bIgnored) {
- + function SetIgnored($bIgnored) {
- FieldDefn_SetIgnored($this->_cPtr,$bIgnored);
- }
- }
- @@ -1117,12 +1119,11 @@
- return $this->_pData[$var];
- }
- - public function __construct($type=null,$wkt=null,$wkb=0,$gml=null) {
- + function __construct($type=null,$wkt=null,$wkb=0,$gml=null) {
- if (is_resource($type) && get_resource_type($type) === '_p_OGRGeometryShadow') {
- $this->_cPtr=$type;
- return;
- }
- - $this->_cPtr=$r;
- switch (func_num_args()) {
- case 0: $this->_cPtr=new_Geometry(); break;
- case 1: $this->_cPtr=new_Geometry($type); break;
- @@ -1131,11 +1132,11 @@
- }
- }
- - public function ExportToWkt() {
- + function ExportToWkt() {
- return Geometry_ExportToWkt($this->_cPtr);
- }
- - public function ExportToWkb($byte_order=null) {
- + function ExportToWkb($byte_order=null) {
- switch (func_num_args()) {
- case 0: $r=Geometry_ExportToWkb($this->_cPtr); break;
- default: $r=Geometry_ExportToWkb($this->_cPtr,$byte_order);
- @@ -1143,11 +1144,11 @@
- return $r;
- }
- - public function ExportToGML() {
- + function ExportToGML() {
- return Geometry_ExportToGML($this->_cPtr);
- }
- - public function ExportToKML($altitude_mode=null) {
- + function ExportToKML($altitude_mode=null) {
- switch (func_num_args()) {
- case 0: $r=Geometry_ExportToKML($this->_cPtr); break;
- default: $r=Geometry_ExportToKML($this->_cPtr,$altitude_mode);
- @@ -1155,27 +1156,27 @@
- return $r;
- }
- - public function ExportToJson() {
- + function ExportToJson() {
- return Geometry_ExportToJson($this->_cPtr);
- }
- - public function AddPoint($x,$y,$z=0.0) {
- + function AddPoint($x,$y,$z=0.0) {
- Geometry_AddPoint($this->_cPtr,$x,$y,$z);
- }
- - public function AddPoint_2D($x,$y) {
- + function AddPoint_2D($x,$y) {
- Geometry_AddPoint_2D($this->_cPtr,$x,$y);
- }
- - public function AddGeometryDirectly($other_disown) {
- + function AddGeometryDirectly($other_disown) {
- return Geometry_AddGeometryDirectly($this->_cPtr,$other_disown);
- }
- - public function AddGeometry($other) {
- + function AddGeometry($other) {
- return Geometry_AddGeometry($this->_cPtr,$other);
- }
- - public function c_Clone() {
- + function c_Clone() {
- $r=Geometry_c_Clone($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1187,63 +1188,63 @@
- return $r;
- }
- - public function GetGeometryType() {
- + function GetGeometryType() {
- return Geometry_GetGeometryType($this->_cPtr);
- }
- - public function GetGeometryName() {
- + function GetGeometryName() {
- return Geometry_GetGeometryName($this->_cPtr);
- }
- - public function Length() {
- + function Length() {
- return Geometry_Length($this->_cPtr);
- }
- - public function Area() {
- + function Area() {
- return Geometry_Area($this->_cPtr);
- }
- - public function GetArea() {
- + function GetArea() {
- return Geometry_GetArea($this->_cPtr);
- }
- - public function GetPointCount() {
- + function GetPointCount() {
- return Geometry_GetPointCount($this->_cPtr);
- }
- - public function GetX($point=0) {
- + function GetX($point=0) {
- return Geometry_GetX($this->_cPtr,$point);
- }
- - public function GetY($point=0) {
- + function GetY($point=0) {
- return Geometry_GetY($this->_cPtr,$point);
- }
- - public function GetZ($point=0) {
- + function GetZ($point=0) {
- return Geometry_GetZ($this->_cPtr,$point);
- }
- - public function GetPoint($iPoint=0) {
- - Geometry_GetPoint($this->_cPtr,$iPoint);
- + function GetPoint($iPoint=0) {
- + return Geometry_GetPoint($this->_cPtr,$iPoint);
- }
- - public function GetPoint_2D($iPoint=0) {
- - Geometry_GetPoint_2D($this->_cPtr,$iPoint);
- + function GetPoint_2D($iPoint=0) {
- + return Geometry_GetPoint_2D($this->_cPtr,$iPoint);
- }
- - public function GetGeometryCount() {
- + function GetGeometryCount() {
- return Geometry_GetGeometryCount($this->_cPtr);
- }
- - public function SetPoint($point,$x,$y,$z=0.0) {
- + function SetPoint($point,$x,$y,$z=0.0) {
- Geometry_SetPoint($this->_cPtr,$point,$x,$y,$z);
- }
- - public function SetPoint_2D($point,$x,$y) {
- + function SetPoint_2D($point,$x,$y) {
- Geometry_SetPoint_2D($this->_cPtr,$point,$x,$y);
- }
- - public function GetGeometryRef($geom) {
- + function GetGeometryRef($geom) {
- $r=Geometry_GetGeometryRef($this->_cPtr,$geom);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1255,7 +1256,7 @@
- return $r;
- }
- - public function Simplify($tolerance) {
- + function Simplify($tolerance) {
- $r=Geometry_Simplify($this->_cPtr,$tolerance);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1267,7 +1268,7 @@
- return $r;
- }
- - public function Boundary() {
- + function Boundary() {
- $r=Geometry_Boundary($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1279,7 +1280,7 @@
- return $r;
- }
- - public function GetBoundary() {
- + function GetBoundary() {
- $r=Geometry_GetBoundary($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1291,7 +1292,7 @@
- return $r;
- }
- - public function ConvexHull() {
- + function ConvexHull() {
- $r=Geometry_ConvexHull($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1303,7 +1304,7 @@
- return $r;
- }
- - public function Buffer($distance,$quadsecs=30) {
- + function Buffer($distance,$quadsecs=30) {
- $r=Geometry_Buffer($this->_cPtr,$distance,$quadsecs);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1315,7 +1316,7 @@
- return $r;
- }
- - public function Intersection($other) {
- + function Intersection($other) {
- $r=Geometry_Intersection($this->_cPtr,$other);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1327,7 +1328,7 @@
- return $r;
- }
- - public function Union($other) {
- + function Union($other) {
- $r=Geometry_Union($this->_cPtr,$other);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1339,7 +1340,7 @@
- return $r;
- }
- - public function UnionCascaded() {
- + function UnionCascaded() {
- $r=Geometry_UnionCascaded($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1351,7 +1352,7 @@
- return $r;
- }
- - public function Difference($other) {
- + function Difference($other) {
- $r=Geometry_Difference($this->_cPtr,$other);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1363,7 +1364,7 @@
- return $r;
- }
- - public function SymDifference($other) {
- + function SymDifference($other) {
- $r=Geometry_SymDifference($this->_cPtr,$other);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1375,7 +1376,7 @@
- return $r;
- }
- - public function SymmetricDifference($other) {
- + function SymmetricDifference($other) {
- $r=Geometry_SymmetricDifference($this->_cPtr,$other);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1387,79 +1388,79 @@
- return $r;
- }
- - public function Distance($other) {
- + function Distance($other) {
- return Geometry_Distance($this->_cPtr,$other);
- }
- - public function c_Empty() {
- + function c_Empty() {
- Geometry_c_Empty($this->_cPtr);
- }
- - public function IsEmpty() {
- + function IsEmpty() {
- return Geometry_IsEmpty($this->_cPtr);
- }
- - public function IsValid() {
- + function IsValid() {
- return Geometry_IsValid($this->_cPtr);
- }
- - public function IsSimple() {
- + function IsSimple() {
- return Geometry_IsSimple($this->_cPtr);
- }
- - public function IsRing() {
- + function IsRing() {
- return Geometry_IsRing($this->_cPtr);
- }
- - public function Intersects($other) {
- + function Intersects($other) {
- return Geometry_Intersects($this->_cPtr,$other);
- }
- - public function Intersect($other) {
- + function Intersect($other) {
- return Geometry_Intersect($this->_cPtr,$other);
- }
- - public function Equals($other) {
- + function Equals($other) {
- return Geometry_Equals($this->_cPtr,$other);
- }
- - public function Equal($other) {
- + function Equal($other) {
- return Geometry_Equal($this->_cPtr,$other);
- }
- - public function Disjoint($other) {
- + function Disjoint($other) {
- return Geometry_Disjoint($this->_cPtr,$other);
- }
- - public function Touches($other) {
- + function Touches($other) {
- return Geometry_Touches($this->_cPtr,$other);
- }
- - public function Crosses($other) {
- + function Crosses($other) {
- return Geometry_Crosses($this->_cPtr,$other);
- }
- - public function Within($other) {
- + function Within($other) {
- return Geometry_Within($this->_cPtr,$other);
- }
- - public function Contains($other) {
- + function Contains($other) {
- return Geometry_Contains($this->_cPtr,$other);
- }
- - public function Overlaps($other) {
- + function Overlaps($other) {
- return Geometry_Overlaps($this->_cPtr,$other);
- }
- - public function TransformTo($reference) {
- + function TransformTo($reference) {
- return Geometry_TransformTo($this->_cPtr,$reference);
- }
- - public function Transform($trans) {
- + function Transform($trans) {
- return Geometry_Transform($this->_cPtr,$trans);
- }
- - public function GetSpatialReference() {
- + function GetSpatialReference() {
- $r=Geometry_GetSpatialReference($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1471,27 +1472,27 @@
- return $r;
- }
- - public function AssignSpatialReference($reference) {
- + function AssignSpatialReference($reference) {
- Geometry_AssignSpatialReference($this->_cPtr,$reference);
- }
- - public function CloseRings() {
- + function CloseRings() {
- Geometry_CloseRings($this->_cPtr);
- }
- - public function FlattenTo2D() {
- + function FlattenTo2D() {
- Geometry_FlattenTo2D($this->_cPtr);
- }
- - public function Segmentize($dfMaxLength) {
- + function Segmentize($dfMaxLength) {
- Geometry_Segmentize($this->_cPtr,$dfMaxLength);
- }
- - public function GetEnvelope() {
- - Geometry_GetEnvelope($this->_cPtr);
- + function GetEnvelope() {
- + return Geometry_GetEnvelope($this->_cPtr);
- }
- - public function Centroid() {
- + function Centroid() {
- $r=Geometry_Centroid($this->_cPtr);
- if (is_resource($r)) {
- $c=substr(get_resource_type($r), (strpos(get_resource_type($r), '__') ? strpos(get_resource_type($r), '__') + 2 : 3));
- @@ -1503,19 +1504,19 @@
- return $r;
- }
- - public function WkbSize() {
- + function WkbSize() {
- return Geometry_WkbSize($this->_cPtr);
- }
- - public function GetCoordinateDimension() {
- + function GetCoordinateDimension() {
- return Geometry_GetCoordinateDimension($this->_cPtr);
- }
- - public function SetCoordinateDimension($dimension) {
- + function SetCoordinateDimension($dimension) {
- Geometry_SetCoordinateDimension($this->_cPtr,$dimension);
- }
- - public function GetDimension() {
- + function GetDimension() {
- return Geometry_GetDimension($this->_cPtr);
- }
- }
- Index: swig/php/osr_wrap.cpp
- ===================================================================
- --- swig/php/osr_wrap.cpp (revision 21891)
- +++ swig/php/osr_wrap.cpp (working copy)
- @@ -1,6 +1,6 @@
- /* ----------------------------------------------------------------------------
- * This file was automatically generated by SWIG (http://www.swig.org).
- - * Version 1.3.40
- + * Version 2.0.1
- *
- * This file is not intended to be easily readable and contains a number of
- * coding conventions designed to improve portability and efficiency. Do not make
- @@ -196,7 +196,7 @@
- /*
- Flags/methods for returning states.
- - The SWIG conversion methods, as ConvertPtr, return and integer
- + The SWIG conversion methods, as ConvertPtr, return an integer
- that tells if the conversion was successful or not. And if not,
- an error code can be returned (see swigerrors.swg for the codes).
- @@ -728,9 +728,6 @@
- #endif
- /* -----------------------------------------------------------------------------
- - * See the LICENSE file for information on copyright, usage and redistribution
- - * of SWIG, and the README file for authors - http://www.swig.org/release.html.
- - *
- * phprun.swg
- *
- * PHP runtime library
- @@ -741,6 +738,7 @@
- #endif
- #include "zend.h"
- #include "zend_API.h"
- +#include "zend_exceptions.h"
- #include "php.h"
- #include "ext/standard/php_string.h"
- @@ -755,17 +753,17 @@
- #endif
- #ifndef Z_SET_ISREF_P
- -// For PHP < 5.3
- +/* For PHP < 5.3 */
- # define Z_SET_ISREF_P(z) (z)->is_ref = 1
- #endif
- #ifndef Z_SET_REFCOUNT_P
- -// For PHP < 5.3
- +/* For PHP < 5.3 */
- # define Z_SET_REFCOUNT_P(z, rc) (z)->refcount = (rc)
- #endif
- #define SWIG_LONG_CONSTANT(N, V) zend_register_long_constant((char*)#N, sizeof(#N), V, CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC)
- #define SWIG_DOUBLE_CONSTANT(N, V) zend_register_double_constant((char*)#N, sizeof(#N), V, CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC)
- -#define SWIG_STRING_CONSTANT(N, V) zend_register_stringl_constant((char*)#N, sizeof(#N), V, strlen(V), CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC)
- +#define SWIG_STRING_CONSTANT(N, V) zend_register_stringl_constant((char*)#N, sizeof(#N), (char*)(V), strlen(V), CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC)
- #define SWIG_CHAR_CONSTANT(N, V) do {\
- static char swig_char = (V);\
- zend_register_stringl_constant((char*)#N, sizeof(#N), &swig_char, 1, CONST_CS | CONST_PERSISTENT, module_number TSRMLS_CC);\
- @@ -1162,23 +1160,29 @@
- }
- -static char *
- +
- +#include "ogr_core.h"
- +static char const *
- OGRErrMessages( int rc ) {
- switch( rc ) {
- - case 0:
- - return "OGR Error 0: None";
- - case 1:
- - return "OGR Error 1: Not enough data";
- - case 2:
- - return "OGR Error 2: Unsupported geometry type";
- - case 3:
- - return "OGR Error 3: Unsupported operation";
- - case 4:
- - return "OGR Error 4: Corrupt data";
- - case 5:
- - return "OGR Error 5: General Error";
- - case 6:
- - return "OGR Error 6: Unsupported SRS";
- + case OGRERR_NONE:
- + return "OGR Error: None";
- + case OGRERR_NOT_ENOUGH_DATA:
- + return "OGR Error: Not enough data to deserialize";
- + case OGRERR_NOT_ENOUGH_MEMORY:
- + return "OGR Error: Not enough memory";
- + case OGRERR_UNSUPPORTED_GEOMETRY_TYPE:
- + return "OGR Error: Unsupported geometry type";
- + case OGRERR_UNSUPPORTED_OPERATION:
- + return "OGR Error: Unsupported operation";
- + case OGRERR_CORRUPT_DATA:
- + return "OGR Error: Corrupt data";
- + case OGRERR_FAILURE:
- + return "OGR Error: General Error";
- + case OGRERR_UNSUPPORTED_SRS:
- + return "OGR Error: Unsupported SRS";
- + case OGRERR_INVALID_HANDLE:
- + return "OGR Error: Invalid handle";
- default:
- return "OGR Error: Unknown";
- }
- @@ -1684,7 +1688,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -1724,7 +1728,9 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- @@ -1733,7 +1739,7 @@
- if ( *arg2 )
- CPLFree( *arg2 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -1754,7 +1760,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -1794,7 +1800,9 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- @@ -1803,7 +1811,7 @@
- if ( *arg2 )
- CPLFree( *arg2 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -1816,12 +1824,24 @@
- }
- result = (char **)OPTGetProjectionMethods();
- -
- - SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_p_char, 0);
- -
- + {
- + /* %typemap(out) char ** -> ( string ) */
- + char **stringarray = result;
- + if ( stringarray == NULL ) {
- + RETVAL_NULL();
- + }
- + else {
- + int len = CSLCount( stringarray );
- + array_init(return_value);
- + for ( int i = 0; i < len; ++i, ++stringarray ) {
- + add_next_index_string( return_value, *stringarray, 1 );
- + }
- + }
- + CSLDestroy(result);
- + }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -1837,7 +1857,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -1852,12 +1872,24 @@
- }
- }
- result = (char **)OPTGetParameterList(arg1,arg2);
- -
- - SWIG_SetPointerZval(return_value, (void *)result, SWIGTYPE_p_p_char, 0);
- -
- + {
- + /* %typemap(out) char ** -> ( string ) */
- + char **stringarray = result;
- + if ( stringarray == NULL ) {
- + RETVAL_NULL();
- + }
- + else {
- + int len = CSLCount( stringarray );
- + array_init(return_value);
- + for ( int i = 0; i < len; ++i, ++stringarray ) {
- + add_next_index_string( return_value, *stringarray, 1 );
- + }
- + }
- + CSLDestroy(result);
- + }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -1875,7 +1907,7 @@
- }
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -1885,7 +1917,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -1913,7 +1945,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -1930,7 +1962,7 @@
- WRONG_PARAM_COUNT;
- if(arg_count > 0) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[0])->type==IS_NULL) {
- arg1 = (char *) 0;
- } else {
- @@ -1946,7 +1978,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -1965,7 +1997,7 @@
- delete_OSRSpatialReferenceShadow(arg1);
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -1996,7 +2028,7 @@
- delete [] result;
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2033,7 +2065,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2070,7 +2102,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2096,7 +2128,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2122,7 +2154,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2148,7 +2180,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2174,7 +2206,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2198,7 +2230,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -2208,7 +2240,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[2])->type==IS_NULL) {
- arg3 = (char *) 0;
- } else {
- @@ -2218,7 +2250,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[3]);
- arg4 = (int) Z_LVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -2232,11 +2264,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2261,7 +2295,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -2271,7 +2305,7 @@
- /*@SWIG@*/;
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -2292,7 +2326,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2315,7 +2349,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -2325,7 +2359,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[2])->type==IS_NULL) {
- arg3 = (char *) 0;
- } else {
- @@ -2348,11 +2382,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2375,7 +2411,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -2385,7 +2421,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -2404,11 +2440,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2434,7 +2472,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2457,7 +2495,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -2467,7 +2505,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -2486,11 +2524,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2513,7 +2553,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -2523,7 +2563,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -2542,11 +2582,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2572,7 +2614,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2602,7 +2644,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2624,7 +2666,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -2643,7 +2685,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2665,7 +2707,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -2684,7 +2726,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2709,13 +2751,13 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -2730,11 +2772,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2760,7 +2804,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2787,20 +2831,20 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (int) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- }
- if(arg_count > 3) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[3])->type==IS_NULL) {
- arg4 = (char *) 0;
- } else {
- @@ -2811,7 +2855,7 @@
- }
- if(arg_count > 4) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -2826,11 +2870,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2859,11 +2905,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2885,7 +2933,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -2903,11 +2951,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2930,7 +2980,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -2940,7 +2990,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -2959,11 +3009,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -2988,7 +3040,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -2998,7 +3050,7 @@
- /*@SWIG@*/;
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -3015,7 +3067,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3038,7 +3090,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -3048,7 +3100,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -3067,11 +3119,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3096,7 +3150,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -3106,7 +3160,7 @@
- /*@SWIG@*/;
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -3123,7 +3177,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3149,7 +3203,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3175,7 +3229,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3201,7 +3255,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3228,37 +3282,37 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[5]);
- arg6 = (double) Z_DVAL_PP(args[5]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[6]);
- arg7 = (double) Z_DVAL_PP(args[6]);
- /*@SWIG@*/;
- @@ -3272,11 +3326,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3301,25 +3357,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -3333,11 +3389,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3362,25 +3420,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -3394,11 +3452,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3423,25 +3483,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -3455,11 +3515,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3484,25 +3546,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -3516,11 +3578,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3547,37 +3611,37 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[5]);
- arg6 = (double) Z_DVAL_PP(args[5]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[6]);
- arg7 = (double) Z_DVAL_PP(args[6]);
- /*@SWIG@*/;
- @@ -3591,11 +3655,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3619,19 +3685,19 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -3645,11 +3711,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3673,19 +3741,19 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -3699,11 +3767,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3728,25 +3798,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -3760,11 +3830,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3790,31 +3862,31 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[5]);
- arg6 = (double) Z_DVAL_PP(args[5]);
- /*@SWIG@*/;
- @@ -3828,11 +3900,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3858,31 +3932,31 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[5]);
- arg6 = (double) Z_DVAL_PP(args[5]);
- /*@SWIG@*/;
- @@ -3896,11 +3970,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3924,19 +4000,19 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -3950,11 +4026,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -3978,19 +4056,19 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -4004,11 +4082,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4033,25 +4113,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -4065,11 +4145,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4094,25 +4176,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -4126,11 +4208,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4158,43 +4242,43 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[5]);
- arg6 = (double) Z_DVAL_PP(args[5]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[6]);
- arg7 = (double) Z_DVAL_PP(args[6]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[7]);
- arg8 = (double) Z_DVAL_PP(args[7]);
- /*@SWIG@*/;
- @@ -4208,11 +4292,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4241,49 +4327,49 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[5]);
- arg6 = (double) Z_DVAL_PP(args[5]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[6]);
- arg7 = (double) Z_DVAL_PP(args[6]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[7]);
- arg8 = (double) Z_DVAL_PP(args[7]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[8]);
- arg9 = (double) Z_DVAL_PP(args[8]);
- /*@SWIG@*/;
- @@ -4297,11 +4383,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4329,43 +4417,43 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[5]);
- arg6 = (double) Z_DVAL_PP(args[5]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[6]);
- arg7 = (double) Z_DVAL_PP(args[6]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[7]);
- arg8 = (double) Z_DVAL_PP(args[7]);
- /*@SWIG@*/;
- @@ -4379,11 +4467,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4408,25 +4498,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -4440,11 +4530,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4471,37 +4563,37 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[5]);
- arg6 = (double) Z_DVAL_PP(args[5]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[6]);
- arg7 = (double) Z_DVAL_PP(args[6]);
- /*@SWIG@*/;
- @@ -4515,11 +4607,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4545,31 +4639,31 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[5]);
- arg6 = (double) Z_DVAL_PP(args[5]);
- /*@SWIG@*/;
- @@ -4583,11 +4677,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4614,37 +4710,37 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[5]);
- arg6 = (double) Z_DVAL_PP(args[5]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[6]);
- arg7 = (double) Z_DVAL_PP(args[6]);
- /*@SWIG@*/;
- @@ -4658,11 +4754,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4687,25 +4785,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -4719,11 +4817,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4749,31 +4849,31 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[5]);
- arg6 = (double) Z_DVAL_PP(args[5]);
- /*@SWIG@*/;
- @@ -4787,11 +4887,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4815,19 +4917,19 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -4841,11 +4943,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4870,25 +4974,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -4902,11 +5006,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4932,31 +5038,31 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[5]);
- arg6 = (double) Z_DVAL_PP(args[5]);
- /*@SWIG@*/;
- @@ -4970,11 +5076,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -4999,25 +5107,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -5031,11 +5139,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5060,25 +5170,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -5092,11 +5202,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5122,31 +5234,31 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[5]);
- arg6 = (double) Z_DVAL_PP(args[5]);
- /*@SWIG@*/;
- @@ -5160,11 +5272,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5188,19 +5302,19 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -5214,11 +5328,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5242,19 +5358,19 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -5268,11 +5384,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5298,31 +5416,31 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[5]);
- arg6 = (double) Z_DVAL_PP(args[5]);
- /*@SWIG@*/;
- @@ -5336,11 +5454,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5365,25 +5485,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -5397,11 +5517,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5427,31 +5549,31 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[5]);
- arg6 = (double) Z_DVAL_PP(args[5]);
- /*@SWIG@*/;
- @@ -5465,11 +5587,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5496,7 +5620,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -5506,31 +5630,31 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[5]);
- arg6 = (double) Z_DVAL_PP(args[5]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[6]);
- arg7 = (double) Z_DVAL_PP(args[6]);
- /*@SWIG@*/;
- @@ -5544,11 +5668,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5573,25 +5699,25 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -5605,11 +5731,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5635,31 +5763,31 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[5]);
- arg6 = (double) Z_DVAL_PP(args[5]);
- /*@SWIG@*/;
- @@ -5673,11 +5801,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5701,19 +5831,19 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -5727,11 +5857,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5753,7 +5885,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -5776,11 +5908,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5802,7 +5936,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -5825,11 +5959,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5869,11 +6005,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -5903,46 +6041,46 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg2 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg3 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg4 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- if(arg_count > 4) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- }
- if(arg_count > 5) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[5]);
- arg6 = (double) Z_DVAL_PP(args[5]);
- /*@SWIG@*/;
- }
- if(arg_count > 6) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[6]);
- arg7 = (double) Z_DVAL_PP(args[6]);
- /*@SWIG@*/;
- }
- if(arg_count > 7) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[7]);
- arg8 = (double) Z_DVAL_PP(args[7]);
- /*@SWIG@*/;
- @@ -5957,11 +6095,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6001,11 +6141,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6027,7 +6169,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -6045,11 +6187,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6081,7 +6225,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -6091,7 +6235,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[2])->type==IS_NULL) {
- arg3 = (char *) 0;
- } else {
- @@ -6101,7 +6245,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[3])->type==IS_NULL) {
- arg4 = (char *) 0;
- } else {
- @@ -6111,19 +6255,19 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[4]);
- arg5 = (double) Z_DVAL_PP(args[4]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[5]);
- arg6 = (double) Z_DVAL_PP(args[5]);
- /*@SWIG@*/;
- if(arg_count > 6) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[6])->type==IS_NULL) {
- arg7 = (char *) 0;
- } else {
- @@ -6134,14 +6278,14 @@
- }
- if(arg_count > 7) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[7]);
- arg8 = (double) Z_DVAL_PP(args[7]);
- /*@SWIG@*/;
- }
- if(arg_count > 8) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[8])->type==IS_NULL) {
- arg9 = (char *) 0;
- } else {
- @@ -6152,7 +6296,7 @@
- }
- if(arg_count > 9) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[9]);
- arg10 = (double) Z_DVAL_PP(args[9]);
- /*@SWIG@*/;
- @@ -6167,11 +6311,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6195,7 +6341,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -6219,11 +6365,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6259,11 +6407,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6285,7 +6435,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -6303,11 +6453,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6329,7 +6481,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -6347,11 +6499,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6398,7 +6552,9 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- @@ -6406,7 +6562,7 @@
- /* %typemap(freearg) char **options */
- CSLDestroy( arg2 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6428,7 +6584,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -6442,11 +6598,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6468,7 +6626,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -6482,11 +6640,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6513,7 +6673,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -6523,7 +6683,7 @@
- /*@SWIG@*/;
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[2])->type==IS_NULL) {
- arg3 = (char *) 0;
- } else {
- @@ -6552,11 +6712,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6584,13 +6746,13 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (long) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- if(arg_count > 2) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[2]);
- arg3 = (long) Z_LVAL_PP(args[2]);
- /*@SWIG@*/;
- @@ -6607,7 +6769,7 @@
- }
- }
- if(arg_count > 4) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[4]);
- arg5 = (long) Z_LVAL_PP(args[4]);
- /*@SWIG@*/;
- @@ -6622,11 +6784,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6648,7 +6812,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -6666,11 +6830,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6694,7 +6860,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -6704,7 +6870,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[2])->type==IS_NULL) {
- arg3 = (char *) 0;
- } else {
- @@ -6714,7 +6880,7 @@
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[3])->type==IS_NULL) {
- arg4 = (char *) 0;
- } else {
- @@ -6732,11 +6898,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6758,7 +6926,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg2 = (char *) 0;
- } else {
- @@ -6776,11 +6944,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6832,7 +7002,9 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- @@ -6841,7 +7013,7 @@
- if ( *arg2 )
- CPLFree( *arg2 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6871,7 +7043,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg3 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -6903,7 +7075,9 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- @@ -6912,7 +7086,7 @@
- if ( *arg2 )
- CPLFree( *arg2 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -6964,7 +7138,9 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- @@ -6973,7 +7149,7 @@
- if ( *arg2 )
- CPLFree( *arg2 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7063,7 +7239,9 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- @@ -7081,7 +7259,7 @@
- /* %typemap(freearg) (double *argout[ANY]) */
- CPLFree(*arg4);
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7152,7 +7330,9 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- @@ -7160,7 +7340,7 @@
- /* %typemap(freearg) (double *argout[ANY]) */
- CPLFree(*arg4);
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7190,7 +7370,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- if(arg_count > 1) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,26,CONVERT_STRING_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,62,CONVERT_STRING_IN@*/
- if ((*args[1])->type==IS_NULL) {
- arg3 = (char *) 0;
- } else {
- @@ -7226,7 +7406,9 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- @@ -7235,7 +7417,7 @@
- if ( *arg2 )
- CPLFree( *arg2 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7287,7 +7469,9 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- @@ -7296,7 +7480,7 @@
- if ( *arg2 )
- CPLFree( *arg2 );
- }
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7322,7 +7506,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7348,7 +7532,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7377,11 +7561,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7410,11 +7596,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7443,11 +7631,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7476,11 +7666,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7509,11 +7701,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7542,11 +7736,13 @@
- }
- {
- /* %typemap(ret) OGRErr */
- - RETVAL_LONG(0);
- + if (result != 0) {
- + RETVAL_LONG(result);
- + }
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7577,7 +7773,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7596,7 +7792,7 @@
- delete_OSRCoordinateTransformationShadow(arg1);
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7634,7 +7830,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7665,19 +7861,19 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[1]);
- arg3 = (double) Z_DVAL_PP(args[1]);
- /*@SWIG@*/;
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[2]);
- arg4 = (double) Z_DVAL_PP(args[2]);
- /*@SWIG@*/;
- if(arg_count > 3) {
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,16,CONVERT_FLOAT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,52,CONVERT_FLOAT_IN@*/
- convert_to_double_ex(args[3]);
- arg5 = (double) Z_DVAL_PP(args[3]);
- /*@SWIG@*/;
- @@ -7692,7 +7888,7 @@
- }
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -7767,7 +7963,7 @@
- }
- if(!arg1) SWIG_PHP_Error(E_ERROR, "this pointer is NULL");
- - /*@SWIG:/usr/share/swig1.3/php/utils.i,7,CONVERT_INT_IN@*/
- + /*@SWIG:/usr/share/swig2.0/php/utils.i,7,CONVERT_INT_IN@*/
- convert_to_long_ex(args[1]);
- arg2 = (int) Z_LVAL_PP(args[1]);
- /*@SWIG@*/;
- @@ -7791,7 +7987,7 @@
- return;
- fail:
- - zend_error_noreturn(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- + zend_error(SWIG_ErrorCode(),"%s",SWIG_ErrorMsg());
- }
- @@ -8352,6 +8548,8 @@
- SWIG_STRING_CONSTANT(SRS_UL_CHAIN_CONV, "20.116684023368047");
- SWIG_STRING_CONSTANT(SRS_UL_ROD, "Rod");
- SWIG_STRING_CONSTANT(SRS_UL_ROD_CONV, "5.02921005842012");
- +SWIG_STRING_CONSTANT(SRS_UL_LINK_Clarke, "Link_Clarke");
- +SWIG_STRING_CONSTANT(SRS_UL_LINK_Clarke_CONV, "0.2011661949");
- SWIG_STRING_CONSTANT(SRS_UA_DEGREE, "degree");
- SWIG_STRING_CONSTANT(SRS_UA_DEGREE_CONV, "0.0174532925199433");
- SWIG_STRING_CONSTANT(SRS_UA_RADIAN, "radian");
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement