Merge remote-tracking branch 'origin/develop' into develop

prepareS2THEIA.py

@@ -136,7 +136,8 @@ def prepare(argv):
         out_fn = od + '/' + os.path.splitext(os.path.basename(fn))[0] + '_' + ext + '.tif'
         subprocess.call(clip_cmd + '\"' + fn + '\" \"' + out_fn + '\"', shell=True)
 
-    clip_cmd = 'gdalwarp -q -of GTiff -ot UInt16 -dstnodata 0 -srcnodata 0 -cutline \"' + clip_shp_val + '\" -crop_to_cutline '
+    # clip_cmd = 'gdalwarp -q -of GTiff -ot UInt16 -dstnodata 0 -srcnodata 0 -cutline \"' + clip_shp_val + '\" -crop_to_cutline '
+    clip_cmd = 'gdalwarp -q -of GTiff -ot UInt16 -cutline \"' + clip_shp_val + '\" -crop_to_cutline '
     if srs != None :
         clip_cmd += '-t_srs {} '.format(srs)
     fns = ['CLM_R1', 'CLM_R2']