Allow R-Tree geometry functions to take 8-byte BLOB arguments which are

passed directly through to the underlying callback, and which can be used
to pass pointers into the callback.

FossilOrigin-Name: b271ed56532a78323accc8a7cb348d55f95c350e

diff --git a/ext/rtree/rtree.c b/ext/rtree/rtree.c
index 5e63c18db9b69aa6b1cca9b7e776ce990859466e..c14c04cd056fc65af93df49cbe1221c773f64d0d 100644 (file)
--- a/ext/rtree/rtree.c
+++ b/ext/rtree/rtree.c
@@ -3401,11 +3401,18 @@ static void geomCallback(sqlite3_context *ctx, int nArg, sqlite3_value **aArg){
     pBlob->cb = pGeomCtx[0];
     pBlob->nParam = nArg;
     for(i=0; i<nArg; i++){
+      if( sqlite3_value_type(aArg[i])==SQLITE_BLOB
+        && sqlite3_value_bytes(aArg[i])==sizeof(sqlite3_rtree_dbl)
+      ){
+        memcpy(&pBlob->aParam[i], sqlite3_value_blob(aArg[i]),
+               sizeof(sqlite3_rtree_dbl));
+      }else{
 #ifdef SQLITE_RTREE_INT_ONLY
-      pBlob->aParam[i] = sqlite3_value_int64(aArg[i]);
+        pBlob->aParam[i] = sqlite3_value_int64(aArg[i]);
 #else
-      pBlob->aParam[i] = sqlite3_value_double(aArg[i]);
+        pBlob->aParam[i] = sqlite3_value_double(aArg[i]);
 #endif
+      }
     }
     sqlite3_result_blob(ctx, pBlob, nBlob, sqlite3_free);
   }

diff --git a/manifest b/manifest
index 5e3998a2e2f35721a1d3c5983a2db4f32c352782..af61509d5cb5c1eb1beec71dd1cfd4a2635aa877 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthat\swhen\sthe\sVM\sapplies\sTEXT\saffinity\sto\sa\svalue\sit\sdiscards\sany\sexisting\sREAL\sor\sINTEGER\svalue.
-D 2015-05-19T19:44:25.924
+C Allow\sR-Tree\sgeometry\sfunctions\sto\stake\s8-byte\sBLOB\sarguments\swhich\sare\npassed\sdirectly\sthrough\sto\sthe\sunderlying\scallback,\sand\swhich\scan\sbe\sused\nto\spass\spointers\sinto\sthe\scallback.
+D 2015-05-19T22:20:48.133
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 0a6ae26396ec696221021780dffbb894ff3cead7
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -143,7 +143,7 @@ F ext/ota/sqlite3ota.c 2246b779f46ab20d5e7876f5b96c378c601d20f4
 F ext/ota/sqlite3ota.h 00028de37eede471ff1947d455cc3f33d3a911c6
 F ext/ota/test_ota.c a876f88550d7d59a3ef62d4c1a5c04c4c2f1ebe1
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
-F ext/rtree/rtree.c 0c207fd8b814a35537d96681cbf57436e200b75e
+F ext/rtree/rtree.c 60ec0a71d4d213665a706c795c887e7c4d148635
 F ext/rtree/rtree.h 834dbcb82dc85b2481cde6a07cdadfddc99e9b9e
 F ext/rtree/rtree1.test 541bbcab74613907fea08b2ecdcdd5b7aa724cc9
 F ext/rtree/rtree2.test acbb3a4ce0f4fbc2c304d2b4b784cfa161856bba
@@ -1278,7 +1278,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P c74e0bc481ce995f83ca8384e05dfbe068a0ae85
-R 156f7f5ee2915cdb09e3f94c0c3af5e0
-U dan
-Z 98adea0e9355f8ba8d3dfa8723cc9e42
+P f5d0ce80792d58ef424300f973f8876d835ed4ad
+R 5846851b430040d78bdb1e84f57132a2
+U drh
+Z 13e366e41ee3fd8fbadbd262c604767f

diff --git a/manifest.uuid b/manifest.uuid
index 327183aa6e67eecaf31dc936d8940689ecd39d41..13bb89e9f059ece1d37da2a05941f026a5100b92 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f5d0ce80792d58ef424300f973f8876d835ed4ad
\ No newline at end of file
+b271ed56532a78323accc8a7cb348d55f95c350e
\ No newline at end of file