Skip to content

Commit 06aa595

Browse files
author
jef
committedApr 7, 2009
upgrade internal spatialite from beta to amalgamated 2.3.0 release
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10504 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent 83f07f3 commit 06aa595

30 files changed

+86002
-90386
lines changed
 

‎src/core/CMakeLists.txt‎

Lines changed: 5 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -115,51 +115,14 @@ IF (WITH_INTERNAL_SPATIALITE)
115115
ENDIF (WIN32 OR APPLE)
116116
IF (WIN32)
117117
ADD_DEFINITIONS(-DDLL_EXPORT)
118-
IF (MSVC)
119-
ADD_DEFINITIONS("-DSQLITE_API=__declspec(dllexport)")
120-
ELSE (MSVC)
121-
ADD_DEFINITIONS("\"-DSQLITE_API=__declspec(dllexport)\"")
122-
ENDIF (MSVC)
123118
ENDIF (WIN32)
124119

125120
SET(QGIS_CORE_SRCS
126121
${QGIS_CORE_SRCS}
127-
spatialite/spatialite/mbrcache.c
128-
spatialite/spatialite/spatialite.c
129-
spatialite/spatialite/virtualfdo.c
130-
spatialite/spatialite/virtualnetwork.c
131-
spatialite/spatialite/virtualshape.c
132-
133-
spatialite/spatialite_c99/spatialite_c99.c
134-
135-
spatialite/gaiageo/gg_endian.c
136-
spatialite/gaiageo/gg_geometries.c
137-
spatialite/gaiageo/gg_advanced.c
138-
spatialite/gaiageo/gg_wkb.c
139-
spatialite/gaiageo/gg_wkt.c
140-
spatialite/gaiageo/gg_transform.c
141-
spatialite/gaiageo/gg_shape.c
142-
spatialite/gaiageo/gg_relations.c
143-
144-
spatialite/virtualtext/gaiaaux/gg_sqlaux.c
145-
spatialite/virtualtext/gaiaaux/gg_utf8.c
146-
147-
spatialite/virtualtext/sqlite3/sqlite3.c
148-
149-
spatialite/gaiaexif/gaia_exif.c
150-
151-
spatialite/virtualtext/virtualtext/virtualtext.c
152-
153-
spatialite/versioninfo/version.c
154-
122+
spatialite/sqlite3.c
123+
spatialite/spatialite.c
155124
)
156125

157-
IF (NOT MSVC)
158-
SET_SOURCE_FILES_PROPERTIES(
159-
spatialite/spatialite_c99/spatialite_c99.c
160-
PROPERTIES COMPILE_FLAGS -std=c99)
161-
ENDIF (NOT MSVC)
162-
163126
INCLUDE_DIRECTORIES(spatialite/headers)
164127
ENDIF (WITH_INTERNAL_SPATIALITE)
165128

@@ -299,6 +262,9 @@ IF (WITH_INTERNAL_SPATIALITE)
299262
IF (WIN32 OR APPLE)
300263
TARGET_LINK_LIBRARIES(qgis_core ${ICONV_LIBRARY})
301264
ENDIF (WIN32 OR APPLE)
265+
IF (UNIX)
266+
TARGET_LINK_LIBRARIES(qgis_core pthread)
267+
ENDIF (UNIX)
302268
ELSE (WITH_INTERNAL_SPATIALITE)
303269
TARGET_LINK_LIBRARIES(qgis_core ${SQLITE3_LIBRARY})
304270
ENDIF (WITH_INTERNAL_SPATIALITE)

‎src/core/spatialite/gaiaexif/gaia_exif.c‎

Lines changed: 0 additions & 2663 deletions
This file was deleted.

‎src/core/spatialite/gaiageo/gg_advanced.c‎

Lines changed: 0 additions & 446 deletions
This file was deleted.

‎src/core/spatialite/gaiageo/gg_endian.c‎

Lines changed: 0 additions & 396 deletions
This file was deleted.

‎src/core/spatialite/gaiageo/gg_geometries.c‎

Lines changed: 0 additions & 1643 deletions
This file was deleted.

‎src/core/spatialite/gaiageo/gg_relations.c‎

Lines changed: 0 additions & 918 deletions
This file was deleted.

‎src/core/spatialite/gaiageo/gg_shape.c‎

Lines changed: 0 additions & 1823 deletions
This file was deleted.

‎src/core/spatialite/gaiageo/gg_transform.c‎

Lines changed: 0 additions & 730 deletions
This file was deleted.

‎src/core/spatialite/gaiageo/gg_wkb.c‎

Lines changed: 0 additions & 1613 deletions
This file was deleted.

‎src/core/spatialite/gaiageo/gg_wkt.c‎

Lines changed: 0 additions & 2029 deletions
This file was deleted.

‎src/core/spatialite/headers/spatialite.h‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
/*
2-
spatialite.h -- Gaia spatial support for SQLite
3-
1+
/*
2+
spatialite.h -- Gaia spatial support for SQLite
3+
44
version 2.3, 2008 October 13
55
66
Author: Sandro Furieri a.furieri@lqt.it
77
88
------------------------------------------------------------------------------
9-
9+
1010
Version: MPL 1.1/GPL 2.0/LGPL 2.1
11-
11+
1212
The contents of this file are subject to the Mozilla Public License Version
1313
1.1 (the "License"); you may not use this file except in compliance with
1414
the License. You may obtain a copy of the License at
1515
http://www.mozilla.org/MPL/
16-
16+
1717
Software distributed under the License is distributed on an "AS IS" basis,
1818
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
1919
for the specific language governing rights and limitations under the
@@ -22,7 +22,7 @@ License.
2222
The Original Code is the SpatiaLite library
2323
2424
The Initial Developer of the Original Code is Alessandro Furieri
25-
25+
2626
Portions created by the Initial Developer are Copyright (C) 2008
2727
the Initial Developer. All Rights Reserved.
2828
@@ -39,7 +39,7 @@ decision by deleting the provisions above and replace them with the notice
3939
and other provisions required by the GPL or the LGPL. If you do not delete
4040
the provisions above, a recipient may use your version of this file under
4141
the terms of any one of the MPL, the GPL or the LGPL.
42-
42+
4343
*/
4444

4545
#ifdef DLL_EXPORT
@@ -56,22 +56,22 @@ extern "C"
5656
{
5757
#endif
5858

59-
SPATIALITE_DECLARE const char *spatialite_version( void );
60-
SPATIALITE_DECLARE const char *virtualtext_version( void );
61-
SPATIALITE_DECLARE void spatialite_init( int verbose );
62-
SPATIALITE_DECLARE void dump_shapefile( sqlite3 * sqlite, char *table,
63-
char *column, char *charset,
64-
char *shp_path, char *geom_type );
65-
SPATIALITE_DECLARE void load_shapefile( sqlite3 * sqlite, char *shp_path,
66-
char *table, char *charset,
67-
int srid, char *column );
68-
SPATIALITE_DECLARE double math_round( double value );
69-
SPATIALITE_DECLARE sqlite3_int64 math_llabs( sqlite3_int64 value );
70-
SPATIALITE_DECLARE sqlite3_int64 min_rowid();
71-
59+
SPATIALITE_DECLARE const char *spatialite_version (void);
60+
SPATIALITE_DECLARE const char *virtualtext_version (void);
61+
SPATIALITE_DECLARE void spatialite_init (int verbose);
62+
SPATIALITE_DECLARE int dump_shapefile (sqlite3 * sqlite, char *table,
63+
char *column, char *charset,
64+
char *shp_path, char *geom_type,
65+
int verbose, int *rows);
66+
SPATIALITE_DECLARE int load_shapefile (sqlite3 * sqlite, char *shp_path,
67+
char *table, char *charset, int srid,
68+
char *column, int verbose,
69+
int *rows);
70+
SPATIALITE_DECLARE double math_round (double value);
71+
SPATIALITE_DECLARE sqlite3_int64 math_llabs (sqlite3_int64 value);
7272

7373
#ifdef __cplusplus
7474
}
7575
#endif
7676

77-
#endif /* _SPATIALITE_H */
77+
#endif /* _SPATIALITE_H */

‎src/core/spatialite/headers/spatialite/gaiaaux.h‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
/*
1+
/*
22
gaiaaux.h -- Gaia common utility functions
3-
3+
44
version 2.3, 2008 October 13
55
66
Author: Sandro Furieri a.furieri@lqt.it
77
88
------------------------------------------------------------------------------
9-
9+
1010
Version: MPL 1.1/GPL 2.0/LGPL 2.1
11-
11+
1212
The contents of this file are subject to the Mozilla Public License Version
1313
1.1 (the "License"); you may not use this file except in compliance with
1414
the License. You may obtain a copy of the License at
1515
http://www.mozilla.org/MPL/
16-
16+
1717
Software distributed under the License is distributed on an "AS IS" basis,
1818
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
1919
for the specific language governing rights and limitations under the
@@ -22,7 +22,7 @@ License.
2222
The Original Code is the SpatiaLite library
2323
2424
The Initial Developer of the Original Code is Alessandro Furieri
25-
25+
2626
Portions created by the Initial Developer are Copyright (C) 2008
2727
the Initial Developer. All Rights Reserved.
2828
@@ -39,7 +39,7 @@ decision by deleting the provisions above and replace them with the notice
3939
and other provisions required by the GPL or the LGPL. If you do not delete
4040
the provisions above, a recipient may use your version of this file under
4141
the terms of any one of the MPL, the GPL or the LGPL.
42-
42+
4343
*/
4444

4545
#ifdef DLL_EXPORT
@@ -56,24 +56,24 @@ extern "C"
5656
{
5757
#endif
5858

59-
/* function prototipes */
60-
61-
GAIAAUX_DECLARE const char *gaiaGetLocaleCharset();
62-
GAIAAUX_DECLARE int gaiaConvertCharset( char **buf, const char *fromCs,
63-
const char *toCs );
64-
GAIAAUX_DECLARE int gaiaToUTF8( char **buf, const char *fromCs,
65-
const char *toCs );
66-
GAIAAUX_DECLARE void *gaiaCreateUTF8Converter( const char *fromCS );
67-
GAIAAUX_DECLARE void gaiaFreeUTF8Converter( void *cvtCS );
68-
GAIAAUX_DECLARE char *gaiaConvertToUTF8( void *cvtCS, const char *buf,
69-
int len, int *err );
70-
GAIAAUX_DECLARE int gaiaIsReservedSqliteName( const char *name );
71-
GAIAAUX_DECLARE int gaiaIsReservedSqlName( const char *name );
72-
GAIAAUX_DECLARE int gaiaIllegalSqlName( const char *name );
73-
GAIAAUX_DECLARE void gaiaCleanSqlString( char *value );
59+
/* function prototipes */
60+
61+
GAIAAUX_DECLARE const char *gaiaGetLocaleCharset ();
62+
GAIAAUX_DECLARE int gaiaConvertCharset (char **buf, const char *fromCs,
63+
const char *toCs);
64+
GAIAAUX_DECLARE int gaiaToUTF8 (char **buf, const char *fromCs,
65+
const char *toCs);
66+
GAIAAUX_DECLARE void *gaiaCreateUTF8Converter (const char *fromCS);
67+
GAIAAUX_DECLARE void gaiaFreeUTF8Converter (void *cvtCS);
68+
GAIAAUX_DECLARE char *gaiaConvertToUTF8 (void *cvtCS, const char *buf,
69+
int len, int *err);
70+
GAIAAUX_DECLARE int gaiaIsReservedSqliteName (const char *name);
71+
GAIAAUX_DECLARE int gaiaIsReservedSqlName (const char *name);
72+
GAIAAUX_DECLARE int gaiaIllegalSqlName (const char *name);
73+
GAIAAUX_DECLARE void gaiaCleanSqlString (char *value);
7474

7575
#ifdef __cplusplus
7676
}
7777
#endif
7878

79-
#endif /* _GAIAAUX_H */
79+
#endif /* _GAIAAUX_H */

‎src/core/spatialite/headers/spatialite/gaiaexif.h‎

Lines changed: 154 additions & 154 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
/*
1+
/*
22
gaiaexif.h -- Gaia common EXIF Metadata reading functions
3-
3+
44
version 2.3, 2008 October 13
55
66
Author: Sandro Furieri a.furieri@lqt.it
77
88
------------------------------------------------------------------------------
9-
9+
1010
Version: MPL 1.1/GPL 2.0/LGPL 2.1
11-
11+
1212
The contents of this file are subject to the Mozilla Public License Version
1313
1.1 (the "License"); you may not use this file except in compliance with
1414
the License. You may obtain a copy of the License at
1515
http://www.mozilla.org/MPL/
16-
16+
1717
Software distributed under the License is distributed on an "AS IS" basis,
1818
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
1919
for the specific language governing rights and limitations under the
@@ -22,7 +22,7 @@ License.
2222
The Original Code is the SpatiaLite library
2323
2424
The Initial Developer of the Original Code is Alessandro Furieri
25-
25+
2626
Portions created by the Initial Developer are Copyright (C) 2008
2727
the Initial Developer. All Rights Reserved.
2828
@@ -39,7 +39,7 @@ decision by deleting the provisions above and replace them with the notice
3939
and other provisions required by the GPL or the LGPL. If you do not delete
4040
the provisions above, a recipient may use your version of this file under
4141
the terms of any one of the MPL, the GPL or the LGPL.
42-
42+
4343
*/
4444

4545
#ifdef DLL_EXPORT
@@ -56,155 +56,155 @@ extern "C"
5656
{
5757
#endif
5858

59-
/* constants used for BLOB value types */
60-
#define GAIA_HEX_BLOB 0
61-
#define GAIA_GIF_BLOB 1
62-
#define GAIA_PNG_BLOB 2
63-
#define GAIA_JPEG_BLOB 3
64-
#define GAIA_EXIF_BLOB 4
65-
#define GAIA_EXIF_GPS_BLOB 5
66-
#define GAIA_ZIP_BLOB 6
67-
#define GAIA_PDF_BLOB 7
68-
#define GAIA_GEOMETRY_BLOB 8
69-
70-
/* constants used for EXIF value types */
71-
#define GAIA_EXIF_NONE 0
72-
#define GAIA_EXIF_BYTE 1
73-
#define GAIA_EXIF_SHORT 2
74-
#define GAIA_EXIF_STRING 3
75-
#define GAIA_EXIF_LONG 4
76-
#define GAIA_EXIF_RATIONAL 5
77-
#define GAIA_EXIF_SLONG 9
78-
#define GAIA_EXIF_SRATIONAL 10
79-
80-
typedef struct gaiaExifTagStruct
81-
{
82-
/* an EXIF TAG */
83-
char Gps;
84-
unsigned short TagId;
85-
unsigned short Type;
86-
unsigned short Count;
87-
unsigned char TagOffset[4];
88-
unsigned char *ByteValue;
89-
char *StringValue;
90-
unsigned short *ShortValues;
91-
unsigned int *LongValues;
92-
unsigned int *LongRationals1;
93-
unsigned int *LongRationals2;
94-
short *SignedShortValues;
95-
int *SignedLongValues;
96-
int *SignedLongRationals1;
97-
int *SignedLongRationals2;
98-
float *FloatValues;
99-
double *DoubleValues;
100-
struct gaiaExifTagStruct *Next;
101-
} gaiaExifTag;
102-
typedef gaiaExifTag *gaiaExifTagPtr;
103-
104-
typedef struct gaiaExifTagListStruct
105-
{
106-
/* an EXIF TAG LIST */
107-
gaiaExifTagPtr First;
108-
gaiaExifTagPtr Last;
109-
int NumTags;
110-
gaiaExifTagPtr *TagsArray;
111-
} gaiaExifTagList;
112-
typedef gaiaExifTagList *gaiaExifTagListPtr;
113-
114-
/* function prototipes */
115-
116-
GAIAEXIF_DECLARE gaiaExifTagListPtr gaiaGetExifTags( const unsigned char
117-
*blob, int size );
118-
GAIAEXIF_DECLARE void gaiaExifTagsFree( gaiaExifTagListPtr tag_list );
119-
GAIAEXIF_DECLARE int gaiaGetExifTagsCount( gaiaExifTagListPtr tag_list );
120-
GAIAEXIF_DECLARE gaiaExifTagPtr gaiaGetExifTagByPos( gaiaExifTagListPtr
121-
tag_list,
122-
const int pos );
123-
GAIAEXIF_DECLARE gaiaExifTagPtr gaiaGetExifTagById( const gaiaExifTagListPtr
124-
tag_list,
125-
const unsigned short
126-
tag_id );
127-
GAIAEXIF_DECLARE gaiaExifTagPtr gaiaGetExifGpsTagById( const
128-
gaiaExifTagListPtr
129-
tag_list,
130-
const unsigned short
131-
tag_id );
132-
GAIAEXIF_DECLARE gaiaExifTagPtr gaiaGetExifTagByName( const
133-
gaiaExifTagListPtr
134-
tag_list,
135-
const char *tag_name );
136-
GAIAEXIF_DECLARE unsigned short gaiaExifTagGetId( const gaiaExifTagPtr tag );
137-
GAIAEXIF_DECLARE void gaiaExifTagGetName( const gaiaExifTagPtr tag,
138-
char *tag_name, int len );
139-
GAIAEXIF_DECLARE int gaiaIsExifGpsTag( const gaiaExifTagPtr tag );
140-
GAIAEXIF_DECLARE unsigned short gaiaExifTagGetValueType( const
141-
gaiaExifTagPtr
142-
tag );
143-
GAIAEXIF_DECLARE unsigned short gaiaExifTagGetNumValues( const
144-
gaiaExifTagPtr
145-
tag );
146-
GAIAEXIF_DECLARE unsigned char gaiaExifTagGetByteValue( const gaiaExifTagPtr
147-
tag, const int ind,
148-
int *ok );
149-
GAIAEXIF_DECLARE void gaiaExifTagGetStringValue( const gaiaExifTagPtr tag,
150-
char *str, int len,
151-
int *ok );
152-
GAIAEXIF_DECLARE unsigned short gaiaExifTagGetShortValue( const
153-
gaiaExifTagPtr
154-
tag,
155-
const int ind,
156-
int *ok );
157-
GAIAEXIF_DECLARE unsigned int gaiaExifTagGetLongValue( const gaiaExifTagPtr
158-
tag, const int ind,
159-
int *ok );
160-
GAIAEXIF_DECLARE unsigned int gaiaExifTagGetRational1Value( const
161-
gaiaExifTagPtr
162-
tag,
163-
const int ind,
164-
int *ok );
165-
GAIAEXIF_DECLARE unsigned int gaiaExifTagGetRational2Value( const
166-
gaiaExifTagPtr
167-
tag,
168-
const int ind,
169-
int *ok );
170-
GAIAEXIF_DECLARE double gaiaExifTagGetRationalValue( const gaiaExifTagPtr
171-
tag, const int ind,
172-
int *ok );
173-
GAIAEXIF_DECLARE short gaiaExifTagGetSignedShortValue( const gaiaExifTagPtr
174-
tag, const int ind,
175-
int *ok );
176-
GAIAEXIF_DECLARE int gaiaExifTagGetSignedLongValue( const gaiaExifTagPtr
177-
tag, const int ind,
178-
int *ok );
179-
GAIAEXIF_DECLARE int gaiaExifTagGetSignedRational1Value( const
180-
gaiaExifTagPtr tag,
181-
const int ind,
182-
int *ok );
183-
GAIAEXIF_DECLARE int gaiaExifTagGetSignedRational2Value( const
184-
gaiaExifTagPtr tag,
185-
const int ind,
186-
int *ok );
187-
GAIAEXIF_DECLARE double gaiaExifTagGetSignedRationalValue( const
188-
gaiaExifTagPtr
189-
tag,
190-
const int ind,
191-
int *ok );
192-
GAIAEXIF_DECLARE float gaiaExifTagGetFloatValue( const gaiaExifTagPtr tag,
193-
const int ind, int *ok );
194-
GAIAEXIF_DECLARE double gaiaExifTagGetDoubleValue( const gaiaExifTagPtr tag,
195-
const int ind, int *ok );
196-
GAIAEXIF_DECLARE void gaiaExifTagGetHumanReadable( const gaiaExifTagPtr tag,
197-
char *str, int len,
198-
int *ok );
199-
GAIAEXIF_DECLARE int gaiaGuessBlobType( const unsigned char *blob,
200-
int size );
201-
GAIAEXIF_DECLARE int gaiaGetGpsCoords( const unsigned char *blob, int size,
202-
double *longitude, double *latitude );
203-
GAIAEXIF_DECLARE int gaiaGetGpsLatLong( const unsigned char *blob, int size,
204-
char *latlong, int ll_size );
59+
/* constants used for BLOB value types */
60+
#define GAIA_HEX_BLOB 0
61+
#define GAIA_GIF_BLOB 1
62+
#define GAIA_PNG_BLOB 2
63+
#define GAIA_JPEG_BLOB 3
64+
#define GAIA_EXIF_BLOB 4
65+
#define GAIA_EXIF_GPS_BLOB 5
66+
#define GAIA_ZIP_BLOB 6
67+
#define GAIA_PDF_BLOB 7
68+
#define GAIA_GEOMETRY_BLOB 8
69+
70+
/* constants used for EXIF value types */
71+
#define GAIA_EXIF_NONE 0
72+
#define GAIA_EXIF_BYTE 1
73+
#define GAIA_EXIF_SHORT 2
74+
#define GAIA_EXIF_STRING 3
75+
#define GAIA_EXIF_LONG 4
76+
#define GAIA_EXIF_RATIONAL 5
77+
#define GAIA_EXIF_SLONG 9
78+
#define GAIA_EXIF_SRATIONAL 10
79+
80+
typedef struct gaiaExifTagStruct
81+
{
82+
/* an EXIF TAG */
83+
char Gps;
84+
unsigned short TagId;
85+
unsigned short Type;
86+
unsigned short Count;
87+
unsigned char TagOffset[4];
88+
unsigned char *ByteValue;
89+
char *StringValue;
90+
unsigned short *ShortValues;
91+
unsigned int *LongValues;
92+
unsigned int *LongRationals1;
93+
unsigned int *LongRationals2;
94+
short *SignedShortValues;
95+
int *SignedLongValues;
96+
int *SignedLongRationals1;
97+
int *SignedLongRationals2;
98+
float *FloatValues;
99+
double *DoubleValues;
100+
struct gaiaExifTagStruct *Next;
101+
} gaiaExifTag;
102+
typedef gaiaExifTag *gaiaExifTagPtr;
103+
104+
typedef struct gaiaExifTagListStruct
105+
{
106+
/* an EXIF TAG LIST */
107+
gaiaExifTagPtr First;
108+
gaiaExifTagPtr Last;
109+
int NumTags;
110+
gaiaExifTagPtr *TagsArray;
111+
} gaiaExifTagList;
112+
typedef gaiaExifTagList *gaiaExifTagListPtr;
113+
114+
/* function prototipes */
115+
116+
GAIAEXIF_DECLARE gaiaExifTagListPtr gaiaGetExifTags (const unsigned char
117+
*blob, int size);
118+
GAIAEXIF_DECLARE void gaiaExifTagsFree (gaiaExifTagListPtr tag_list);
119+
GAIAEXIF_DECLARE int gaiaGetExifTagsCount (gaiaExifTagListPtr tag_list);
120+
GAIAEXIF_DECLARE gaiaExifTagPtr gaiaGetExifTagByPos (gaiaExifTagListPtr
121+
tag_list,
122+
const int pos);
123+
GAIAEXIF_DECLARE gaiaExifTagPtr gaiaGetExifTagById (const gaiaExifTagListPtr
124+
tag_list,
125+
const unsigned short
126+
tag_id);
127+
GAIAEXIF_DECLARE gaiaExifTagPtr gaiaGetExifGpsTagById (const
128+
gaiaExifTagListPtr
129+
tag_list,
130+
const unsigned short
131+
tag_id);
132+
GAIAEXIF_DECLARE gaiaExifTagPtr gaiaGetExifTagByName (const
133+
gaiaExifTagListPtr
134+
tag_list,
135+
const char *tag_name);
136+
GAIAEXIF_DECLARE unsigned short gaiaExifTagGetId (const gaiaExifTagPtr tag);
137+
GAIAEXIF_DECLARE void gaiaExifTagGetName (const gaiaExifTagPtr tag,
138+
char *tag_name, int len);
139+
GAIAEXIF_DECLARE int gaiaIsExifGpsTag (const gaiaExifTagPtr tag);
140+
GAIAEXIF_DECLARE unsigned short gaiaExifTagGetValueType (const
141+
gaiaExifTagPtr
142+
tag);
143+
GAIAEXIF_DECLARE unsigned short gaiaExifTagGetNumValues (const
144+
gaiaExifTagPtr
145+
tag);
146+
GAIAEXIF_DECLARE unsigned char gaiaExifTagGetByteValue (const gaiaExifTagPtr
147+
tag, const int ind,
148+
int *ok);
149+
GAIAEXIF_DECLARE void gaiaExifTagGetStringValue (const gaiaExifTagPtr tag,
150+
char *str, int len,
151+
int *ok);
152+
GAIAEXIF_DECLARE unsigned short gaiaExifTagGetShortValue (const
153+
gaiaExifTagPtr
154+
tag,
155+
const int ind,
156+
int *ok);
157+
GAIAEXIF_DECLARE unsigned int gaiaExifTagGetLongValue (const gaiaExifTagPtr
158+
tag, const int ind,
159+
int *ok);
160+
GAIAEXIF_DECLARE unsigned int gaiaExifTagGetRational1Value (const
161+
gaiaExifTagPtr
162+
tag,
163+
const int ind,
164+
int *ok);
165+
GAIAEXIF_DECLARE unsigned int gaiaExifTagGetRational2Value (const
166+
gaiaExifTagPtr
167+
tag,
168+
const int ind,
169+
int *ok);
170+
GAIAEXIF_DECLARE double gaiaExifTagGetRationalValue (const gaiaExifTagPtr
171+
tag, const int ind,
172+
int *ok);
173+
GAIAEXIF_DECLARE short gaiaExifTagGetSignedShortValue (const gaiaExifTagPtr
174+
tag, const int ind,
175+
int *ok);
176+
GAIAEXIF_DECLARE int gaiaExifTagGetSignedLongValue (const gaiaExifTagPtr
177+
tag, const int ind,
178+
int *ok);
179+
GAIAEXIF_DECLARE int gaiaExifTagGetSignedRational1Value (const
180+
gaiaExifTagPtr tag,
181+
const int ind,
182+
int *ok);
183+
GAIAEXIF_DECLARE int gaiaExifTagGetSignedRational2Value (const
184+
gaiaExifTagPtr tag,
185+
const int ind,
186+
int *ok);
187+
GAIAEXIF_DECLARE double gaiaExifTagGetSignedRationalValue (const
188+
gaiaExifTagPtr
189+
tag,
190+
const int ind,
191+
int *ok);
192+
GAIAEXIF_DECLARE float gaiaExifTagGetFloatValue (const gaiaExifTagPtr tag,
193+
const int ind, int *ok);
194+
GAIAEXIF_DECLARE double gaiaExifTagGetDoubleValue (const gaiaExifTagPtr tag,
195+
const int ind, int *ok);
196+
GAIAEXIF_DECLARE void gaiaExifTagGetHumanReadable (const gaiaExifTagPtr tag,
197+
char *str, int len,
198+
int *ok);
199+
GAIAEXIF_DECLARE int gaiaGuessBlobType (const unsigned char *blob,
200+
int size);
201+
GAIAEXIF_DECLARE int gaiaGetGpsCoords (const unsigned char *blob, int size,
202+
double *longitude, double *latitude);
203+
GAIAEXIF_DECLARE int gaiaGetGpsLatLong (const unsigned char *blob, int size,
204+
char *latlong, int ll_size);
205205

206206
#ifdef __cplusplus
207207
}
208208
#endif
209209

210-
#endif /* _GAIAEXIF_H */
210+
#endif /* _GAIAEXIF_H */

‎src/core/spatialite/headers/spatialite/gaiageo.h‎

Lines changed: 570 additions & 558 deletions
Large diffs are not rendered by default.

‎src/core/spatialite/headers/spatialite/spatialite.h‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
/*
1+
/*
22
spatialite.h -- Gaia support for SQLite extensions
3-
3+
44
version 2.3, 2008 October 13
55
66
Author: Sandro Furieri a.furieri@lqt.it
77
88
------------------------------------------------------------------------------
9-
9+
1010
Version: MPL 1.1/GPL 2.0/LGPL 2.1
11-
11+
1212
The contents of this file are subject to the Mozilla Public License Version
1313
1.1 (the "License"); you may not use this file except in compliance with
1414
the License. You may obtain a copy of the License at
1515
http://www.mozilla.org/MPL/
16-
16+
1717
Software distributed under the License is distributed on an "AS IS" basis,
1818
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
1919
for the specific language governing rights and limitations under the
@@ -22,7 +22,7 @@ License.
2222
The Original Code is the SpatiaLite library
2323
2424
The Initial Developer of the Original Code is Alessandro Furieri
25-
25+
2626
Portions created by the Initial Developer are Copyright (C) 2008
2727
the Initial Developer. All Rights Reserved.
2828
@@ -39,16 +39,11 @@ decision by deleting the provisions above and replace them with the notice
3939
and other provisions required by the GPL or the LGPL. If you do not delete
4040
the provisions above, a recipient may use your version of this file under
4141
the terms of any one of the MPL, the GPL or the LGPL.
42-
42+
4343
*/
4444

45-
int rtree_extension_init( sqlite3 * db, const sqlite3_api_routines * pApi );
46-
int virtualshape_extension_init( sqlite3 * db,
47-
const sqlite3_api_routines * pApi );
48-
int virtualtext_extension_init( sqlite3 * db,
49-
const sqlite3_api_routines * pApi );
50-
int virtualnetwork_extension_init( sqlite3 * db,
51-
const sqlite3_api_routines * pApi );
52-
int mbrcache_extension_init( sqlite3 * db, const sqlite3_api_routines * pApi );
53-
54-
int virtualfdo_extension_init( sqlite3 * db, const sqlite3_api_routines * pApi );
45+
int virtualshape_extension_init (sqlite3 * db);
46+
int virtualtext_extension_init (sqlite3 * db);
47+
int virtualnetwork_extension_init (sqlite3 * db);
48+
int virtualfdo_extension_init (sqlite3 * db);
49+
int mbrcache_extension_init (sqlite3 * db);

‎src/core/spatialite/headers/spatialite/sqlite3.h‎

Lines changed: 5350 additions & 6599 deletions
Large diffs are not rendered by default.

‎src/core/spatialite/headers/spatialite/sqlite3ext.h‎

Lines changed: 202 additions & 160 deletions
Large diffs are not rendered by default.

‎src/core/spatialite/spatialite.c‎

Lines changed: 28633 additions & 0 deletions
Large diffs are not rendered by default.

‎src/core/spatialite/spatialite/mbrcache.c‎

Lines changed: 0 additions & 1440 deletions
This file was deleted.

‎src/core/spatialite/spatialite/spatialite.c‎

Lines changed: 0 additions & 8012 deletions
This file was deleted.

‎src/core/spatialite/spatialite/virtualfdo.c‎

Lines changed: 0 additions & 1267 deletions
This file was deleted.

‎src/core/spatialite/spatialite/virtualnetwork.c‎

Lines changed: 0 additions & 1666 deletions
This file was deleted.

‎src/core/spatialite/spatialite/virtualshape.c‎

Lines changed: 0 additions & 521 deletions
This file was deleted.

‎src/core/spatialite/spatialite_c99/spatialite_c99.c‎

Lines changed: 0 additions & 80 deletions
This file was deleted.

‎src/core/spatialite/virtualtext/sqlite3/sqlite3.c‎ renamed to ‎src/core/spatialite/sqlite3.c‎

Lines changed: 51031 additions & 55702 deletions
Large diffs are not rendered by default.

‎src/core/spatialite/versioninfo/version.c‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

‎src/core/spatialite/virtualtext/gaiaaux/gg_sqlaux.c‎

Lines changed: 0 additions & 557 deletions
This file was deleted.

‎src/core/spatialite/virtualtext/gaiaaux/gg_utf8.c‎

Lines changed: 0 additions & 176 deletions
This file was deleted.

‎src/core/spatialite/virtualtext/versiontext/version.c‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎src/core/spatialite/virtualtext/virtualtext/virtualtext.c‎

Lines changed: 0 additions & 1015 deletions
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.