]>
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 | ||
0316feee JB |
12 | --- gdal-1.11.0/ogr/ogrsf_frmts/sxf/ogrsxfdatasource.cpp.orig 2014-04-16 22:04:02.000000000 +0200 |
13 | +++ gdal-1.11.0/ogr/ogrsf_frmts/sxf/ogrsxfdatasource.cpp 2014-05-10 17:33:52.404601057 +0200 | |
14 | @@ -459,7 +459,7 @@ | |
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 | ||
23 | @@ -468,14 +468,14 @@ | |
24 | if (eImportFromEPSGErr != OGRERR_NONE) | |
25 | { | |
26 | CPLError( CE_Warning, CPLE_None, | |
27 | - CPLString().Printf("SXF. Vertical coordinate system (SXF index %ld, EPSG %d) import from EPSG error", iVCS, nEPSG) ); | |
28 | + "SXF. Vertical coordinate system (SXF index %ld, EPSG %d) import from EPSG error", iVCS, nEPSG ); | |
29 | return; | |
30 | } | |
31 | ||
32 | if (sr->IsVertical() != 1) | |
33 | { | |
34 | CPLError( CE_Warning, CPLE_None, | |
35 | - CPLString().Printf("SXF. Coordinate system (SXF index %ld, EPSG %d) is not Vertical", iVCS, nEPSG) ); | |
36 | + "SXF. Coordinate system (SXF index %ld, EPSG %d) is not Vertical", iVCS, nEPSG ); | |
37 | return; | |
38 | } | |
39 | ||
40 | @@ -484,7 +484,7 @@ | |
41 | if (eSetVertCSErr != OGRERR_NONE) | |
42 | { | |
43 | CPLError( CE_Warning, CPLE_None, | |
44 | - CPLString().Printf("SXF. Vertical coordinate system (SXF index %ld, EPSG %d) set error", iVCS, nEPSG) ); | |
45 | + "SXF. Vertical coordinate system (SXF index %ld, EPSG %d) set error", iVCS, nEPSG ); | |
46 | return; | |
47 | } | |
48 | } |