From 785fb36c3725c70a1eab147c70a77240b544f1c4 Mon Sep 17 00:00:00 2001 From: David Blasby Date: Thu, 28 Jun 2001 17:52:15 +0000 Subject: [PATCH] converting a GEOMETRYCOLLECTION to wkb had the size of the wkb off by 9 bytes (size of the collection header). Fixed. git-svn-id: http://svn.osgeo.org/postgis/trunk@11 b70326c6-7e19-0410-871a-916f4a2858ee --- examples/wkb_reader/comp | 2 +- examples/wkb_reader/readwkb | Bin 21420 -> 35744 bytes examples/wkb_reader/readwkb.c | 12 +++++++----- postgis_inout.c | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/examples/wkb_reader/comp b/examples/wkb_reader/comp index b915e13c9..bf67b16d2 100644 --- a/examples/wkb_reader/comp +++ b/examples/wkb_reader/comp @@ -1,2 +1,2 @@ -gcc -g -I/usr/include/pgsql -I/usr/local/include/pgsql -L/data3/postgresql-7.1.2/lib readwkb.c -o readwkb -lpq +gcc -g -I/data3/postgresql-7.1.2/include -I/usr/include/pgsql -I/usr/local/include/pgsql -L/data3/postgresql-7.1.2/lib readwkb.c -o readwkb -lpq diff --git a/examples/wkb_reader/readwkb b/examples/wkb_reader/readwkb index 6d5e5313c5f6eae63120ae9ce34298c415ff4bf4..659cec97aa7940d3be368f7a9f6f837ab6c0dd7f 100755 GIT binary patch literal 35744 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 aMpMV*(fCqq-(wpbT56%!%UG+h!v6ul4e$H_ delta 5956 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 BXM6wv diff --git a/examples/wkb_reader/readwkb.c b/examples/wkb_reader/readwkb.c index be40e62c8..33c07cdbe 100644 --- a/examples/wkb_reader/readwkb.c +++ b/examples/wkb_reader/readwkb.c @@ -157,7 +157,7 @@ int WKB_OID; double *double_val; char *char_val; char *wkb_val; - char *table_name = "tt"; + char *table_name = "t"; char query_str[1000]; /* @@ -172,7 +172,7 @@ int WKB_OID; pgport = "5555"; pgoptions = "user=postgres"; pgtty = NULL; - dbName = "test1"; + dbName = "t2"; @@ -217,7 +217,9 @@ int WKB_OID; * fetch rows from the pg_database, the system catalog of * databases */ - sprintf(query_str, "DECLARE mycursor BINARY CURSOR FOR select interesting, comments, wkb_ndr(the_geom) as wkb from %s",table_name); + sprintf(query_str, "DECLARE mycursor BINARY CURSOR FOR select text(num), asbinary(the_geom,'ndr') as wkb from %s",table_name); + + printf(query_str); printf("\n"); res = PQexec(conn, query_str); @@ -271,7 +273,7 @@ int WKB_OID; double_val = (double *) PQgetvalue(res, row, field); printf("%s: %g\n",field_name,*double_val); } - if (field_type ==1043 )//varchar + if ( (field_type ==1043 ) || (field_type==25) )//varchar { char_val = (char *) PQgetvalue(res, row, field); printf("%s: %s\n",field_name,char_val); @@ -300,4 +302,4 @@ int WKB_OID; PQfinish(conn); return 0; -} \ No newline at end of file +} diff --git a/postgis_inout.c b/postgis_inout.c index f9df0bc3d..72b1f4e25 100644 --- a/postgis_inout.c +++ b/postgis_inout.c @@ -2490,7 +2490,7 @@ char *to_wkb_collection(GEOMETRY *geom, bool flip_endian, int32 *end_size) pfree( sizes); //total size of the wkb - *end_size = total_size; + *end_size = total_size+9; -- 2.49.0