From: Pierre Racine Date: Mon, 28 Mar 2011 22:10:18 +0000 (+0000) Subject: -Changed message not proper when just setting pixel value X-Git-Tag: 2.0.0alpha1~1823 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b17a7e3127843cb8d625f6a1c29f2c40d4edeae2;p=postgis -Changed message not proper when just setting pixel value git-svn-id: http://svn.osgeo.org/postgis/trunk@6979 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/raster/rt_core/rt_api.c b/raster/rt_core/rt_api.c index 854fd393c..57d7d99cb 100644 --- a/raster/rt_core/rt_api.c +++ b/raster/rt_core/rt_api.c @@ -260,13 +260,13 @@ rt_util_display_dbl_trunc_warning(rt_context ctx, case PT_32BSI: { if (fabs(checkvalint - initialvalue) >= 1) { - ctx->warn("Initial pixel value for %s band got clamped from %f to %d", + ctx->warn("Value set for %s band got clamped from %f to %d", rt_pixtype_name(ctx, pixtype), initialvalue, checkvalint); result = -1; } else if (fabs(checkvalint - initialvalue) > FLT_EPSILON) { - ctx->warn("Initial pixel value for %s band got truncated from %f to %d", + ctx->warn("Value set for %s band got truncated from %f to %d", rt_pixtype_name(ctx, pixtype), initialvalue, checkvalint); result = -1; @@ -276,13 +276,13 @@ rt_util_display_dbl_trunc_warning(rt_context ctx, case PT_32BUI: { if (fabs(checkvaluint - initialvalue) >= 1) { - ctx->warn("Initial pixel value for %s band got clamped from %f to %u", + ctx->warn("Value set for %s band got clamped from %f to %u", rt_pixtype_name(ctx, pixtype), initialvalue, checkvaluint); result = -1; } else if (fabs(checkvaluint - initialvalue) > FLT_EPSILON) { - ctx->warn("Initial pixel value for %s band got truncated from %f to %u", + ctx->warn("Value set for %s band got truncated from %f to %u", rt_pixtype_name(ctx, pixtype), initialvalue, checkvaluint); result = -1; @@ -294,7 +294,7 @@ rt_util_display_dbl_trunc_warning(rt_context ctx, /* For float, because the initial value is a double, there is very often a difference between the desired value and the obtained one */ if (fabs(checkvalfloat - initialvalue) > FLT_EPSILON) - ctx->warn("Initial pixel value for %s band got converted from %f to %f", + ctx->warn("Value set for %s band got converted from %f to %f", rt_pixtype_name(ctx, pixtype), initialvalue, checkvalfloat); break; @@ -302,7 +302,7 @@ rt_util_display_dbl_trunc_warning(rt_context ctx, case PT_64BF: { if (fabs(checkvaldouble - initialvalue) > FLT_EPSILON) - ctx->warn("Initial pixel value for %s band got converted from %f to %f", + ctx->warn("Value set for %s band got converted from %f to %f", rt_pixtype_name(ctx, pixtype), initialvalue, checkvaldouble); break; diff --git a/raster/test/regress/rt_addband_expected b/raster/test/regress/rt_addband_expected index 44d6c6119..e36e5f755 100644 --- a/raster/test/regress/rt_addband_expected +++ b/raster/test/regress/rt_addband_expected @@ -1,124 +1,124 @@ -WARNING: Initial pixel value for 1BB band got clamped from -1.000000 to 0 +WARNING: Value set for 1BB band got clamped from -1.000000 to 0 0 0 1 -WARNING: Initial pixel value for 1BB band got clamped from 2.000000 to 1 +WARNING: Value set for 1BB band got clamped from 2.000000 to 1 1 -WARNING: Initial pixel value for 1BB band got clamped from 21.460000 to 1 +WARNING: Value set for 1BB band got clamped from 21.460000 to 1 1 -WARNING: Initial pixel value for 2BUI band got clamped from -1.000000 to 0 +WARNING: Value set for 2BUI band got clamped from -1.000000 to 0 0 0 3 -WARNING: Initial pixel value for 2BUI band got clamped from 4.000000 to 3 +WARNING: Value set for 2BUI band got clamped from 4.000000 to 3 3 -WARNING: Initial pixel value for 2BUI band got clamped from 21.460000 to 3 +WARNING: Value set for 2BUI band got clamped from 21.460000 to 3 3 -WARNING: Initial pixel value for 4BUI band got clamped from -1.000000 to 0 +WARNING: Value set for 4BUI band got clamped from -1.000000 to 0 0 0 15 -WARNING: Initial pixel value for 4BUI band got clamped from 16.000000 to 15 +WARNING: Value set for 4BUI band got clamped from 16.000000 to 15 15 -WARNING: Initial pixel value for 4BUI band got clamped from 21.460000 to 15 +WARNING: Value set for 4BUI band got clamped from 21.460000 to 15 15 -WARNING: Initial pixel value for 8BSI band got clamped from -129.000000 to -128 +WARNING: Value set for 8BSI band got clamped from -129.000000 to -128 -128 -128 0 127 -WARNING: Initial pixel value for 8BSI band got clamped from 128.000000 to 127 +WARNING: Value set for 8BSI band got clamped from 128.000000 to 127 127 -WARNING: Initial pixel value for 8BSI band got truncated from 21.460000 to 21 +WARNING: Value set for 8BSI band got truncated from 21.460000 to 21 21 -WARNING: Initial pixel value for 8BSI band got clamped from 210.460000 to 127 +WARNING: Value set for 8BSI band got clamped from 210.460000 to 127 127 -WARNING: Initial pixel value for 8BUI band got clamped from -1.000000 to 0 +WARNING: Value set for 8BUI band got clamped from -1.000000 to 0 0 0 255 -WARNING: Initial pixel value for 8BUI band got clamped from 256.000000 to 255 +WARNING: Value set for 8BUI band got clamped from 256.000000 to 255 255 -WARNING: Initial pixel value for 8BUI band got truncated from 21.460000 to 21 +WARNING: Value set for 8BUI band got truncated from 21.460000 to 21 21 -WARNING: Initial pixel value for 8BUI band got clamped from 410.460000 to 255 +WARNING: Value set for 8BUI band got clamped from 410.460000 to 255 255 -WARNING: Initial pixel value for 8BUI band got truncated from 256.000000 to 255 +WARNING: Value set for 8BUI band got truncated from 256.000000 to 255 255 -WARNING: Initial pixel value for 16BSI band got clamped from -32769.000000 to -32768 +WARNING: Value set for 16BSI band got clamped from -32769.000000 to -32768 -32768 -32768 0 32767 -WARNING: Initial pixel value for 16BSI band got clamped from 32768.000000 to 32767 +WARNING: Value set for 16BSI band got clamped from 32768.000000 to 32767 32767 -WARNING: Initial pixel value for 16BSI band got truncated from 21.460000 to 21 +WARNING: Value set for 16BSI band got truncated from 21.460000 to 21 21 -WARNING: Initial pixel value for 16BSI band got clamped from 210000.460000 to 32767 +WARNING: Value set for 16BSI band got clamped from 210000.460000 to 32767 32767 -WARNING: Initial pixel value for 16BUI band got clamped from -1.000000 to 0 +WARNING: Value set for 16BUI band got clamped from -1.000000 to 0 0 0 65535 -WARNING: Initial pixel value for 16BUI band got clamped from 65537.000000 to 65535 +WARNING: Value set for 16BUI band got clamped from 65537.000000 to 65535 65535 -WARNING: Initial pixel value for 16BUI band got truncated from 21.460000 to 21 +WARNING: Value set for 16BUI band got truncated from 21.460000 to 21 21 -WARNING: Initial pixel value for 16BUI band got clamped from 210000.464564 to 65535 +WARNING: Value set for 16BUI band got clamped from 210000.464564 to 65535 65535 -WARNING: Initial pixel value for 32BSI band got clamped from -2147483649.000000 to -2147483648 +WARNING: Value set for 32BSI band got clamped from -2147483649.000000 to -2147483648 -2147483648 -2147483648 0 2147483647 -WARNING: Initial pixel value for 32BSI band got clamped from 2147483648.000000 to 2147483647 +WARNING: Value set for 32BSI band got clamped from 2147483648.000000 to 2147483647 2147483647 -WARNING: Initial pixel value for 32BSI band got truncated from 21.460000 to 21 +WARNING: Value set for 32BSI band got truncated from 21.460000 to 21 21 -WARNING: Initial pixel value for 32BSI band got truncated from 210000.464564 to 210000 +WARNING: Value set for 32BSI band got truncated from 210000.464564 to 210000 210000 -WARNING: Initial pixel value for 32BUI band got clamped from -1.000000 to 0 +WARNING: Value set for 32BUI band got clamped from -1.000000 to 0 0 0 4294967295 -WARNING: Initial pixel value for 32BUI band got clamped from 4294967296.000000 to 4294967295 +WARNING: Value set for 32BUI band got clamped from 4294967296.000000 to 4294967295 4294967295 -WARNING: Initial pixel value for 32BUI band got clamped from 214294967296.000000 to 4294967295 +WARNING: Value set for 32BUI band got clamped from 214294967296.000000 to 4294967295 4294967295 -WARNING: Initial pixel value for 32BUI band got truncated from 21.460000 to 21 +WARNING: Value set for 32BUI band got truncated from 21.460000 to 21 21 -WARNING: Initial pixel value for 32BUI band got clamped from 4294967296.000000 to 4294967295 +WARNING: Value set for 32BUI band got clamped from 4294967296.000000 to 4294967295 4294967295 0 -WARNING: Initial pixel value for 32BF band got converted from 4294967000.000000 to 4294967040.000000 +WARNING: Value set for 32BF band got converted from 4294967000.000000 to 4294967040.000000 4294967040 -WARNING: Initial pixel value for 32BF band got converted from 4294967000.000000 to 4294967040.000000 +WARNING: Value set for 32BF band got converted from 4294967000.000000 to 4294967040.000000 4.29497e+9 -WARNING: Initial pixel value for 32BF band got converted from 4294967295.000000 to 4294967296.000000 +WARNING: Value set for 32BF band got converted from 4294967295.000000 to 4294967296.000000 4294967296 -WARNING: Initial pixel value for 32BF band got converted from 4294967295.000000 to 4294967296.000000 +WARNING: Value set for 32BF band got converted from 4294967295.000000 to 4294967296.000000 4.29497e+9 4294967296 4.29497e+9 -WARNING: Initial pixel value for 32BF band got converted from 21.460000 to 21.459999 +WARNING: Value set for 32BF band got converted from 21.460000 to 21.459999 21.4599990844727 -WARNING: Initial pixel value for 32BF band got converted from 21.460000 to 21.459999 +WARNING: Value set for 32BF band got converted from 21.460000 to 21.459999 21.46 -WARNING: Initial pixel value for 32BF band got converted from 21003.100000 to 21003.099609 +WARNING: Value set for 32BF band got converted from 21003.100000 to 21003.099609 21003.099609375 -WARNING: Initial pixel value for 32BF band got converted from 21003.100000 to 21003.099609 +WARNING: Value set for 32BF band got converted from 21003.100000 to 21003.099609 21003.1 -WARNING: Initial pixel value for 32BF band got converted from 123.456000 to 123.456001 +WARNING: Value set for 32BF band got converted from 123.456000 to 123.456001 123.456001281738 -WARNING: Initial pixel value for 32BF band got converted from 123.456000 to 123.456001 +WARNING: Value set for 32BF band got converted from 123.456000 to 123.456001 123.456 -WARNING: Initial pixel value for 32BF band got converted from 1234.567000 to 1234.567017 +WARNING: Value set for 32BF band got converted from 1234.567000 to 1234.567017 1234.56701660156 -WARNING: Initial pixel value for 32BF band got converted from 1234.567000 to 1234.567017 +WARNING: Value set for 32BF band got converted from 1234.567000 to 1234.567017 1234.57 -WARNING: Initial pixel value for 32BF band got converted from 210000.464564 to 210000.468750 +WARNING: Value set for 32BF band got converted from 210000.464564 to 210000.468750 210000.46875 -WARNING: Initial pixel value for 32BF band got converted from 210000.464564 to 210000.468750 +WARNING: Value set for 32BF band got converted from 210000.464564 to 210000.468750 210000 -1 0