77 changes: 77 additions & 0 deletions src/core/spatialite/headers/spatialite/gaiaaux.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
/*
gaiaaux.h -- Gaia common utility functions
version 2.4, 2009 September 17
Author: Sandro Furieri a.furieri@lqt.it
------------------------------------------------------------------------------
Version: MPL 1.1/GPL 2.0/LGPL 2.1
The contents of this file are subject to the Mozilla Public License Version
1.1 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.mozilla.org/MPL/
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
for the specific language governing rights and limitations under the
License.
The Original Code is the SpatiaLite library
The Initial Developer of the Original Code is Alessandro Furieri
Portions created by the Initial Developer are Copyright (C) 2008
the Initial Developer. All Rights Reserved.
Contributor(s):
Alternatively, the contents of this file may be used under the terms of
either the GNU General Public License Version 2 or later (the "GPL"), or
the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
in which case the provisions of the GPL or the LGPL are applicable instead
of those above. If you wish to allow use of your version of this file only
under the terms of either the GPL or the LGPL, and not to allow others to
use your version of this file under the terms of the MPL, indicate your
decision by deleting the provisions above and replace them with the notice
and other provisions required by the GPL or the LGPL. If you do not delete
the provisions above, a recipient may use your version of this file under
the terms of any one of the MPL, the GPL or the LGPL.
*/

#ifdef DLL_EXPORT
#define GAIAAUX_DECLARE __declspec(dllexport)
#else
#define GAIAAUX_DECLARE extern
#endif

#ifndef _GAIAAUX_H
#define _GAIAAUX_H

#ifdef __cplusplus
extern "C"
{
#endif

/* function prototipes */

GAIAAUX_DECLARE const char *gaiaGetLocaleCharset (void);
GAIAAUX_DECLARE int gaiaConvertCharset (char **buf, const char *fromCs,
const char *toCs);
GAIAAUX_DECLARE void *gaiaCreateUTF8Converter (const char *fromCS);
GAIAAUX_DECLARE void gaiaFreeUTF8Converter (void *cvtCS);
GAIAAUX_DECLARE char *gaiaConvertToUTF8 (void *cvtCS, const char *buf,
int len, int *err);
GAIAAUX_DECLARE int gaiaIsReservedSqliteName (const char *name);
GAIAAUX_DECLARE int gaiaIsReservedSqlName (const char *name);
GAIAAUX_DECLARE int gaiaIllegalSqlName (const char *name);
GAIAAUX_DECLARE void gaiaCleanSqlString (char *value);

#ifdef __cplusplus
}
#endif

#endif /* _GAIAAUX_H */
211 changes: 211 additions & 0 deletions src/core/spatialite/headers/spatialite/gaiaexif.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,211 @@
/*
gaiaexif.h -- Gaia common EXIF Metadata reading functions
version 2.4, 2009 September 17
Author: Sandro Furieri a.furieri@lqt.it
------------------------------------------------------------------------------
Version: MPL 1.1/GPL 2.0/LGPL 2.1
The contents of this file are subject to the Mozilla Public License Version
1.1 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.mozilla.org/MPL/
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
for the specific language governing rights and limitations under the
License.
The Original Code is the SpatiaLite library
The Initial Developer of the Original Code is Alessandro Furieri
Portions created by the Initial Developer are Copyright (C) 2008
the Initial Developer. All Rights Reserved.
Contributor(s):
Alternatively, the contents of this file may be used under the terms of
either the GNU General Public License Version 2 or later (the "GPL"), or
the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
in which case the provisions of the GPL or the LGPL are applicable instead
of those above. If you wish to allow use of your version of this file only
under the terms of either the GPL or the LGPL, and not to allow others to
use your version of this file under the terms of the MPL, indicate your
decision by deleting the provisions above and replace them with the notice
and other provisions required by the GPL or the LGPL. If you do not delete
the provisions above, a recipient may use your version of this file under
the terms of any one of the MPL, the GPL or the LGPL.
*/

#ifdef DLL_EXPORT
#define GAIAEXIF_DECLARE __declspec(dllexport)
#else
#define GAIAEXIF_DECLARE extern
#endif

#ifndef _GAIAEXIF_H
#define _GAIAEXIF_H

#ifdef __cplusplus
extern "C"
{
#endif

/* constants used for BLOB value types */
#define GAIA_HEX_BLOB 0
#define GAIA_GIF_BLOB 1
#define GAIA_PNG_BLOB 2
#define GAIA_JPEG_BLOB 3
#define GAIA_EXIF_BLOB 4
#define GAIA_EXIF_GPS_BLOB 5
#define GAIA_ZIP_BLOB 6
#define GAIA_PDF_BLOB 7
#define GAIA_GEOMETRY_BLOB 8
#define GAIA_TIFF_BLOB 9

/* constants used for EXIF value types */
#define GAIA_EXIF_NONE 0
#define GAIA_EXIF_BYTE 1
#define GAIA_EXIF_SHORT 2
#define GAIA_EXIF_STRING 3
#define GAIA_EXIF_LONG 4
#define GAIA_EXIF_RATIONAL 5
#define GAIA_EXIF_SLONG 9
#define GAIA_EXIF_SRATIONAL 10

typedef struct gaiaExifTagStruct
{
/* an EXIF TAG */
char Gps;
unsigned short TagId;
unsigned short Type;
unsigned short Count;
unsigned char TagOffset[4];
unsigned char *ByteValue;
char *StringValue;
unsigned short *ShortValues;
unsigned int *LongValues;
unsigned int *LongRationals1;
unsigned int *LongRationals2;
short *SignedShortValues;
int *SignedLongValues;
int *SignedLongRationals1;
int *SignedLongRationals2;
float *FloatValues;
double *DoubleValues;
struct gaiaExifTagStruct *Next;
} gaiaExifTag;
typedef gaiaExifTag *gaiaExifTagPtr;

typedef struct gaiaExifTagListStruct
{
/* an EXIF TAG LIST */
gaiaExifTagPtr First;
gaiaExifTagPtr Last;
int NumTags;
gaiaExifTagPtr *TagsArray;
} gaiaExifTagList;
typedef gaiaExifTagList *gaiaExifTagListPtr;

/* function prototipes */

GAIAEXIF_DECLARE gaiaExifTagListPtr gaiaGetExifTags (const unsigned char
*blob, int size);
GAIAEXIF_DECLARE void gaiaExifTagsFree (gaiaExifTagListPtr tag_list);
GAIAEXIF_DECLARE int gaiaGetExifTagsCount (gaiaExifTagListPtr tag_list);
GAIAEXIF_DECLARE gaiaExifTagPtr gaiaGetExifTagByPos (gaiaExifTagListPtr
tag_list,
const int pos);
GAIAEXIF_DECLARE gaiaExifTagPtr gaiaGetExifTagById (const gaiaExifTagListPtr
tag_list,
const unsigned short
tag_id);
GAIAEXIF_DECLARE gaiaExifTagPtr gaiaGetExifGpsTagById (const
gaiaExifTagListPtr
tag_list,
const unsigned short
tag_id);
GAIAEXIF_DECLARE gaiaExifTagPtr gaiaGetExifTagByName (const
gaiaExifTagListPtr
tag_list,
const char *tag_name);
GAIAEXIF_DECLARE unsigned short gaiaExifTagGetId (const gaiaExifTagPtr tag);
GAIAEXIF_DECLARE void gaiaExifTagGetName (const gaiaExifTagPtr tag,
char *tag_name, int len);
GAIAEXIF_DECLARE int gaiaIsExifGpsTag (const gaiaExifTagPtr tag);
GAIAEXIF_DECLARE unsigned short gaiaExifTagGetValueType (const
gaiaExifTagPtr
tag);
GAIAEXIF_DECLARE unsigned short gaiaExifTagGetNumValues (const
gaiaExifTagPtr
tag);
GAIAEXIF_DECLARE unsigned char gaiaExifTagGetByteValue (const gaiaExifTagPtr
tag, const int ind,
int *ok);
GAIAEXIF_DECLARE void gaiaExifTagGetStringValue (const gaiaExifTagPtr tag,
char *str, int len,
int *ok);
GAIAEXIF_DECLARE unsigned short gaiaExifTagGetShortValue (const
gaiaExifTagPtr
tag,
const int ind,
int *ok);
GAIAEXIF_DECLARE unsigned int gaiaExifTagGetLongValue (const gaiaExifTagPtr
tag, const int ind,
int *ok);
GAIAEXIF_DECLARE unsigned int gaiaExifTagGetRational1Value (const
gaiaExifTagPtr
tag,
const int ind,
int *ok);
GAIAEXIF_DECLARE unsigned int gaiaExifTagGetRational2Value (const
gaiaExifTagPtr
tag,
const int ind,
int *ok);
GAIAEXIF_DECLARE double gaiaExifTagGetRationalValue (const gaiaExifTagPtr
tag, const int ind,
int *ok);
GAIAEXIF_DECLARE short gaiaExifTagGetSignedShortValue (const gaiaExifTagPtr
tag, const int ind,
int *ok);
GAIAEXIF_DECLARE int gaiaExifTagGetSignedLongValue (const gaiaExifTagPtr
tag, const int ind,
int *ok);
GAIAEXIF_DECLARE int gaiaExifTagGetSignedRational1Value (const
gaiaExifTagPtr tag,
const int ind,
int *ok);
GAIAEXIF_DECLARE int gaiaExifTagGetSignedRational2Value (const
gaiaExifTagPtr tag,
const int ind,
int *ok);
GAIAEXIF_DECLARE double gaiaExifTagGetSignedRationalValue (const
gaiaExifTagPtr
tag,
const int ind,
int *ok);
GAIAEXIF_DECLARE float gaiaExifTagGetFloatValue (const gaiaExifTagPtr tag,
const int ind, int *ok);
GAIAEXIF_DECLARE double gaiaExifTagGetDoubleValue (const gaiaExifTagPtr tag,
const int ind, int *ok);
GAIAEXIF_DECLARE void gaiaExifTagGetHumanReadable (const gaiaExifTagPtr tag,
char *str, int len,
int *ok);
GAIAEXIF_DECLARE int gaiaGuessBlobType (const unsigned char *blob,
int size);
GAIAEXIF_DECLARE int gaiaGetGpsCoords (const unsigned char *blob, int size,
double *longitude, double *latitude);
GAIAEXIF_DECLARE int gaiaGetGpsLatLong (const unsigned char *blob, int size,
char *latlong, int ll_size);

#ifdef __cplusplus
}
#endif

#endif /* _GAIAEXIF_H */
999 changes: 999 additions & 0 deletions src/core/spatialite/headers/spatialite/gaiageo.h
View file

Large diffs are not rendered by default.

50 changes: 50 additions & 0 deletions src/core/spatialite/headers/spatialite/spatialite.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/*
spatialite.h -- Gaia support for SQLite extensions
version 2.4, 2009 September 17
Author: Sandro Furieri a.furieri@lqt.it
------------------------------------------------------------------------------
Version: MPL 1.1/GPL 2.0/LGPL 2.1
The contents of this file are subject to the Mozilla Public License Version
1.1 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.mozilla.org/MPL/
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
for the specific language governing rights and limitations under the
License.
The Original Code is the SpatiaLite library
The Initial Developer of the Original Code is Alessandro Furieri
Portions created by the Initial Developer are Copyright (C) 2008
the Initial Developer. All Rights Reserved.
Contributor(s):
Alternatively, the contents of this file may be used under the terms of
either the GNU General Public License Version 2 or later (the "GPL"), or
the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
in which case the provisions of the GPL or the LGPL are applicable instead
of those above. If you wish to allow use of your version of this file only
under the terms of either the GPL or the LGPL, and not to allow others to
use your version of this file under the terms of the MPL, indicate your
decision by deleting the provisions above and replace them with the notice
and other provisions required by the GPL or the LGPL. If you do not delete
the provisions above, a recipient may use your version of this file under
the terms of any one of the MPL, the GPL or the LGPL.
*/

int virtualshape_extension_init (sqlite3 * db);
int virtualdbf_extension_init (sqlite3 * db);
int virtualtext_extension_init (sqlite3 * db);
int virtualnetwork_extension_init (sqlite3 * db);
int virtualfdo_extension_init (sqlite3 * db);
int mbrcache_extension_init (sqlite3 * db);
6,410 changes: 6,410 additions & 0 deletions src/core/spatialite/headers/spatialite/sqlite3.h
View file

Large diffs are not rendered by default.

607 changes: 607 additions & 0 deletions src/core/spatialite/headers/spatialite/sqlite3ext.h
View file

Large diffs are not rendered by default.

170,513 changes: 170,513 additions & 0 deletions src/core/spatialite/spatialite.c
View file

Large diffs are not rendered by default.

120,950 changes: 120,950 additions & 0 deletions src/core/spatialite/sqlite3.c
View file

Large diffs are not rendered by default.

12 changes: 10 additions & 2 deletions src/gui/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,13 @@ INCLUDE_DIRECTORIES(
../core/symbology-ng
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../ui
${SQLITE3_INCLUDE_DIR}
)
IF (WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(../core/spatialite/headers)
INCLUDE_DIRECTORIES(../core/spatialite/headers/spatialite)
ELSE (WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
ENDIF (WITH_INTERNAL_SPATIALITE)

INCLUDE_DIRECTORIES(${GEOS_INCLUDE_DIR})

Expand Down Expand Up @@ -296,9 +301,12 @@ TARGET_LINK_LIBRARIES(qgis_gui
qgis_core
${QT_QTUITOOLS_LIBRARY}
#${QT_QTTEST_LIBRARY} # for ModelTest
${SQLITE3_LIBRARIES}
)

IF (NOT WITH_INTERNAL_SPATIALITE)
TARGET_LINK_LIBRARIES(qgis_gui ${SQLITE3_LIBRARIES})
ENDIF (NOT WITH_INTERNAL_SPATIALITE)

IF (APPLE)
SET_TARGET_PROPERTIES(qgis_gui PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
ENDIF (APPLE)
Expand Down
15 changes: 12 additions & 3 deletions src/helpviewer/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,21 @@ ADD_EXECUTABLE (qgis_help MACOSX_BUNDLE WIN32 ${HELP_SRCS} ${HELP_MOC_SRCS} ${HE
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../core
${CMAKE_CURRENT_BINARY_DIR}
${SQLITE3_INCLUDE_DIR}
)

IF (WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(../core/spatialite/headers/spatialite)
ELSE (WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
ENDIF (WITH_INTERNAL_SPATIALITE)

TARGET_LINK_LIBRARIES(qgis_help qgis_core)

IF (NOT WITH_INTERNAL_SPATIALITE)
TARGET_LINK_LIBRARIES(qgis_help ${SQLITE3_LIBRARY})
ENDIF (NOT WITH_INTERNAL_SPATIALITE)

TARGET_LINK_LIBRARIES(qgis_help
qgis_core
${SQLITE3_LIBRARY}
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTNETWORK_LIBRARY}
Expand Down
4 changes: 4 additions & 0 deletions src/mapserver/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ INCLUDE_DIRECTORIES(
.
)

IF (WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(BEFORE ../core/spatialite/headers/spatialite)
ENDIF (WITH_INTERNAL_SPATIALITE)

TARGET_LINK_LIBRARIES(qgis_mapserv.fcgi
qgis_core
qgis_analysis
Expand Down
13 changes: 9 additions & 4 deletions src/plugins/offline_editing/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,17 @@ QT4_ADD_RESOURCES(offline_editing_plugin_RCC_SRCS ${offline_editing_plugin_RCCS}

ADD_LIBRARY (offlineeditingplugin MODULE ${offline_editing_plugin_SRCS} ${offline_editing_plugin_MOC_SRCS} ${offline_editing_plugin_RCC_SRCS} ${offline_editing_plugin_UIS_H})

ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)
IF (WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(../../core/spatialite/headers)
INCLUDE_DIRECTORIES(../../core/spatialite/headers/spatialite)
ELSE (WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
TARGET_LINK_LIBRARIES(offlineeditingplugin ${SPATIALITE_LIBRARY})
ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)
ENDIF (WITH_INTERNAL_SPATIALITE)

INCLUDE_DIRECTORIES(
${SPATIALITE_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
../../core ../../core/raster ../../core/renderer ../../core/symbology
../../gui
Expand All @@ -49,7 +55,6 @@ INCLUDE_DIRECTORIES(
TARGET_LINK_LIBRARIES(offlineeditingplugin
qgis_core
qgis_gui
${SPATIALITE_LIBRARY}
)


Expand Down
4 changes: 2 additions & 2 deletions src/providers/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ IF (POSTGRES_FOUND)
ADD_SUBDIRECTORY(postgres)
ENDIF (POSTGRES_FOUND)

IF (SPATIALITE_FOUND)
IF (SPATIALITE_FOUND OR WITH_INTERNAL_SPATIALITE)
ADD_SUBDIRECTORY(spatialite)
ENDIF (SPATIALITE_FOUND)
ENDIF (SPATIALITE_FOUND OR WITH_INTERNAL_SPATIALITE)

IF (EXPAT_FOUND)
ADD_SUBDIRECTORY(gpx)
Expand Down
12 changes: 10 additions & 2 deletions src/providers/osm/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,20 @@ INCLUDE_DIRECTORIES (
../../core
../../core/renderer
${GEOS_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
)

IF (WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(BEFORE ../../core/spatialite/headers/spatialite)
ELSE (WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
ENDIF (WITH_INTERNAL_SPATIALITE)

ADD_LIBRARY (osmprovider MODULE ${OSM_SRCS} ${OSM_MOC_SRCS})

TARGET_LINK_LIBRARIES (osmprovider qgis_core)
TARGET_LINK_LIBRARIES (osmprovider
qgis_core
)


########################################################
# Install
Expand Down
19 changes: 16 additions & 3 deletions src/providers/spatialite/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,31 @@ INCLUDE_DIRECTORIES(
../../core
../../gui
${CMAKE_CURRENT_BINARY_DIR}/../../ui
${SPATIALITE_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
)

IF(WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(
../../core/spatialite/headers
../../core/spatialite/headers/spatialite
)
ELSE(WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
ENDIF(WITH_INTERNAL_SPATIALITE)

INCLUDE_DIRECTORIES(${GEOS_INCLUDE_DIR})

ADD_LIBRARY (spatialiteprovider MODULE ${SPATIALITE_SRCS} ${SPATIALITE_MOC_SRCS})

TARGET_LINK_LIBRARIES(spatialiteprovider
qgis_core
qgis_gui
${SPATIALITE_LIBRARY}
)

IF(NOT WITH_INTERNAL_SPATIALITE)
TARGET_LINK_LIBRARIES(spatialiteprovider ${SPATIALITE_LIBRARY})
ENDIF(NOT WITH_INTERNAL_SPATIALITE)


########################################################
# Install

Expand Down