diff --git a/ext/rtree/sqlite3rtree.h b/ext/rtree/sqlite3rtree.h new file mode 100644 index 0000000000..778919343c --- /dev/null +++ b/ext/rtree/sqlite3rtree.h @@ -0,0 +1,26 @@ + +#include + +typedef struct RtreeGeometry RtreeGeometry; + +struct RtreeGeometry { + void *pContext; /* Copy of pContext passed to s_r_g_c() */ + int nParam; /* Size of array aParam[] */ + double *aParam; /* Parameters passed to SQL geom function */ + void *pUser; /* Callback implementation user data */ + void (*xDelUser)(void *); /* Called by SQLite to clean up pUser */ +}; + +/* +** Register a geometry callback named zGeom that can be used as part of an +** R-Tree geometry query as follows: +** +** SELECT ... FROM WHERE MATCH $zGeom(... params ...) +*/ +int sqlite3_rtree_geometry_callback( + sqlite3 *db, + const char *zGeom, + int (*xGeom)(RtreeGeometry *, int nCoord, double *aCoord, int *piResOut), + void *pContext +); + diff --git a/manifest b/manifest index 02139e2a22..db1cb535f6 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -C Updates\sto\scomments\son\sthe\sVDBE\sopcodes. -D 2010-08-30T01:17:20 +C Add\sfile\ssqlite3rtree.h. +D 2010-08-30T11:34:40 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -94,6 +91,7 @@ F ext/rtree/rtree8.test 67c5a03476bb729853ce01ad3828a290bf65eade F ext/rtree/rtree9.test 16775c219f0e134471c08a9bb0c3902e75ccb4c6 F ext/rtree/rtree_perf.tcl 6c18c1f23cd48e0f948930c98dfdd37dfccb5195 F ext/rtree/rtree_util.tcl 06aab2ed5b826545bf215fff90ecb9255a8647ea +F ext/rtree/sqlite3rtree.h 24ded963afda4658cb25a6df4a26efada6204931 F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x @@ -853,14 +851,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P aec52959d047d7c7b280319a8c84dc009d2cbf91 -R d42f696bda751354ebcfd7240343c8e5 -U drh -Z 45433ffcac53a1d2bada2d04966671ff ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFMewajoxKgR168RlERAgN2AJ0RaxPypP5uTi419TQ6rOf6X/AkAwCeOZap -llBX52cJqVTqMdulFKQX5hg= -=daOA ------END PGP SIGNATURE----- +P 49c05b4e08920797f3a5dd14c292e2275db61acb +R dcf5e3a796eed045514baa467f72a9be +U dan +Z af89287d274f76fcba5494173843655e diff --git a/manifest.uuid b/manifest.uuid index 244ea9595e..6ea288bf2a 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -49c05b4e08920797f3a5dd14c292e2275db61acb \ No newline at end of file +e1d9ffce0f84469eeb926f50030cb772de98a652 \ No newline at end of file