Index.h   Index.h 
skipping to change at line 37 skipping to change at line 37
*************************************************************************** ***/ *************************************************************************** ***/
#pragma once #pragma once
#include "sidx_export.h" #include "sidx_export.h"
class SIDX_DLL Index class SIDX_DLL Index
{ {
public: public:
Index(Tools::PropertySet& poProperties); Index(const Tools::PropertySet& poProperties);
Index(Tools::PropertySet& poProperties, int (*readNext)(SpatialIndex::i Index(const Tools::PropertySet& poProperties, int (*readNext)(SpatialIn
d_type *id, double **pMin, double **pMax, uint32_t *nDimension, const uint8 dex::id_type *id, double **pMin, double **pMax, uint32_t *nDimension, const
_t **pData, uint32_t *nDataLength)); uint8_t **pData, uint32_t *nDataLength));
~Index(); ~Index();
const Tools::PropertySet& GetProperties() { return m_properties; } const Tools::PropertySet GetProperties() { index().getIndexProperties(m _properties); return m_properties;}
bool insertFeature(uint64_t id, double *min, double *max); bool insertFeature(uint64_t id, double *min, double *max);
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();
skipping to change at line 75 skipping to change at line 75
private: private:
Index& operator=(const Index&); Index& operator=(const Index&);
Index(); Index();
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();
SpatialIndex::IStorageManager* CreateStorage(); SpatialIndex::IStorageManager* CreateStorage();
SpatialIndex::StorageManager::IBuffer* CreateIndexBuffer(SpatialIndex:: IStorageManager& storage); SpatialIndex::StorageManager::IBuffer* CreateIndexBuffer(SpatialIndex:: IStorageManager& storage);
SpatialIndex::ISpatialIndex* CreateIndex(); SpatialIndex::ISpatialIndex* CreateIndex();
}; };
 End of changes. 3 change blocks. 
6 lines changed or deleted 6 lines changed or added


 Version.h   Version.h 
skipping to change at line 33 skipping to change at line 33
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*************************************************************************** ***/ *************************************************************************** ***/
#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 8 #define SIDX_VERSION_MINOR 8
#define SIDX_VERSION_REV 4 #define SIDX_VERSION_REV 5
#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 20140929 #define SIDX_RELEASE_DATE 20141101
#endif #endif
#ifndef SIDX_RELEASE_NAME #ifndef SIDX_RELEASE_NAME
#define SIDX_RELEASE_NAME "1.8.4" #define SIDX_RELEASE_NAME "1.8.5"
#endif #endif
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/