Commit 74e84aea authored by Paul Ramsey's avatar Paul Ramsey

#2287, fix regressions with new debug in raster


git-svn-id: http://svn.osgeo.org/postgis/trunk@13619 b70326c6-7e19-0410-871a-916f4a2858ee
parent 054ac575
......@@ -1176,8 +1176,8 @@ int lwgeom_count_vertices(const LWGEOM *geom)
result = lwcollection_count_vertices((LWCOLLECTION *)geom);
break;
default:
lwerror("lwgeom_count_vertices: unsupported input geometry type: %s",
lwtype_name(geom->type));
lwerror("%s: unsupported input geometry type: %s",
__func__, lwtype_name(geom->type));
break;
}
LWDEBUGF(3, "counted %d vertices", result);
......@@ -1237,8 +1237,8 @@ int lwgeom_dimension(const LWGEOM *geom)
return maxdim;
}
default:
lwerror("lwgeom_dimension: unsupported input geometry type: %s",
lwtype_name(geom->type));
lwerror("%s: unsupported input geometry type: %s",
__func__, lwtype_name(geom->type));
}
return -1;
}
......
......@@ -1602,7 +1602,7 @@ rt_raster rt_raster_colormap(
/* INTERPOLATE and only one non-NODATA entry */
if (colormap->method == CM_INTERPOLATE && arg->npos < 2) {
rtinfo("Method INTERPOLATE requires at least two non-NODATA colormap entries. Using NEAREST instead");
rtwarn("Method INTERPOLATE requires at least two non-NODATA colormap entries. Using NEAREST instead");
colormap->method = CM_NEAREST;
}
......
......@@ -293,7 +293,7 @@ rt_raster rt_raster_gdal_warp(
) {
double ngt[6] = {166021.4431, 0.1, 0, 10000000.0000, 0, -0.1};
rtinfo("Raster has default geotransform. Adjusting metadata for use of GDAL Warp API");
rtwarn("Raster has default geotransform. Adjusting metadata for use of GDAL Warp API");
subspatial = 1;
......
......@@ -509,5 +509,5 @@ rt_init_allocators(void)
{
/* raster callback - install raster handlers */
rt_set_handlers(rt_pg_alloc, rt_pg_realloc, rt_pg_free, rt_pg_error,
rt_pg_notice, rt_pg_debug);
rt_pg_debug, rt_pg_notice);
}
......@@ -129,7 +129,6 @@ NOTICE: value = {{{1}},{{2}}}
NOTICE: pos = [0:2][1:2]={{1,1},{2,2},{1,1}}
NOTICE: userargs = <NULL>
20|21|(1,-1,1,1,1,-1,0,0,0,1)|(16BUI,0,f,)
NOTICE: rt_raster_iterator: Computed raster for intersection extent is empty
NOTICE: Raster provided has no bands
20|22|(0,0,0,0,0,0,0,0,0,0)|(,,,)
NOTICE: value = {{{2}},{{3}}}
......@@ -265,7 +264,6 @@ NOTICE: value = {{{NULL}},{{NULL}},{{3}}}
NOTICE: pos = [0:3][1:2]={{2,2},{2,4},{1,3},{2,2}}
NOTICE: userargs = <NULL>
20|21|22|(0,-2,2,2,1,-1,0,0,0,1)|(16BUI,0,f,)
NOTICE: rt_raster_iterator: Computed raster for intersection extent is empty
NOTICE: Raster provided has no bands
20|21|22|(0,0,0,0,0,0,0,0,0,0)|(,,,)
NOTICE: value = {{{1}},{{10}},{{100}}}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment