Fixed width and height values expected.

git-svn-id: http://svn.osgeo.org/postgis/trunk@7653 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/raster/test/regress/rt_resample_expected b/raster/test/regress/rt_resample_expected
index 7f52a3a12a456e805aa1be952f72a50f56a5c420..edc1b1d4bf68bfd483533726e8b940881a54bf71 100644 (file)
--- a/raster/test/regress/rt_resample_expected
+++ b/raster/test/regress/rt_resample_expected
@@ -5,20 +5,20 @@ NOTICE:  Values must be provided for both X and Y axis when specifying the scale
 1.1|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
 1.10|992163|40|40|1|250.000|-250.000|0.000|0.000|-500000.000|600000.000|t|t|t
 1.11|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
-1.12|992163|11|11|1|1000.000|-1000.000|0.000|0.000|-500001.000|600000.000|t|t|t
-1.13|992163|11|11|1|1000.000|-1000.000|0.000|0.000|-500000.000|600009.000|t|t|t
-1.14|992163|11|12|1|1000.000|-1000.000|0.000|0.000|-500100.000|600950.000|t|t|t
-1.15|992163|201|201|1|50.000|-50.000|0.000|0.000|-500010.000|600007.000|t|t|t
-1.16|992163|84|84|1|121.000|-121.000|0.000|0.000|-500093.000|600039.000|t|t|t
-1.17|993310|244|244|1|50.000|-50.000|0.000|0.000|950710.000|1409307.000|t|t|t
-1.18|993309|243|244|1|50.000|-50.000|0.000|0.000|950760.000|1409107.000|t|t|t
+1.12|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500001.000|600000.000|t|t|t
+1.13|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600009.000|t|t|t
+1.14|992163|10|11|1|1000.000|-1000.000|0.000|0.000|-500100.000|600950.000|t|t|t
+1.15|992163|200|200|1|50.000|-50.000|0.000|0.000|-500010.000|600007.000|t|t|t
+1.16|992163|83|83|1|121.000|-121.000|0.000|0.000|-500093.000|600039.000|t|t|t
+1.17|993310|243|243|1|50.000|-50.000|0.000|0.000|950710.000|1409307.000|t|t|t
+1.18|993309|242|243|1|50.000|-50.000|0.000|0.000|950760.000|1409107.000|t|t|t
 1.19|992163|10|10|1|1000.000|-1000.000|3.000|3.000|-500000.000|600000.000|t|t|t
 1.2|993310|12|12|1|1009.894|-1009.894|0.000|0.000|950732.188|1409281.783|t|t|t
 1.20|993310|12|12|1|1009.894|-1009.894|3.000|3.000|950732.188|1409281.783|t|t|t
 1.21|993309|12|12|1|1009.916|-1009.916|1.000|3.000|950762.305|1409088.896|t|t|t
 1.22|993310|24|24|1|500.000|-500.000|3.000|3.000|950732.188|1409281.783|t|t|t
-1.23|993310|26|26|1|500.000|-500.000|0.000|6.000|950452.000|1409682.000|t|t|t
-1.24|992163|201|102|1|50.000|-100.000|3.000|0.000|-500021.000|600056.000|t|t|t
+1.23|993310|25|25|1|500.000|-500.000|0.000|6.000|950452.000|1409682.000|t|t|t
+1.24|992163|200|101|1|50.000|-100.000|3.000|0.000|-500021.000|600056.000|t|t|t
 1.3|993309|12|12|1|1009.916|-1009.916|0.000|0.000|950762.305|1409088.896|t|t|t
 1.4|994269|12|8|1|0.012|-0.012|0.000|0.000|-107.029|50.206|t|t|t
 1.5|993310|24|24|1|500.000|-500.000|0.000|0.000|950732.188|1409281.783|t|t|t
@@ -54,29 +54,29 @@ NOTICE:  Values must be provided for both X and Y axis when specifying the scale
 4.5|992163|10|10|1|1000.000|-1000.000|10.000|10.000|-500000.000|600000.000|t|t|t
 4.6|992163|10|10|1|1000.000|-1000.000|10.000|10.000|-500000.000|600000.000|t|t|t
 5.1|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
-5.10|992163|11|11|1|1000.000|-1000.000|0.000|0.000|-500005.000|600001.000|t|t|t
-5.11|992163|12|12|1|1000.000|-1000.000|0.000|0.000|-500991.000|600991.000|t|t|t
+5.10|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500005.000|600001.000|t|t|t
+5.11|992163|11|11|1|1000.000|-1000.000|0.000|0.000|-500991.000|600991.000|t|t|t
 5.12|992163|200|200|1|50.000|-50.000|0.000|0.000|-500000.000|600000.000|t|t|t
 5.13|992163|200|200|1|50.000|-50.000|0.000|0.000|-500000.000|600000.000|t|t|t
-5.14|992163|201|201|1|50.000|-50.000|0.000|0.000|-500001.000|600000.000|t|t|t
-5.15|992163|201|201|1|50.000|-50.000|0.000|0.000|-500001.000|600000.000|t|t|t
-5.16|992163|202|201|1|50.000|-50.000|0.000|0.000|-500049.000|600000.000|t|t|t
-5.17|992163|201|202|1|50.000|-50.000|0.000|0.000|-500000.000|600049.000|t|t|t
-5.18|992163|201|202|1|50.000|-50.000|0.000|0.000|-500000.000|600041.000|t|t|t
-5.19|992163|201|201|1|50.000|-50.000|0.000|0.000|-500000.000|600001.000|t|t|t
+5.14|992163|200|200|1|50.000|-50.000|0.000|0.000|-500001.000|600000.000|t|t|t
+5.15|992163|200|200|1|50.000|-50.000|0.000|0.000|-500001.000|600000.000|t|t|t
+5.16|992163|201|200|1|50.000|-50.000|0.000|0.000|-500049.000|600000.000|t|t|t
+5.17|992163|200|201|1|50.000|-50.000|0.000|0.000|-500000.000|600049.000|t|t|t
+5.18|992163|200|201|1|50.000|-50.000|0.000|0.000|-500000.000|600041.000|t|t|t
+5.19|992163|200|200|1|50.000|-50.000|0.000|0.000|-500000.000|600001.000|t|t|t
 5.2|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600000.000|t|t|t
-5.20|992163|201|201|1|50.000|-50.000|0.000|0.000|-500000.000|600009.000|t|t|t
-5.21|992163|201|201|1|50.000|-50.000|0.000|0.000|-500005.000|600001.000|t|t|t
-5.22|992163|202|202|1|50.000|-50.000|0.000|0.000|-500041.000|600041.000|t|t|t
-5.23|992163|84|84|1|121.000|-121.000|0.000|0.000|-500093.000|600039.000|t|t|t
-5.24|992163|84|84|1|121.000|-121.000|0.000|0.000|-500000.000|600040.000|t|t|t
-5.25|992163|84|84|1|121.000|-121.000|0.000|0.000|-500000.000|600048.000|t|t|t
-5.26|992163|84|84|1|121.000|-121.000|0.000|0.000|-500098.000|600040.000|t|t|t
-5.27|992163|84|84|1|121.000|-121.000|0.000|0.000|-500037.000|600030.000|t|t|t
-5.3|992163|11|11|1|1000.000|-1000.000|0.000|0.000|-500001.000|600000.000|t|t|t
-5.4|992163|11|11|1|1000.000|-1000.000|0.000|0.000|-500001.000|600000.000|t|t|t
-5.5|992163|12|11|1|1000.000|-1000.000|0.000|0.000|-500999.000|600000.000|t|t|t
-5.6|992163|11|12|1|1000.000|-1000.000|0.000|0.000|-500000.000|600999.000|t|t|t
-5.7|992163|11|12|1|1000.000|-1000.000|0.000|0.000|-500000.000|600991.000|t|t|t
-5.8|992163|11|11|1|1000.000|-1000.000|0.000|0.000|-500000.000|600001.000|t|t|t
-5.9|992163|11|11|1|1000.000|-1000.000|0.000|0.000|-500000.000|600009.000|t|t|t
+5.20|992163|200|200|1|50.000|-50.000|0.000|0.000|-500000.000|600009.000|t|t|t
+5.21|992163|200|200|1|50.000|-50.000|0.000|0.000|-500005.000|600001.000|t|t|t
+5.22|992163|201|201|1|50.000|-50.000|0.000|0.000|-500041.000|600041.000|t|t|t
+5.23|992163|83|83|1|121.000|-121.000|0.000|0.000|-500093.000|600039.000|t|t|t
+5.24|992163|83|83|1|121.000|-121.000|0.000|0.000|-500000.000|600040.000|t|t|t
+5.25|992163|83|83|1|121.000|-121.000|0.000|0.000|-500000.000|600048.000|t|t|t
+5.26|992163|83|83|1|121.000|-121.000|0.000|0.000|-500098.000|600040.000|t|t|t
+5.27|992163|83|83|1|121.000|-121.000|0.000|0.000|-500037.000|600030.000|t|t|t
+5.3|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500001.000|600000.000|t|t|t
+5.4|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500001.000|600000.000|t|t|t
+5.5|992163|11|10|1|1000.000|-1000.000|0.000|0.000|-500999.000|600000.000|t|t|t
+5.6|992163|10|11|1|1000.000|-1000.000|0.000|0.000|-500000.000|600999.000|t|t|t
+5.7|992163|10|11|1|1000.000|-1000.000|0.000|0.000|-500000.000|600991.000|t|t|t
+5.8|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600001.000|t|t|t
+5.9|992163|10|10|1|1000.000|-1000.000|0.000|0.000|-500000.000|600009.000|t|t|t