diff --git a/Data/Baseline/OTB/Files/ioOtbVectorImageTestFORMOSAT2.1.txt b/Data/Baseline/OTB/Files/ioOtbVectorImageTestFORMOSAT2.1.txt
index a5740b7ff06d8960a97b6a796e2c0a43ce7b28dd..3ce5a16e692395a432a8785f032be1d2e727449b 100644
--- a/Data/Baseline/OTB/Files/ioOtbVectorImageTestFORMOSAT2.1.txt
+++ b/Data/Baseline/OTB/Files/ioOtbVectorImageTestFORMOSAT2.1.txt
@@ -1,37 +1,37 @@
 ------ IMAGE --------
 Spacing [1, 1]
-Origin [0, 0]
+Origin [0.5, 0.5]
 Projection REF 
-GCP Projection GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4326"]]
+GCP Projection GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AXIS["Latitude",NORTH],AXIS["Longitude",EAST],AUTHORITY["EPSG","4326"]]
 GCP Count 4
 GCP[0] Id 1
 GCP[0] Info 
-GCP[0] Row 1
-GCP[0] Col 1
+GCP[0] Row 0.5
+GCP[0] Col 0.5
 GCP[0] X 1.05476
 GCP[0] Y 43.5896
 GCP[0] Z 0
 ----------------
 GCP[1] Id 2
 GCP[1] Info 
-GCP[1] Row 1
-GCP[1] Col 3000
+GCP[1] Row 0.5
+GCP[1] Col 2999.5
 GCP[1] X 1.41679
 GCP[1] Y 43.5219
 GCP[1] Z 0
 ----------------
 GCP[2] Id 3
 GCP[2] Info 
-GCP[2] Row 3000
-GCP[2] Col 3000
+GCP[2] Row 2999.5
+GCP[2] Col 2999.5
 GCP[2] X 1.32096
 GCP[2] Y 43.313
 GCP[2] Z 0
 ----------------
 GCP[3] Id 4
 GCP[3] Info 
-GCP[3] Row 3000
-GCP[3] Col 1
+GCP[3] Row 2999.5
+GCP[3] Col 0.5
 GCP[3] X 0.960095
 GCP[3] Y 43.3803
 GCP[3] Z 0
diff --git a/Data/Baseline/OTB/Files/ioOtbVectorImageTestFORMOSAT2.3.txt b/Data/Baseline/OTB/Files/ioOtbVectorImageTestFORMOSAT2.3.txt
deleted file mode 100644
index 3ce5a16e692395a432a8785f032be1d2e727449b..0000000000000000000000000000000000000000
--- a/Data/Baseline/OTB/Files/ioOtbVectorImageTestFORMOSAT2.3.txt
+++ /dev/null
@@ -1,48 +0,0 @@
------- IMAGE --------
-Spacing [1, 1]
-Origin [0.5, 0.5]
-Projection REF 
-GCP Projection GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AXIS["Latitude",NORTH],AXIS["Longitude",EAST],AUTHORITY["EPSG","4326"]]
-GCP Count 4
-GCP[0] Id 1
-GCP[0] Info 
-GCP[0] Row 0.5
-GCP[0] Col 0.5
-GCP[0] X 1.05476
-GCP[0] Y 43.5896
-GCP[0] Z 0
-----------------
-GCP[1] Id 2
-GCP[1] Info 
-GCP[1] Row 0.5
-GCP[1] Col 2999.5
-GCP[1] X 1.41679
-GCP[1] Y 43.5219
-GCP[1] Z 0
-----------------
-GCP[2] Id 3
-GCP[2] Info 
-GCP[2] Row 2999.5
-GCP[2] Col 2999.5
-GCP[2] X 1.32096
-GCP[2] Y 43.313
-GCP[2] Z 0
-----------------
-GCP[3] Id 4
-GCP[3] Info 
-GCP[3] Row 2999.5
-GCP[3] Col 0.5
-GCP[3] X 0.960095
-GCP[3] Y 43.3803
-GCP[3] Z 0
-----------------
-Geo Transform 
-Corners 
- UL[0] -> 0
- UL[1] -> 0
- UR[0] -> 3000
- UR[1] -> 0
- LL[0] -> 0
- LL[1] -> 3000
- LR[0] -> 3000
- LR[1] -> 3000
diff --git a/Data/Baseline/OTB/Files/ioOtbVectorImageTestFORMOSAT2.txt b/Data/Baseline/OTB/Files/ioOtbVectorImageTestFORMOSAT2.txt
index 44265a775dc58303cf8647fac1fe90f90e1bcb1a..c9ae6be41f3ac1c1321c4e51c7d7e4c7df15ad83 100644
--- a/Data/Baseline/OTB/Files/ioOtbVectorImageTestFORMOSAT2.txt
+++ b/Data/Baseline/OTB/Files/ioOtbVectorImageTestFORMOSAT2.txt
@@ -1,37 +1,37 @@
 ------ IMAGE --------
 Spacing [1, 1]
-Origin [0, 0]
+Origin [0.5, 0.5]
 Projection REF 
-GCP Projection GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.2572235630016,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4326"]]
+GCP Projection GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AXIS["Latitude",NORTH],AXIS["Longitude",EAST],AUTHORITY["EPSG","4326"]]
 GCP Count 4
 GCP[0] Id 1
 GCP[0] Info 
-GCP[0] Row 1
-GCP[0] Col 1
+GCP[0] Row 0.5
+GCP[0] Col 0.5
 GCP[0] X 1.05476
 GCP[0] Y 43.5896
 GCP[0] Z 0
 ----------------
 GCP[1] Id 2
 GCP[1] Info 
-GCP[1] Row 1
-GCP[1] Col 3000
+GCP[1] Row 0.5
+GCP[1] Col 2999.5
 GCP[1] X 1.41679
 GCP[1] Y 43.5219
 GCP[1] Z 0
 ----------------
 GCP[2] Id 3
 GCP[2] Info 
-GCP[2] Row 3000
-GCP[2] Col 3000
+GCP[2] Row 2999.5
+GCP[2] Col 2999.5
 GCP[2] X 1.32096
 GCP[2] Y 43.313
 GCP[2] Z 0
 ----------------
 GCP[3] Id 4
 GCP[3] Info 
-GCP[3] Row 3000
-GCP[3] Col 1
+GCP[3] Row 2999.5
+GCP[3] Col 0.5
 GCP[3] X 0.960095
 GCP[3] Y 43.3803
 GCP[3] Z 0
diff --git a/Data/Baseline/OTB/Files/ioOtbVectorImageTestSpot5.1.txt b/Data/Baseline/OTB/Files/ioOtbVectorImageTestSpot5.1.txt
index a46f428a25407de15197169864623fd22ce2b9d5..979813c3501f2ce23e63cf93bd0170a9d2f9a40d 100644
--- a/Data/Baseline/OTB/Files/ioOtbVectorImageTestSpot5.1.txt
+++ b/Data/Baseline/OTB/Files/ioOtbVectorImageTestSpot5.1.txt
@@ -1,37 +1,37 @@
 ------ IMAGE --------
 Spacing [1, 1]
-Origin [0, 0]
+Origin [0.5, 0.5]
 Projection REF 
-GCP Projection GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4326"]]
+GCP Projection GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AXIS["Latitude",NORTH],AXIS["Longitude",EAST],AUTHORITY["EPSG","4326"]]
 GCP Count 4
 GCP[0] Id 1
 GCP[0] Info 
-GCP[0] Row 1
-GCP[0] Col 1
+GCP[0] Row 0.5
+GCP[0] Col 0.5
 GCP[0] X 51.1515
 GCP[0] Y 36.0442
 GCP[0] Z 0
 ----------------
 GCP[1] Id 2
 GCP[1] Info 
-GCP[1] Row 1
-GCP[1] Col 6000
+GCP[1] Row 0.5
+GCP[1] Col 5999.5
 GCP[1] X 51.8029
 GCP[1] Y 35.9172
 GCP[1] Z 0
 ----------------
 GCP[2] Id 3
 GCP[2] Info 
-GCP[2] Row 6000
-GCP[2] Col 6000
+GCP[2] Row 5999.5
+GCP[2] Col 5999.5
 GCP[2] X 51.6467
 GCP[2] Y 35.3907
 GCP[2] Z 0
 ----------------
 GCP[3] Id 4
 GCP[3] Info 
-GCP[3] Row 6000
-GCP[3] Col 1
+GCP[3] Row 5999.5
+GCP[3] Col 0.5
 GCP[3] X 50.9995
 GCP[3] Y 35.5173
 GCP[3] Z 0
@@ -46,3 +46,4 @@ Corners
  LL[1] -> 6000
  LR[0] -> 6000
  LR[1] -> 6000
+
diff --git a/Data/Baseline/OTB/Files/ioOtbVectorImageTestSpot5.3.txt b/Data/Baseline/OTB/Files/ioOtbVectorImageTestSpot5.3.txt
deleted file mode 100644
index 465456d6c79942c8abc8e1c8883df49e6df0139e..0000000000000000000000000000000000000000
--- a/Data/Baseline/OTB/Files/ioOtbVectorImageTestSpot5.3.txt
+++ /dev/null
@@ -1,48 +0,0 @@
------- IMAGE --------
-Spacing [1, 1]
-Origin [0.5, 0.5]
-Projection REF 
-GCP Projection GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AXIS["Latitude",NORTH],AXIS["Longitude",EAST],AUTHORITY["EPSG","4326"]]
-GCP Count 4
-GCP[0] Id 1
-GCP[0] Info 
-GCP[0] Row 0.5
-GCP[0] Col 0.5
-GCP[0] X 51.1515
-GCP[0] Y 36.0442
-GCP[0] Z 0
-----------------
-GCP[1] Id 2
-GCP[1] Info 
-GCP[1] Row 0.5
-GCP[1] Col 5999.5
-GCP[1] X 51.8029
-GCP[1] Y 35.9172
-GCP[1] Z 0
-----------------
-GCP[2] Id 3
-GCP[2] Info 
-GCP[2] Row 5999.5
-GCP[2] Col 5999.5
-GCP[2] X 51.6467
-GCP[2] Y 35.3907
-GCP[2] Z 0
-----------------
-GCP[3] Id 4
-GCP[3] Info 
-GCP[3] Row 5999.5
-GCP[3] Col 0.5
-GCP[3] X 50.9995
-GCP[3] Y 35.5173
-GCP[3] Z 0
-----------------
-Geo Transform 
-Corners 
- UL[0] -> 0
- UL[1] -> 0
- UR[0] -> 6000
- UR[1] -> 0
- LL[0] -> 0
- LL[1] -> 6000
- LR[0] -> 6000
- LR[1] -> 6000
diff --git a/Data/Baseline/OTB/Files/ioOtbVectorImageTestSpot5.txt b/Data/Baseline/OTB/Files/ioOtbVectorImageTestSpot5.txt
index 98347deea9cff0872e2929fb0286bad538898736..8173678535f22c0749bbf61bbf61239de16bd1f7 100644
--- a/Data/Baseline/OTB/Files/ioOtbVectorImageTestSpot5.txt
+++ b/Data/Baseline/OTB/Files/ioOtbVectorImageTestSpot5.txt
@@ -1,37 +1,37 @@
 ------ IMAGE --------
 Spacing [1, 1]
-Origin [0, 0]
+Origin [0.5, 0.5]
 Projection REF 
-GCP Projection GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.2572235629972,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433],AUTHORITY["EPSG","4326"]]
+GCP Projection GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AXIS["Latitude",NORTH],AXIS["Longitude",EAST],AUTHORITY["EPSG","4326"]]
 GCP Count 4
 GCP[0] Id 1
 GCP[0] Info 
-GCP[0] Row 1
-GCP[0] Col 1
+GCP[0] Row 0.5
+GCP[0] Col 0.5
 GCP[0] X 51.1515
 GCP[0] Y 36.0442
 GCP[0] Z 0
 ----------------
 GCP[1] Id 2
 GCP[1] Info 
-GCP[1] Row 1
-GCP[1] Col 6000
+GCP[1] Row 0.5
+GCP[1] Col 5999.5
 GCP[1] X 51.8029
 GCP[1] Y 35.9172
 GCP[1] Z 0
 ----------------
 GCP[2] Id 3
 GCP[2] Info 
-GCP[2] Row 6000
-GCP[2] Col 6000
+GCP[2] Row 5999.5
+GCP[2] Col 5999.5
 GCP[2] X 51.6467
 GCP[2] Y 35.3907
 GCP[2] Z 0
 ----------------
 GCP[3] Id 4
 GCP[3] Info 
-GCP[3] Row 6000
-GCP[3] Col 1
+GCP[3] Row 5999.5
+GCP[3] Col 0.5
 GCP[3] X 50.9995
 GCP[3] Y 35.5173
 GCP[3] Z 0