Fixed default Y-scale to -1 from 1

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

diff --git a/raster/rt_core/rt_api.c b/raster/rt_core/rt_api.c
index 11761a047498575ccfab6ccc2af398b3953177ec..c6e15c27e5bba2fc43862b5b9a7dd1c7f7abbaab 100644 (file)
--- a/raster/rt_core/rt_api.c
+++ b/raster/rt_core/rt_api.c
@@ -5158,7 +5158,7 @@ rt_raster_new(uint32_t width, uint32_t height) {
        ret->width = width;
        ret->height = height;
        ret->scaleX = 1;
-       ret->scaleY = 1;
+       ret->scaleY = -1;
        ret->ipX = 0.0;
        ret->ipY = 0.0;
        ret->skewX = 0.0;

diff --git a/raster/test/core/testapi.c b/raster/test/core/testapi.c
index 8210b1da4bab5cdf767683545c8dcbca1abc7170..147932560cf31619aa384e9b1cc4cd2553e00bea 100644 (file)
--- a/raster/test/core/testapi.c
+++ b/raster/test/core/testapi.c
@@ -62,6 +62,7 @@ fillRasterToPolygonize(int hasnodata, double nodatavalue)
     uint16_t height = 9;
 
     rt_raster raster = rt_raster_new(width, height);
+               rt_raster_set_scale(raster, 1, 1);
 
     rt_band band = addBand(raster, PT_32BF, hasnodata, nodatavalue);
 
@@ -1933,6 +1934,7 @@ static void testIntersects() {
        */
        rast1 = rt_raster_new(2, 2);
        assert(rast1);
+       rt_raster_set_scale(rast1, 1, 1);
        rt_raster_set_offsets(rast1, -1, -1);
 
        band1 = addBand(rast1, PT_8BUI, 1, 0);
@@ -1959,6 +1961,7 @@ static void testIntersects() {
        */
        rast2 = rt_raster_new(2, 2);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
        CHECK(band2);
@@ -2168,6 +2171,7 @@ static void testIntersects() {
        */
        rast2 = rt_raster_new(3, 3);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
        CHECK(band2);
@@ -2325,6 +2329,7 @@ static void testIntersects() {
        /* rast2 (skewed by -0.5, 0.5) */
        rast2 = rt_raster_new(3, 3);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
        rt_raster_set_skews(rast2, -0.5, 0.5);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
@@ -2396,6 +2401,7 @@ static void testOverlaps() {
        */
        rast1 = rt_raster_new(2, 2);
        assert(rast1);
+       rt_raster_set_scale(rast1, 1, 1);
        rt_raster_set_offsets(rast1, -1, -1);
 
        band1 = addBand(rast1, PT_8BUI, 1, 0);
@@ -2430,6 +2436,7 @@ static void testOverlaps() {
        */
        rast2 = rt_raster_new(2, 2);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
        CHECK(band2);
@@ -2639,6 +2646,7 @@ static void testOverlaps() {
        */
        rast2 = rt_raster_new(3, 3);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
        CHECK(band2);
@@ -2796,6 +2804,7 @@ static void testOverlaps() {
        /* rast2 (skewed by -0.5, 0.5) */
        rast2 = rt_raster_new(3, 3);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
        rt_raster_set_skews(rast2, -0.5, 0.5);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
@@ -2867,6 +2876,7 @@ static void testTouches() {
        */
        rast1 = rt_raster_new(2, 2);
        assert(rast1);
+       rt_raster_set_scale(rast1, 1, 1);
        rt_raster_set_offsets(rast1, -1, -1);
 
        band1 = addBand(rast1, PT_8BUI, 1, 0);
@@ -2901,6 +2911,7 @@ static void testTouches() {
        */
        rast2 = rt_raster_new(2, 2);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
        CHECK(band2);
@@ -3162,6 +3173,7 @@ static void testTouches() {
        */
        rast2 = rt_raster_new(3, 3);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
        CHECK(band2);
@@ -3319,6 +3331,7 @@ static void testTouches() {
        /* rast2 (skewed by -0.5, 0.5) */
        rast2 = rt_raster_new(3, 3);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
        rt_raster_set_skews(rast2, -0.5, 0.5);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
@@ -3390,6 +3403,7 @@ static void testContains() {
        */
        rast1 = rt_raster_new(2, 2);
        assert(rast1);
+       rt_raster_set_scale(rast1, 1, 1);
        rt_raster_set_offsets(rast1, -1, -1);
 
        band1 = addBand(rast1, PT_8BUI, 1, 0);
@@ -3424,6 +3438,7 @@ static void testContains() {
        */
        rast2 = rt_raster_new(2, 2);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
        CHECK(band2);
@@ -3685,6 +3700,7 @@ static void testContains() {
        */
        rast2 = rt_raster_new(3, 3);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
        CHECK(band2);
@@ -3842,6 +3858,7 @@ static void testContains() {
        /* rast2 (skewed by -0.5, 0.5) */
        rast2 = rt_raster_new(3, 3);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
        rt_raster_set_skews(rast2, -0.5, 0.5);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
@@ -3913,6 +3930,7 @@ static void testContainsProperly() {
        */
        rast1 = rt_raster_new(2, 2);
        assert(rast1);
+       rt_raster_set_scale(rast1, 1, 1);
        rt_raster_set_offsets(rast1, -1, -1);
 
        band1 = addBand(rast1, PT_8BUI, 1, 0);
@@ -3947,6 +3965,7 @@ static void testContainsProperly() {
        */
        rast2 = rt_raster_new(2, 2);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
        CHECK(band2);
@@ -4208,6 +4227,7 @@ static void testContainsProperly() {
        */
        rast2 = rt_raster_new(3, 3);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
        CHECK(band2);
@@ -4365,6 +4385,7 @@ static void testContainsProperly() {
        /* rast2 (skewed by -0.5, 0.5) */
        rast2 = rt_raster_new(3, 3);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
        rt_raster_set_skews(rast2, -0.5, 0.5);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
@@ -4436,6 +4457,7 @@ static void testCovers() {
        */
        rast1 = rt_raster_new(2, 2);
        assert(rast1);
+       rt_raster_set_scale(rast1, 1, 1);
        rt_raster_set_offsets(rast1, -1, -1);
 
        band1 = addBand(rast1, PT_8BUI, 1, 0);
@@ -4470,6 +4492,7 @@ static void testCovers() {
        */
        rast2 = rt_raster_new(2, 2);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
        CHECK(band2);
@@ -4731,6 +4754,7 @@ static void testCovers() {
        */
        rast2 = rt_raster_new(3, 3);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
        CHECK(band2);
@@ -4888,6 +4912,7 @@ static void testCovers() {
        /* rast2 (skewed by -0.5, 0.5) */
        rast2 = rt_raster_new(3, 3);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
        rt_raster_set_skews(rast2, -0.5, 0.5);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
@@ -4959,6 +4984,7 @@ static void testCoveredBy() {
        */
        rast1 = rt_raster_new(2, 2);
        assert(rast1);
+       rt_raster_set_scale(rast1, 1, 1);
        rt_raster_set_offsets(rast1, -1, -1);
 
        band1 = addBand(rast1, PT_8BUI, 1, 0);
@@ -4993,6 +5019,7 @@ static void testCoveredBy() {
        */
        rast2 = rt_raster_new(2, 2);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
        CHECK(band2);
@@ -5254,6 +5281,7 @@ static void testCoveredBy() {
        */
        rast2 = rt_raster_new(3, 3);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
        CHECK(band2);
@@ -5411,6 +5439,7 @@ static void testCoveredBy() {
        /* rast2 (skewed by -0.5, 0.5) */
        rast2 = rt_raster_new(3, 3);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
        rt_raster_set_skews(rast2, -0.5, 0.5);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
@@ -5482,6 +5511,7 @@ static void testDWithin() {
        */
        rast1 = rt_raster_new(2, 2);
        assert(rast1);
+       rt_raster_set_scale(rast1, 1, 1);
        rt_raster_set_offsets(rast1, -1, -1);
 
        band1 = addBand(rast1, PT_8BUI, 1, 0);
@@ -5525,6 +5555,7 @@ static void testDWithin() {
        */
        rast2 = rt_raster_new(2, 2);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
        CHECK(band2);
@@ -5761,6 +5792,7 @@ static void testDWithin() {
        */
        rast2 = rt_raster_new(3, 3);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
        CHECK(band2);
@@ -5966,6 +5998,7 @@ static void testDWithin() {
        /* rast2 (skewed by -0.5, 0.5) */
        rast2 = rt_raster_new(3, 3);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
        rt_raster_set_skews(rast2, -0.5, 0.5);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
@@ -6040,6 +6073,7 @@ static void testDFullyWithin() {
        */
        rast1 = rt_raster_new(2, 2);
        assert(rast1);
+       rt_raster_set_scale(rast1, 1, 1);
        rt_raster_set_offsets(rast1, -1, -1);
 
        band1 = addBand(rast1, PT_8BUI, 1, 0);
@@ -6083,6 +6117,7 @@ static void testDFullyWithin() {
        */
        rast2 = rt_raster_new(2, 2);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
        CHECK(band2);
@@ -6319,6 +6354,7 @@ static void testDFullyWithin() {
        */
        rast2 = rt_raster_new(3, 3);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
        CHECK(band2);
@@ -6524,6 +6560,7 @@ static void testDFullyWithin() {
        /* rast2 (skewed by -0.5, 0.5) */
        rast2 = rt_raster_new(3, 3);
        assert(rast2);
+       rt_raster_set_scale(rast2, 1, 1);
        rt_raster_set_skews(rast2, -0.5, 0.5);
 
        band2 = addBand(rast2, PT_8BUI, 1, 0);
@@ -8174,6 +8211,7 @@ main()
 
     raster = rt_raster_new(256, 256);
     assert(raster); /* or we're out of virtual memory */
+               rt_raster_set_scale(raster, 1, 1);
 
        printf("Checking empty and hasnoband functions...\n");
        { /* Check isEmpty and hasnoband */

diff --git a/raster/test/regress/rt_mapalgebra_expected b/raster/test/regress/rt_mapalgebra_expected
index 51c5c302147cfdb48ae7a90584e593da34f84122..81cc1f28afda0f0cfeb6b48104463980eeeae387 100644 (file)
--- a/raster/test/regress/rt_mapalgebra_expected
+++ b/raster/test/regress/rt_mapalgebra_expected
@@ -84,7 +84,7 @@ NOTICE:  userargs = <NULL>
 NOTICE:  value = {{{200,200,NULL},{200,200,NULL},{NULL,NULL,NULL}}}
 NOTICE:  pos = [0:1][1:2]={{2,2},{2,2}}
 NOTICE:  userargs = <NULL>
-3|(0,0,0,0,1,1,0,0,0,0)|(,,,)|
+3|(0,0,0,0,1,-1,0,0,0,0)|(,,,)|
 4|(1,-1,2,2,1,-1,0,0,0,1)|(8BUI,0,f,)|255
 NOTICE:  value = {{{NULL,NULL,NULL},{NULL,1,1},{NULL,1,1}}}
 NOTICE:  pos = [0:1][1:2]={{1,1},{1,1}}