support for cyrillic symbols in raster metadata (fix #4452)

qgis · Dec 26, 2011 · e53c4aa · e53c4aa
1 parent d169b5a
commit e53c4aa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
@@ -372,7 +372,7 @@ QString QgsGdalProvider::metadata()
   myMetadata += tr( "Dataset Description" );
   myMetadata += "</p>\n";
   myMetadata += "<p>";
-  myMetadata += QFile::decodeName( GDALGetDescription( mGdalDataset ) );
+  myMetadata += FROM8( GDALGetDescription( mGdalDataset ) );
   myMetadata += "</p>\n";
 
 

diff --git a/src/providers/gdal/qgsgdalprovider.h b/src/providers/gdal/qgsgdalprovider.h
@@ -38,6 +38,14 @@ class QgsRasterPyramid;
 #define CPL_SUPRESS_CPLUSPLUS
 #include <gdal.h>
 
+#if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1800
+#define TO8F(x) (x).toUtf8().constData()
+#define FROM8(x) QString::fromUtf8(x)
+#else
+#define TO8F(x) QFile::encodeName( x ).constData()
+#define FROM8(x) QString::fromLocal8Bit(x)
+#endif
+
 /** \ingroup core
  * A call back function for showing progress of gdal operations.
  */