Georeferencer: Fix a bug in GDAL script generation.

git-svn-id: http://svn.osgeo.org/qgis/trunk@12966 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 23, 2010 · 2af331c · 2af331c
1 parent b7a47ca
commit 2af331c
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp
@@ -297,17 +297,24 @@ void QgsGeorefPluginGui::generateGDALScript()
   if (QgsGeorefTransform::Linear != mTransformParam
       && QgsGeorefTransform::Helmert != mTransformParam)
   {
+    // CAVEAT: gdalwarpCommand*() rely on some member variables being set
+    // by gdal_translateCommand(), so this method must be called before
+    // gdalwarpCommand*()!
+    QString translateCommand = gdal_translateCommand();
     QString gdalwarpCommand;
     QString resamplingStr = convertResamplingEnumToString(mResamplingMethod);
     if (QgsGeorefTransform::ThinPlateSpline == mTransformParam)
+    {
       gdalwarpCommand = gdalwarpCommandTPS(resamplingStr, mCompressionMethod, mUseZeroForTrans, 
                                            mUserResX, mUserResY);
+    }
     else
+    {
       gdalwarpCommand = gdalwarpCommandGCP(resamplingStr, mCompressionMethod, mUseZeroForTrans,
                                            polynomeOrder(mTransformParam),
                                            mUserResX, mUserResY);
-
-    showGDALScript(2, gdal_translateCommand().toAscii().data(), gdalwarpCommand.toAscii().data());
+    }
+    showGDALScript(2, translateCommand.toAscii().data(), gdalwarpCommand.toAscii().data());
   }
   else
   {