Merge branch 'release-1_7_0' of github.com:timlinux/Quantum-GIS into release-1_7_0

timlinux · timlinux · commit 08ee810885ff · 2011-05-07T17:10:13.000+02:00
diff --git a/python/plugins/GdalTools/tools/doWarp.py b/python/plugins/GdalTools/tools/doWarp.py
@@ -189,7 +189,7 @@ def getArguments(self):
         mask = self.getMaskFileName()
         if not mask.isEmpty():
           arguments << "-q"
-          arguments << "-mask"
+          arguments << "-cutline"
           arguments << mask
           arguments << "-dstalpha"
       if self.isBatchEnabled():
