set SHAPE_ENCODING to "" when creating new shapefile (follows up 4fb9879)

minorua · minorua · commit f7cce9c67633 · 2013-04-26T20:33:29.000+09:00
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -1851,6 +1851,9 @@ QGISEXTERN bool createEmptyDataSource( const QString &uri,
   if ( driverName == "ESRI Shapefile" )
   {
     papszOptions = CSLSetNameValue( papszOptions, "ENCODING", encoding.toLocal8Bit().data() );
+    // OGR Shapefile fails to create fields if given encoding is not supported by its side
+    // so disable encoding conversion of OGR Shapefile layer
+    CPLSetConfigOption( "SHAPE_ENCODING", "" );
   }
 
   OGRLayerH layer;

Original file line number	Diff line number	Diff line change
`@@ -1851,6 +1851,9 @@ QGISEXTERN bool createEmptyDataSource( const QString &uri,`
`1851`	`1851`	`if ( driverName == "ESRI Shapefile" )`
`1852`	`1852`	`{`
`1853`	`1853`	`papszOptions = CSLSetNameValue( papszOptions, "ENCODING", encoding.toLocal8Bit().data() );`
	`1854`	`+ // OGR Shapefile fails to create fields if given encoding is not supported by its side`
	`1855`	`+ // so disable encoding conversion of OGR Shapefile layer`
	`1856`	`+ CPLSetConfigOption( "SHAPE_ENCODING", "" );`
`1854`	`1857`	`}`
`1855`	`1858`
`1856`	`1859`	`OGRLayerH layer;`