Skip to content
Commits on Source (11)
Expand all Show whitespace changes
Inline Side-by-side
Makefile-static-MinGW
View file @ 9a741be8
......@@ -13,7 +13,7 @@ all: ./static_bin/rl2sniff.exe ./static_bin/rl2tool.exe \
/usr/local/lib/librasterlite2.a \
/usr/local/lib/libspatialite.a \
/usr/local/lib/libsqlite3.a \
/usr/local/lib/liblwgeom.a \
/usr/local/lib/librttopo.a \
/usr/local/lib/libproj.a \
/usr/local/lib/libgeos_c.a \
/usr/local/lib/libgeos.a \
......@@ -46,7 +46,7 @@ all: ./static_bin/rl2sniff.exe ./static_bin/rl2tool.exe \
/usr/local/lib/librasterlite2.a \
/usr/local/lib/libspatialite.a \
/usr/local/lib/libsqlite3.a \
/usr/local/lib/liblwgeom.a \
/usr/local/lib/librttopo.a \
/usr/local/lib/libproj.a \
/usr/local/lib/libgeos_c.a \
/usr/local/lib/libgeos.a \
......@@ -79,7 +79,7 @@ all: ./static_bin/rl2sniff.exe ./static_bin/rl2tool.exe \
/usr/local/lib/librasterlite2.a \
/usr/local/lib/libspatialite.a \
/usr/local/lib/libsqlite3.a \
/usr/local/lib/liblwgeom.a \
/usr/local/lib/librttopo.a \
/usr/local/lib/libproj.a \
/usr/local/lib/libgeos_c.a \
/usr/local/lib/libgeos.a \
......
Makefile-static-mingw32 0 → 100644
View file @ 9a741be8
# SandroFurieri (c) 2014
# Makefile RasterLite2 statically linked CLI-tools [Win MSYS/MinGW]
CFLAGS = -Wall -Wextra -Wunused -pedantic -I/mingw32/local/include
GG = g++ -static
CC = gcc -static
all: ./static_bin/rl2sniff.exe ./static_bin/rl2tool.exe \
./static_bin/wmslite.exe
./static_bin/rl2sniff.exe: ./tools/rl2sniff.o
$(GG) ./tools/rl2sniff.o -o ./static_bin/rl2sniff.exe \
/mingw32/local/lib/librasterlite2.a \
/mingw32/local/lib/libspatialite.a \
/mingw32/local/lib/libsqlite3.a \
/mingw32/local/lib/librttopo.a \
/mingw32/local/lib/libproj.a \
/mingw32/local/lib/libgeos_c.a \
/mingw32/local/lib/libgeos.a \
/mingw32/local/lib/libfreexl.a \
/mingw32/local/lib/libcairo.a \
/mingw32/local/lib/libpixman-1.a \
/mingw32/local/lib/libfontconfig.a \
/mingw32/local/lib/libfreetype.a \
/mingw32/local/lib/libgif.a \
/mingw32/local/lib/libwebp.a \
/mingw32/local/lib/libjpeg.a \
/mingw32/local/lib/libgeotiff.a \
/mingw32/local/lib/libtiff.a \
/mingw32/local/lib/libpng.a \
/mingw32/local/lib/libCharLS.a \
/mingw32/local/lib/libopenjp2.a \
/mingw32/local/lib/libcurl.a \
/mingw32/local/lib/libssl.a \
/mingw32/local/lib/libcrypto.a \
/mingw32/local/lib/libxml2.a \
/mingw32/local/lib/libexpat.a \
/mingw32/local/lib/liblzma.a \
/mingw32/local/lib/libz.a \
/mingw32/local/lib/libiconv.a \
-lm -lmsimg32 -lws2_32 -lgdi32 -lwldap32 -static-libstdc++ -static-libgcc
strip --strip-all ./static_bin/rl2sniff.exe
./static_bin/rl2tool.exe: ./tools/rl2tool.o
$(GG) ./tools/rl2tool.o -o ./static_bin/rl2tool.exe \
/mingw32/local/lib/librasterlite2.a \
/mingw32/local/lib/libspatialite.a \
/mingw32/local/lib/libsqlite3.a \
/mingw32/local/lib/librttopo.a \
/mingw32/local/lib/libproj.a \
/mingw32/local/lib/libgeos_c.a \
/mingw32/local/lib/libgeos.a \
/mingw32/local/lib/libfreexl.a \
/mingw32/local/lib/libcairo.a \
/mingw32/local/lib/libpixman-1.a \
/mingw32/local/lib/libfontconfig.a \
/mingw32/local/lib/libfreetype.a \
/mingw32/local/lib/libgif.a \
/mingw32/local/lib/libwebp.a \
/mingw32/local/lib/libjpeg.a \
/mingw32/local/lib/libgeotiff.a \
/mingw32/local/lib/libtiff.a \
/mingw32/local/lib/libpng.a \
/mingw32/local/lib/libCharLS.a \
/mingw32/local/lib/libopenjp2.a \
/mingw32/local/lib/libcurl.a \
/mingw32/local/lib/libssl.a \
/mingw32/local/lib/libcrypto.a \
/mingw32/local/lib/libxml2.a \
/mingw32/local/lib/libexpat.a \
/mingw32/local/lib/liblzma.a \
/mingw32/local/lib/libz.a \
/mingw32/local/lib/libiconv.a \
-lm -lmsimg32 -lws2_32 -lgdi32 -lwldap32 -static-libstdc++ -static-libgcc
strip --strip-all ./static_bin/rl2tool.exe
./static_bin/wmslite.exe: ./tools/wmslite.o
$(GG) ./tools/wmslite.o -o ./static_bin/wmslite.exe \
/mingw32/local/lib/librasterlite2.a \
/mingw32/local/lib/libspatialite.a \
/mingw32/local/lib/libsqlite3.a \
/mingw32/local/lib/librttopo.a \
/mingw32/local/lib/libproj.a \
/mingw32/local/lib/libgeos_c.a \
/mingw32/local/lib/libgeos.a \
/mingw32/local/lib/libfreexl.a \
/mingw32/local/lib/libcairo.a \
/mingw32/local/lib/libpixman-1.a \
/mingw32/local/lib/libfontconfig.a \
/mingw32/local/lib/libfreetype.a \
/mingw32/local/lib/libgif.a \
/mingw32/local/lib/libwebp.a \
/mingw32/local/lib/libjpeg.a \
/mingw32/local/lib/libgeotiff.a \
/mingw32/local/lib/libtiff.a \
/mingw32/local/lib/libpng.a \
/mingw32/local/lib/libCharLS.a \
/mingw32/local/lib/libopenjp2.a \
/mingw32/local/lib/libcurl.a \
/mingw32/local/lib/libssl.a \
/mingw32/local/lib/libcrypto.a \
/mingw32/local/lib/libxml2.a \
/mingw32/local/lib/libexpat.a \
/mingw32/local/lib/liblzma.a \
/mingw32/local/lib/libz.a \
/mingw32/local/lib/libiconv.a \
-lm -lmsimg32 -lws2_32 -lgdi32 -lwldap32 -static-libstdc++ -static-libgcc
strip --strip-all ./static_bin/wmslite.exe
./tools/rl2sniff.o:
$(CC) $(CFLAGS) ./tools/rlsniff.c -c
./tools/rl2tool.o:
$(CC) $(CFLAGS) ./tools/rl2tool.c -c
./tools/wmslite.o:
$(CC) $(CFLAGS) ./tools/wmslite.c -c
Makefile-static-mingw64 0 → 100644
View file @ 9a741be8
# SandroFurieri (c) 2014
# Makefile RasterLite2 statically linked CLI-tools [Win MSYS/MinGW]
CFLAGS = -Wall -Wextra -Wunused -pedantic -I/mingw64/local/include
GG = g++ -static
CC = gcc -static
all: ./static_bin/rl2sniff.exe ./static_bin/rl2tool.exe \
./static_bin/wmslite.exe
./static_bin/rl2sniff.exe: ./tools/rl2sniff.o
$(GG) ./tools/rl2sniff.o -o ./static_bin/rl2sniff.exe \
/mingw64/local/lib/librasterlite2.a \
/mingw64/local/lib/libspatialite.a \
/mingw64/local/lib/libsqlite3.a \
/mingw64/local/lib/librttopo.a \
/mingw64/local/lib/libproj.a \
/mingw64/local/lib/libgeos_c.a \
/mingw64/local/lib/libgeos.a \
/mingw64/local/lib/libfreexl.a \
/mingw64/local/lib/libcairo.a \
/mingw64/local/lib/libpixman-1.a \
/mingw64/local/lib/libfontconfig.a \
/mingw64/local/lib/libfreetype.a \
/mingw64/local/lib/libgif.a \
/mingw64/local/lib/libwebp.a \
/mingw64/local/lib/libjpeg.a \
/mingw64/local/lib/libgeotiff.a \
/mingw64/local/lib/libtiff.a \
/mingw64/local/lib/libpng.a \
/mingw64/local/lib/libCharLS.a \
/mingw64/local/lib/libopenjp2.a \
/mingw64/local/lib/libcurl.a \
/mingw64/local/lib/libssl.a \
/mingw64/local/lib/libcrypto.a \
/mingw64/local/lib/libxml2.a \
/mingw64/local/lib/libexpat.a \
/mingw64/local/lib/liblzma.a \
/mingw64/local/lib/libz.a \
/mingw64/local/lib/libiconv.a \
-lm -lmsimg32 -lws2_32 -lgdi32 -lwldap32 -static-libstdc++ -static-libgcc
strip --strip-all ./static_bin/rl2sniff.exe
./static_bin/rl2tool.exe: ./tools/rl2tool.o
$(GG) ./tools/rl2tool.o -o ./static_bin/rl2tool.exe \
/mingw64/local/lib/librasterlite2.a \
/mingw64/local/lib/libspatialite.a \
/mingw64/local/lib/libsqlite3.a \
/mingw64/local/lib/librttopo.a \
/mingw64/local/lib/libproj.a \
/mingw64/local/lib/libgeos_c.a \
/mingw64/local/lib/libgeos.a \
/mingw64/local/lib/libfreexl.a \
/mingw64/local/lib/libcairo.a \
/mingw64/local/lib/libpixman-1.a \
/mingw64/local/lib/libfontconfig.a \
/mingw64/local/lib/libfreetype.a \
/mingw64/local/lib/libgif.a \
/mingw64/local/lib/libwebp.a \
/mingw64/local/lib/libjpeg.a \
/mingw64/local/lib/libgeotiff.a \
/mingw64/local/lib/libtiff.a \
/mingw64/local/lib/libpng.a \
/mingw64/local/lib/libCharLS.a \
/mingw64/local/lib/libopenjp2.a \
/mingw64/local/lib/libcurl.a \
/mingw64/local/lib/libssl.a \
/mingw64/local/lib/libcrypto.a \
/mingw64/local/lib/libxml2.a \
/mingw64/local/lib/libexpat.a \
/mingw64/local/lib/liblzma.a \
/mingw64/local/lib/libz.a \
/mingw64/local/lib/libiconv.a \
-lm -lmsimg32 -lws2_32 -lgdi32 -lwldap32 -static-libstdc++ -static-libgcc
strip --strip-all ./static_bin/rl2tool.exe
./static_bin/wmslite.exe: ./tools/wmslite.o
$(GG) ./tools/wmslite.o -o ./static_bin/wmslite.exe \
/mingw64/local/lib/librasterlite2.a \
/mingw64/local/lib/libspatialite.a \
/mingw64/local/lib/libsqlite3.a \
/mingw64/local/lib/librttopo.a \
/mingw64/local/lib/libproj.a \
/mingw64/local/lib/libgeos_c.a \
/mingw64/local/lib/libgeos.a \
/mingw64/local/lib/libfreexl.a \
/mingw64/local/lib/libcairo.a \
/mingw64/local/lib/libpixman-1.a \
/mingw64/local/lib/libfontconfig.a \
/mingw64/local/lib/libfreetype.a \
/mingw64/local/lib/libgif.a \
/mingw64/local/lib/libwebp.a \
/mingw64/local/lib/libjpeg.a \
/mingw64/local/lib/libgeotiff.a \
/mingw64/local/lib/libtiff.a \
/mingw64/local/lib/libpng.a \
/mingw64/local/lib/libCharLS.a \
/mingw64/local/lib/libopenjp2.a \
/mingw64/local/lib/libcurl.a \
/mingw64/local/lib/libssl.a \
/mingw64/local/lib/libcrypto.a \
/mingw64/local/lib/libxml2.a \
/mingw64/local/lib/libexpat.a \
/mingw64/local/lib/liblzma.a \
/mingw64/local/lib/libz.a \
/mingw64/local/lib/libiconv.a \
-lm -lmsimg32 -lws2_32 -lgdi32 -lwldap32 -static-libstdc++ -static-libgcc
strip --strip-all ./static_bin/wmslite.exe
./tools/rl2sniff.o:
$(CC) $(CFLAGS) ./tools/rlsniff.c -c
./tools/rl2tool.o:
$(CC) $(CFLAGS) ./tools/rl2tool.c -c
./tools/wmslite.o:
$(CC) $(CFLAGS) ./tools/wmslite.c -c
Makefile.am
View file @ 9a741be8
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = headers src test tools
SUBDIRS = headers src test tools examples
EXTRA_DIST = mainpage.doxy Android_R4.3.0.mk rasterlite2-4.3.0.mk \
Makefile-static-MinGW
Makefile-static-MinGW Makefile-static-mingw32 Makefile-static-mingw64
AUTOMAKE_OPTIONS = dist-zip foreign
......
Makefile.in
View file @ 9a741be8
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -285,6 +285,8 @@ LIBFREETYPE2_LIBS = @LIBFREETYPE2_LIBS@
LIBLZMA_CFLAGS = @LIBLZMA_CFLAGS@
LIBLZMA_LIBS = @LIBLZMA_LIBS@
LIBOBJS = @LIBOBJS@
LIBOPENJP2_CFLAGS = @LIBOPENJP2_CFLAGS@
LIBOPENJP2_LIBS = @LIBOPENJP2_LIBS@
LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
LIBPNG_LIBS = @LIBPNG_LIBS@
LIBS = @LIBS@
......@@ -379,9 +381,9 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = headers src test tools
SUBDIRS = headers src test tools examples
EXTRA_DIST = mainpage.doxy Android_R4.3.0.mk rasterlite2-4.3.0.mk \
Makefile-static-MinGW
Makefile-static-MinGW Makefile-static-mingw32 Makefile-static-mingw64
AUTOMAKE_OPTIONS = dist-zip foreign
pkgconfigdir = $(libdir)/pkgconfig
......@@ -645,7 +647,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
......@@ -671,7 +673,7 @@ dist-shar: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
-rm -f $(distdir).zip
......@@ -688,7 +690,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
......@@ -698,7 +700,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
......
aclocal.m4
View file @ 9a741be8
This diff is collapsed.
config.h.in
View file @ 9a741be8
......@@ -42,8 +42,8 @@
/* Define to 1 if you have the `jpeg' library (-ljpeg). */
#undef HAVE_LIBJPEG
/* Define to 1 if you have the `openjp2' library (-lopenjp2). */
#undef HAVE_LIBOPENJP2
/* Define to 1 if you have the `proj' library (-lproj). */
#undef HAVE_LIBPROJ
/* Define to 1 if you have the `sqlite3' library (-lsqlite3). */
#undef HAVE_LIBSQLITE3
......@@ -64,12 +64,6 @@
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the <openjpeg-2.0/openjpeg.h> header file. */
#undef HAVE_OPENJPEG_2_0_OPENJPEG_H
/* Define to 1 if you have the <openjpeg-2.1/openjpeg.h> header file. */
#undef HAVE_OPENJPEG_2_1_OPENJPEG_H
/* Define to 1 if you have the <png.h> header file. */
#undef HAVE_PNG_H
......@@ -151,9 +145,6 @@
/* Should be defined in order to disable WebP support. */
#undef OMIT_WEBP
/* testing for OpenJpeg 2.1 */
#undef OPENJPEG_2_1
/* Name of package */
#undef PACKAGE
......
configure
View file @ 9a741be8
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for librasterlite2 1.0.0-devel.
# Generated by GNU Autoconf 2.69 for librasterlite2 1.1.0-beta0.
#
# Report bugs to <a.furieri@lqt.it>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='librasterlite2'
PACKAGE_TARNAME='librasterlite2'
PACKAGE_VERSION='1.0.0-devel'
PACKAGE_STRING='librasterlite2 1.0.0-devel'
PACKAGE_VERSION='1.1.0-beta0'
PACKAGE_STRING='librasterlite2 1.1.0-beta0'
PACKAGE_BUGREPORT='a.furieri@lqt.it'
PACKAGE_URL=''
 
......@@ -652,6 +652,8 @@ LIBLZMA_LIBS
LIBLZMA_CFLAGS
LIBWEBP_LIBS
LIBWEBP_CFLAGS
LIBOPENJP2_LIBS
LIBOPENJP2_CFLAGS
LIBPNG_LIBS
LIBPNG_CFLAGS
PKG_CONFIG_LIBDIR
......@@ -818,6 +820,8 @@ PKG_CONFIG_PATH
PKG_CONFIG_LIBDIR
LIBPNG_CFLAGS
LIBPNG_LIBS
LIBOPENJP2_CFLAGS
LIBOPENJP2_LIBS
LIBWEBP_CFLAGS
LIBWEBP_LIBS
LIBLZMA_CFLAGS
......@@ -1372,7 +1376,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures librasterlite2 1.0.0-devel to adapt to many kinds of systems.
\`configure' configures librasterlite2 1.1.0-beta0 to adapt to many kinds of systems.
 
Usage: $0 [OPTION]... [VAR=VALUE]...
 
......@@ -1442,7 +1446,7 @@ fi
 
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of librasterlite2 1.0.0-devel:";;
short | recursive ) echo "Configuration of librasterlite2 1.1.0-beta0:";;
esac
cat <<\_ACEOF
 
......@@ -1499,6 +1503,10 @@ Some influential environment variables:
LIBPNG_CFLAGS
C compiler flags for LIBPNG, overriding pkg-config
LIBPNG_LIBS linker flags for LIBPNG, overriding pkg-config
LIBOPENJP2_CFLAGS
C compiler flags for LIBOPENJP2, overriding pkg-config
LIBOPENJP2_LIBS
linker flags for LIBOPENJP2, overriding pkg-config
LIBWEBP_CFLAGS
C compiler flags for LIBWEBP, overriding pkg-config
LIBWEBP_LIBS
......@@ -1594,7 +1602,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
librasterlite2 configure 1.0.0-devel
librasterlite2 configure 1.1.0-beta0
generated by GNU Autoconf 2.69
 
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -2138,7 +2146,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
 
It was created by librasterlite2 $as_me 1.0.0-devel, which was
It was created by librasterlite2 $as_me 1.1.0-beta0, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
$ $0 $@
......@@ -3009,7 +3017,7 @@ fi
 
# Define the identity of the package.
PACKAGE='librasterlite2'
VERSION='1.0.0-devel'
VERSION='1.1.0-beta0'
 
 
cat >>confdefs.h <<_ACEOF
......@@ -3145,7 +3153,6 @@ $as_echo "#define NDEBUG 1" >>confdefs.h
 
 
 
# config depending options
 
 
......@@ -17362,7 +17369,7 @@ if test "x$enable_gcov" = "xyes"; then
GCOV_FLAGS="-lgcov"
fi
 
ac_config_files="$ac_config_files Makefile headers/Makefile src/Makefile test/Makefile test/sql_stmt_tests/Makefile test/sql_stmt_security_tests/Makefile tools/Makefile Doxyfile rasterlite2.pc"
ac_config_files="$ac_config_files Makefile headers/Makefile src/Makefile test/Makefile test/sql_stmt_tests/Makefile test/sql_stmt_security_tests/Makefile tools/Makefile examples/Makefile Doxyfile rasterlite2.pc"
 
 
# exporting the TARGET_CPU string
......@@ -17608,6 +17615,53 @@ else
as_fn_error $? "'libtiff' is required but it doesn't seems to be installed on this system." "$LINENO" 5
fi
 
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pj_init_plus in -lproj" >&5
$as_echo_n "checking for pj_init_plus in -lproj... " >&6; }
if ${ac_cv_lib_proj_pj_init_plus+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lproj -lm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char pj_init_plus ();
int
main ()
{
return pj_init_plus ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_proj_pj_init_plus=yes
else
ac_cv_lib_proj_pj_init_plus=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_proj_pj_init_plus" >&5
$as_echo "$ac_cv_lib_proj_pj_init_plus" >&6; }
if test "x$ac_cv_lib_proj_pj_init_plus" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBPROJ 1
_ACEOF
LIBS="-lproj $LIBS"
else
as_fn_error $? "'l'libproj' is required but the version on this system does not support the required features (Version 4.8.0 or later is needed)." "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTIFSetFromProj4 in -lgeotiff" >&5
$as_echo_n "checking for GTIFSetFromProj4 in -lgeotiff... " >&6; }
if ${ac_cv_lib_geotiff_GTIFSetFromProj4+:} false; then :
......@@ -17850,7 +17904,6 @@ fi
 
 
 
#-----------------------------------------------------------------------
# --enable-openjpeg
#
......@@ -17862,121 +17915,83 @@ else
fi
 
if test x"$enable_openjpeg" != "xno"; then
#
# testing OpenJpeg-2 headers
# they could be either on -/include/openjpeg-2.0
# or on -/include/openjpeg-2.1
#
for ac_header in openjpeg-2.0/openjpeg.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.0/openjpeg.h" "ac_cv_header_openjpeg_2_0_openjpeg_h" "$ac_includes_default"
if test "x$ac_cv_header_openjpeg_2_0_openjpeg_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENJPEG_2_0_OPENJPEG_H 1
_ACEOF
fi
done
for ac_header in openjpeg-2.1/openjpeg.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.1/openjpeg.h" "ac_cv_header_openjpeg_2_1_openjpeg_h" "$ac_includes_default"
if test "x$ac_cv_header_openjpeg_2_1_openjpeg_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_OPENJPEG_2_1_OPENJPEG_H 1
_ACEOF
fi
 
done
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBOPENJP2" >&5
$as_echo_n "checking for LIBOPENJP2... " >&6; }
 
if test x"$ac_cv_header_openjpeg_2_0_openjpeg_h" != x"yes" &&
test x"$ac_cv_header_openjpeg_2_1_openjpeg_h" != x"yes";
then
as_fn_error $? "'OpenJpeg-2' is required but the header (openjpeg.h) doesn't seem to be installed on this system" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_create_decompress in -lopenjp2" >&5
$as_echo_n "checking for opj_create_decompress in -lopenjp2... " >&6; }
if ${ac_cv_lib_openjp2_opj_create_decompress+:} false; then :
$as_echo_n "(cached) " >&6
if test -n "$LIBOPENJP2_CFLAGS"; then
pkg_cv_LIBOPENJP2_CFLAGS="$LIBOPENJP2_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenjp2\""; } >&5
($PKG_CONFIG --exists --print-errors "libopenjp2") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBOPENJP2_CFLAGS=`$PKG_CONFIG --cflags "libopenjp2" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lopenjp2 -lm $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char opj_create_decompress ();
int
main ()
{
return opj_create_decompress ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_openjp2_opj_create_decompress=yes
pkg_failed=yes
fi
else
ac_cv_lib_openjp2_opj_create_decompress=no
pkg_failed=untried
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
if test -n "$LIBOPENJP2_LIBS"; then
pkg_cv_LIBOPENJP2_LIBS="$LIBOPENJP2_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenjp2\""; } >&5
($PKG_CONFIG --exists --print-errors "libopenjp2") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
pkg_cv_LIBOPENJP2_LIBS=`$PKG_CONFIG --libs "libopenjp2" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_openjp2_opj_create_decompress" >&5
$as_echo "$ac_cv_lib_openjp2_opj_create_decompress" >&6; }
if test "x$ac_cv_lib_openjp2_opj_create_decompress" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBOPENJP2 1
_ACEOF
LIBS="-lopenjp2 $LIBS"
else
as_fn_error $? "'libopenjp2' is required but it doesn't seems to be installed on this system." "$LINENO" 5
pkg_failed=untried
fi
 
# testing for OpenJpeg 2.0 or 2.1
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#ifdef HAVE_OPENJPEG_2_1_OPENJPEG_H
#include <openjpeg-2.1/openjpeg.h>
#else
#include <openjpeg-2.0/openjpeg.h>
#endif
int
main ()
{
void *d; opj_stream_t *s; opj_stream_set_user_data (s, &d, NULL);
;
return 0;
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
 
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
$as_echo "#define OPENJPEG_2_1 1" >>confdefs.h
 
if test $pkg_failed = yes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
 
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
LIBOPENJP2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libopenjp2" 2>&1`
else
LIBOPENJP2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libopenjp2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBOPENJP2_PKG_ERRORS" >&5
as_fn_error $? "'libopenjp2' (v2.1 or later) is required but it doesn't seem to be installed on this system." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
as_fn_error $? "'libopenjp2' (v2.1 or later) is required but it doesn't seem to be installed on this system." "$LINENO" 5
else
LIBOPENJP2_CFLAGS=$pkg_cv_LIBOPENJP2_CFLAGS
LIBOPENJP2_LIBS=$pkg_cv_LIBOPENJP2_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
 
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
$as_echo "#define OMIT_OPENJPEG 1" >>confdefs.h
 
fi
#-----------------------------------------------------------------------
 
#-----------------------------------------------------------------------
# --enable-webp
......@@ -19161,7 +19176,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by librasterlite2 $as_me 1.0.0-devel, which was
This file was extended by librasterlite2 $as_me 1.1.0-beta0, which was
generated by GNU Autoconf 2.69. Invocation command line was
 
CONFIG_FILES = $CONFIG_FILES
......@@ -19227,7 +19242,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
librasterlite2 config.status 1.0.0-devel
librasterlite2 config.status 1.1.0-beta0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
 
......@@ -19743,6 +19758,7 @@ do
"test/sql_stmt_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_tests/Makefile" ;;
"test/sql_stmt_security_tests/Makefile") CONFIG_FILES="$CONFIG_FILES test/sql_stmt_security_tests/Makefile" ;;
"tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
"examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
"Doxyfile") CONFIG_FILES="$CONFIG_FILES Doxyfile" ;;
"rasterlite2.pc") CONFIG_FILES="$CONFIG_FILES rasterlite2.pc" ;;
 
......
configure.ac
View file @ 9a741be8
......@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
AC_INIT(librasterlite2, 1.0.0-devel, a.furieri@lqt.it)
AC_INIT(librasterlite2, 1.1.0-beta0, a.furieri@lqt.it)
AC_LANG(C)
AC_CONFIG_AUX_DIR([.])
AC_CONFIG_MACRO_DIR([m4])
......@@ -28,8 +28,6 @@ AH_TEMPLATE([NDEBUG],
AC_DEFINE(NDEBUG)
AH_TEMPLATE([TARGET_CPU],
[Should contain a text-string describing the intended target CPU])
AH_TEMPLATE([OPENJPEG_2_1],
[testing for OpenJpeg 2.1])
# config depending options
AH_TEMPLATE([OMIT_LZMA],
......@@ -118,6 +116,7 @@ AC_CONFIG_FILES([Makefile \
test/sql_stmt_tests/Makefile \
test/sql_stmt_security_tests/Makefile \
tools/Makefile \
examples/Makefile \
Doxyfile \
rasterlite2.pc])
......@@ -131,13 +130,13 @@ AC_CHECK_LIB(z,inflateInit_,,AC_MSG_ERROR(['libz' is required but it doesn't see
AC_CHECK_LIB(jpeg,jpeg_start_compress,,AC_MSG_ERROR(['libjpeg' is required but it doesn't seems to be installed on this system.]),-lm)
AC_CHECK_LIB(gif,DGifSlurp,,AC_MSG_ERROR(['libgif' is required but it doesn't seems to be installed on this system.]),-lm)
AC_CHECK_LIB(tiff,TIFFClientOpen,,AC_MSG_ERROR(['libtiff' is required but it doesn't seems to be installed on this system.]),-lm)
AC_CHECK_LIB(proj,pj_init_plus,,AC_MSG_ERROR(['l'libproj' is required but the version on this system does not support the required features (Version 4.8.0 or later is needed).]),-lm)
AC_CHECK_LIB(geotiff,GTIFSetFromProj4,,AC_MSG_ERROR(['libgeotiff' [>= v.1.2.5] is required but it doesn't seems to be installed on this system.]),-lm)
PKG_CHECK_MODULES([LIBPNG], [libpng], , AC_MSG_ERROR(['libpng' is required but it doesn't seems to be installed on this system.]))
AC_SUBST(LIBPNG_CFLAGS)
AC_SUBST(LIBPNG_LIBS)
#-----------------------------------------------------------------------
# --enable-openjpeg
#
......@@ -145,36 +144,12 @@ AC_ARG_ENABLE(openjpeg, [AS_HELP_STRING(
[--enable-openjpeg], [enables OpenJpeg inclusion [default=yes]])],
[], [enable_openjpeg=yes])
if test x"$enable_openjpeg" != "xno"; then
#
# testing OpenJpeg-2 headers
# they could be either on -/include/openjpeg-2.0
# or on -/include/openjpeg-2.1
#
AC_CHECK_HEADERS(openjpeg-2.0/openjpeg.h)
AC_CHECK_HEADERS(openjpeg-2.1/openjpeg.h)
if test x"$ac_cv_header_openjpeg_2_0_openjpeg_h" != x"yes" &&
test x"$ac_cv_header_openjpeg_2_1_openjpeg_h" != x"yes";
then
AC_MSG_ERROR(['OpenJpeg-2' is required but the header (openjpeg.h) doesn't seem to be installed on this system])
fi
AC_CHECK_LIB(openjp2,opj_create_decompress,,AC_MSG_ERROR(['libopenjp2' is required but it doesn't seems to be installed on this system.]),-lm)
# testing for OpenJpeg 2.0 or 2.1
AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#ifdef HAVE_OPENJPEG_2_1_OPENJPEG_H
#include <openjpeg-2.1/openjpeg.h>
#else
#include <openjpeg-2.0/openjpeg.h>
#endif]],
[[void *d; opj_stream_t *s; opj_stream_set_user_data (s, &d, NULL);]])],
[
AC_MSG_RESULT([yes])
AC_DEFINE(OPENJPEG_2_1)
],
[AC_MSG_RESULT([no])]
)
PKG_CHECK_MODULES([LIBOPENJP2], [libopenjp2], , AC_MSG_ERROR(['libopenjp2' (v2.1 or later) is required but it doesn't seem to be installed on this system.]))
AC_SUBST(LIBOPENJP2_CFLAGS)
AC_SUBST(LIBOPENJP2_LIBS)
else
AC_DEFINE(OMIT_OPENJPEG)
fi
#-----------------------------------------------------------------------
#-----------------------------------------------------------------------
# --enable-webp
......
debian/changelog
View file @ 9a741be8
librasterlite2 (1.1.0~beta0-1) unstable; urgency=medium
* Move from experimental to unstable.
-- Bas Couwenberg <sebastic@debian.org> Fri, 03 Aug 2018 17:00:16 +0200
librasterlite2 (1.1.0~beta0-1~exp1) experimental; urgency=medium
* New upstream beta release.
* Add libproj-dev to build dependencies.
* Update copyright file, changes:
- Update copyright years for Alessandro Furieri
- Drop license & copyright for Autotools files
* Drop openjp patches, fixed upstream.
* Update symbols for 1.1.0~beta0.
-- Bas Couwenberg <sebastic@debian.org> Wed, 01 Aug 2018 11:04:23 +0200
librasterlite2 (1.0.0~rc0+devel1-8) unstable; urgency=medium
* Drop autopkgtest to test installability.
......
debian/control
View file @ 9a741be8
......@@ -15,6 +15,7 @@ Build-Depends: debhelper (>= 9.20160114),
liblzma-dev,
libopenjp2-7-dev,
libpng-dev,
libproj-dev,
libspatialite-dev (>= 4.3.0),
libsqlite3-dev,
libtiff-dev,
......
debian/copyright
View file @ 9a741be8
......@@ -4,53 +4,9 @@ Upstream-Contact: Alessandro Furieri <a.furieri@lqt.it>
Source: http://www.gaia-gis.it/gaia-sins/librasterlite2-sources/
Files: *
Copyright: © 2008-2015, Alessandro Furieri <a.furieri@lqt.it>
Copyright: 2008-2017, Alessandro Furieri <a.furieri@lqt.it>
License: MPL-1.1 or GPL-2+ or LGPL-2.1+
Files: aclocal.m4
Copyright: 1996-2014, Free Software Foundation, Inc.
License: fsf-unlimited-disclaimer
Files: config.guess
config.sub
Copyright: 1992-2013, Free Software Foundation, Inc.
License: GPL-3+ with Autoconf exception
Files: configure
Copyright: 1992-1996, 1998-2012, Free Software Foundation, Inc.
License: fsf-unlimited-configure
Files: compile
depcomp
missing
test-driver
Copyright: 1996-2013, Free Software Foundation, Inc.
License: GPL-2+ with Autoconf exception
Files: install-sh
Copyright: 1994, X Consortium
License: install-sh
Files: ltmain.sh
Copyright: 1996-2001, 2003-2011, Free Software Foundation, Inc.
License: GPL-2+ with Libtool exception
Files: m4/libtool.m4
m4/lt~obsolete.m4
m4/ltoptions.m4
m4/ltsugar.m4
m4/ltversion.m4
Copyright: 1996-2001, 2003-2011, Free Software Foundation, Inc.
License: fsf-unlimited
Files: Makefile.in
headers/Makefile.in
src/Makefile.in
test/Makefile.in
tools/Makefile.in
Copyright: 1994-2014, Free Software Foundation, Inc.
License: fsf-unlimited-makefile
Files: src/md5.c
src/md5.h
Copyright: disclaimed
......@@ -127,68 +83,6 @@ Files: debian/*
Copyright: © 2013, Bas Couwenberg <sebastic@debian.org>
License: GPL-2+
License: fsf-unlimited
This file is free software; the Free Software Foundation gives
unlimited permission to copy and/or distribute it, with or without
modifications, as long as this notice is preserved.
License: fsf-unlimited-configure
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
License: fsf-unlimited-disclaimer
This file is free software; the Free Software Foundation
gives unlimited permission to copy and/or distribute it,
with or without modifications, as long as this notice is preserved.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY, to the extent permitted by law; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE.
License: fsf-unlimited-makefile
This Makefile.in is free software; the Free Software Foundation
gives unlimited permission to copy and/or distribute it,
with or without modifications, as long as this notice is preserved.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY, to the extent permitted by law; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE.
License: install-sh
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
.
Except as contained in this notice, the name of the X Consortium shall not
be used in advertising or otherwise to promote the sale, use or other deal-
ings in this Software without prior written authorization from the X Consor-
tium.
.
.
FSF changes to this file are in the public domain.
.
Calling this script install-sh is preferred over install.sh, to prevent
`make' implicit rules from creating a file called install from it
when there is no Makefile.
.
This script is compatible with the BSD install script, but was written
from scratch.
License: BSD-4-Clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
......@@ -218,55 +112,6 @@ License: BSD-4-Clause
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
License: GPL-2+ with Autoconf exception
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
As a special exception to the GNU General Public License, if you
distribute this file as part of a program that contains a
configuration script generated by Autoconf, you may include it under
the same distribution terms that you use for the rest of that program.
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
License: GPL-2+ with Libtool exception
GNU Libtool is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
.
As a special exception to the GNU General Public License,
if you distribute this file as part of a program or library that
is built using GNU Libtool, you may include this file under the
same distribution terms that you use for the rest of that program.
.
GNU Libtool is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with GNU Libtool; see the file COPYING. If not, a copy
can be downloaded from http://www.gnu.org/licenses/gpl.html,
or obtained by writing to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
License: GPL-2+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -282,31 +127,6 @@ License: GPL-2+
version 2 can be found in the file
`/usr/share/common-licenses/GPL-2'.
License: GPL-3+ with Autoconf exception
This file is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
.
As a special exception to the GNU General Public License, if you
distribute this file as part of a program that contains a
configuration script generated by Autoconf, you may include it under
the same distribution terms that you use for the rest of that
program. This Exception is an additional permission under section 7
of the GNU General Public License, version 3 ("GPLv3").
.
On Debian systems, the full text of the GNU General Public License
version 3 can be found in the file
`/usr/share/common-licenses/GPL-3'.
License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......
debian/librasterlite2-1.symbols
View file @ 9a741be8
......@@ -9,11 +9,14 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
destroy_wms_tile_pattern@Base 1.0.0~rc0
doRunDecoderThread@Base 1.0.0~rc0+devel
doRunImportThread@Base 1.0.0~rc0+devel
doRunMaskDecoderThread@Base 1.1.0~beta0
doRunShadowerThread@Base 1.0.0~rc0+devel
doRunTransformThread@Base 1.1.0~beta0
do_wms_GetFeatureInfo_get@Base 1.0.0~rc0
do_wms_GetFeatureInfo_post@Base 1.0.0~rc0
do_wms_GetMap_TileService_get@Base 1.0.0~rc0
do_wms_GetMap_TileService_post@Base 1.0.0~rc0
do_wms_GetMap_blob@Base 1.1.0~beta0
do_wms_GetMap_get@Base 1.0.0~rc0
do_wms_GetMap_post@Base 1.0.0~rc0
get_wms_abstract@Base 1.0.0~rc0
......@@ -109,6 +112,7 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
is_wms_layer_queryable@Base 1.0.0~rc0
is_wms_tile_service@Base 1.0.0~rc0
reset_wms_cache@Base 1.0.0~rc0
rl2_add_layer_to_multilayer@Base 1.1.0~beta0
rl2_aggregate_raster_statistics@Base 1.0.0~rc0
rl2_alloc_private@Base 1.0.0~rc0+devel
rl2_build_all_section_pyramids@Base 1.0.0~rc0
......@@ -121,6 +125,8 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_build_section_pyramid@Base 1.0.0~rc0
rl2_build_tiff_xml_summary@Base 1.0.0~rc0+devel
rl2_build_worldfile_path@Base 1.0.0~rc0+devel
rl2_cairo_version@Base 1.1.0~beta0
rl2_charLS_version@Base 1.1.0~beta0
rl2_check_dbms_palette@Base 1.0.0~rc0
rl2_check_raster_coverage_destination@Base 1.0.0~rc0+devel
rl2_check_raster_coverage_origin@Base 1.0.0~rc0+devel
......@@ -132,6 +138,7 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_compute_file_md5_checksum@Base 1.0.0~rc0+devel
rl2_copy_raster_coverage@Base 1.0.0~rc0+devel
rl2_coverage_georeference@Base 1.0.0~rc0
rl2_create_affine_transform@Base 1.1.0~beta0
rl2_create_ascii_grid_destination@Base 1.0.0~rc0
rl2_create_ascii_grid_origin@Base 1.0.0~rc0
rl2_create_coverage@Base 1.0.0~rc0
......@@ -146,12 +153,16 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_create_group_style_from_dbms@Base 1.0.0~rc0
rl2_create_mem_pdf_target@Base 1.0.0~rc0
rl2_create_mono_band_pixel@Base 1.0.0~rc0
rl2_create_multi_layer@Base 1.1.0~beta0
rl2_create_network_canvas@Base 1.1.0~beta0
rl2_create_palette@Base 1.0.0~rc0
rl2_create_pattern_from_external_graphic@Base 1.0.0~rc0+devel
rl2_create_pattern_from_external_svg@Base 1.0.0~rc0+devel
rl2_create_pixel@Base 1.0.0~rc0
rl2_create_pixel_none@Base 1.1.0~beta0
rl2_create_raster@Base 1.0.0~rc0
rl2_create_raster_alpha@Base 1.0.0~rc0+devel
rl2_create_raster_canvas@Base 1.1.0~beta0
rl2_create_raster_pixel@Base 1.0.0~rc0
rl2_create_raster_statistics@Base 1.0.0~rc0
rl2_create_raster_statistics_from_dbms@Base 1.0.0~rc0
......@@ -161,24 +172,31 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_create_tiff_origin@Base 1.0.0~rc0
rl2_create_tiff_worldfile_destination@Base 1.0.0~rc0
rl2_create_tiff_worldfile_origin@Base 1.0.0~rc0
rl2_create_topology_canvas@Base 1.1.0~beta0
rl2_create_triple_band_pixel@Base 1.0.0~rc0
rl2_create_variant_array@Base 1.0.0~rc0+devel
rl2_create_vector_canvas@Base 1.1.0~beta0
rl2_create_vector_layer@Base 1.0.0~rc0+devel
rl2_create_vector_layer_from_dbms@Base 1.0.0~rc0+devel
rl2_create_wms_canvas@Base 1.1.0~beta0
rl2_curl_version@Base 1.1.0~beta0
rl2_delete_all_pyramids@Base 1.0.0~rc0
rl2_delete_dbms_section@Base 1.0.0~rc0
rl2_delete_section_pyramid@Base 1.0.0~rc0
rl2_deserialize_dbms_palette@Base 1.0.0~rc0
rl2_deserialize_dbms_pixel@Base 1.0.0~rc0
rl2_deserialize_dbms_raster_statistics@Base 1.0.0~rc0
rl2_destroy_affine_transform@Base 1.1.0~beta0
rl2_destroy_ascii_grid_destination@Base 1.0.0~rc0
rl2_destroy_ascii_grid_origin@Base 1.0.0~rc0
rl2_destroy_canvas@Base 1.1.0~beta0
rl2_destroy_coverage@Base 1.0.0~rc0
rl2_destroy_coverage_style@Base 1.0.0~rc0+devel
rl2_destroy_feature_type_style@Base 1.0.0~rc0+devel
rl2_destroy_group_renderer@Base 1.0.0~rc0
rl2_destroy_group_style@Base 1.0.0~rc0
rl2_destroy_mem_pdf_target@Base 1.0.0~rc0
rl2_destroy_multi_layer@Base 1.1.0~beta0
rl2_destroy_palette@Base 1.0.0~rc0
rl2_destroy_pixel@Base 1.0.0~rc0
rl2_destroy_raster@Base 1.0.0~rc0
......@@ -219,10 +237,12 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_export_triple_band_geotiff_from_dbms@Base 1.0.0~rc0
rl2_export_triple_band_tiff_from_dbms@Base 1.0.0~rc0
rl2_export_triple_band_tiff_worldfile_from_dbms@Base 1.0.0~rc0
rl2_feature_type_style_from_xml@Base 1.1.0~beta0
rl2_find_matching_resolution@Base 1.0.0~rc0
rl2_font_decode@Base 1.0.0~rc0+devel
rl2_font_encode@Base 1.0.0~rc0+devel
rl2_free@Base 1.0.0~rc0
rl2_geotiff_version@Base 1.1.0~beta0
rl2_get_TrueType_font@Base 1.0.0~rc0+devel
rl2_get_ascii_grid_destination_path@Base 1.0.0~rc0
rl2_get_ascii_grid_destination_resolution@Base 1.0.0~rc0
......@@ -235,10 +255,13 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_get_ascii_grid_origin_srid@Base 1.0.0~rc0
rl2_get_ascii_grid_origin_type@Base 1.0.0~rc0
rl2_get_band_statistics@Base 1.0.0~rc0
rl2_get_canvas_ctx@Base 1.1.0~beta0
rl2_get_canvas_type@Base 1.1.0~beta0
rl2_get_coverage_compression@Base 1.0.0~rc0
rl2_get_coverage_name@Base 1.0.0~rc0
rl2_get_coverage_no_data@Base 1.0.0~rc0
rl2_get_coverage_policies@Base 1.0.0~rc0+devel
rl2_get_coverage_prefix@Base 1.1.0~beta0
rl2_get_coverage_resolution@Base 1.0.0~rc0
rl2_get_coverage_srid@Base 1.0.0~rc0
rl2_get_coverage_style_name@Base 1.0.0~rc0+devel
......@@ -255,6 +278,7 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_get_feature_type_style_name@Base 1.0.0~rc0+devel
rl2_get_group_named_layer@Base 1.0.0~rc0
rl2_get_group_named_style@Base 1.0.0~rc0
rl2_get_group_prefix@Base 1.1.0~beta0
rl2_get_group_style_count@Base 1.0.0~rc0
rl2_get_group_style_name@Base 1.0.0~rc0
rl2_get_jpeg2000_blob_type@Base 1.0.0~rc0+devel
......@@ -263,6 +287,8 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_get_line_symbolizer@Base 1.0.0~rc0+devel
rl2_get_mem_pdf_buffer@Base 1.0.0~rc0
rl2_get_mono_band_raw_raster_data@Base 1.0.0~rc0
rl2_get_multilayer_count@Base 1.1.0~beta0
rl2_get_multilayer_item@Base 1.1.0~beta0
rl2_get_palette_colors@Base 1.0.0~rc0
rl2_get_palette_entries@Base 1.0.0~rc0
rl2_get_palette_index@Base 1.0.0~rc0
......@@ -307,11 +333,15 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_get_raw_raster_data@Base 1.0.0~rc0
rl2_get_raw_raster_data_bgcolor@Base 1.0.0~rc0
rl2_get_raw_raster_data_mixed_resolutions@Base 1.0.0~rc0+devel
rl2_get_raw_raster_data_mixed_resolutions_transparent@Base 1.1.0~beta0
rl2_get_raw_raster_data_transparent@Base 1.1.0~beta0
rl2_get_raw_raster_mask@Base 1.1.0~beta0
rl2_get_section_compression@Base 1.0.0~rc0
rl2_get_section_mono_band_raw_raster_data@Base 1.0.0~rc0+devel
rl2_get_section_name@Base 1.0.0~rc0
rl2_get_section_raster@Base 1.0.0~rc0
rl2_get_section_raw_raster_data@Base 1.0.0~rc0+devel
rl2_get_section_raw_raster_mask@Base 1.1.0~beta0
rl2_get_section_tile_size@Base 1.0.0~rc0
rl2_get_section_triple_band_raw_raster_data@Base 1.0.0~rc0+devel
rl2_get_svg_size@Base 1.0.0~rc0
......@@ -347,6 +377,7 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_get_triple_band_raw_raster_data@Base 1.0.0~rc0
rl2_get_vector_geometry_name@Base 1.0.0~rc0+devel
rl2_get_vector_geometry_type@Base 1.0.0~rc0+devel
rl2_get_vector_prefix@Base 1.1.0~beta0
rl2_get_vector_spatial_index@Base 1.0.0~rc0+devel
rl2_get_vector_srid@Base 1.0.0~rc0+devel
rl2_get_vector_symbolizer_count@Base 1.0.0~rc0+devel
......@@ -354,9 +385,11 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_get_vector_table_name@Base 1.0.0~rc0+devel
rl2_graph_add_line_to_path@Base 1.0.0~rc0
rl2_graph_close_subpath@Base 1.0.0~rc0
rl2_graph_context_get_dimensions@Base 1.1.0~beta0
rl2_graph_create_TrueType_font@Base 1.0.0~rc0+devel
rl2_graph_create_bitmap@Base 1.0.0~rc0
rl2_graph_create_context@Base 1.0.0~rc0
rl2_graph_create_context_rgba@Base 1.1.0~beta0
rl2_graph_create_mem_pdf_context@Base 1.0.0~rc0
rl2_graph_create_pattern@Base 1.0.0~rc0
rl2_graph_create_pdf_context@Base 1.0.0~rc0
......@@ -383,6 +416,7 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_graph_get_context_rgb_array@Base 1.0.0~rc0
rl2_graph_get_pattern_size@Base 1.0.0~rc0+devel
rl2_graph_get_text_extent@Base 1.0.0~rc0
rl2_graph_merge@Base 1.1.0~beta0
rl2_graph_move_to_point@Base 1.0.0~rc0
rl2_graph_pattern_recolor@Base 1.0.0~rc0+devel
rl2_graph_pattern_transparency@Base 1.0.0~rc0+devel
......@@ -411,6 +445,8 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_has_raster_symbolizer_color_map_interpolated@Base 1.0.0~rc0+devel
rl2_has_raster_symbolizer_shaded_relief@Base 1.0.0~rc0+devel
rl2_init@Base 1.0.0~rc0
rl2_install_dbms_palette_from_tiff@Base 1.1.0~beta0
rl2_is_canvas_ready@Base 1.1.0~beta0
rl2_is_coverage_compression_lossless@Base 1.0.0~rc0
rl2_is_coverage_compression_lossy@Base 1.0.0~rc0
rl2_is_coverage_uncompressed@Base 1.0.0~rc0
......@@ -419,6 +455,9 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_is_encoded_font_italic@Base 1.0.0~rc0+devel
rl2_is_geotiff_destination@Base 1.0.0~rc0
rl2_is_geotiff_origin@Base 1.0.0~rc0
rl2_is_multilayer_topogeo@Base 1.1.0~beta0
rl2_is_multilayer_toponet@Base 1.1.0~beta0
rl2_is_pixel_none@Base 1.1.0~beta0
rl2_is_pixel_opaque@Base 1.0.0~rc0
rl2_is_pixel_transparent@Base 1.0.0~rc0
rl2_is_raster_symbolizer_mono_band_selected@Base 1.0.0~rc0+devel
......@@ -431,6 +470,7 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_is_tiff_worldfile_origin@Base 1.0.0~rc0
rl2_is_tiled_tiff_destination@Base 1.0.0~rc0
rl2_is_tiled_tiff_origin@Base 1.0.0~rc0
rl2_is_valid_affine_transform@Base 1.1.0~beta0
rl2_is_valid_dbms_palette@Base 1.0.0~rc0
rl2_is_valid_dbms_pixel@Base 1.0.0~rc0
rl2_is_valid_dbms_raster_statistics@Base 1.0.0~rc0
......@@ -440,7 +480,19 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_is_valid_group_named_style@Base 1.0.0~rc0
rl2_is_valid_group_style@Base 1.0.0~rc0
rl2_is_valid_vector_symbolizer@Base 1.0.0~rc0+devel
rl2_is_vector_visible@Base 1.1.0~beta0
rl2_is_visible_style@Base 1.0.0~rc0+devel
rl2_jpeg_version@Base 1.1.0~beta0
rl2_line_symbolizer_get_col_graphic_stroke_href@Base 1.1.0~beta0
rl2_line_symbolizer_get_col_graphic_stroke_recode_color@Base 1.1.0~beta0
rl2_line_symbolizer_get_col_perpendicular_offset@Base 1.1.0~beta0
rl2_line_symbolizer_get_col_stroke_color@Base 1.1.0~beta0
rl2_line_symbolizer_get_col_stroke_dash_array@Base 1.1.0~beta0
rl2_line_symbolizer_get_col_stroke_dash_offset@Base 1.1.0~beta0
rl2_line_symbolizer_get_col_stroke_linecap@Base 1.1.0~beta0
rl2_line_symbolizer_get_col_stroke_linejoin@Base 1.1.0~beta0
rl2_line_symbolizer_get_col_stroke_opacity@Base 1.1.0~beta0
rl2_line_symbolizer_get_col_stroke_width@Base 1.1.0~beta0
rl2_line_symbolizer_get_graphic_stroke_href@Base 1.0.0~rc0+devel
rl2_line_symbolizer_get_graphic_stroke_recode_color@Base 1.0.0~rc0+devel
rl2_line_symbolizer_get_graphic_stroke_recode_count@Base 1.0.0~rc0+devel
......@@ -458,17 +510,46 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_load_mrasters_into_dbms@Base 1.0.0~rc0
rl2_load_raster_into_dbms@Base 1.0.0~rc0
rl2_load_raw_raster_into_dbms@Base 1.0.0~rc0+devel
rl2_load_raw_tiles_into_dbms@Base 1.1.0~beta0
rl2_lzma_version@Base 1.1.0~beta0
rl2_map_image_blob_from_raster@Base 1.1.0~beta0
rl2_map_image_blob_from_vector@Base 1.1.0~beta0
rl2_map_image_from_wms@Base 1.1.0~beta0
rl2_map_image_paint_from_raster@Base 1.1.0~beta0
rl2_map_image_paint_from_vector@Base 1.1.0~beta0
rl2_map_image_paint_from_vector_ex@Base 1.1.0~beta0
rl2_openJPEG_version@Base 1.1.0~beta0
rl2_parse_hexrgb@Base 1.0.0~rc0
rl2_pixel_from_raster_by_point@Base 1.1.0~beta0
rl2_png_version@Base 1.1.0~beta0
rl2_point_symbolizer_get_anchor_point@Base 1.0.0~rc0+devel
rl2_point_symbolizer_get_col_anchor_point_x@Base 1.1.0~beta0
rl2_point_symbolizer_get_col_anchor_point_y@Base 1.1.0~beta0
rl2_point_symbolizer_get_col_displacement_x@Base 1.1.0~beta0
rl2_point_symbolizer_get_col_displacement_y@Base 1.1.0~beta0
rl2_point_symbolizer_get_col_graphic_href@Base 1.1.0~beta0
rl2_point_symbolizer_get_col_graphic_recode_color@Base 1.1.0~beta0
rl2_point_symbolizer_get_col_opacity@Base 1.1.0~beta0
rl2_point_symbolizer_get_col_rotation@Base 1.1.0~beta0
rl2_point_symbolizer_get_col_size@Base 1.1.0~beta0
rl2_point_symbolizer_get_count@Base 1.0.0~rc0+devel
rl2_point_symbolizer_get_displacement@Base 1.0.0~rc0+devel
rl2_point_symbolizer_get_graphic_href@Base 1.0.0~rc0+devel
rl2_point_symbolizer_get_graphic_recode_color@Base 1.0.0~rc0+devel
rl2_point_symbolizer_get_graphic_recode_count@Base 1.1.0~beta0
rl2_point_symbolizer_get_opacity@Base 1.0.0~rc0+devel
rl2_point_symbolizer_get_rotation@Base 1.0.0~rc0+devel
rl2_point_symbolizer_get_size@Base 1.0.0~rc0+devel
rl2_point_symbolizer_is_graphic@Base 1.0.0~rc0+devel
rl2_point_symbolizer_is_mark@Base 1.0.0~rc0+devel
rl2_point_symbolizer_mark_get_col_fill_color@Base 1.1.0~beta0
rl2_point_symbolizer_mark_get_col_stroke_color@Base 1.1.0~beta0
rl2_point_symbolizer_mark_get_col_stroke_dash_array@Base 1.1.0~beta0
rl2_point_symbolizer_mark_get_col_stroke_dash_offset@Base 1.1.0~beta0
rl2_point_symbolizer_mark_get_col_stroke_linecap@Base 1.1.0~beta0
rl2_point_symbolizer_mark_get_col_stroke_linejoin@Base 1.1.0~beta0
rl2_point_symbolizer_mark_get_col_stroke_width@Base 1.1.0~beta0
rl2_point_symbolizer_mark_get_col_well_known_type@Base 1.1.0~beta0
rl2_point_symbolizer_mark_get_fill_color@Base 1.0.0~rc0+devel
rl2_point_symbolizer_mark_get_stroke_color@Base 1.0.0~rc0+devel
rl2_point_symbolizer_mark_get_stroke_dash_count@Base 1.0.0~rc0+devel
......@@ -480,6 +561,22 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_point_symbolizer_mark_get_well_known_type@Base 1.0.0~rc0+devel
rl2_point_symbolizer_mark_has_fill@Base 1.0.0~rc0+devel
rl2_point_symbolizer_mark_has_stroke@Base 1.0.0~rc0+devel
rl2_polygon_symbolizer_get_col_displacement_x@Base 1.1.0~beta0
rl2_polygon_symbolizer_get_col_displacement_y@Base 1.1.0~beta0
rl2_polygon_symbolizer_get_col_fill_color@Base 1.1.0~beta0
rl2_polygon_symbolizer_get_col_fill_opacity@Base 1.1.0~beta0
rl2_polygon_symbolizer_get_col_graphic_fill_href@Base 1.1.0~beta0
rl2_polygon_symbolizer_get_col_graphic_fill_recode_color@Base 1.1.0~beta0
rl2_polygon_symbolizer_get_col_graphic_stroke_href@Base 1.1.0~beta0
rl2_polygon_symbolizer_get_col_graphic_stroke_recode_color@Base 1.1.0~beta0
rl2_polygon_symbolizer_get_col_perpendicular_offset@Base 1.1.0~beta0
rl2_polygon_symbolizer_get_col_stroke_color@Base 1.1.0~beta0
rl2_polygon_symbolizer_get_col_stroke_dash_array@Base 1.1.0~beta0
rl2_polygon_symbolizer_get_col_stroke_dash_offset@Base 1.1.0~beta0
rl2_polygon_symbolizer_get_col_stroke_linecap@Base 1.1.0~beta0
rl2_polygon_symbolizer_get_col_stroke_linejoin@Base 1.1.0~beta0
rl2_polygon_symbolizer_get_col_stroke_opacity@Base 1.1.0~beta0
rl2_polygon_symbolizer_get_col_stroke_width@Base 1.1.0~beta0
rl2_polygon_symbolizer_get_displacement@Base 1.0.0~rc0+devel
rl2_polygon_symbolizer_get_fill_color@Base 1.0.0~rc0+devel
rl2_polygon_symbolizer_get_fill_opacity@Base 1.0.0~rc0+devel
......@@ -502,8 +599,10 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_polygon_symbolizer_has_graphic_fill@Base 1.0.0~rc0+devel
rl2_polygon_symbolizer_has_graphic_stroke@Base 1.0.0~rc0+devel
rl2_polygon_symbolizer_has_stroke@Base 1.0.0~rc0+devel
rl2_prime_background@Base 1.1.0~beta0
rl2_prime_void_tile@Base 1.0.0~rc0
rl2_prime_void_tile_palette@Base 1.0.0~rc0
rl2_query_dbms_raster_tile@Base 1.1.0~beta0
rl2_raster_band_to_uint16@Base 1.0.0~rc0
rl2_raster_band_to_uint8@Base 1.0.0~rc0
rl2_raster_bands_to_RGB@Base 1.0.0~rc0
......@@ -546,6 +645,8 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_raster_to_lossy_webp@Base 1.0.0~rc0
rl2_raster_to_png@Base 1.0.0~rc0
rl2_raster_to_tiff_mono4@Base 1.0.0~rc0
rl2_rescale_pixbuf@Base 1.1.0~beta0
rl2_rescale_pixbuf_transparent@Base 1.1.0~beta0
rl2_resolve_base_resolution_from_dbms@Base 1.0.0~rc0+devel
rl2_resolve_full_section_from_dbms@Base 1.0.0~rc0+devel
rl2_rgb_alpha_to_png@Base 1.0.0~rc0
......@@ -571,8 +672,12 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_serialize_dbms_palette@Base 1.0.0~rc0
rl2_serialize_dbms_pixel@Base 1.0.0~rc0
rl2_serialize_dbms_raster_statistics@Base 1.0.0~rc0
rl2_set_affine_transform_destination@Base 1.1.0~beta0
rl2_set_affine_transform_origin@Base 1.1.0~beta0
rl2_set_coverage_policies@Base 1.0.0~rc0+devel
rl2_set_dbms_coverage_default_bands@Base 1.0.0~rc0+devel
rl2_set_multilayer_topogeo@Base 1.1.0~beta0
rl2_set_multilayer_toponet@Base 1.1.0~beta0
rl2_set_palette_color@Base 1.0.0~rc0
rl2_set_palette_hexrgb@Base 1.0.0~rc0
rl2_set_pixel_opaque@Base 1.0.0~rc0
......@@ -596,17 +701,34 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_set_variant_int@Base 1.0.0~rc0+devel
rl2_set_variant_null@Base 1.0.0~rc0+devel
rl2_set_variant_text@Base 1.0.0~rc0+devel
rl2_set_vector_visibility@Base 1.1.0~beta0
rl2_style_has_labels@Base 1.1.0~beta0
rl2_target_cpu@Base 1.0.0~rc0
rl2_text_symbolizer_get_col_fill_color@Base 1.1.0~beta0
rl2_text_symbolizer_get_col_fill_opacity@Base 1.1.0~beta0
rl2_text_symbolizer_get_col_font@Base 1.1.0~beta0
rl2_text_symbolizer_get_col_label@Base 1.1.0~beta0
rl2_text_symbolizer_get_col_size@Base 1.1.0~beta0
rl2_text_symbolizer_get_col_style@Base 1.1.0~beta0
rl2_text_symbolizer_get_col_weight@Base 1.1.0~beta0
rl2_text_symbolizer_get_fill_color@Base 1.0.0~rc0+devel
rl2_text_symbolizer_get_fill_opacity@Base 1.1.0~beta0
rl2_text_symbolizer_get_font_families_count@Base 1.0.0~rc0+devel
rl2_text_symbolizer_get_font_family_name@Base 1.0.0~rc0+devel
rl2_text_symbolizer_get_font_size@Base 1.0.0~rc0+devel
rl2_text_symbolizer_get_font_style@Base 1.0.0~rc0+devel
rl2_text_symbolizer_get_font_weight@Base 1.0.0~rc0+devel
rl2_text_symbolizer_get_halo_col_fill_color@Base 1.1.0~beta0
rl2_text_symbolizer_get_halo_col_fill_opacity@Base 1.1.0~beta0
rl2_text_symbolizer_get_halo_col_radius@Base 1.1.0~beta0
rl2_text_symbolizer_get_halo_fill_color@Base 1.0.0~rc0+devel
rl2_text_symbolizer_get_halo_fill_opacity@Base 1.1.0~beta0
rl2_text_symbolizer_get_halo_radius@Base 1.0.0~rc0+devel
rl2_text_symbolizer_get_label@Base 1.0.0~rc0+devel
rl2_text_symbolizer_get_label_placement_mode@Base 1.0.0~rc0+devel
rl2_text_symbolizer_get_line_placement_col_gap@Base 1.1.0~beta0
rl2_text_symbolizer_get_line_placement_col_initial_gap@Base 1.1.0~beta0
rl2_text_symbolizer_get_line_placement_col_perpendicular_offset@Base 1.1.0~beta0
rl2_text_symbolizer_get_line_placement_gap@Base 1.0.0~rc0+devel
rl2_text_symbolizer_get_line_placement_generalize_line@Base 1.0.0~rc0+devel
rl2_text_symbolizer_get_line_placement_initial_gap@Base 1.0.0~rc0+devel
......@@ -614,21 +736,28 @@ librasterlite2.so.1 #PACKAGE# #MINVER#
rl2_text_symbolizer_get_line_placement_is_repeated@Base 1.0.0~rc0+devel
rl2_text_symbolizer_get_line_placement_perpendicular_offset@Base 1.0.0~rc0+devel
rl2_text_symbolizer_get_point_placement_anchor_point@Base 1.0.0~rc0+devel
rl2_text_symbolizer_get_point_placement_col_anchor_point_x@Base 1.1.0~beta0
rl2_text_symbolizer_get_point_placement_col_anchor_point_y@Base 1.1.0~beta0
rl2_text_symbolizer_get_point_placement_col_displacement_x@Base 1.1.0~beta0
rl2_text_symbolizer_get_point_placement_col_displacement_y@Base 1.1.0~beta0
rl2_text_symbolizer_get_point_placement_col_rotation@Base 1.1.0~beta0
rl2_text_symbolizer_get_point_placement_displacement@Base 1.0.0~rc0+devel
rl2_text_symbolizer_get_point_placement_rotation@Base 1.0.0~rc0+devel
rl2_text_symbolizer_has_fill@Base 1.0.0~rc0+devel
rl2_text_symbolizer_has_halo@Base 1.0.0~rc0+devel
rl2_text_symbolizer_has_halo_fill@Base 1.0.0~rc0+devel
rl2_tiff_version@Base 1.1.0~beta0
rl2_transform_bitmap@Base 1.1.0~beta0
rl2_update_dbms_coverage@Base 1.0.0~rc0
rl2_update_dbms_palette@Base 1.0.0~rc0
rl2_version@Base 1.0.0~rc0
rl2_webp_version@Base 1.1.0~beta0
rl2_write_ascii_grid_header@Base 1.0.0~rc0
rl2_write_ascii_grid_scanline@Base 1.0.0~rc0
rl2_write_tiff_scanline@Base 1.0.0~rc0
rl2_write_tiff_tile@Base 1.0.0~rc0
rl2_write_tiff_worldfile@Base 1.0.0~rc0
rl2targetcpu@Base 1.0.0~rc0
rl2version@Base 1.0.0~rc0
rl2_zlib_version@Base 1.1.0~beta0
set_wms_cache_max_size@Base 1.0.0~rc0
wms_feature_collection_parse_geometries@Base 1.0.0~rc0
wms_layer_has_children@Base 1.0.0~rc0
......
debian/patches/openjp-2.2.patch deleted 100644 → 0
View file @ 90accae4
Description: Add support for OpenJPEig 2.2.
Author: Alessandro Furieri <a.furieri@lqt.it>
Origin: https://www.gaia-gis.it/fossil/librasterlite2/ci/d8b9d9894ad2d72a?sbs=1
Bug: https://www.gaia-gis.it/fossil/librasterlite2/tktview/4085e7ccf0ce2a350e9cabc93d37bf06a75ca8cf
Bug-Debian: https://bugs.debian.org/876808
--- a/config.h.in
+++ b/config.h.in
@@ -70,6 +70,9 @@
/* Define to 1 if you have the <openjpeg-2.1/openjpeg.h> header file. */
#undef HAVE_OPENJPEG_2_1_OPENJPEG_H
+/* Define to 1 if you have the <openjpeg-2.2/openjpeg.h> header file. */
+#undef HAVE_OPENJPEG_2_2_OPENJPEG_H
+
/* Define to 1 if you have the <png.h> header file. */
#undef HAVE_PNG_H
@@ -154,6 +157,9 @@
/* testing for OpenJpeg 2.1 */
#undef OPENJPEG_2_1
+/* testing for OpenJpeg 2.2 */
+#undef OPENJPEG_2_2
+
/* Name of package */
#undef PACKAGE
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,8 @@ AH_TEMPLATE([TARGET_CPU],
[Should contain a text-string describing the intended target CPU])
AH_TEMPLATE([OPENJPEG_2_1],
[testing for OpenJpeg 2.1])
+AH_TEMPLATE([OPENJPEG_2_2],
+ [testing for OpenJpeg 2.2])
# config depending options
AH_TEMPLATE([OMIT_LZMA],
@@ -149,28 +151,18 @@ AC_ARG_ENABLE(openjpeg, [AS_HELP_STRING(
# testing OpenJpeg-2 headers
# they could be either on -/include/openjpeg-2.0
# or on -/include/openjpeg-2.1
+ # or on -/include/openjpeg-2.2
#
AC_CHECK_HEADERS(openjpeg-2.0/openjpeg.h)
AC_CHECK_HEADERS(openjpeg-2.1/openjpeg.h)
+ AC_CHECK_HEADERS(openjpeg-2.2/openjpeg.h)
if test x"$ac_cv_header_openjpeg_2_0_openjpeg_h" != x"yes" &&
- test x"$ac_cv_header_openjpeg_2_1_openjpeg_h" != x"yes";
+ test x"$ac_cv_header_openjpeg_2_1_openjpeg_h" != x"yes" &&
+ test x"$ac_cv_header_openjpeg_2_2_openjpeg_h" != x"yes";
then
AC_MSG_ERROR(['OpenJpeg-2' is required but the header (openjpeg.h) doesn't seem to be installed on this system])
fi
AC_CHECK_LIB(openjp2,opj_create_decompress,,AC_MSG_ERROR(['libopenjp2' is required but it doesn't seems to be installed on this system.]),-lm)
- # testing for OpenJpeg 2.0 or 2.1
- AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#ifdef HAVE_OPENJPEG_2_1_OPENJPEG_H
- #include <openjpeg-2.1/openjpeg.h>
- #else
- #include <openjpeg-2.0/openjpeg.h>
- #endif]],
- [[void *d; opj_stream_t *s; opj_stream_set_user_data (s, &d, NULL);]])],
- [
- AC_MSG_RESULT([yes])
- AC_DEFINE(OPENJPEG_2_1)
- ],
- [AC_MSG_RESULT([no])]
- )
else
AC_DEFINE(OMIT_OPENJPEG)
fi
--- a/src/rl2openjpeg.c
+++ b/src/rl2openjpeg.c
@@ -60,12 +60,16 @@ the terms of any one of the MPL, the GPL
#ifdef HAVE_OPENJPEG_2_1_OPENJPEG_H
#include <openjpeg-2.1/openjpeg.h>
#else
+#ifdef HAVE_OPENJPEG_2_2_OPENJPEG_H
+#include <openjpeg-2.2/openjpeg.h>
+#else
#ifdef __ANDROID__ /* Android specific */
#include <openjpeg.h>
#else
#include <openjpeg-2.0/openjpeg.h>
#endif
#endif
+#endif
struct jp2_memfile
{
@@ -400,7 +404,7 @@ compress_jpeg2000 (rl2RasterPtr ptr, uns
opj_stream_set_write_function (stream, write_callback);
opj_stream_set_seek_function (stream, seek_callback);
opj_stream_set_skip_function (stream, skip_callback);
-#ifdef OPENJPEG_2_1
+#if defined(HAVE_OPENJPEG_2_1_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_2_OPENJPEG_H)
opj_stream_set_user_data (stream, &clientdata, NULL);
#else
opj_stream_set_user_data (stream, &clientdata);
@@ -760,7 +764,7 @@ rl2_decode_jpeg2000_scaled (int scale, c
clientdata.size = jpeg2000_sz;
clientdata.eof = jpeg2000_sz;
clientdata.current = 0;
-#ifdef OPENJPEG_2_1
+#if defined(HAVE_OPENJPEG_2_1_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_2_OPENJPEG_H)
opj_stream_set_user_data (stream, &clientdata, NULL);
#else
opj_stream_set_user_data (stream, &clientdata);
@@ -1332,7 +1336,7 @@ rl2_get_jpeg2000_infos (const char *path
clientdata.size = jpeg2000_sz;
clientdata.eof = jpeg2000_sz;
clientdata.current = 0;
-#ifdef OPENJPEG_2_1
+#if defined(HAVE_OPENJPEG_2_1_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_2_OPENJPEG_H)
opj_stream_set_user_data (stream, &clientdata, NULL);
#else
opj_stream_set_user_data (stream, &clientdata);
@@ -1433,7 +1437,7 @@ rl2_get_jpeg2000_blob_type (const unsign
clientdata.size = jpeg2000_sz;
clientdata.eof = jpeg2000_sz;
clientdata.current = 0;
-#ifdef OPENJPEG_2_1
+#if defined(HAVE_OPENJPEG_2_1_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_2_OPENJPEG_H)
opj_stream_set_user_data (stream, &clientdata, NULL);
#else
opj_stream_set_user_data (stream, &clientdata);
debian/patches/openjp-2.3.patch deleted 100644 → 0
View file @ 90accae4
Description: Add support for OpenJPEG 2.3.
Author: Bas Couwennberg <sebastic@debian.org>
Bug: https://www.gaia-gis.it/fossil/librasterlite2/info/f3f2e7d32bf737e7
Forwarded: https://www.gaia-gis.it/fossil/librasterlite2/info/f3f2e7d32bf737e7
--- a/config.h.in
+++ b/config.h.in
@@ -73,6 +73,9 @@
/* Define to 1 if you have the <openjpeg-2.2/openjpeg.h> header file. */
#undef HAVE_OPENJPEG_2_2_OPENJPEG_H
+/* Define to 1 if you have the <openjpeg-2.3/openjpeg.h> header file. */
+#undef HAVE_OPENJPEG_2_3_OPENJPEG_H
+
/* Define to 1 if you have the <png.h> header file. */
#undef HAVE_PNG_H
@@ -160,6 +163,9 @@
/* testing for OpenJpeg 2.2 */
#undef OPENJPEG_2_2
+/* testing for OpenJpeg 2.3 */
+#undef OPENJPEG_2_3
+
/* Name of package */
#undef PACKAGE
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,8 @@ AH_TEMPLATE([OPENJPEG_2_1],
[testing for OpenJpeg 2.1])
AH_TEMPLATE([OPENJPEG_2_2],
[testing for OpenJpeg 2.2])
+AH_TEMPLATE([OPENJPEG_2_3],
+ [testing for OpenJpeg 2.3])
# config depending options
AH_TEMPLATE([OMIT_LZMA],
@@ -152,13 +154,16 @@ AC_ARG_ENABLE(openjpeg, [AS_HELP_STRING(
# they could be either on -/include/openjpeg-2.0
# or on -/include/openjpeg-2.1
# or on -/include/openjpeg-2.2
+ # or on -/include/openjpeg-2.3
#
AC_CHECK_HEADERS(openjpeg-2.0/openjpeg.h)
AC_CHECK_HEADERS(openjpeg-2.1/openjpeg.h)
AC_CHECK_HEADERS(openjpeg-2.2/openjpeg.h)
+ AC_CHECK_HEADERS(openjpeg-2.3/openjpeg.h)
if test x"$ac_cv_header_openjpeg_2_0_openjpeg_h" != x"yes" &&
test x"$ac_cv_header_openjpeg_2_1_openjpeg_h" != x"yes" &&
- test x"$ac_cv_header_openjpeg_2_2_openjpeg_h" != x"yes";
+ test x"$ac_cv_header_openjpeg_2_2_openjpeg_h" != x"yes" &&
+ test x"$ac_cv_header_openjpeg_2_3_openjpeg_h" != x"yes";
then
AC_MSG_ERROR(['OpenJpeg-2' is required but the header (openjpeg.h) doesn't seem to be installed on this system])
fi
--- a/src/rl2openjpeg.c
+++ b/src/rl2openjpeg.c
@@ -63,6 +63,9 @@ the terms of any one of the MPL, the GPL
#ifdef HAVE_OPENJPEG_2_2_OPENJPEG_H
#include <openjpeg-2.2/openjpeg.h>
#else
+#ifdef HAVE_OPENJPEG_2_3_OPENJPEG_H
+#include <openjpeg-2.3/openjpeg.h>
+#else
#ifdef __ANDROID__ /* Android specific */
#include <openjpeg.h>
#else
@@ -70,6 +73,7 @@ the terms of any one of the MPL, the GPL
#endif
#endif
#endif
+#endif
struct jp2_memfile
{
@@ -404,7 +408,7 @@ compress_jpeg2000 (rl2RasterPtr ptr, uns
opj_stream_set_write_function (stream, write_callback);
opj_stream_set_seek_function (stream, seek_callback);
opj_stream_set_skip_function (stream, skip_callback);
-#if defined(HAVE_OPENJPEG_2_1_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_2_OPENJPEG_H)
+#if defined(HAVE_OPENJPEG_2_1_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_2_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_3_OPENJPEG_H)
opj_stream_set_user_data (stream, &clientdata, NULL);
#else
opj_stream_set_user_data (stream, &clientdata);
@@ -764,7 +768,7 @@ rl2_decode_jpeg2000_scaled (int scale, c
clientdata.size = jpeg2000_sz;
clientdata.eof = jpeg2000_sz;
clientdata.current = 0;
-#if defined(HAVE_OPENJPEG_2_1_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_2_OPENJPEG_H)
+#if defined(HAVE_OPENJPEG_2_1_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_2_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_3_OPENJPEG_H)
opj_stream_set_user_data (stream, &clientdata, NULL);
#else
opj_stream_set_user_data (stream, &clientdata);
@@ -1336,7 +1340,7 @@ rl2_get_jpeg2000_infos (const char *path
clientdata.size = jpeg2000_sz;
clientdata.eof = jpeg2000_sz;
clientdata.current = 0;
-#if defined(HAVE_OPENJPEG_2_1_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_2_OPENJPEG_H)
+#if defined(HAVE_OPENJPEG_2_1_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_2_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_3_OPENJPEG_H)
opj_stream_set_user_data (stream, &clientdata, NULL);
#else
opj_stream_set_user_data (stream, &clientdata);
@@ -1437,7 +1441,7 @@ rl2_get_jpeg2000_blob_type (const unsign
clientdata.size = jpeg2000_sz;
clientdata.eof = jpeg2000_sz;
clientdata.current = 0;
-#if defined(HAVE_OPENJPEG_2_1_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_2_OPENJPEG_H)
+#if defined(HAVE_OPENJPEG_2_1_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_2_OPENJPEG_H) || defined(HAVE_OPENJPEG_2_3_OPENJPEG_H)
opj_stream_set_user_data (stream, &clientdata, NULL);
#else
opj_stream_set_user_data (stream, &clientdata);
debian/patches/series deleted 100644 → 0
View file @ 90accae4
openjp-2.2.patch
openjp-2.3.patch
examples/Makefile.am 0 → 100644
View file @ 9a741be8
noinst_PROGRAMS = sample1
AM_CFLAGS = -I@srcdir@/../headers
AM_LDFLAGS = -L../src @LIBSPATIALITE_LIBS@ -lrasterlite2 -ljpeg -lpng -lm $(GCOV_FLAGS)
MOSTLYCLEANFILES = *.gcna *.gcno *.gcda
EXTRA_DIST = examples.doxy
examples/Makefile.in 0 → 100644
View file @ 9a741be8
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@SET_MAKE@
VPATH = @srcdir@
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
*) echo "am__make_running_with_option: internal error: invalid" \
"target option '$${target_option-}' specified" >&2; \
exit 1;; \
esac; \
has_opt=no; \
sane_makeflags=$$MAKEFLAGS; \
if $(am__is_gnu_make); then \
sane_makeflags=$$MFLAGS; \
else \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
bs=\\; \
sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
| sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
esac; \
fi; \
skip_next=no; \
strip_trailopt () \
{ \
flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
}; \
for flg in $$sane_makeflags; do \
test $$skip_next = yes && { skip_next=no; continue; }; \
case $$flg in \
*=*|--*) continue;; \
-*I) strip_trailopt 'I'; skip_next=yes;; \
-*I?*) strip_trailopt 'I';; \
-*O) strip_trailopt 'O'; skip_next=yes;; \
-*O?*) strip_trailopt 'O';; \
-*l) strip_trailopt 'l'; skip_next=yes;; \
-*l?*) strip_trailopt 'l';; \
-[dEDm]) skip_next=yes;; \
-[JT]) skip_next=yes;; \
esac; \
case $$flg in \
*$$target_option*) has_opt=yes; break;; \
esac; \
done; \
test $$has_opt = yes
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_HEADER = $(INSTALL_DATA)
transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
noinst_PROGRAMS = sample1$(EXEEXT)
subdir = examples
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
PROGRAMS = $(noinst_PROGRAMS)
sample1_SOURCES = sample1.c
sample1_OBJECTS = sample1.$(OBJEXT)
sample1_LDADD = $(LDADD)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
am__v_P_1 = :
AM_V_GEN = $(am__v_GEN_@AM_V@)
am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
am__v_GEN_0 = @echo " GEN " $@;
am__v_GEN_1 =
AM_V_at = $(am__v_at_@AM_V@)
am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
am__v_at_0 = @
am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
am__v_CC_1 =
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
SOURCES = sample1.c
DIST_SOURCES = sample1.c
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
# *not* preserved.
am__uniquify_input = $(AWK) '\
BEGIN { nonempty = 0; } \
{ items[$$0] = 1; nonempty = 1; } \
END { if (nonempty) { for (i in items) print i; }; } \
'
# Make sure the list of sources is unique. This is necessary because,
# e.g., the same source file might be shared among _SOURCES variables
# for different programs/libraries.
am__define_uniq_tagged_files = \
list='$(am__tagged_files)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
AS = @AS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FREETYPE2_CFLAGS = @FREETYPE2_CFLAGS@
FREETYPE2_LIBS = @FREETYPE2_LIBS@
GREP = @GREP@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBCAIRO_CFLAGS = @LIBCAIRO_CFLAGS@
LIBCAIRO_LIBS = @LIBCAIRO_LIBS@
LIBCURL_CFLAGS = @LIBCURL_CFLAGS@
LIBCURL_LIBS = @LIBCURL_LIBS@
LIBFREETYPE2_CFLAGS = @LIBFREETYPE2_CFLAGS@
LIBFREETYPE2_LIBS = @LIBFREETYPE2_LIBS@
LIBLZMA_CFLAGS = @LIBLZMA_CFLAGS@
LIBLZMA_LIBS = @LIBLZMA_LIBS@
LIBOBJS = @LIBOBJS@
LIBOPENJP2_CFLAGS = @LIBOPENJP2_CFLAGS@
LIBOPENJP2_LIBS = @LIBOPENJP2_LIBS@
LIBPNG_CFLAGS = @LIBPNG_CFLAGS@
LIBPNG_LIBS = @LIBPNG_LIBS@
LIBS = @LIBS@
LIBSPATIALITE_CFLAGS = @LIBSPATIALITE_CFLAGS@
LIBSPATIALITE_LIBS = @LIBSPATIALITE_LIBS@
LIBTOOL = @LIBTOOL@
LIBWEBP_CFLAGS = @LIBWEBP_CFLAGS@
LIBWEBP_LIBS = @LIBWEBP_LIBS@
LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
LIBXML2_LIBS = @LIBXML2_LIBS@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CFLAGS = -I@srcdir@/../headers
AM_LDFLAGS = -L../src @LIBSPATIALITE_LIBS@ -lrasterlite2 -ljpeg -lpng -lm $(GCOV_FLAGS)
MOSTLYCLEANFILES = *.gcna *.gcno *.gcda
EXTRA_DIST = examples.doxy
all: all-am
.SUFFIXES:
.SUFFIXES: .c .lo .o .obj
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
&& { if test -f $@; then exit 0; else break; fi; }; \
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --gnu examples/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
*) \
echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
clean-noinstPROGRAMS:
@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
echo " rm -f" $$list; \
rm -f $$list || exit $$?; \
test -n "$(EXEEXT)" || exit 0; \
list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
echo " rm -f" $$list; \
rm -f $$list
sample1$(EXEEXT): $(sample1_OBJECTS) $(sample1_DEPENDENCIES) $(EXTRA_sample1_DEPENDENCIES)
@rm -f sample1$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(sample1_OBJECTS) $(sample1_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sample1.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
.c.obj:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
.c.lo:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
mostlyclean-libtool:
-rm -f *.lo
clean-libtool:
-rm -rf .libs _libs
ID: $(am__tagged_files)
$(am__define_uniq_tagged_files); mkid -fID $$unique
tags: tags-am
TAGS: tags
tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
set x; \
here=`pwd`; \
$(am__define_uniq_tagged_files); \
shift; \
if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
if test $$# -gt 0; then \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
"$$@" $$unique; \
else \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$unique; \
fi; \
fi
ctags: ctags-am
CTAGS: ctags
ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
$(am__define_uniq_tagged_files); \
test -z "$(CTAGS_ARGS)$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
cscopelist: cscopelist-am
cscopelist-am: $(am__tagged_files)
list='$(am__tagged_files)'; \
case "$(srcdir)" in \
[\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
*) sdir=$(subdir)/$(srcdir) ;; \
esac; \
for i in $$list; do \
if test -f "$$i"; then \
echo "$(subdir)/$$i"; \
else \
echo "$$sdir/$$i"; \
fi; \
done >> $(top_builddir)/cscope.files
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
dist_files=`for file in $$list; do echo $$file; done | \
sed -e "s|^$$srcdirstrip/||;t" \
-e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
case $$dist_files in \
*/*) $(MKDIR_P) `echo "$$dist_files" | \
sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
sort -u` ;; \
esac; \
for file in $$dist_files; do \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
if test -d $$d/$$file; then \
dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d "$(distdir)/$$file"; then \
find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
else \
test -f "$(distdir)/$$file" \
|| cp -p $$d/$$file "$(distdir)/$$file" \
|| exit 1; \
fi; \
done
check-am: all-am
check: check-am
all-am: Makefile $(PROGRAMS)
installdirs:
install: install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
installcheck: installcheck-am
install-strip:
if test -z '$(STRIP)'; then \
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
install; \
else \
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
"INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
fi
mostlyclean-generic:
-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
clean-generic:
distclean-generic:
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
dvi: dvi-am
dvi-am:
html: html-am
html-am:
info: info-am
info-am:
install-data-am:
install-dvi: install-dvi-am
install-dvi-am:
install-exec-am:
install-html: install-html-am
install-html-am:
install-info: install-info-am
install-info-am:
install-man:
install-pdf: install-pdf-am
install-pdf-am:
install-ps: install-ps-am
install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
-rm -rf ./$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool
pdf: pdf-am
pdf-am:
ps: ps-am
ps-am:
uninstall-am:
.MAKE: install-am install-strip
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
ctags-am distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-pdf install-pdf-am \
install-ps install-ps-am install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am
.PRECIOUS: Makefile
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
examples/examples.doxy 0 → 100644
View file @ 9a741be8
/** \example test_xl.c
test_xl.c is a simple demonstration and diagnostic tool for the Excel (.xls)
file format.
This sample code provides an example of:
- opening the .xls file
- querying general information
- querying Workbooks, SST entries and FAT entries
- error handling
- closing the .xls file when no further operations are required
Here is an example of a typical run:
\verbatim
./test_xl multi.xls
Excel document: multi.xls
==========================================================
CFBF Version ........: 3
CFBF Sector size ....: 512
CFBF FAT entries ....: 128
BIFF Version ........: 8 [Excel 98/XP/2003/2007/2010]
BIFF Max record size : 8224
BIFF DateMode .......: 0 [day#1 = '1900-01-01']
BIFF Password/Crypted: NO, clear data
BIFF CodePage .......: UTF-16LE [Unicode]
BIFF Worksheets .....: 2
BIFF SST entries ....: 24
BIFF Formats ........: 2
BIFF eXtendedFormats : 24
Worksheets:
=========================================================
0] I'm a Worsheet
ok, Worksheet succesfully selected: currently active: 0
12 Rows X 7 Columns
1] Yet another
ok, Worksheet succesfully selected: currently active: 1
302 Rows X 4 Columns
\endverbatim
Here is another example. Note that this earlier version (Excel 3.0) format
does not use the CFBF container, so no information is provided for the first
three entries.
\verbatim
# ./test_xl v3sample.xls
Excel document: v3sample.xls
==========================================================
CFBF Version ........: UNKNOWN
CFBF Sector size ....: UNKNOWN
CFBF FAT entries ....: 0
BIFF Version ........: 3 [Excel 3.0]
BIFF Max record size : UNKNOWN
BIFF DateMode .......: 0 [day#1 = '1900-01-01']
BIFF Password/Crypted: NO, clear data
BIFF CodePage .......: CP1252 [Windows Latin 1]
BIFF Worksheets .....: 1
BIFF Formats ........: 21
BIFF eXtendedFormats : 25
Worksheets:
=========================================================
0] Worksheet
ok, Worksheet succesfully selected: currently active: 0
17 Rows X 6 Columns
\endverbatim
For more information, or to aid with debugging, you can specify a -verbose
flag, as shown in this example:
\verbatim
# ./test_xl multi.xls -verbose
Excel document: multi.xls
==========================================================
...
Worksheets:
=========================================================
...
SST [Shared String Table]:
=========================================================
0] uno
1] one
2] due
3] two
4] tre
5] three
...
18] dieci
19] ten
20] undici
21] eleven
22] dodici
23] twelve
FAT entries [File Allocation Table]:
=========================================================
0 -> 0xfffffffe FATSECT
1 -> 0xffffffff FREESECT
2 -> 3
3 -> 4
...
36 -> 37
37 -> 38
38 -> 0xfffffffe ENDOFCHAIN
39 -> 0xfffffffe ENDOFCHAIN
40 -> 41
41 -> 0xfffffffe ENDOFCHAIN
42 -> 43
43 -> 0xfffffffe ENDOFCHAIN
44 -> 0xffffffff FREESECT
...
127 -> 0xffffffff FREESECT
\endverbatim
*/
/** \example xl2sql.c
xl2sql a simple tool that takes an .xls file as input, and generates a SQL
script as output. You can then use the SQL script to load the extracted data
info a SQLite / SpatiaLite database.
Here is a typical usage example:
\verbatim
./xl2sql comuni_italiani.xls >comuni.sql
spatialite italy.sqlite <comuni.sql
\endverbatim
The first command will parse the .xls document, extracting any data and
generating the corresponding SQL script. The second command will create and
populate a database from the SQL script. When using xl2sql this way, the first
worksheet will become database table xl_table_00, the second worksheet will
become database table xl_table_01 and so on.
As an alternative, if you pass a second argument to xl2sql, this argument will
be used as the table prefix. For example:
\verbatim
./xl2sql comuni_italiani.xls italia >comuni.sql
spatialite italy2.sqlite <comuni.sql
\endverbatim
This will result in the tables being named italia_00, italia_01 and so on.
This sample code provides an example of:
- selecting a worksheet to be active
- retrieving cell values
*/
\ No newline at end of file
examples/sample1.c 0 → 100644
View file @ 9a741be8
/*
sample1.c
Author: Sandro Furieri a.furieri@lqt.it
This software is provided 'as-is', without any express or implied
warranty. In no event will the author be held liable for any
damages arising from the use of this software.
Permission is granted to anyone to use this software for any
purpose, including commercial applications, and to alter it and
redistribute it freely
*/
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
/*
these headers are required in order to support
SQLite, SpatiaLite and RasterLite2
*/
#include <rasterlite2/rasterlite2.h>
#include <spatialite.h>
static void
fill_horz (unsigned char r, unsigned char g, unsigned char b,
unsigned char *pix, int strip, unsigned int width,
unsigned int height)
{
/* color-filling an horizontal strip */
unsigned int strip0 = height / 3;
unsigned int strip1 = height - strip0;
unsigned int strip2 = height;
unsigned int min;
unsigned int max;
unsigned int x;
unsigned int y;
if (strip == 1)
{
min = strip0;
max = strip1;
}
else if (strip == 2)
{
min = strip1;
max = strip2;
}
else
{
min = 0;
max = strip1;
}
for (y = min; y < max; y++)
{
unsigned char *p = pix + (y * width * 3);
for (x = 0; x < width; x++)
{
*p++ = r;
*p++ = g;
*p++ = b;
}
}
}
static void
fill_vert (unsigned char r, unsigned char g, unsigned char b,
unsigned char *pix, int strip,
unsigned int width, unsigned int height)
{
/* color-filling a vertical strip */
unsigned int strip0 = width / 3;
unsigned int strip1 = width - strip0;
unsigned int strip2 = width;
unsigned int min;
unsigned int max;
unsigned int x;
unsigned int y;
if (strip == 1)
{
min = strip0;
max = strip1;
}
else if (strip == 2)
{
min = strip1;
max = strip2;
}
else
{
min = 0;
max = strip1;
}
for (y = 0; y < height; y++)
{
unsigned char *p = pix + (y * width * 3) + (min * 3);
for (x = min; x < max; x++)
{
*p++ = r;
*p++ = g;
*p++ = b;
}
}
}
static void
add_border (unsigned char *pixels, unsigned int width, unsigned int height)
{
/* adding a narrow gray border */
unsigned char *p = pixels;
unsigned int y;
unsigned int x;
for (y = 0; y < height; y++)
{
for (x = 0; x < width; x++)
{
int mark = 0;
if (x < 8 || x > (width - 9))
mark = 1;
if (y < 8 || y > (height - 9))
mark = 1;
if (mark)
{
*p++ = 192;
*p++ = 192;
*p++ = 192;
}
else
p += 3;
}
}
}
static void
create_austria (unsigned int flag_base, unsigned char **pixels, int *pixels_sz)
{
/* creating the austrian flag (RGB pixel buffer) */
unsigned int width = flag_base * 3;
unsigned int height = flag_base * 2;
unsigned int sz = width * height * 3;
unsigned char *pix = malloc (sz);
fill_horz (237, 41, 35, pix, 0, width, height); /* red */
fill_horz (255, 255, 255, pix, 1, width, height); /* white */
fill_horz (237, 41, 35, pix, 2, width, height); /* red */
add_border (pix, width, height);
*pixels = pix;
*pixels_sz = sz;
}
static void
create_netherlands (unsigned int flag_base, unsigned char **pixels,
int *pixels_sz)
{
/* creating the dutch flag (RGB pixel buffer) */
unsigned int width = flag_base * 3;
unsigned int height = flag_base * 2;
unsigned int sz = width * height * 3;
unsigned char *pix = malloc (sz);
fill_horz (174, 28, 40, pix, 0, width, height); /* red */
fill_horz (255, 255, 255, pix, 1, width, height); /* white */
fill_horz (33, 70, 139, pix, 2, width, height); /* blue */
add_border (pix, width, height);
*pixels = pix;
*pixels_sz = sz;
}
static void
create_germany (unsigned int flag_base, unsigned char **pixels, int *pixels_sz)
{
/* creating the german flag (RGB pixel buffer) */
unsigned int width = flag_base * 3;
unsigned int height = flag_base * 2;
unsigned int sz = width * height * 3;
unsigned char *pix = malloc (sz);
fill_horz (1, 1, 1, pix, 0, width, height); /* black */
fill_horz (221, 0, 0, pix, 1, width, height); /* red */
fill_horz (255, 206, 0, pix, 2, width, height); /* yellow */
add_border (pix, width, height);
*pixels = pix;
*pixels_sz = sz;
}
static void
create_france (unsigned int flag_base, unsigned char **pixels, int *pixels_sz)
{
/* creating the french flag (RGB pixel buffer) */
unsigned int width = flag_base * 3;
unsigned int height = flag_base * 2;
unsigned int sz = width * height * 3;
unsigned char *pix = malloc (sz);
fill_vert (0, 85, 164, pix, 0, width, height); /* blue */
fill_vert (255, 255, 255, pix, 1, width, height); /* white */
fill_vert (239, 65, 53, pix, 2, width, height); /* red */
add_border (pix, width, height);
*pixels = pix;
*pixels_sz = sz;
}
static void
create_belgium (unsigned int flag_base, unsigned char **pixels, int *pixels_sz)
{
/* creating the french flag (RGB pixel buffer) */
unsigned int width = flag_base * 3;
unsigned int height = flag_base * 2;
unsigned int sz = width * height * 3;
unsigned char *pix = malloc (sz);
fill_vert (1, 1, 1, pix, 0, width, height); /* black */
fill_vert (255, 233, 54, pix, 1, width, height); /* yellow */
fill_vert (255, 15, 33, pix, 2, width, height); /* red */
add_border (pix, width, height);
*pixels = pix;
*pixels_sz = sz;
}
static void
create_italy (unsigned int flag_base, unsigned char **pixels, int *pixels_sz)
{
/* creating the italian flag (RGB pixel buffer) */
unsigned int width = flag_base * 3;
unsigned int height = flag_base * 2;
unsigned int sz = width * height * 3;
unsigned char *pix = malloc (sz);
fill_vert (0, 146, 80, pix, 0, width, height); /* green */
fill_vert (241, 242, 241, pix, 1, width, height); /* white */
fill_vert (206, 43, 55, pix, 2, width, height); /* red */
add_border (pix, width, height);
*pixels = pix;
*pixels_sz = sz;
}
static int
insert_section (sqlite3 * handle, const char *sql, unsigned int width,
unsigned int height, unsigned char *pixels, int pixels_sz)
{
/* attempting to insert a RAW pixel buffer (Section) */
sqlite3_stmt *stmt = NULL;
int ret;
int ok = 0;
ret = sqlite3_prepare_v2 (handle, sql, strlen (sql), &stmt, NULL);
if (ret != SQLITE_OK)
{
printf ("SELECT RL2_ImportSectionRawPixels SQL error: %s\n",
sqlite3_errmsg (handle));
goto error;
}
sqlite3_reset (stmt);
sqlite3_clear_bindings (stmt);
sqlite3_bind_int (stmt, 1, width);
sqlite3_bind_int (stmt, 2, height);
sqlite3_bind_blob (stmt, 3, pixels, pixels_sz, free);
while (1)
{
ret = sqlite3_step (stmt);
if (ret == SQLITE_DONE)
break;
if (ret == SQLITE_ROW)
ok = sqlite3_column_int (stmt, 0);
else
{
fprintf (stderr,
"SELECT RL2_ImportSectionRawPixels; sqlite3_step() error: %s\n",
sqlite3_errmsg (handle));
goto error;
}
}
sqlite3_finalize (stmt);
if (ok != 1)
{
fprintf (stderr, "ERROR: unable to insert RAW pixels\n");
ok = 0;
}
return ok;
error:
if (stmt != NULL)
sqlite3_finalize (stmt);
return 0;
}
int
main (int argc, char *argv[])
{
const char *sql;
int ret;
unsigned int flag_base = 1234;
double h_res = 1.5 / ((double) flag_base * 3.0);
double v_res = 1.0 / ((double) flag_base * 2.0);
char *err_msg = NULL;
sqlite3 *handle;
void *cache;
void *priv_data;
unsigned char *pixels;
int pixels_sz;
rl2PixelPtr no_data = NULL;
int err = 0;
if (argc != 2)
{
fprintf (stderr, "usage: %s test_db_path\n", argv[0]);
return -1;
}
/* trying to connect (and eventually create) the target DB */
ret =
sqlite3_open_v2 (argv[1], &handle,
SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL);
if (ret != SQLITE_OK)
{
printf ("cannot open '%s': %s\n", argv[1], sqlite3_errmsg (handle));
sqlite3_close (handle);
return -1;
}
/* initializing both SpatiaLite and RasterLite2 */
cache = spatialite_alloc_connection ();
spatialite_init_ex (handle, cache, 0);
priv_data = rl2_alloc_private ();
rl2_init (handle, priv_data, 0);
/* showing the SQLite version */
printf ("SQLite version: %s\n", sqlite3_libversion ());
/* showing the RasterLite2 version */
printf ("RasterLite2 version: %s\n", rl2_version ());
printf ("\n\n");
/* initializing the DB Metatables */
sql = "SELECT InitSpatialMetadata(1)";
ret = sqlite3_exec (handle, sql, NULL, NULL, &err_msg);
if (ret != SQLITE_OK)
{
fprintf (stderr, "InitSpatialMetadata() error: %s\n", err_msg);
sqlite3_free (err_msg);
err = 1;
goto stop;
}
sql = "SELECT CreateRasterCoveragesTable()";
ret = sqlite3_exec (handle, sql, NULL, NULL, &err_msg);
if (ret != SQLITE_OK)
{
fprintf (stderr, "CreateRasterCoveragesTable() error: %s\n", err_msg);
sqlite3_free (err_msg);
err = 1;
goto stop;
}
sql = "SELECT CreateStylingTables()";
ret = sqlite3_exec (handle, sql, NULL, NULL, &err_msg);
if (ret != SQLITE_OK)
{
fprintf (stderr, "CreateStylingTables() error: %s\n", err_msg);
sqlite3_free (err_msg);
err = 1;
goto stop;
}
/* creating a BLACK pixel (NO-DATA / Transparent color) */
no_data = rl2_create_pixel (RL2_SAMPLE_UINT8, /* unsigned 8bit sample */
RL2_PIXEL_RGB, /* RGB pixel */
3 /* number of bands */
);
if (no_data == NULL)
{
fprintf (stderr, "unable to create a Black NoData pixel\n");
err = 1;
goto stop;
}
rl2_set_pixel_sample_uint8 (no_data, 0, 0);
rl2_set_pixel_sample_uint8 (no_data, 1, 0);
rl2_set_pixel_sample_uint8 (no_data, 2, 0);
/* creating a ficticious RGB coverage */
if (rl2_create_dbms_coverage (handle, /* DB handle */
"euro_flags", /* Coverage name */
RL2_SAMPLE_UINT8, /* unsigned 8bit sample */
RL2_PIXEL_RGB, /* RGB pixel */
3, /* number of bands */
RL2_COMPRESSION_PNG, /* PNG compressed tiles */
100, /* compression quality */
256, /* tile Width */
256, /* tile Height */
4326, /* pseudo-SRID (this is simply to define a cartesian space) */
h_res, /* horizontal pixel resolution */
v_res, /* vertical pixel resolution */
no_data, /* transparent Color = BLACK */
NULL, /* palette (not required by RGB) */
1, /* enabling StrictResolution mode */
0, /* disabling MixedResolutions mode */
1, /* enabling Section Paths recording */
1, /* enabling Section MD5 checksum */
1, /* enabling Section Summary */
1 /* enabling IsQueryable */
) != RL2_OK)
return 0;
/* inserting the belgian flag (Section 1) */
create_belgium (flag_base, &pixels, &pixels_sz);
sql = "SELECT RL2_ImportSectionRawPixels('euro_flags', 'belgium', "
"?, ?, ?, BuildMBR(0, 0, 1.5, 1, 4326), 1, 1, 0)";
if (!insert_section
(handle, sql, flag_base * 3, flag_base * 2, pixels, pixels_sz))
{
err = 1;
goto stop;
}
/* inserting the german flag (Section 2) */
create_germany (flag_base, &pixels, &pixels_sz);
sql = "SELECT RL2_ImportSectionRawPixels('euro_flags', 'germany', "
"?, ?, ?, BuildMBR(1.5, 0, 3, 1, 4326), 1, 1, 0)";
if (!insert_section
(handle, sql, flag_base * 3, flag_base * 2, pixels, pixels_sz))
{
err = 1;
goto stop;
}
/* inserting the italian flag (Section 3) */
create_italy (flag_base, &pixels, &pixels_sz);
sql = "SELECT RL2_ImportSectionRawPixels('euro_flags', 'italy', "
"?, ?, ?, BuildMBR(3, 0, 4.5, 1, 4326), 1, 1, 0)";
if (!insert_section
(handle, sql, flag_base * 3, flag_base * 2, pixels, pixels_sz))
{
err = 1;
goto stop;
}
/* inserting the austrian flag (Section 4) */
create_austria (flag_base, &pixels, &pixels_sz);
sql = "SELECT RL2_ImportSectionRawPixels('euro_flags', 'austria', "
"?, ?, ?, BuildMBR(0, 1, 1.5, 2, 4326), 1, 1, 0)";
if (!insert_section
(handle, sql, flag_base * 3, flag_base * 2, pixels, pixels_sz))
{
err = 1;
goto stop;
}
/* inserting the french flag (Section 5) */
create_france (flag_base, &pixels, &pixels_sz);
sql = "SELECT RL2_ImportSectionRawPixels('euro_flags', 'france', "
"?, ?, ?, BuildMBR(1.5, 1, 3, 2, 4326), 1, 1, 0)";
if (!insert_section
(handle, sql, flag_base * 3, flag_base * 2, pixels, pixels_sz))
{
err = 1;
goto stop;
}
/* inserting the dutch flag (Section 6) */
create_netherlands (flag_base, &pixels, &pixels_sz);
sql = "SELECT RL2_ImportSectionRawPixels('euro_flags', 'netherlands', "
"?, ?, ?, BuildMBR(3, 1, 4.5, 2, 4326), 1, 1, 0)";
if (!insert_section
(handle, sql, flag_base * 3, flag_base * 2, pixels, pixels_sz))
{
err = 1;
goto stop;
}
/* disconnecting the DB and final cleanup */
stop:
if (no_data != NULL)
rl2_destroy_pixel (no_data);
ret = sqlite3_close (handle);
if (ret != SQLITE_OK)
{
printf ("close() error: %s\n", sqlite3_errmsg (handle));
return -1;
}
if (!err)
printf ("\n\nsample successfully terminated\n");
spatialite_cleanup_ex (cache);
rl2_cleanup_private (priv_data);
spatialite_shutdown ();
return 0;
}