]>
Commit | Line | Data |
---|---|---|
c9c08280 JB |
1 | --- gdal-1.9.2/swig/include/ruby/typemaps_ruby.i.orig 2012-10-09 02:58:28.000000000 +0200 |
2 | +++ gdal-1.9.2/swig/include/ruby/typemaps_ruby.i 2013-01-06 15:12:18.221272187 +0100 | |
3 | @@ -127,7 +127,7 @@ | |
4 | { | |
5 | /* %typemap(out) OGRErr */ | |
6 | if ($1 != 0) { | |
7 | - rb_raise(rb_eRuntimeError, OGRErrMessages(result)); | |
8 | + rb_raise(rb_eRuntimeError, "%s", OGRErrMessages(result)); | |
9 | } | |
10 | } | |
11 | ||
ce035715 JB |
12 | --- gdal-1.11.2/ogr/ogrsf_frmts/sxf/ogrsxfdatasource.cpp.orig 2015-02-10 13:11:16.000000000 +0100 |
13 | +++ gdal-1.11.2/ogr/ogrsf_frmts/sxf/ogrsxfdatasource.cpp 2015-02-28 12:20:28.595919291 +0100 | |
14 | @@ -458,7 +458,7 @@ | |
0316feee JB |
15 | if (nEPSG == 0) |
16 | { | |
17 | CPLError( CE_Warning, CPLE_NotSupported, | |
18 | - CPLString().Printf("SXF. Vertical coordinate system (SXF index %ld) not supported", iVCS) ); | |
19 | + "SXF. Vertical coordinate system (SXF index %ld) not supported", iVCS ); | |
20 | return; | |
21 | } | |
22 | ||
ce035715 | 23 | @@ -467,14 +467,14 @@ |
0316feee JB |
24 | if (eImportFromEPSGErr != OGRERR_NONE) |
25 | { | |
26 | CPLError( CE_Warning, CPLE_None, | |
ce035715 JB |
27 | - CPLString().Printf("SXF. Vertical coordinate system (SXF index %ld, EPSG %ld) import from EPSG error", iVCS, nEPSG) ); |
28 | + "SXF. Vertical coordinate system (SXF index %ld, EPSG %ld) import from EPSG error", iVCS, nEPSG ); | |
0316feee JB |
29 | return; |
30 | } | |
31 | ||
32 | if (sr->IsVertical() != 1) | |
33 | { | |
34 | CPLError( CE_Warning, CPLE_None, | |
ce035715 JB |
35 | - CPLString().Printf("SXF. Coordinate system (SXF index %ld, EPSG %ld) is not Vertical", iVCS, nEPSG) ); |
36 | + "SXF. Coordinate system (SXF index %ld, EPSG %ld) is not Vertical", iVCS, nEPSG ); | |
0316feee JB |
37 | return; |
38 | } | |
39 | ||
ce035715 | 40 | @@ -483,7 +483,7 @@ |
0316feee JB |
41 | if (eSetVertCSErr != OGRERR_NONE) |
42 | { | |
43 | CPLError( CE_Warning, CPLE_None, | |
ce035715 JB |
44 | - CPLString().Printf("SXF. Vertical coordinate system (SXF index %ld, EPSG %ld) set error", iVCS, nEPSG) ); |
45 | + "SXF. Vertical coordinate system (SXF index %ld, EPSG %ld) set error", iVCS, nEPSG ); | |
0316feee JB |
46 | return; |
47 | } | |
48 | } | |
ce035715 JB |
49 | --- gdal-1.11.2/ogr/ogrsf_frmts/oci/ogrociwritablelayer.cpp.orig 2015-02-10 13:11:16.000000000 +0100 |
50 | +++ gdal-1.11.2/ogr/ogrsf_frmts/oci/ogrociwritablelayer.cpp 2015-02-28 13:46:28.845702734 +0100 | |
51 | @@ -321,7 +321,7 @@ | |
52 | + strlen(oField.GetNameRef()) | |
53 | + strlen(szFieldType) ); | |
54 | ||
55 | - snprintf( szFieldName, sizeof( szFieldName ), oField.GetNameRef()); | |
56 | + snprintf( szFieldName, sizeof( szFieldName ), "%s", oField.GetNameRef()); | |
57 | szFieldName[sizeof( szFieldName )-1] = '\0'; | |
58 | if ( strlen(oField.GetNameRef()) > sizeof ( szFieldName ) ) | |
59 | { |