Patch #2480 by Jack R: quote filenames in gdal scripts.

mmassing · mmassing · commit ef187cd03c64 · 2010-04-03T19:05:36.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13230 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp
@@ -1181,7 +1181,7 @@ QString QgsGeorefPluginGui::gdal_translateCommand( bool generateTFW )
 
   QFileInfo rasterFileInfo( mRasterFileName );
   mTranslatedRasterFileName = QDir::tempPath() + "/" + rasterFileInfo.fileName();
-  gdalCommand << mRasterFileName << mTranslatedRasterFileName;
+  gdalCommand << QString("\"%1\"").arg(mRasterFileName) << QString("\"%1\"").arg(mTranslatedRasterFileName);
 
   return gdalCommand.join( " " );
 }
@@ -1199,7 +1199,7 @@ QString QgsGeorefPluginGui::gdalwarpCommandGCP( QString resampling, QString comp
     gdalCommand << "-tr" << QString::number( targetResX, 'f' ) << QString::number( targetResY, 'f' );
   }
 
-  gdalCommand << mTranslatedRasterFileName << mModifiedRasterFileName;
+  gdalCommand << QString("\"%1\"").arg(mTranslatedRasterFileName) << QString("\"%1\"").arg(mModifiedRasterFileName);
 
   return gdalCommand.join( " " );
 }
@@ -1216,7 +1216,7 @@ QString QgsGeorefPluginGui::gdalwarpCommandTPS( QString resampling, QString comp
     gdalCommand << "-tr" << QString::number( targetResX, 'f' ) << QString::number( targetResY, 'f' );
   }
 
-  gdalCommand << mTranslatedRasterFileName << mModifiedRasterFileName;
+  gdalCommand << QString("\"%1\"").arg(mTranslatedRasterFileName) << QString("\"%1\"").arg(mModifiedRasterFileName);
 
   return gdalCommand.join( " " );
 }

Original file line number	Diff line number	Diff line change
`@@ -1181,7 +1181,7 @@ QString QgsGeorefPluginGui::gdal_translateCommand( bool generateTFW )`
`1181`	`1181`
`1182`	`1182`	`QFileInfo rasterFileInfo( mRasterFileName );`
`1183`	`1183`	`mTranslatedRasterFileName = QDir::tempPath() + "/" + rasterFileInfo.fileName();`
`1184`		`- gdalCommand << mRasterFileName << mTranslatedRasterFileName;`
	`1184`	`+ gdalCommand << QString("\"%1\"").arg(mRasterFileName) << QString("\"%1\"").arg(mTranslatedRasterFileName);`
`1185`	`1185`
`1186`	`1186`	`return gdalCommand.join( " " );`
`1187`	`1187`	`}`
`@@ -1199,7 +1199,7 @@ QString QgsGeorefPluginGui::gdalwarpCommandGCP( QString resampling, QString comp`
`1199`	`1199`	`gdalCommand << "-tr" << QString::number( targetResX, 'f' ) << QString::number( targetResY, 'f' );`
`1200`	`1200`	`}`
`1201`	`1201`
`1202`		`- gdalCommand << mTranslatedRasterFileName << mModifiedRasterFileName;`
	`1202`	`+ gdalCommand << QString("\"%1\"").arg(mTranslatedRasterFileName) << QString("\"%1\"").arg(mModifiedRasterFileName);`
`1203`	`1203`
`1204`	`1204`	`return gdalCommand.join( " " );`
`1205`	`1205`	`}`
`@@ -1216,7 +1216,7 @@ QString QgsGeorefPluginGui::gdalwarpCommandTPS( QString resampling, QString comp`
`1216`	`1216`	`gdalCommand << "-tr" << QString::number( targetResX, 'f' ) << QString::number( targetResY, 'f' );`
`1217`	`1217`	`}`
`1218`	`1218`
`1219`		`- gdalCommand << mTranslatedRasterFileName << mModifiedRasterFileName;`
	`1219`	`+ gdalCommand << QString("\"%1\"").arg(mTranslatedRasterFileName) << QString("\"%1\"").arg(mModifiedRasterFileName);`
`1220`	`1220`
`1221`	`1221`	`return gdalCommand.join( " " );`
`1222`	`1222`	`}`