Fix broken error message when attempting to deserialise a type other than a point; the message should now correctly show the name of the offending type. Patch supplied by Charlie Savage.

git-svn-id: http://svn.osgeo.org/postgis/trunk@2712 b70326c6-7e19-0410-871a-916f4a2858ee
This commit is contained in:
Mark Cave-Ayland 2007-10-29 12:34:17 +00:00
parent 1ac4070cb0
commit 946928fc1f

View file

@ -256,6 +256,7 @@ LWPOINT *
lwpoint_deserialize(uchar *serialized_form)
{
uchar type;
int geom_type;
LWPOINT *result;
uchar *loc = NULL;
POINTARRAY *pa;
@ -267,10 +268,11 @@ lwpoint_deserialize(uchar *serialized_form)
result = (LWPOINT*) lwalloc(sizeof(LWPOINT)) ;
type = serialized_form[0];
geom_type = lwgeom_getType(type);
if ( lwgeom_getType(type) != POINTTYPE)
if ( geom_type != POINTTYPE)
{
lwerror("lwpoint_deserialize: attempt to deserialize a point which is really a %s", lwgeom_typename(type));
lwerror("lwpoint_deserialize: attempt to deserialize a point which is really a %s", lwgeom_typename(geom_type));
return NULL;
}
result->type = type;