database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-07-29 08:01:23 +03:00
Code Activity

When converting 64-bit floating point coordinates to 32-bit in RTree, take

Browse Source 
care to round the values such that the size of the bounding box is enlarged.

FossilOrigin-Name: f4e8ff03eae70334632455a867859cfcc25682be
This commit is contained in:
drh
2012-05-28 19:19:25 +00:00
parent 9cb7200815
commit 7923863602
3 changed files with 49 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ext/rtree/rtree.c
View File

@ -2739,6 +2739,43 @@ static int rtreeDeleteRowid(Rtree *pRtree, sqlite3_int64 iDelete){
return rc;
}
/*
** Convert an sqlite3_value into an RtreeValue (presumably a float)
** while taking care to round toward negative or positive, respectively.
*/
static RtreeValue rtreeValueDown(sqlite3_value *v){
#ifdef SQLITE_RTREE_INT_ONLY
return (RtreeValue)sqlite3_value_double(v);
#else
double d = sqlite3_value_double(v);
float f = (float)d;
if( f>d ){
if( f<0.0 ){
f += f/8388608.0;
}else{
f -= f/8388608.0;
}
}
return f;
#endif
}
static RtreeValue rtreeValueUp(sqlite3_value *v){
#ifdef SQLITE_RTREE_INT_ONLY
return (RtreeValue)sqlite3_value_double(v);
#else
double d = sqlite3_value_double(v);
float f = (float)d;
if( f<d ){
if( f<0.0 ){
f -= f/8388608.0;
}else{
f += f/8388608.0;
}
}
return f;
#endif
}
/*
** The xUpdate method for rtree module virtual tables.
*/
@ -2775,8 +2812,8 @@ static int rtreeUpdate(
#ifndef SQLITE_RTREE_INT_ONLY
if( pRtree->eCoordType==RTREE_COORD_REAL32 ){
for(ii=0; ii<(pRtree->nDim*2); ii+=2){
cell.aCoord[ii].f = (RtreeValue)sqlite3_value_double(azData[ii+3]);
cell.aCoord[ii+1].f = (RtreeValue)sqlite3_value_double(azData[ii+4]);
cell.aCoord[ii].f = rtreeValueDown(azData[ii+3]);
cell.aCoord[ii+1].f = rtreeValueUp(azData[ii+4]);
if( cell.aCoord[ii].f>cell.aCoord[ii+1].f ){
rc = SQLITE_CONSTRAINT;
goto constraint;