Index.h | Index.h | |||
---|---|---|---|---|
skipping to change at line 52 | skipping to change at line 52 | |||
RTIndexType GetIndexType(); | RTIndexType GetIndexType(); | |||
void SetIndexType(RTIndexType v); | void SetIndexType(RTIndexType v); | |||
RTStorageType GetIndexStorage(); | RTStorageType GetIndexStorage(); | |||
void SetIndexStorage(RTStorageType v); | void SetIndexStorage(RTStorageType v); | |||
RTIndexVariant GetIndexVariant(); | RTIndexVariant GetIndexVariant(); | |||
void SetIndexVariant(RTStorageType v); | void SetIndexVariant(RTStorageType v); | |||
SpatialIndex::ISpatialIndex& index() {return *m_rtree;} | SpatialIndex::ISpatialIndex& index() {return *m_rtree;} | |||
SpatialIndex::StorageManager::IBuffer& buffer() {return *m_buffer;} | ||||
private: | private: | |||
void Initialize(); | void Initialize(); | |||
SpatialIndex::IStorageManager* m_storage; | SpatialIndex::IStorageManager* m_storage; | |||
SpatialIndex::StorageManager::IBuffer* m_buffer; | SpatialIndex::StorageManager::IBuffer* m_buffer; | |||
SpatialIndex::ISpatialIndex* m_rtree; | SpatialIndex::ISpatialIndex* m_rtree; | |||
Tools::PropertySet m_properties; | Tools::PropertySet m_properties; | |||
void Setup(); | void Setup(); | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 2 lines changed or added | |||
Version.h | Version.h | |||
---|---|---|---|---|
skipping to change at line 26 | skipping to change at line 26 | |||
// License along with this library; if not, write to the Free Software | // License along with this library; if not, write to the Free Software | |||
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A | // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A | |||
// | // | |||
// Email: | // Email: | |||
// mhadji@gmail.com | // mhadji@gmail.com | |||
#pragma once | #pragma once | |||
#ifndef SIDX_VERSION_MAJOR | #ifndef SIDX_VERSION_MAJOR | |||
#define SIDX_VERSION_MAJOR 1 | #define SIDX_VERSION_MAJOR 1 | |||
#define SIDX_VERSION_MINOR 5 | #define SIDX_VERSION_MINOR 6 | |||
#define SIDX_VERSION_REV 0 | #define SIDX_VERSION_REV 0 | |||
#define SIDX_VERSION_BUILD 0 | #define SIDX_VERSION_BUILD 0 | |||
#endif | #endif | |||
#ifndef SIDX_VERSION_NUM | #ifndef SIDX_VERSION_NUM | |||
#define SIDX_VERSION_NUM (SIDX_VERSION_MAJOR*1000+SIDX_VERSION_MINOR*1 00+SIDX_VERSION_REV*10+SIDX_VERSION_BUILD) | #define SIDX_VERSION_NUM (SIDX_VERSION_MAJOR*1000+SIDX_VERSION_MINOR*1 00+SIDX_VERSION_REV*10+SIDX_VERSION_BUILD) | |||
#endif | #endif | |||
#ifndef SIDX_RELEASE_DATE | #ifndef SIDX_RELEASE_DATE | |||
#define SIDX_RELEASE_DATE 20100305 | #define SIDX_RELEASE_DATE 20100917 | |||
#endif | #endif | |||
#ifndef SIDX_RELEASE_NAME | #ifndef SIDX_RELEASE_NAME | |||
#define SIDX_RELEASE_NAME "1.5.0" | #define SIDX_RELEASE_NAME "1.6.0" | |||
#endif | #endif | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added | |||
sidx_api.h | sidx_api.h | |||
---|---|---|---|---|
skipping to change at line 110 | skipping to change at line 110 | |||
SIDX_C_DLL RTError Index_GetLeaves( IndexH index, | SIDX_C_DLL RTError Index_GetLeaves( IndexH index, | |||
uint 32_t* nLeafNodes, | uint 32_t* nLeafNodes, | |||
uint 32_t** nLeafSizes, | uint 32_t** nLeafSizes, | |||
int6 4_t** nLeafIDs, | int6 4_t** nLeafIDs, | |||
int6 4_t*** nLeafChildIDs, | int6 4_t*** nLeafChildIDs, | |||
doub le*** pppdMin, | doub le*** pppdMin, | |||
doub le*** pppdMax, | doub le*** pppdMax, | |||
uint 32_t* nDimension); | uint 32_t* nDimension); | |||
SIDX_DLL void Index_DestroyObjResults(IndexItemH* results, uint32_t nResult s); | SIDX_DLL void Index_DestroyObjResults(IndexItemH* results, uint32_t nResult s); | |||
SIDX_DLL void Index_ClearBuffer(IndexH index); | ||||
SIDX_DLL void Index_Free(void* object); | SIDX_DLL void Index_Free(void* object); | |||
SIDX_DLL void IndexItem_Destroy(IndexItemH item); | SIDX_DLL void IndexItem_Destroy(IndexItemH item); | |||
SIDX_DLL uint64_t IndexItem_GetID(IndexItemH item); | SIDX_DLL uint64_t IndexItem_GetID(IndexItemH item); | |||
SIDX_DLL RTError IndexItem_GetData(IndexItemH item, uint8_t** data, uint64_ t* length); | SIDX_DLL RTError IndexItem_GetData(IndexItemH item, uint8_t** data, uint64_ t* length); | |||
SIDX_DLL RTError IndexItem_GetBounds( IndexItemH item, | SIDX_DLL RTError IndexItem_GetBounds( IndexItemH item, | |||
double** ppdMin, | double** ppdMin, | |||
double** ppdMax, | double** ppdMax, | |||
skipping to change at line 194 | skipping to change at line 195 | |||
SIDX_DLL RTError IndexProperty_SetFileName(IndexPropertyH iprop, const char * value); | SIDX_DLL RTError IndexProperty_SetFileName(IndexPropertyH iprop, const char * value); | |||
SIDX_DLL char* IndexProperty_GetFileName(IndexPropertyH iprop); | SIDX_DLL char* IndexProperty_GetFileName(IndexPropertyH iprop); | |||
SIDX_DLL RTError IndexProperty_SetFileNameExtensionDat(IndexPropertyH iprop , const char* value); | SIDX_DLL RTError IndexProperty_SetFileNameExtensionDat(IndexPropertyH iprop , const char* value); | |||
SIDX_DLL char* IndexProperty_GetFileNameExtensionDat(IndexPropertyH iprop); | SIDX_DLL char* IndexProperty_GetFileNameExtensionDat(IndexPropertyH iprop); | |||
SIDX_DLL RTError IndexProperty_SetFileNameExtensionIdx(IndexPropertyH iprop , const char* value); | SIDX_DLL RTError IndexProperty_SetFileNameExtensionIdx(IndexPropertyH iprop , const char* value); | |||
SIDX_DLL char* IndexProperty_GetFileNameExtensionIdx(IndexPropertyH iprop); | SIDX_DLL char* IndexProperty_GetFileNameExtensionIdx(IndexPropertyH iprop); | |||
SIDX_DLL RTError IndexProperty_SetCustomStorageCallbacksSize(IndexPropertyH | ||||
iprop, uint32_t value); | ||||
SIDX_DLL uint32_t IndexProperty_GetCustomStorageCallbacksSize(IndexProperty | ||||
H iprop); | ||||
SIDX_DLL RTError IndexProperty_SetCustomStorageCallbacks(IndexPropertyH ipr | ||||
op, const void* value); | ||||
SIDX_DLL void* IndexProperty_GetCustomStorageCallbacks(IndexPropertyH iprop | ||||
); | ||||
SIDX_DLL RTError IndexProperty_SetIndexID(IndexPropertyH iprop, int64_t val ue); | SIDX_DLL RTError IndexProperty_SetIndexID(IndexPropertyH iprop, int64_t val ue); | |||
SIDX_DLL int64_t IndexProperty_GetIndexID(IndexPropertyH iprop); | SIDX_DLL int64_t IndexProperty_GetIndexID(IndexPropertyH iprop); | |||
SIDX_C_DLL void* SIDX_NewBuffer(size_t bytes); | ||||
SIDX_C_DLL void SIDX_DeleteBuffer(void* buffer); | ||||
SIDX_C_DLL char* SIDX_Version(); | SIDX_C_DLL char* SIDX_Version(); | |||
IDX_C_END | IDX_C_END | |||
#endif | #endif | |||
End of changes. 3 change blocks. | ||||
0 lines changed or deleted | 14 lines changed or added | |||
sidx_config.h | sidx_config.h | |||
---|---|---|---|---|
skipping to change at line 80 | skipping to change at line 80 | |||
RT_RTree = 0, | RT_RTree = 0, | |||
RT_MVRTree = 1, | RT_MVRTree = 1, | |||
RT_TPRTree = 2, | RT_TPRTree = 2, | |||
RT_InvalidIndexType = -99 | RT_InvalidIndexType = -99 | |||
} RTIndexType; | } RTIndexType; | |||
typedef enum | typedef enum | |||
{ | { | |||
RT_Memory = 0, | RT_Memory = 0, | |||
RT_Disk = 1, | RT_Disk = 1, | |||
RT_Custom = 2, | ||||
RT_InvalidStorageType = -99 | RT_InvalidStorageType = -99 | |||
} RTStorageType; | } RTStorageType; | |||
typedef enum | typedef enum | |||
{ | { | |||
RT_Linear = 0, | RT_Linear = 0, | |||
RT_Quadratic = 1, | RT_Quadratic = 1, | |||
RT_Star = 2, | RT_Star = 2, | |||
RT_InvalidIndexVariant = -99 | RT_InvalidIndexVariant = -99 | |||
} RTIndexVariant; | } RTIndexVariant; | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 1 lines changed or added | |||
sidx_impl.h | sidx_impl.h | |||
---|---|---|---|---|
skipping to change at line 46 | skipping to change at line 46 | |||
#include <capi/Utility.h> | #include <capi/Utility.h> | |||
#include <capi/ObjVisitor.h> | #include <capi/ObjVisitor.h> | |||
#include <capi/IdVisitor.h> | #include <capi/IdVisitor.h> | |||
#include <capi/CountVisitor.h> | #include <capi/CountVisitor.h> | |||
#include <capi/BoundsQuery.h> | #include <capi/BoundsQuery.h> | |||
#include <capi/LeafQuery.h> | #include <capi/LeafQuery.h> | |||
#include <capi/Error.h> | #include <capi/Error.h> | |||
#include <capi/DataStream.h> | #include <capi/DataStream.h> | |||
#include <capi/Index.h> | #include <capi/Index.h> | |||
#include <capi/CustomStorage.h> | ||||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 0 lines changed or added | |||