diff -Nru mapnik-3.0.23+ds/bootstrap.sh mapnik-3.1.0+ds/bootstrap.sh --- mapnik-3.0.23+ds/bootstrap.sh 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/bootstrap.sh 2021-01-08 11:20:06.000000000 +0000 @@ -1,8 +1,5 @@ #!/usr/bin/env bash -set -eu -set -o pipefail - : ' todo @@ -11,17 +8,19 @@ - shrink icu data ' -MASON_VERSION="v0.17.0" +MASON_VERSION="fde1d9f5" function setup_mason() { if [[ ! -d ./.mason ]]; then - git clone https://github.com/mapbox/mason.git ./.mason - (cd ./.mason && git checkout ${MASON_VERSION}) - else - echo "Updating to latest mason" - (cd ./.mason && git fetch && git checkout ${MASON_VERSION} && git pull origin ${MASON_VERSION}) + git clone https://github.com/mapbox/mason.git .mason || return + elif ! git -C .mason rev-parse -q --verify "$MASON_VERSION" >/dev/null; then + git -C .mason fetch --all || true # non-fatal fi - export PATH=$(pwd)/.mason:$PATH + git -C .mason checkout --detach "$MASON_VERSION" -- || return + case ":$PATH:" in + *":$PWD/.mason:"*) : already there ;; + *) export PATH="$PWD/.mason:$PATH" ;; + esac export CXX=${CXX:-clang++} export CC=${CC:-clang} } @@ -45,7 +44,7 @@ } ICU_VERSION="57.1" -BOOST_VERSION="1.65.1" +BOOST_VERSION="1.73.0" function install_mason_deps() { install ccache 3.3.1 @@ -60,9 +59,6 @@ install proj 4.9.3 libproj install pixman 0.34.0 libpixman-1 install cairo 1.14.8 libcairo - install protobuf 3.2.0 - # technically protobuf is not a mapnik core dep, but installing - # here by default helps make mapnik-vector-tile builds easier install webp 0.6.0 libwebp install libgdal 2.1.3 libgdal install boost ${BOOST_VERSION} @@ -133,22 +129,46 @@ echo "export PROJ_LIB=${MASON_LINKED_ABS}/share/proj" > mapnik-settings.env echo "export ICU_DATA=${MASON_LINKED_ABS}/share/icu/${ICU_VERSION}" >> mapnik-settings.env echo "export GDAL_DATA=${MASON_LINKED_ABS}/share/gdal" >> mapnik-settings.env - source mapnik-settings.env +} + +# turn arguments of the form NAME=VALUE into exported variables; +# any other arguments are reported and cause error return status +function export_variables() { + local arg= ret=0 + for arg + do + if [[ "$arg" =~ ^[[:alpha:]][_[:alnum:]]*= ]] + then + export "$arg" + else + printf >&2 "bootstrap.sh: invalid argument: %s\n" "$arg" + ret=1 + fi + done + return $ret } function main() { - setup_mason - install_mason_deps - make_config > ./config.py - setup_runtime_settings - echo "Ready, now run:" - echo "" - echo " ./configure && make" + export_variables "$@" || return + # setup_mason must not run in subshell, because it sets default + # values of CC, CXX and adds mason to PATH, which we want to keep + # when sourced + setup_mason || return + ( + # this is wrapped in subshell to allow sourcing this script + # without having the terminal closed on error + set -eu + set -o pipefail + + install_mason_deps + make_config > ./config.py + setup_runtime_settings + + printf "\n\e[1;32m%s\e[m\n" "bootstrap successful, now run:" + echo "" + echo " ./configure && make" + echo "" + ) } -main - -# allow sourcing of script without -# causing the terminal to bail on error -set +eu -set +o pipefail +main "$@" diff -Nru mapnik-3.0.23+ds/CHANGELOG.md mapnik-3.1.0+ds/CHANGELOG.md --- mapnik-3.0.23+ds/CHANGELOG.md 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/CHANGELOG.md 2021-01-08 11:20:06.000000000 +0000 @@ -6,6 +6,22 @@ For a complete change history, see the git log. +## 3.1.0 + +Released: January 8, 2021 + +(Packaged from 445438e34) + +* Require c++14 compliant complier (Boost.Geometry `BOOST_VERSION >= 1_75`) + +## 3.0.24 + +Released: January 5, 2021 + +(Packaged from be0904fcd) + +- Backport support for `BOOST_VERSION >= 1_74` + ## 3.0.23 Released: February 18, 2020 diff -Nru mapnik-3.0.23+ds/debian/changelog mapnik-3.1.0+ds/debian/changelog --- mapnik-3.0.23+ds/debian/changelog 2020-03-03 20:33:26.000000000 +0000 +++ mapnik-3.1.0+ds/debian/changelog 2021-10-03 10:00:00.000000000 +0000 @@ -1,8 +1,47 @@ -mapnik (3.0.23+ds-1build1) focal; urgency=medium +mapnik (3.1.0+ds-1~focal0) focal; urgency=medium - * No-change rebuild for icu soname change. + * No change rebuild for Focal. - -- Matthias Klose Tue, 03 Mar 2020 21:33:26 +0100 + -- Angelos Tzotsos Sun, 03 Oct 2021 13:00:00 +0300 + +mapnik (3.1.0+ds-1) unstable; urgency=medium + + * Move from experimental to unstable. + + -- Bas Couwenberg Mon, 11 Jan 2021 05:33:41 +0100 + +mapnik (3.1.0+ds-1~exp1) experimental; urgency=medium + + * New upstream release. + * Rename library package for new minor version. + * Drop explicit architecture list, see: #893188. + + -- Bas Couwenberg Fri, 08 Jan 2021 14:57:36 +0100 + +mapnik (3.0.24+ds-1) unstable; urgency=medium + + * New upstream release. + * Update copyright file. + * Drop patches applied upstream. + + -- Bas Couwenberg Tue, 05 Jan 2021 14:55:39 +0100 + +mapnik (3.0.23+ds-3) unstable; urgency=medium + + * Bump Standards-Version to 4.5.1, no changes. + * Add upstream patch for Boost 1.73 compatibility. + (closes: #975593) + + -- Bas Couwenberg Sat, 12 Dec 2020 13:05:32 +0100 + +mapnik (3.0.23+ds-2) unstable; urgency=medium + + * Bump debhelper compat to 10, changes: + - Drop --parallel option, enabled by default + * Bump watch file version to 4. + * Update lintian overrides. + + -- Bas Couwenberg Wed, 11 Nov 2020 19:39:14 +0100 mapnik (3.0.23+ds-1) unstable; urgency=medium diff -Nru mapnik-3.0.23+ds/debian/compat mapnik-3.1.0+ds/debian/compat --- mapnik-3.0.23+ds/debian/compat 2020-01-21 14:14:24.000000000 +0000 +++ mapnik-3.1.0+ds/debian/compat 2021-01-08 13:51:04.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru mapnik-3.0.23+ds/debian/control mapnik-3.1.0+ds/debian/control --- mapnik-3.0.23+ds/debian/control 2020-02-21 07:47:30.000000000 +0000 +++ mapnik-3.1.0+ds/debian/control 2021-01-11 04:32:50.000000000 +0000 @@ -6,7 +6,7 @@ Bas Couwenberg Section: libs Priority: optional -Build-Depends: debhelper (>= 9~), +Build-Depends: debhelper (>= 10~), libboost-filesystem-dev, libboost-program-options-dev, libboost-regex-dev, @@ -31,13 +31,13 @@ pkg-config, python3, zlib1g-dev -Standards-Version: 4.5.0 +Standards-Version: 4.5.1 Vcs-Browser: https://salsa.debian.org/debian-gis-team/mapnik Vcs-Git: https://salsa.debian.org/debian-gis-team/mapnik.git Homepage: http://www.mapnik.org/ -Package: libmapnik3.0 -Architecture: any-amd64 i386 arm64 armel armhf powerpc ppc64el s390x alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 +Package: libmapnik3.1 +Architecture: any Depends: fonts-dejavu, ${shlibs:Depends}, ${misc:Depends} @@ -55,9 +55,9 @@ This package contains the shared library and input plugins. Package: libmapnik-dev -Architecture: any-amd64 i386 arm64 armel armhf powerpc ppc64el s390x alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 +Architecture: any Section: libdevel -Depends: libmapnik3.0 (= ${binary:Version}), +Depends: libmapnik3.1 (= ${binary:Version}), libboost-filesystem-dev, libboost-program-options-dev, libboost-regex-dev, @@ -99,7 +99,7 @@ build utilities. Package: mapnik-utils -Architecture: any-amd64 i386 arm64 armel armhf powerpc ppc64el s390x alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 +Architecture: any Section: utils Depends: ${shlibs:Depends}, ${misc:Depends} diff -Nru mapnik-3.0.23+ds/debian/copyright mapnik-3.1.0+ds/debian/copyright --- mapnik-3.0.23+ds/debian/copyright 2020-01-21 14:14:24.000000000 +0000 +++ mapnik-3.1.0+ds/debian/copyright 2021-01-08 13:51:04.000000000 +0000 @@ -8,7 +8,7 @@ fonts/unifont* Files: * -Copyright: 2006-2017, Artem Pavlenko +Copyright: 2006-2021, Artem Pavlenko 2005-2012, Jean-Francois Doyon 2011, Hermann Kraus 2010, Robert Coup diff -Nru mapnik-3.0.23+ds/debian/libmapnik3.0.install mapnik-3.1.0+ds/debian/libmapnik3.0.install --- mapnik-3.0.23+ds/debian/libmapnik3.0.install 2020-01-21 14:14:24.000000000 +0000 +++ mapnik-3.1.0+ds/debian/libmapnik3.0.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/lib/lib*.so.* -usr/lib/mapnik/*/input/* diff -Nru mapnik-3.0.23+ds/debian/libmapnik3.0.lintian-overrides mapnik-3.1.0+ds/debian/libmapnik3.0.lintian-overrides --- mapnik-3.0.23+ds/debian/libmapnik3.0.lintian-overrides 2020-01-21 14:14:24.000000000 +0000 +++ mapnik-3.1.0+ds/debian/libmapnik3.0.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ -# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports: -# Fortify Source functions: no, only unprotected functions found! -hardening-no-fortify-functions usr/lib/mapnik/*/input/*.input - -# Symbols are problematic for C++ libraries -no-symbols-control-file * - -# False positive, string not included in source -spelling-error-in-binary * ment meant - diff -Nru mapnik-3.0.23+ds/debian/libmapnik3.1.install mapnik-3.1.0+ds/debian/libmapnik3.1.install --- mapnik-3.0.23+ds/debian/libmapnik3.1.install 1970-01-01 00:00:00.000000000 +0000 +++ mapnik-3.1.0+ds/debian/libmapnik3.1.install 2021-01-11 04:32:39.000000000 +0000 @@ -0,0 +1,2 @@ +usr/lib/lib*.so.* +usr/lib/mapnik/*/input/* diff -Nru mapnik-3.0.23+ds/debian/libmapnik3.1.lintian-overrides mapnik-3.1.0+ds/debian/libmapnik3.1.lintian-overrides --- mapnik-3.0.23+ds/debian/libmapnik3.1.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ mapnik-3.1.0+ds/debian/libmapnik3.1.lintian-overrides 2021-01-11 04:32:39.000000000 +0000 @@ -0,0 +1,10 @@ +# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports: +# Fortify Source functions: no, only unprotected functions found! +hardening-no-fortify-functions usr/lib/mapnik/*/input/*.input + +# Symbols are problematic for C++ libraries +no-symbols-control-file * + +# False positive, string not included in source +spelling-error-in-binary * ment meant + diff -Nru mapnik-3.0.23+ds/debian/mapnik-doc.lintian-overrides mapnik-3.1.0+ds/debian/mapnik-doc.lintian-overrides --- mapnik-3.0.23+ds/debian/mapnik-doc.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ mapnik-3.1.0+ds/debian/mapnik-doc.lintian-overrides 2021-01-08 13:51:04.000000000 +0000 @@ -0,0 +1,3 @@ +# Not a problem +national-encoding usr/share/doc/mapnik-doc/examples/data/COPYRIGHT.txt + diff -Nru mapnik-3.0.23+ds/debian/patches/0001-Use-pkg-config-to-find-FreeType2-if-available.patch mapnik-3.1.0+ds/debian/patches/0001-Use-pkg-config-to-find-FreeType2-if-available.patch --- mapnik-3.0.23+ds/debian/patches/0001-Use-pkg-config-to-find-FreeType2-if-available.patch 2020-02-18 13:47:33.000000000 +0000 +++ mapnik-3.1.0+ds/debian/patches/0001-Use-pkg-config-to-find-FreeType2-if-available.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -Description: Use pkg-config to find FreeType2 if available -Author: Raul Marin -Origin: https://github.com/mapnik/mapnik/pull/3892/commits/23755a527a5e0f24a7591fcc41dece7ce5f080b7 -Bug: https://github.com/mapnik/mapnik/issues/3870 -Bug-Debian: https://bugs.debian.org/892451 - ---- a/SConstruct -+++ b/SConstruct -@@ -1398,6 +1398,7 @@ if not preconfigured: - ] - OPTIONAL_LIBSHEADERS = [] - -+ CHECK_PKG_CONFIG = conf.CheckPKGConfig('0.15.0') - if env.get('FREETYPE_LIBS') or env.get('FREETYPE_INCLUDES'): - REQUIRED_LIBSHEADERS.insert(0,['freetype','ft2build.h',True,'C']) - if env.get('FREETYPE_INCLUDES'): -@@ -1406,6 +1407,21 @@ if not preconfigured: - if env.get('FREETYPE_LIBS'): - lib_path = env['FREETYPE_LIBS'] - env.AppendUnique(LIBPATH = fix_path(lib_path)) -+ elif CHECK_PKG_CONFIG and conf.CheckPKG('freetype2'): -+ # Freetype 2.9+ doesn't use freetype-config and uses pkg-config instead -+ cmd = 'pkg-config freetype2 --libs --cflags' -+ if env['RUNTIME_LINK'] == 'static': -+ cmd += ' --static' -+ -+ temp_env = Environment(ENV=os.environ) -+ try: -+ temp_env.ParseConfig(cmd) -+ for lib in temp_env['LIBS']: -+ env.AppendUnique(LIBPATH = fix_path(lib)) -+ for inc in temp_env['CPPPATH']: -+ env.AppendUnique(CPPPATH = fix_path(inc)) -+ except OSError as e: -+ pass - elif conf.parse_config('FREETYPE_CONFIG'): - # check if freetype links to bz2 - if env['RUNTIME_LINK'] == 'static': -@@ -1635,9 +1651,6 @@ if not preconfigured: - color_print(1,'%s not detected on your system' % env['QUERIED_ICU_DATA'] ) - env['MISSING_DEPS'].append('ICU_DATA') - -- -- CHECK_PKG_CONFIG = conf.CheckPKGConfig('0.15.0') -- - if len(env['REQUESTED_PLUGINS']): - if env['HOST']: - for plugin in env['REQUESTED_PLUGINS']: diff -Nru mapnik-3.0.23+ds/debian/patches/series mapnik-3.1.0+ds/debian/patches/series --- mapnik-3.0.23+ds/debian/patches/series 2020-01-21 14:14:24.000000000 +0000 +++ mapnik-3.1.0+ds/debian/patches/series 2021-01-08 13:51:04.000000000 +0000 @@ -1,2 +1 @@ -0001-Use-pkg-config-to-find-FreeType2-if-available.patch libxml2.patch diff -Nru mapnik-3.0.23+ds/debian/rules mapnik-3.1.0+ds/debian/rules --- mapnik-3.0.23+ds/debian/rules 2020-01-21 14:14:24.000000000 +0000 +++ mapnik-3.1.0+ds/debian/rules 2021-01-11 04:32:39.000000000 +0000 @@ -44,13 +44,13 @@ SCONS_FLAGS += XMLPARSER=libxml2 SCONS_FLAGS += DEMO=False SCONS_FLAGS += CPP_TESTS=False -SCONS_FLAGS += PREFIX=/usr LIB_DIR_NAME=/mapnik/3.0 +SCONS_FLAGS += PREFIX=/usr LIB_DIR_NAME=/mapnik/3.1 SCONS_FLAGS += CUSTOM_CXXFLAGS="$(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) -g0" SCONS_FLAGS += CUSTOM_CFLAGS="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) -g0" SCONS_FLAGS += CUSTOM_LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS) -g0" %: - dh $@ --parallel + dh $@ override_dh_auto_clean: rm -rf build-python diff -Nru mapnik-3.0.23+ds/debian/source/lintian-overrides mapnik-3.1.0+ds/debian/source/lintian-overrides --- mapnik-3.0.23+ds/debian/source/lintian-overrides 2020-01-21 14:14:24.000000000 +0000 +++ mapnik-3.1.0+ds/debian/source/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# Not worth the effort -testsuite-autopkgtest-missing - diff -Nru mapnik-3.0.23+ds/debian/watch mapnik-3.1.0+ds/debian/watch --- mapnik-3.0.23+ds/debian/watch 2020-01-21 14:14:24.000000000 +0000 +++ mapnik-3.1.0+ds/debian/watch 2021-01-08 13:51:04.000000000 +0000 @@ -1,4 +1,4 @@ -version=3 +version=4 opts=\ dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\ uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)(?:-?offset)?\d*)$/$1~$2/;s/RC/rc/,\ diff -Nru mapnik-3.0.23+ds/demo/c++/rundemo.cpp mapnik-3.1.0+ds/demo/c++/rundemo.cpp --- mapnik-3.0.23+ds/demo/c++/rundemo.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/demo/c++/rundemo.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/demo/viewer/about_dialog.cpp mapnik-3.1.0+ds/demo/viewer/about_dialog.cpp --- mapnik-3.0.23+ds/demo/viewer/about_dialog.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/demo/viewer/about_dialog.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * Mapnik is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru mapnik-3.0.23+ds/demo/viewer/about_dialog.hpp mapnik-3.1.0+ds/demo/viewer/about_dialog.hpp --- mapnik-3.0.23+ds/demo/viewer/about_dialog.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/demo/viewer/about_dialog.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * Mapnik is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru mapnik-3.0.23+ds/demo/viewer/info_dialog.cpp mapnik-3.1.0+ds/demo/viewer/info_dialog.cpp --- mapnik-3.0.23+ds/demo/viewer/info_dialog.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/demo/viewer/info_dialog.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * Mapnik is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru mapnik-3.0.23+ds/demo/viewer/info_dialog.hpp mapnik-3.1.0+ds/demo/viewer/info_dialog.hpp --- mapnik-3.0.23+ds/demo/viewer/info_dialog.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/demo/viewer/info_dialog.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * Mapnik is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru mapnik-3.0.23+ds/demo/viewer/layerdelegate.cpp mapnik-3.1.0+ds/demo/viewer/layerdelegate.cpp --- mapnik-3.0.23+ds/demo/viewer/layerdelegate.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/demo/viewer/layerdelegate.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * Mapnik is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru mapnik-3.0.23+ds/demo/viewer/layerdelegate.hpp mapnik-3.1.0+ds/demo/viewer/layerdelegate.hpp --- mapnik-3.0.23+ds/demo/viewer/layerdelegate.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/demo/viewer/layerdelegate.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * Mapnik is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru mapnik-3.0.23+ds/demo/viewer/layer_info_dialog.cpp mapnik-3.1.0+ds/demo/viewer/layer_info_dialog.cpp --- mapnik-3.0.23+ds/demo/viewer/layer_info_dialog.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/demo/viewer/layer_info_dialog.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * Mapnik is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru mapnik-3.0.23+ds/demo/viewer/layer_info_dialog.hpp mapnik-3.1.0+ds/demo/viewer/layer_info_dialog.hpp --- mapnik-3.0.23+ds/demo/viewer/layer_info_dialog.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/demo/viewer/layer_info_dialog.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * Mapnik is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru mapnik-3.0.23+ds/demo/viewer/layerlistmodel.cpp mapnik-3.1.0+ds/demo/viewer/layerlistmodel.cpp --- mapnik-3.0.23+ds/demo/viewer/layerlistmodel.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/demo/viewer/layerlistmodel.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * Mapnik is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru mapnik-3.0.23+ds/demo/viewer/layerlistmodel.hpp mapnik-3.1.0+ds/demo/viewer/layerlistmodel.hpp --- mapnik-3.0.23+ds/demo/viewer/layerlistmodel.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/demo/viewer/layerlistmodel.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * Mapnik is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru mapnik-3.0.23+ds/demo/viewer/layerwidget.cpp mapnik-3.1.0+ds/demo/viewer/layerwidget.cpp --- mapnik-3.0.23+ds/demo/viewer/layerwidget.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/demo/viewer/layerwidget.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * Mapnik is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru mapnik-3.0.23+ds/demo/viewer/layerwidget.hpp mapnik-3.1.0+ds/demo/viewer/layerwidget.hpp --- mapnik-3.0.23+ds/demo/viewer/layerwidget.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/demo/viewer/layerwidget.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * Mapnik is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru mapnik-3.0.23+ds/demo/viewer/main.cpp mapnik-3.1.0+ds/demo/viewer/main.cpp --- mapnik-3.0.23+ds/demo/viewer/main.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/demo/viewer/main.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * Mapnik is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru mapnik-3.0.23+ds/demo/viewer/mainwindow.cpp mapnik-3.1.0+ds/demo/viewer/mainwindow.cpp --- mapnik-3.0.23+ds/demo/viewer/mainwindow.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/demo/viewer/mainwindow.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * Mapnik is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru mapnik-3.0.23+ds/demo/viewer/mainwindow.hpp mapnik-3.1.0+ds/demo/viewer/mainwindow.hpp --- mapnik-3.0.23+ds/demo/viewer/mainwindow.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/demo/viewer/mainwindow.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * Mapnik is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru mapnik-3.0.23+ds/demo/viewer/mapwidget.cpp mapnik-3.1.0+ds/demo/viewer/mapwidget.cpp --- mapnik-3.0.23+ds/demo/viewer/mapwidget.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/demo/viewer/mapwidget.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * Mapnik is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru mapnik-3.0.23+ds/demo/viewer/mapwidget.hpp mapnik-3.1.0+ds/demo/viewer/mapwidget.hpp --- mapnik-3.0.23+ds/demo/viewer/mapwidget.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/demo/viewer/mapwidget.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * Mapnik is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru mapnik-3.0.23+ds/demo/viewer/styles_model.cpp mapnik-3.1.0+ds/demo/viewer/styles_model.cpp --- mapnik-3.0.23+ds/demo/viewer/styles_model.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/demo/viewer/styles_model.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * Mapnik is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru mapnik-3.0.23+ds/demo/viewer/styles_model.hpp mapnik-3.1.0+ds/demo/viewer/styles_model.hpp --- mapnik-3.0.23+ds/demo/viewer/styles_model.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/demo/viewer/styles_model.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -1,6 +1,6 @@ /* This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * Mapnik is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff -Nru mapnik-3.0.23+ds/include/mapnik/agg/render_polygon_pattern.hpp mapnik-3.1.0+ds/include/mapnik/agg/render_polygon_pattern.hpp --- mapnik-3.0.23+ds/include/mapnik/agg/render_polygon_pattern.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/agg/render_polygon_pattern.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2017 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/agg_helpers.hpp mapnik-3.1.0+ds/include/mapnik/agg_helpers.hpp --- mapnik-3.0.23+ds/include/mapnik/agg_helpers.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/agg_helpers.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/agg_pattern_source.hpp mapnik-3.1.0+ds/include/mapnik/agg_pattern_source.hpp --- mapnik-3.0.23+ds/include/mapnik/agg_pattern_source.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/agg_pattern_source.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/agg_rasterizer.hpp mapnik-3.1.0+ds/include/mapnik/agg_rasterizer.hpp --- mapnik-3.0.23+ds/include/mapnik/agg_rasterizer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/agg_rasterizer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/agg_renderer.hpp mapnik-3.1.0+ds/include/mapnik/agg_renderer.hpp --- mapnik-3.0.23+ds/include/mapnik/agg_renderer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/agg_renderer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/agg_render_marker.hpp mapnik-3.1.0+ds/include/mapnik/agg_render_marker.hpp --- mapnik-3.0.23+ds/include/mapnik/agg_render_marker.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/agg_render_marker.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/attribute_collector.hpp mapnik-3.1.0+ds/include/mapnik/attribute_collector.hpp --- mapnik-3.0.23+ds/include/mapnik/attribute_collector.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/attribute_collector.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/attribute_descriptor.hpp mapnik-3.1.0+ds/include/mapnik/attribute_descriptor.hpp --- mapnik-3.0.23+ds/include/mapnik/attribute_descriptor.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/attribute_descriptor.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/attribute.hpp mapnik-3.1.0+ds/include/mapnik/attribute.hpp --- mapnik-3.0.23+ds/include/mapnik/attribute.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/attribute.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/boolean.hpp mapnik-3.1.0+ds/include/mapnik/boolean.hpp --- mapnik-3.0.23+ds/include/mapnik/boolean.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/boolean.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/box2d.hpp mapnik-3.1.0+ds/include/mapnik/box2d.hpp --- mapnik-3.0.23+ds/include/mapnik/box2d.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/box2d.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/box2d_impl.hpp mapnik-3.1.0+ds/include/mapnik/box2d_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/box2d_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/box2d_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/cairo/cairo_context.hpp mapnik-3.1.0+ds/include/mapnik/cairo/cairo_context.hpp --- mapnik-3.0.23+ds/include/mapnik/cairo/cairo_context.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/cairo/cairo_context.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/cairo/cairo_image_util.hpp mapnik-3.1.0+ds/include/mapnik/cairo/cairo_image_util.hpp --- mapnik-3.0.23+ds/include/mapnik/cairo/cairo_image_util.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/cairo/cairo_image_util.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/cairo/cairo_renderer.hpp mapnik-3.1.0+ds/include/mapnik/cairo/cairo_renderer.hpp --- mapnik-3.0.23+ds/include/mapnik/cairo/cairo_renderer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/cairo/cairo_renderer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/cairo/cairo_render_vector.hpp mapnik-3.1.0+ds/include/mapnik/cairo/cairo_render_vector.hpp --- mapnik-3.0.23+ds/include/mapnik/cairo/cairo_render_vector.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/cairo/cairo_render_vector.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/cairo/render_polygon_pattern.hpp mapnik-3.1.0+ds/include/mapnik/cairo/render_polygon_pattern.hpp --- mapnik-3.0.23+ds/include/mapnik/cairo/render_polygon_pattern.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/cairo/render_polygon_pattern.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2017 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/cairo_io.hpp mapnik-3.1.0+ds/include/mapnik/cairo_io.hpp --- mapnik-3.0.23+ds/include/mapnik/cairo_io.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/cairo_io.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/color_factory.hpp mapnik-3.1.0+ds/include/mapnik/color_factory.hpp --- mapnik-3.0.23+ds/include/mapnik/color_factory.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/color_factory.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/color.hpp mapnik-3.1.0+ds/include/mapnik/color.hpp --- mapnik-3.0.23+ds/include/mapnik/color.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/color.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/config_error.hpp mapnik-3.1.0+ds/include/mapnik/config_error.hpp --- mapnik-3.0.23+ds/include/mapnik/config_error.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/config_error.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/config.hpp mapnik-3.1.0+ds/include/mapnik/config.hpp --- mapnik-3.0.23+ds/include/mapnik/config.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/config.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/coord.hpp mapnik-3.1.0+ds/include/mapnik/coord.hpp --- mapnik-3.0.23+ds/include/mapnik/coord.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/coord.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/css_color_grammar.hpp mapnik-3.1.0+ds/include/mapnik/css_color_grammar.hpp --- mapnik-3.0.23+ds/include/mapnik/css_color_grammar.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/css_color_grammar.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/css_color_grammar_impl.hpp mapnik-3.1.0+ds/include/mapnik/css_color_grammar_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/css_color_grammar_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/css_color_grammar_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/csv/csv_grammar.hpp mapnik-3.1.0+ds/include/mapnik/csv/csv_grammar.hpp --- mapnik-3.0.23+ds/include/mapnik/csv/csv_grammar.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/csv/csv_grammar.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/csv/csv_grammar_impl.hpp mapnik-3.1.0+ds/include/mapnik/csv/csv_grammar_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/csv/csv_grammar_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/csv/csv_grammar_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/csv/csv_types.hpp mapnik-3.1.0+ds/include/mapnik/csv/csv_types.hpp --- mapnik-3.0.23+ds/include/mapnik/csv/csv_types.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/csv/csv_types.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/cxx11_support.hpp mapnik-3.1.0+ds/include/mapnik/cxx11_support.hpp --- mapnik-3.0.23+ds/include/mapnik/cxx11_support.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/cxx11_support.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/datasource_cache.hpp mapnik-3.1.0+ds/include/mapnik/datasource_cache.hpp --- mapnik-3.0.23+ds/include/mapnik/datasource_cache.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/datasource_cache.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/datasource_geometry_type.hpp mapnik-3.1.0+ds/include/mapnik/datasource_geometry_type.hpp --- mapnik-3.0.23+ds/include/mapnik/datasource_geometry_type.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/datasource_geometry_type.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/datasource.hpp mapnik-3.1.0+ds/include/mapnik/datasource.hpp --- mapnik-3.0.23+ds/include/mapnik/datasource.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/datasource.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/debug.hpp mapnik-3.1.0+ds/include/mapnik/debug.hpp --- mapnik-3.0.23+ds/include/mapnik/debug.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/debug.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/ellipsoid.hpp mapnik-3.1.0+ds/include/mapnik/ellipsoid.hpp --- mapnik-3.0.23+ds/include/mapnik/ellipsoid.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/ellipsoid.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/enumeration.hpp mapnik-3.1.0+ds/include/mapnik/enumeration.hpp --- mapnik-3.0.23+ds/include/mapnik/enumeration.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/enumeration.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/evaluate_global_attributes.hpp mapnik-3.1.0+ds/include/mapnik/evaluate_global_attributes.hpp --- mapnik-3.0.23+ds/include/mapnik/evaluate_global_attributes.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/evaluate_global_attributes.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/expression_evaluator.hpp mapnik-3.1.0+ds/include/mapnik/expression_evaluator.hpp --- mapnik-3.0.23+ds/include/mapnik/expression_evaluator.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/expression_evaluator.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/expression_grammar.hpp mapnik-3.1.0+ds/include/mapnik/expression_grammar.hpp --- mapnik-3.0.23+ds/include/mapnik/expression_grammar.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/expression_grammar.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/expression_grammar_impl.hpp mapnik-3.1.0+ds/include/mapnik/expression_grammar_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/expression_grammar_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/expression_grammar_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -233,11 +233,13 @@ ) ; - unary_function_expr = unary_func_type >> '(' > logical_expr > ')' + unary_function_expr = unary_func_type + > '(' > logical_expr > ')' ; - binary_function_expr = binary_func_type >> '(' > logical_expr > ',' - > logical_expr > ')' + binary_function_expr = binary_func_type + > '(' > logical_expr > ',' + > logical_expr > ')' ; unary_expr = primary_expr [_val = _1] diff -Nru mapnik-3.0.23+ds/include/mapnik/expression.hpp mapnik-3.1.0+ds/include/mapnik/expression.hpp --- mapnik-3.0.23+ds/include/mapnik/expression.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/expression.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/expression_node.hpp mapnik-3.1.0+ds/include/mapnik/expression_node.hpp --- mapnik-3.0.23+ds/include/mapnik/expression_node.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/expression_node.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/expression_node_types.hpp mapnik-3.1.0+ds/include/mapnik/expression_node_types.hpp --- mapnik-3.0.23+ds/include/mapnik/expression_node_types.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/expression_node_types.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/expression_string.hpp mapnik-3.1.0+ds/include/mapnik/expression_string.hpp --- mapnik-3.0.23+ds/include/mapnik/expression_string.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/expression_string.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/factory.hpp mapnik-3.1.0+ds/include/mapnik/factory.hpp --- mapnik-3.0.23+ds/include/mapnik/factory.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/factory.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/feature_factory.hpp mapnik-3.1.0+ds/include/mapnik/feature_factory.hpp --- mapnik-3.0.23+ds/include/mapnik/feature_factory.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/feature_factory.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/feature.hpp mapnik-3.1.0+ds/include/mapnik/feature.hpp --- mapnik-3.0.23+ds/include/mapnik/feature.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/feature.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/feature_kv_iterator.hpp mapnik-3.1.0+ds/include/mapnik/feature_kv_iterator.hpp --- mapnik-3.0.23+ds/include/mapnik/feature_kv_iterator.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/feature_kv_iterator.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/feature_layer_desc.hpp mapnik-3.1.0+ds/include/mapnik/feature_layer_desc.hpp --- mapnik-3.0.23+ds/include/mapnik/feature_layer_desc.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/feature_layer_desc.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/featureset.hpp mapnik-3.1.0+ds/include/mapnik/featureset.hpp --- mapnik-3.0.23+ds/include/mapnik/featureset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/featureset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/feature_style_processor_context.hpp mapnik-3.1.0+ds/include/mapnik/feature_style_processor_context.hpp --- mapnik-3.0.23+ds/include/mapnik/feature_style_processor_context.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/feature_style_processor_context.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/feature_style_processor.hpp mapnik-3.1.0+ds/include/mapnik/feature_style_processor.hpp --- mapnik-3.0.23+ds/include/mapnik/feature_style_processor.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/feature_style_processor.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/feature_style_processor_impl.hpp mapnik-3.1.0+ds/include/mapnik/feature_style_processor_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/feature_style_processor_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/feature_style_processor_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/feature_type_style.hpp mapnik-3.1.0+ds/include/mapnik/feature_type_style.hpp --- mapnik-3.0.23+ds/include/mapnik/feature_type_style.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/feature_type_style.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/filter_featureset.hpp mapnik-3.1.0+ds/include/mapnik/filter_featureset.hpp --- mapnik-3.0.23+ds/include/mapnik/filter_featureset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/filter_featureset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/font_engine_freetype.hpp mapnik-3.1.0+ds/include/mapnik/font_engine_freetype.hpp --- mapnik-3.0.23+ds/include/mapnik/font_engine_freetype.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/font_engine_freetype.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/font_set.hpp mapnik-3.1.0+ds/include/mapnik/font_set.hpp --- mapnik-3.0.23+ds/include/mapnik/font_set.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/font_set.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/function_call.hpp mapnik-3.1.0+ds/include/mapnik/function_call.hpp --- mapnik-3.0.23+ds/include/mapnik/function_call.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/function_call.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geometry/boost_spirit_karma_adapter.hpp mapnik-3.1.0+ds/include/mapnik/geometry/boost_spirit_karma_adapter.hpp --- mapnik-3.0.23+ds/include/mapnik/geometry/boost_spirit_karma_adapter.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geometry/boost_spirit_karma_adapter.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2017 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geometry/interior.hpp mapnik-3.1.0+ds/include/mapnik/geometry/interior.hpp --- mapnik-3.0.23+ds/include/mapnik/geometry/interior.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geometry/interior.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2017 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geometry/polygon_vertex_processor.hpp mapnik-3.1.0+ds/include/mapnik/geometry/polygon_vertex_processor.hpp --- mapnik-3.0.23+ds/include/mapnik/geometry/polygon_vertex_processor.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geometry/polygon_vertex_processor.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2017 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geometry_adapters.hpp mapnik-3.1.0+ds/include/mapnik/geometry_adapters.hpp --- mapnik-3.0.23+ds/include/mapnik/geometry_adapters.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geometry_adapters.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geometry_centroid.hpp mapnik-3.1.0+ds/include/mapnik/geometry_centroid.hpp --- mapnik-3.0.23+ds/include/mapnik/geometry_centroid.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geometry_centroid.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geometry_correct.hpp mapnik-3.1.0+ds/include/mapnik/geometry_correct.hpp --- mapnik-3.0.23+ds/include/mapnik/geometry_correct.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geometry_correct.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geometry_envelope.hpp mapnik-3.1.0+ds/include/mapnik/geometry_envelope.hpp --- mapnik-3.0.23+ds/include/mapnik/geometry_envelope.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geometry_envelope.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geometry_envelope_impl.hpp mapnik-3.1.0+ds/include/mapnik/geometry_envelope_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/geometry_envelope_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geometry_envelope_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geometry_fusion_adapted.hpp mapnik-3.1.0+ds/include/mapnik/geometry_fusion_adapted.hpp --- mapnik-3.0.23+ds/include/mapnik/geometry_fusion_adapted.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geometry_fusion_adapted.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geometry.hpp mapnik-3.1.0+ds/include/mapnik/geometry.hpp --- mapnik-3.0.23+ds/include/mapnik/geometry.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geometry.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geometry_is_empty.hpp mapnik-3.1.0+ds/include/mapnik/geometry_is_empty.hpp --- mapnik-3.0.23+ds/include/mapnik/geometry_is_empty.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geometry_is_empty.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geometry_is_simple.hpp mapnik-3.1.0+ds/include/mapnik/geometry_is_simple.hpp --- mapnik-3.0.23+ds/include/mapnik/geometry_is_simple.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geometry_is_simple.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geometry_is_valid.hpp mapnik-3.1.0+ds/include/mapnik/geometry_is_valid.hpp --- mapnik-3.0.23+ds/include/mapnik/geometry_is_valid.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geometry_is_valid.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geometry_remove_empty.hpp mapnik-3.1.0+ds/include/mapnik/geometry_remove_empty.hpp --- mapnik-3.0.23+ds/include/mapnik/geometry_remove_empty.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geometry_remove_empty.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geometry_reprojection.hpp mapnik-3.1.0+ds/include/mapnik/geometry_reprojection.hpp --- mapnik-3.0.23+ds/include/mapnik/geometry_reprojection.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geometry_reprojection.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geometry_reprojection_impl.hpp mapnik-3.1.0+ds/include/mapnik/geometry_reprojection_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/geometry_reprojection_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geometry_reprojection_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geometry_strategy.hpp mapnik-3.1.0+ds/include/mapnik/geometry_strategy.hpp --- mapnik-3.0.23+ds/include/mapnik/geometry_strategy.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geometry_strategy.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geometry_to_path.hpp mapnik-3.1.0+ds/include/mapnik/geometry_to_path.hpp --- mapnik-3.0.23+ds/include/mapnik/geometry_to_path.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geometry_to_path.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geometry_transform.hpp mapnik-3.1.0+ds/include/mapnik/geometry_transform.hpp --- mapnik-3.0.23+ds/include/mapnik/geometry_transform.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geometry_transform.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geometry_type.hpp mapnik-3.1.0+ds/include/mapnik/geometry_type.hpp --- mapnik-3.0.23+ds/include/mapnik/geometry_type.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geometry_type.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geometry_types.hpp mapnik-3.1.0+ds/include/mapnik/geometry_types.hpp --- mapnik-3.0.23+ds/include/mapnik/geometry_types.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geometry_types.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/geom_util.hpp mapnik-3.1.0+ds/include/mapnik/geom_util.hpp --- mapnik-3.0.23+ds/include/mapnik/geom_util.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/geom_util.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/global.hpp mapnik-3.1.0+ds/include/mapnik/global.hpp --- mapnik-3.0.23+ds/include/mapnik/global.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/global.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/gradient.hpp mapnik-3.1.0+ds/include/mapnik/gradient.hpp --- mapnik-3.0.23+ds/include/mapnik/gradient.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/gradient.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/grid/grid.hpp mapnik-3.1.0+ds/include/mapnik/grid/grid.hpp --- mapnik-3.0.23+ds/include/mapnik/grid/grid.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/grid/grid.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/grid/grid_pixel.hpp mapnik-3.1.0+ds/include/mapnik/grid/grid_pixel.hpp --- mapnik-3.0.23+ds/include/mapnik/grid/grid_pixel.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/grid/grid_pixel.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/grid/grid_pixfmt.hpp mapnik-3.1.0+ds/include/mapnik/grid/grid_pixfmt.hpp --- mapnik-3.0.23+ds/include/mapnik/grid/grid_pixfmt.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/grid/grid_pixfmt.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/grid/grid_rasterizer.hpp mapnik-3.1.0+ds/include/mapnik/grid/grid_rasterizer.hpp --- mapnik-3.0.23+ds/include/mapnik/grid/grid_rasterizer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/grid/grid_rasterizer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/grid/grid_renderer_base.hpp mapnik-3.1.0+ds/include/mapnik/grid/grid_renderer_base.hpp --- mapnik-3.0.23+ds/include/mapnik/grid/grid_renderer_base.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/grid/grid_renderer_base.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/grid/grid_renderer.hpp mapnik-3.1.0+ds/include/mapnik/grid/grid_renderer.hpp --- mapnik-3.0.23+ds/include/mapnik/grid/grid_renderer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/grid/grid_renderer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/grid/grid_rendering_buffer.hpp mapnik-3.1.0+ds/include/mapnik/grid/grid_rendering_buffer.hpp --- mapnik-3.0.23+ds/include/mapnik/grid/grid_rendering_buffer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/grid/grid_rendering_buffer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/grid/grid_render_marker.hpp mapnik-3.1.0+ds/include/mapnik/grid/grid_render_marker.hpp --- mapnik-3.0.23+ds/include/mapnik/grid/grid_render_marker.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/grid/grid_render_marker.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/grid/grid_view.hpp mapnik-3.1.0+ds/include/mapnik/grid/grid_view.hpp --- mapnik-3.0.23+ds/include/mapnik/grid/grid_view.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/grid/grid_view.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/grid_vertex_converter.hpp mapnik-3.1.0+ds/include/mapnik/grid_vertex_converter.hpp --- mapnik-3.0.23+ds/include/mapnik/grid_vertex_converter.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/grid_vertex_converter.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/group/group_layout.hpp mapnik-3.1.0+ds/include/mapnik/group/group_layout.hpp --- mapnik-3.0.23+ds/include/mapnik/group/group_layout.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/group/group_layout.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/group/group_layout_manager.hpp mapnik-3.1.0+ds/include/mapnik/group/group_layout_manager.hpp --- mapnik-3.0.23+ds/include/mapnik/group/group_layout_manager.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/group/group_layout_manager.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/group/group_rule.hpp mapnik-3.1.0+ds/include/mapnik/group/group_rule.hpp --- mapnik-3.0.23+ds/include/mapnik/group/group_rule.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/group/group_rule.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/group/group_symbolizer_helper.hpp mapnik-3.1.0+ds/include/mapnik/group/group_symbolizer_helper.hpp --- mapnik-3.0.23+ds/include/mapnik/group/group_symbolizer_helper.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/group/group_symbolizer_helper.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/group/group_symbolizer_properties.hpp mapnik-3.1.0+ds/include/mapnik/group/group_symbolizer_properties.hpp --- mapnik-3.0.23+ds/include/mapnik/group/group_symbolizer_properties.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/group/group_symbolizer_properties.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/hextree.hpp mapnik-3.1.0+ds/include/mapnik/hextree.hpp --- mapnik-3.0.23+ds/include/mapnik/hextree.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/hextree.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/hit_test_filter.hpp mapnik-3.1.0+ds/include/mapnik/hit_test_filter.hpp --- mapnik-3.0.23+ds/include/mapnik/hit_test_filter.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/hit_test_filter.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_any.hpp mapnik-3.1.0+ds/include/mapnik/image_any.hpp --- mapnik-3.0.23+ds/include/mapnik/image_any.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_any.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_compositing.hpp mapnik-3.1.0+ds/include/mapnik/image_compositing.hpp --- mapnik-3.0.23+ds/include/mapnik/image_compositing.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_compositing.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_copy.hpp mapnik-3.1.0+ds/include/mapnik/image_copy.hpp --- mapnik-3.0.23+ds/include/mapnik/image_copy.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_copy.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_filter_grammar.hpp mapnik-3.1.0+ds/include/mapnik/image_filter_grammar.hpp --- mapnik-3.0.23+ds/include/mapnik/image_filter_grammar.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_filter_grammar.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_filter_grammar_impl.hpp mapnik-3.1.0+ds/include/mapnik/image_filter_grammar_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/image_filter_grammar_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_filter_grammar_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_filter.hpp mapnik-3.1.0+ds/include/mapnik/image_filter.hpp --- mapnik-3.0.23+ds/include/mapnik/image_filter.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_filter.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_filter_types.hpp mapnik-3.1.0+ds/include/mapnik/image_filter_types.hpp --- mapnik-3.0.23+ds/include/mapnik/image_filter_types.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_filter_types.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image.hpp mapnik-3.1.0+ds/include/mapnik/image.hpp --- mapnik-3.0.23+ds/include/mapnik/image.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_impl.hpp mapnik-3.1.0+ds/include/mapnik/image_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/image_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_null.hpp mapnik-3.1.0+ds/include/mapnik/image_null.hpp --- mapnik-3.0.23+ds/include/mapnik/image_null.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_null.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_options.hpp mapnik-3.1.0+ds/include/mapnik/image_options.hpp --- mapnik-3.0.23+ds/include/mapnik/image_options.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_options.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_reader.hpp mapnik-3.1.0+ds/include/mapnik/image_reader.hpp --- mapnik-3.0.23+ds/include/mapnik/image_reader.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_reader.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_scaling.hpp mapnik-3.1.0+ds/include/mapnik/image_scaling.hpp --- mapnik-3.0.23+ds/include/mapnik/image_scaling.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_scaling.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_scaling_traits.hpp mapnik-3.1.0+ds/include/mapnik/image_scaling_traits.hpp --- mapnik-3.0.23+ds/include/mapnik/image_scaling_traits.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_scaling_traits.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_util.hpp mapnik-3.1.0+ds/include/mapnik/image_util.hpp --- mapnik-3.0.23+ds/include/mapnik/image_util.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_util.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_util_jpeg.hpp mapnik-3.1.0+ds/include/mapnik/image_util_jpeg.hpp --- mapnik-3.0.23+ds/include/mapnik/image_util_jpeg.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_util_jpeg.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_util_png.hpp mapnik-3.1.0+ds/include/mapnik/image_util_png.hpp --- mapnik-3.0.23+ds/include/mapnik/image_util_png.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_util_png.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_util_tiff.hpp mapnik-3.1.0+ds/include/mapnik/image_util_tiff.hpp --- mapnik-3.0.23+ds/include/mapnik/image_util_tiff.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_util_tiff.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_util_webp.hpp mapnik-3.1.0+ds/include/mapnik/image_util_webp.hpp --- mapnik-3.0.23+ds/include/mapnik/image_util_webp.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_util_webp.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_view_any.hpp mapnik-3.1.0+ds/include/mapnik/image_view_any.hpp --- mapnik-3.0.23+ds/include/mapnik/image_view_any.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_view_any.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_view.hpp mapnik-3.1.0+ds/include/mapnik/image_view.hpp --- mapnik-3.0.23+ds/include/mapnik/image_view.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_view.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_view_impl.hpp mapnik-3.1.0+ds/include/mapnik/image_view_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/image_view_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_view_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/image_view_null.hpp mapnik-3.1.0+ds/include/mapnik/image_view_null.hpp --- mapnik-3.0.23+ds/include/mapnik/image_view_null.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/image_view_null.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/jpeg_io.hpp mapnik-3.1.0+ds/include/mapnik/jpeg_io.hpp --- mapnik-3.0.23+ds/include/mapnik/jpeg_io.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/jpeg_io.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/attribute_value_visitor.hpp mapnik-3.1.0+ds/include/mapnik/json/attribute_value_visitor.hpp --- mapnik-3.0.23+ds/include/mapnik/json/attribute_value_visitor.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/attribute_value_visitor.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/error_handler.hpp mapnik-3.1.0+ds/include/mapnik/json/error_handler.hpp --- mapnik-3.0.23+ds/include/mapnik/json/error_handler.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/error_handler.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/extract_bounding_box_grammar.hpp mapnik-3.1.0+ds/include/mapnik/json/extract_bounding_box_grammar.hpp --- mapnik-3.0.23+ds/include/mapnik/json/extract_bounding_box_grammar.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/extract_bounding_box_grammar.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/extract_bounding_box_grammar_impl.hpp mapnik-3.1.0+ds/include/mapnik/json/extract_bounding_box_grammar_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/json/extract_bounding_box_grammar_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/extract_bounding_box_grammar_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/feature_collection_grammar.hpp mapnik-3.1.0+ds/include/mapnik/json/feature_collection_grammar.hpp --- mapnik-3.0.23+ds/include/mapnik/json/feature_collection_grammar.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/feature_collection_grammar.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/feature_collection_grammar_impl.hpp mapnik-3.1.0+ds/include/mapnik/json/feature_collection_grammar_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/json/feature_collection_grammar_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/feature_collection_grammar_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/feature_generator_grammar.hpp mapnik-3.1.0+ds/include/mapnik/json/feature_generator_grammar.hpp --- mapnik-3.0.23+ds/include/mapnik/json/feature_generator_grammar.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/feature_generator_grammar.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2017 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,88 +30,87 @@ #include // boost +#include #include +#include +#include + + +namespace mapnik { + +struct kv_store +{ + using value_type = mapnik::feature_impl::value_type; + using iterator_type = mapnik::feature_kv_iterator2; + kv_store(mapnik::feature_impl const& f) + : start_(mapnik::value_not_null(),f.begin(),f.end()), + end_(mapnik::value_not_null(),f.end(),f.end()) + {} + iterator_type start_; + iterator_type end_; +}; + +} namespace boost { namespace spirit { namespace traits { template <> -struct is_container : mpl::false_ {} ; +struct is_container : mpl::false_ {} ; template <> -struct container_iterator +struct container_iterator { - using type = mapnik::feature_kv_iterator2; + using type = mapnik::kv_store::iterator_type; }; template <> -struct begin_container +struct begin_container { - static mapnik::feature_kv_iterator2 - call (mapnik::feature_impl const& f) + static mapnik::kv_store::iterator_type + call (mapnik::kv_store const& kv) { - return mapnik::feature_kv_iterator2(mapnik::value_not_null(),f.begin(),f.end()); + return kv.start_; } }; template <> -struct end_container +struct end_container { - static mapnik::feature_kv_iterator2 - call (mapnik::feature_impl const& f) + static mapnik::kv_store::iterator_type + call (mapnik::kv_store const& kv) { - return mapnik::feature_kv_iterator2(mapnik::value_not_null(),f.end(),f.end()); + return kv.end_; } }; -#if BOOST_VERSION >= 106900 -template <> -struct transform_attribute - : detail::transform_attribute_base -{}; - -template <> -struct transform_attribute, const mapnik::feature_impl &, - boost::spirit::karma::domain, void> - : detail::transform_attribute_base, mapnik::feature_impl const&, boost::spirit::karma::domain> -{}; -#endif }}} -namespace mapnik { namespace json { - -namespace karma = boost::spirit::karma; +BOOST_FUSION_ADAPT_ADT( + mapnik::feature_impl, + (int, int, obj.id(), /**/) + (mapnik::geometry::geometryconst&, mapnik::geometry::geometry const&, obj.get_geometry(),/**/) + (mapnik::kv_store const, mapnik::kv_store const, mapnik::kv_store(obj), /**/)) +namespace mapnik { namespace json { +namespace detail { template -struct get_id -{ - using feature_type = T; - using result_type = mapnik::value_integer; - result_type operator() (feature_type const& f) const - { - return f.id(); - } -}; +#if BOOST_VERSION >= 107000 +struct attribute_type { using type = T();}; +#else +struct attribute_type { using type = T const&();}; +#endif +} -struct extract_geometry -{ - using result_type = mapnik::geometry::geometry const&; - template - result_type operator() (T const& f) const - { - return f.get_geometry(); - } -}; +namespace karma = boost::spirit::karma; template struct feature_generator_grammar : - karma::grammar + karma::grammar::type> { feature_generator_grammar(); - karma::rule feature; - geometry_generator_grammar > geometry; - properties_generator_grammar properties; - boost::phoenix::function > id_; - boost::phoenix::function geom_; + karma::rule::type> feature; + geometry_generator_grammar> geometry; + properties_generator_grammar properties; }; }} diff -Nru mapnik-3.0.23+ds/include/mapnik/json/feature_generator_grammar_impl.hpp mapnik-3.1.0+ds/include/mapnik/json/feature_generator_grammar_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/json/feature_generator_grammar_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/feature_generator_grammar_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2017 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,13 +29,11 @@ : feature_generator_grammar::base_type(feature) { boost::spirit::karma::lit_type lit; - boost::spirit::karma::uint_type uint_; - boost::spirit::karma::_val_type _val; - boost::spirit::karma::_1_type _1; + boost::spirit::karma::int_type int_; - feature = lit("{\"type\":\"Feature\",\"id\":") - << uint_[_1 = id_(_val)] - << lit(",\"geometry\":") << geometry[_1 = geom_(_val)] + feature = lit("{\"type\":\"Feature\"") + << lit(",\"id\":") << int_ + << lit(",\"geometry\":") << geometry << lit(",\"properties\":") << properties << lit('}') ; diff -Nru mapnik-3.0.23+ds/include/mapnik/json/feature_generator.hpp mapnik-3.1.0+ds/include/mapnik/json/feature_generator.hpp --- mapnik-3.0.23+ds/include/mapnik/json/feature_generator.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/feature_generator.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/feature_grammar.hpp mapnik-3.1.0+ds/include/mapnik/json/feature_grammar.hpp --- mapnik-3.0.23+ds/include/mapnik/json/feature_grammar.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/feature_grammar.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/feature_grammar_impl.hpp mapnik-3.1.0+ds/include/mapnik/json/feature_grammar_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/json/feature_grammar_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/feature_grammar_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/feature_parser.hpp mapnik-3.1.0+ds/include/mapnik/json/feature_parser.hpp --- mapnik-3.0.23+ds/include/mapnik/json/feature_parser.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/feature_parser.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/generic_json.hpp mapnik-3.1.0+ds/include/mapnik/json/generic_json.hpp --- mapnik-3.0.23+ds/include/mapnik/json/generic_json.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/generic_json.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/geometry_generator_grammar.hpp mapnik-3.1.0+ds/include/mapnik/json/geometry_generator_grammar.hpp --- mapnik-3.0.23+ds/include/mapnik/json/geometry_generator_grammar.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/geometry_generator_grammar.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2017 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/geometry_generator_grammar_impl.hpp mapnik-3.1.0+ds/include/mapnik/json/geometry_generator_grammar_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/json/geometry_generator_grammar_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/geometry_generator_grammar_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2017 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/geometry_grammar.hpp mapnik-3.1.0+ds/include/mapnik/json/geometry_grammar.hpp --- mapnik-3.0.23+ds/include/mapnik/json/geometry_grammar.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/geometry_grammar.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/geometry_grammar_impl.hpp mapnik-3.1.0+ds/include/mapnik/json/geometry_grammar_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/json/geometry_grammar_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/geometry_grammar_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/geometry_parser.hpp mapnik-3.1.0+ds/include/mapnik/json/geometry_parser.hpp --- mapnik-3.0.23+ds/include/mapnik/json/geometry_parser.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/geometry_parser.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/geometry_util.hpp mapnik-3.1.0+ds/include/mapnik/json/geometry_util.hpp --- mapnik-3.0.23+ds/include/mapnik/json/geometry_util.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/geometry_util.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/positions_grammar.hpp mapnik-3.1.0+ds/include/mapnik/json/positions_grammar.hpp --- mapnik-3.0.23+ds/include/mapnik/json/positions_grammar.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/positions_grammar.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/positions_grammar_impl.hpp mapnik-3.1.0+ds/include/mapnik/json/positions_grammar_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/json/positions_grammar_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/positions_grammar_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/positions.hpp mapnik-3.1.0+ds/include/mapnik/json/positions.hpp --- mapnik-3.0.23+ds/include/mapnik/json/positions.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/positions.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/properties_generator_grammar.hpp mapnik-3.1.0+ds/include/mapnik/json/properties_generator_grammar.hpp --- mapnik-3.0.23+ds/include/mapnik/json/properties_generator_grammar.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/properties_generator_grammar.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,6 +30,7 @@ #include #include #include +#include #pragma GCC diagnostic pop #include @@ -50,7 +51,7 @@ struct extract_string { - using result_type = std::tuple; + using result_type = std::tuple; result_type operator() (mapnik::value const& val) const { @@ -60,19 +61,17 @@ }; template -struct properties_generator_grammar : karma::grammar +struct properties_generator_grammar : karma::grammar { using pair_type = std::tuple; properties_generator_grammar(); // rules - karma::rule properties; + karma::rule properties; karma::rule pair; karma::rule()> value; - karma::rule value_null_; - karma::rule ustring; + // escaped_string escaped_string_; - typename karma::int_generator int__; boost::phoenix::function extract_string_; std::string quote_; }; diff -Nru mapnik-3.0.23+ds/include/mapnik/json/properties_generator_grammar_impl.hpp mapnik-3.1.0+ds/include/mapnik/json/properties_generator_grammar_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/json/properties_generator_grammar_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/properties_generator_grammar_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -69,6 +69,7 @@ boost::spirit::karma::string_type kstring; boost::spirit::karma::eps_type eps; using boost::phoenix::at_c; + properties = lit('{') << -(pair % lit(',')) << lit('}') @@ -84,7 +85,6 @@ | kstring[_1 = at_c<0>(_val)] ; - } }} diff -Nru mapnik-3.0.23+ds/include/mapnik/json/stringifier.hpp mapnik-3.1.0+ds/include/mapnik/json/stringifier.hpp --- mapnik-3.0.23+ds/include/mapnik/json/stringifier.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/stringifier.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/topojson_grammar.hpp mapnik-3.1.0+ds/include/mapnik/json/topojson_grammar.hpp --- mapnik-3.0.23+ds/include/mapnik/json/topojson_grammar.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/topojson_grammar.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/topojson_grammar_impl.hpp mapnik-3.1.0+ds/include/mapnik/json/topojson_grammar_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/json/topojson_grammar_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/topojson_grammar_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/topojson_utils.hpp mapnik-3.1.0+ds/include/mapnik/json/topojson_utils.hpp --- mapnik-3.0.23+ds/include/mapnik/json/topojson_utils.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/topojson_utils.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/topology.hpp mapnik-3.1.0+ds/include/mapnik/json/topology.hpp --- mapnik-3.0.23+ds/include/mapnik/json/topology.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/topology.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/json/value_converters.hpp mapnik-3.1.0+ds/include/mapnik/json/value_converters.hpp --- mapnik-3.0.23+ds/include/mapnik/json/value_converters.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/json/value_converters.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/label_collision_detector.hpp mapnik-3.1.0+ds/include/mapnik/label_collision_detector.hpp --- mapnik-3.0.23+ds/include/mapnik/label_collision_detector.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/label_collision_detector.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/layer.hpp mapnik-3.1.0+ds/include/mapnik/layer.hpp --- mapnik-3.0.23+ds/include/mapnik/layer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/layer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/load_map.hpp mapnik-3.1.0+ds/include/mapnik/load_map.hpp --- mapnik-3.0.23+ds/include/mapnik/load_map.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/load_map.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/make_unique.hpp mapnik-3.1.0+ds/include/mapnik/make_unique.hpp --- mapnik-3.0.23+ds/include/mapnik/make_unique.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/make_unique.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/map.hpp mapnik-3.1.0+ds/include/mapnik/map.hpp --- mapnik-3.0.23+ds/include/mapnik/map.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/map.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/mapped_memory_cache.hpp mapnik-3.1.0+ds/include/mapnik/mapped_memory_cache.hpp --- mapnik-3.0.23+ds/include/mapnik/mapped_memory_cache.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/mapped_memory_cache.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/marker_cache.hpp mapnik-3.1.0+ds/include/mapnik/marker_cache.hpp --- mapnik-3.0.23+ds/include/mapnik/marker_cache.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/marker_cache.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/marker_helpers.hpp mapnik-3.1.0+ds/include/mapnik/marker_helpers.hpp --- mapnik-3.0.23+ds/include/mapnik/marker_helpers.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/marker_helpers.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/marker.hpp mapnik-3.1.0+ds/include/mapnik/marker.hpp --- mapnik-3.0.23+ds/include/mapnik/marker.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/marker.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/markers_placement.hpp mapnik-3.1.0+ds/include/mapnik/markers_placement.hpp --- mapnik-3.0.23+ds/include/mapnik/markers_placement.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/markers_placement.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/markers_placements/basic.hpp mapnik-3.1.0+ds/include/mapnik/markers_placements/basic.hpp --- mapnik-3.0.23+ds/include/mapnik/markers_placements/basic.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/markers_placements/basic.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/markers_placements/interior.hpp mapnik-3.1.0+ds/include/mapnik/markers_placements/interior.hpp --- mapnik-3.0.23+ds/include/mapnik/markers_placements/interior.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/markers_placements/interior.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/markers_placements/line.hpp mapnik-3.1.0+ds/include/mapnik/markers_placements/line.hpp --- mapnik-3.0.23+ds/include/mapnik/markers_placements/line.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/markers_placements/line.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/markers_placements/point.hpp mapnik-3.1.0+ds/include/mapnik/markers_placements/point.hpp --- mapnik-3.0.23+ds/include/mapnik/markers_placements/point.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/markers_placements/point.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/markers_placements/vertext_first.hpp mapnik-3.1.0+ds/include/mapnik/markers_placements/vertext_first.hpp --- mapnik-3.0.23+ds/include/mapnik/markers_placements/vertext_first.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/markers_placements/vertext_first.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/markers_placements/vertext_last.hpp mapnik-3.1.0+ds/include/mapnik/markers_placements/vertext_last.hpp --- mapnik-3.0.23+ds/include/mapnik/markers_placements/vertext_last.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/markers_placements/vertext_last.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/memory_datasource.hpp mapnik-3.1.0+ds/include/mapnik/memory_datasource.hpp --- mapnik-3.0.23+ds/include/mapnik/memory_datasource.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/memory_datasource.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/memory_featureset.hpp mapnik-3.1.0+ds/include/mapnik/memory_featureset.hpp --- mapnik-3.0.23+ds/include/mapnik/memory_featureset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/memory_featureset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/octree.hpp mapnik-3.1.0+ds/include/mapnik/octree.hpp --- mapnik-3.0.23+ds/include/mapnik/octree.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/octree.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/offset_converter.hpp mapnik-3.1.0+ds/include/mapnik/offset_converter.hpp --- mapnik-3.0.23+ds/include/mapnik/offset_converter.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/offset_converter.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/palette.hpp mapnik-3.1.0+ds/include/mapnik/palette.hpp --- mapnik-3.0.23+ds/include/mapnik/palette.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/palette.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/params.hpp mapnik-3.1.0+ds/include/mapnik/params.hpp --- mapnik-3.0.23+ds/include/mapnik/params.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/params.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/params_impl.hpp mapnik-3.1.0+ds/include/mapnik/params_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/params_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/params_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/parse_path.hpp mapnik-3.1.0+ds/include/mapnik/parse_path.hpp --- mapnik-3.0.23+ds/include/mapnik/parse_path.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/parse_path.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/parse_transform.hpp mapnik-3.1.0+ds/include/mapnik/parse_transform.hpp --- mapnik-3.0.23+ds/include/mapnik/parse_transform.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/parse_transform.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/path_expression_grammar.hpp mapnik-3.1.0+ds/include/mapnik/path_expression_grammar.hpp --- mapnik-3.0.23+ds/include/mapnik/path_expression_grammar.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/path_expression_grammar.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/path_expression_grammar_impl.hpp mapnik-3.1.0+ds/include/mapnik/path_expression_grammar_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/path_expression_grammar_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/path_expression_grammar_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/path_expression.hpp mapnik-3.1.0+ds/include/mapnik/path_expression.hpp --- mapnik-3.0.23+ds/include/mapnik/path_expression.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/path_expression.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/path.hpp mapnik-3.1.0+ds/include/mapnik/path.hpp --- mapnik-3.0.23+ds/include/mapnik/path.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/path.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/pixel_position.hpp mapnik-3.1.0+ds/include/mapnik/pixel_position.hpp --- mapnik-3.0.23+ds/include/mapnik/pixel_position.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/pixel_position.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/pixel_types.hpp mapnik-3.1.0+ds/include/mapnik/pixel_types.hpp --- mapnik-3.0.23+ds/include/mapnik/pixel_types.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/pixel_types.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/plugin.hpp mapnik-3.1.0+ds/include/mapnik/plugin.hpp --- mapnik-3.0.23+ds/include/mapnik/plugin.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/plugin.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/png_io.hpp mapnik-3.1.0+ds/include/mapnik/png_io.hpp --- mapnik-3.0.23+ds/include/mapnik/png_io.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/png_io.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/pool.hpp mapnik-3.1.0+ds/include/mapnik/pool.hpp --- mapnik-3.0.23+ds/include/mapnik/pool.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/pool.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/projection.hpp mapnik-3.1.0+ds/include/mapnik/projection.hpp --- mapnik-3.0.23+ds/include/mapnik/projection.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/projection.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/proj_strategy.hpp mapnik-3.1.0+ds/include/mapnik/proj_strategy.hpp --- mapnik-3.0.23+ds/include/mapnik/proj_strategy.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/proj_strategy.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/proj_transform.hpp mapnik-3.1.0+ds/include/mapnik/proj_transform.hpp --- mapnik-3.0.23+ds/include/mapnik/proj_transform.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/proj_transform.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/ptree_helpers.hpp mapnik-3.1.0+ds/include/mapnik/ptree_helpers.hpp --- mapnik-3.0.23+ds/include/mapnik/ptree_helpers.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/ptree_helpers.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/quad_tree.hpp mapnik-3.1.0+ds/include/mapnik/quad_tree.hpp --- mapnik-3.0.23+ds/include/mapnik/quad_tree.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/quad_tree.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/query.hpp mapnik-3.1.0+ds/include/mapnik/query.hpp --- mapnik-3.0.23+ds/include/mapnik/query.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/query.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/raster_colorizer.hpp mapnik-3.1.0+ds/include/mapnik/raster_colorizer.hpp --- mapnik-3.0.23+ds/include/mapnik/raster_colorizer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/raster_colorizer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/raster.hpp mapnik-3.1.0+ds/include/mapnik/raster.hpp --- mapnik-3.0.23+ds/include/mapnik/raster.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/raster.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/renderer_common/apply_vertex_converter.hpp mapnik-3.1.0+ds/include/mapnik/renderer_common/apply_vertex_converter.hpp --- mapnik-3.0.23+ds/include/mapnik/renderer_common/apply_vertex_converter.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/renderer_common/apply_vertex_converter.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/renderer_common/clipping_extent.hpp mapnik-3.1.0+ds/include/mapnik/renderer_common/clipping_extent.hpp --- mapnik-3.0.23+ds/include/mapnik/renderer_common/clipping_extent.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/renderer_common/clipping_extent.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/renderer_common/pattern_alignment.hpp mapnik-3.1.0+ds/include/mapnik/renderer_common/pattern_alignment.hpp --- mapnik-3.0.23+ds/include/mapnik/renderer_common/pattern_alignment.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/renderer_common/pattern_alignment.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,10 +27,10 @@ namespace mapnik { -class symbolizer_base; +struct symbolizer_base; class feature_impl; class proj_transform; -class renderer_common; +struct renderer_common; coord pattern_offset( symbolizer_base const & sym, diff -Nru mapnik-3.0.23+ds/include/mapnik/renderer_common/process_building_symbolizer.hpp mapnik-3.1.0+ds/include/mapnik/renderer_common/process_building_symbolizer.hpp --- mapnik-3.0.23+ds/include/mapnik/renderer_common/process_building_symbolizer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/renderer_common/process_building_symbolizer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/renderer_common/process_point_symbolizer.hpp mapnik-3.1.0+ds/include/mapnik/renderer_common/process_point_symbolizer.hpp --- mapnik-3.0.23+ds/include/mapnik/renderer_common/process_point_symbolizer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/renderer_common/process_point_symbolizer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/renderer_common/process_polygon_symbolizer.hpp mapnik-3.1.0+ds/include/mapnik/renderer_common/process_polygon_symbolizer.hpp --- mapnik-3.0.23+ds/include/mapnik/renderer_common/process_polygon_symbolizer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/renderer_common/process_polygon_symbolizer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/renderer_common/process_raster_symbolizer.hpp mapnik-3.1.0+ds/include/mapnik/renderer_common/process_raster_symbolizer.hpp --- mapnik-3.0.23+ds/include/mapnik/renderer_common/process_raster_symbolizer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/renderer_common/process_raster_symbolizer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/renderer_common/render_group_symbolizer.hpp mapnik-3.1.0+ds/include/mapnik/renderer_common/render_group_symbolizer.hpp --- mapnik-3.0.23+ds/include/mapnik/renderer_common/render_group_symbolizer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/renderer_common/render_group_symbolizer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/renderer_common/render_markers_symbolizer.hpp mapnik-3.1.0+ds/include/mapnik/renderer_common/render_markers_symbolizer.hpp --- mapnik-3.0.23+ds/include/mapnik/renderer_common/render_markers_symbolizer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/renderer_common/render_markers_symbolizer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/renderer_common/render_pattern.hpp mapnik-3.1.0+ds/include/mapnik/renderer_common/render_pattern.hpp --- mapnik-3.0.23+ds/include/mapnik/renderer_common/render_pattern.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/renderer_common/render_pattern.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/renderer_common/render_thunk_extractor.hpp mapnik-3.1.0+ds/include/mapnik/renderer_common/render_thunk_extractor.hpp --- mapnik-3.0.23+ds/include/mapnik/renderer_common/render_thunk_extractor.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/renderer_common/render_thunk_extractor.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/renderer_common/render_thunk.hpp mapnik-3.1.0+ds/include/mapnik/renderer_common/render_thunk.hpp --- mapnik-3.0.23+ds/include/mapnik/renderer_common/render_thunk.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/renderer_common/render_thunk.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/renderer_common.hpp mapnik-3.1.0+ds/include/mapnik/renderer_common.hpp --- mapnik-3.0.23+ds/include/mapnik/renderer_common.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/renderer_common.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/request.hpp mapnik-3.1.0+ds/include/mapnik/request.hpp --- mapnik-3.0.23+ds/include/mapnik/request.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/request.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/rule_cache.hpp mapnik-3.1.0+ds/include/mapnik/rule_cache.hpp --- mapnik-3.0.23+ds/include/mapnik/rule_cache.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/rule_cache.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/rule.hpp mapnik-3.1.0+ds/include/mapnik/rule.hpp --- mapnik-3.0.23+ds/include/mapnik/rule.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/rule.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/safe_cast.hpp mapnik-3.1.0+ds/include/mapnik/safe_cast.hpp --- mapnik-3.0.23+ds/include/mapnik/safe_cast.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/safe_cast.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/save_map.hpp mapnik-3.1.0+ds/include/mapnik/save_map.hpp --- mapnik-3.0.23+ds/include/mapnik/save_map.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/save_map.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/scale_denominator.hpp mapnik-3.1.0+ds/include/mapnik/scale_denominator.hpp --- mapnik-3.0.23+ds/include/mapnik/scale_denominator.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/scale_denominator.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/segment.hpp mapnik-3.1.0+ds/include/mapnik/segment.hpp --- mapnik-3.0.23+ds/include/mapnik/segment.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/segment.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/span_image_filter.hpp mapnik-3.1.0+ds/include/mapnik/span_image_filter.hpp --- mapnik-3.0.23+ds/include/mapnik/span_image_filter.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/span_image_filter.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/sql_utils.hpp mapnik-3.1.0+ds/include/mapnik/sql_utils.hpp --- mapnik-3.0.23+ds/include/mapnik/sql_utils.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/sql_utils.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/sse.hpp mapnik-3.1.0+ds/include/mapnik/sse.hpp --- mapnik-3.0.23+ds/include/mapnik/sse.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/sse.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/stringify_macro.hpp mapnik-3.1.0+ds/include/mapnik/stringify_macro.hpp --- mapnik-3.0.23+ds/include/mapnik/stringify_macro.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/stringify_macro.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/geometry_svg_generator.hpp mapnik-3.1.0+ds/include/mapnik/svg/geometry_svg_generator.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/geometry_svg_generator.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/geometry_svg_generator.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/geometry_svg_generator_impl.hpp mapnik-3.1.0+ds/include/mapnik/svg/geometry_svg_generator_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/geometry_svg_generator_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/geometry_svg_generator_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/output/svg_generator.hpp mapnik-3.1.0+ds/include/mapnik/svg/output/svg_generator.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/output/svg_generator.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/output/svg_generator.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/output/svg_output_attributes.hpp mapnik-3.1.0+ds/include/mapnik/svg/output/svg_output_attributes.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/output/svg_output_attributes.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/output/svg_output_attributes.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/output/svg_output_grammars.hpp mapnik-3.1.0+ds/include/mapnik/svg/output/svg_output_grammars.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/output/svg_output_grammars.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/output/svg_output_grammars.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/output/svg_output_grammars_impl.hpp mapnik-3.1.0+ds/include/mapnik/svg/output/svg_output_grammars_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/output/svg_output_grammars_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/output/svg_output_grammars_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/output/svg_path_iterator.hpp mapnik-3.1.0+ds/include/mapnik/svg/output/svg_path_iterator.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/output/svg_path_iterator.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/output/svg_path_iterator.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/output/svg_renderer.hpp mapnik-3.1.0+ds/include/mapnik/svg/output/svg_renderer.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/output/svg_renderer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/output/svg_renderer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/svg_converter.hpp mapnik-3.1.0+ds/include/mapnik/svg/svg_converter.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/svg_converter.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/svg_converter.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/svg_parser_exception.hpp mapnik-3.1.0+ds/include/mapnik/svg/svg_parser_exception.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/svg_parser_exception.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/svg_parser_exception.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/svg_parser.hpp mapnik-3.1.0+ds/include/mapnik/svg/svg_parser.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/svg_parser.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/svg_parser.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2017 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/svg_path_adapter.hpp mapnik-3.1.0+ds/include/mapnik/svg/svg_path_adapter.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/svg_path_adapter.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/svg_path_adapter.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/svg_path_attributes.hpp mapnik-3.1.0+ds/include/mapnik/svg/svg_path_attributes.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/svg_path_attributes.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/svg_path_attributes.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/svg_path_commands.hpp mapnik-3.1.0+ds/include/mapnik/svg/svg_path_commands.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/svg_path_commands.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/svg_path_commands.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/svg_path_grammar.hpp mapnik-3.1.0+ds/include/mapnik/svg/svg_path_grammar.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/svg_path_grammar.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/svg_path_grammar.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/svg_path_grammar_impl.hpp mapnik-3.1.0+ds/include/mapnik/svg/svg_path_grammar_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/svg_path_grammar_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/svg_path_grammar_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/svg_path_parser.hpp mapnik-3.1.0+ds/include/mapnik/svg/svg_path_parser.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/svg_path_parser.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/svg_path_parser.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/svg_points_grammar.hpp mapnik-3.1.0+ds/include/mapnik/svg/svg_points_grammar.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/svg_points_grammar.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/svg_points_grammar.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/svg_points_grammar_impl.hpp mapnik-3.1.0+ds/include/mapnik/svg/svg_points_grammar_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/svg_points_grammar_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/svg_points_grammar_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/svg_renderer_agg.hpp mapnik-3.1.0+ds/include/mapnik/svg/svg_renderer_agg.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/svg_renderer_agg.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/svg_renderer_agg.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/svg_storage.hpp mapnik-3.1.0+ds/include/mapnik/svg/svg_storage.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/svg_storage.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/svg_storage.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/svg_transform_grammar.hpp mapnik-3.1.0+ds/include/mapnik/svg/svg_transform_grammar.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/svg_transform_grammar.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/svg_transform_grammar.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/svg/svg_transform_grammar_impl.hpp mapnik-3.1.0+ds/include/mapnik/svg/svg_transform_grammar_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/svg/svg_transform_grammar_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/svg/svg_transform_grammar_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/symbolizer_base.hpp mapnik-3.1.0+ds/include/mapnik/symbolizer_base.hpp --- mapnik-3.0.23+ds/include/mapnik/symbolizer_base.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/symbolizer_base.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/symbolizer_default_values.hpp mapnik-3.1.0+ds/include/mapnik/symbolizer_default_values.hpp --- mapnik-3.0.23+ds/include/mapnik/symbolizer_default_values.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/symbolizer_default_values.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/symbolizer_dispatch.hpp mapnik-3.1.0+ds/include/mapnik/symbolizer_dispatch.hpp --- mapnik-3.0.23+ds/include/mapnik/symbolizer_dispatch.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/symbolizer_dispatch.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/symbolizer_enumerations.hpp mapnik-3.1.0+ds/include/mapnik/symbolizer_enumerations.hpp --- mapnik-3.0.23+ds/include/mapnik/symbolizer_enumerations.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/symbolizer_enumerations.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/symbolizer_hash.hpp mapnik-3.1.0+ds/include/mapnik/symbolizer_hash.hpp --- mapnik-3.0.23+ds/include/mapnik/symbolizer_hash.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/symbolizer_hash.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/symbolizer.hpp mapnik-3.1.0+ds/include/mapnik/symbolizer.hpp --- mapnik-3.0.23+ds/include/mapnik/symbolizer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/symbolizer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/symbolizer_keys.hpp mapnik-3.1.0+ds/include/mapnik/symbolizer_keys.hpp --- mapnik-3.0.23+ds/include/mapnik/symbolizer_keys.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/symbolizer_keys.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/symbolizer_utils.hpp mapnik-3.1.0+ds/include/mapnik/symbolizer_utils.hpp --- mapnik-3.0.23+ds/include/mapnik/symbolizer_utils.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/symbolizer_utils.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/evaluated_format_properties_ptr.hpp mapnik-3.1.0+ds/include/mapnik/text/evaluated_format_properties_ptr.hpp --- mapnik-3.0.23+ds/include/mapnik/text/evaluated_format_properties_ptr.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/evaluated_format_properties_ptr.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/face.hpp mapnik-3.1.0+ds/include/mapnik/text/face.hpp --- mapnik-3.0.23+ds/include/mapnik/text/face.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/face.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/font_feature_settings.hpp mapnik-3.1.0+ds/include/mapnik/text/font_feature_settings.hpp --- mapnik-3.0.23+ds/include/mapnik/text/font_feature_settings.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/font_feature_settings.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/font_library.hpp mapnik-3.1.0+ds/include/mapnik/text/font_library.hpp --- mapnik-3.0.23+ds/include/mapnik/text/font_library.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/font_library.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/formatting/base.hpp mapnik-3.1.0+ds/include/mapnik/text/formatting/base.hpp --- mapnik-3.0.23+ds/include/mapnik/text/formatting/base.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/formatting/base.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/formatting/format.hpp mapnik-3.1.0+ds/include/mapnik/text/formatting/format.hpp --- mapnik-3.0.23+ds/include/mapnik/text/formatting/format.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/formatting/format.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/formatting/layout.hpp mapnik-3.1.0+ds/include/mapnik/text/formatting/layout.hpp --- mapnik-3.0.23+ds/include/mapnik/text/formatting/layout.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/formatting/layout.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/formatting/list.hpp mapnik-3.1.0+ds/include/mapnik/text/formatting/list.hpp --- mapnik-3.0.23+ds/include/mapnik/text/formatting/list.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/formatting/list.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/formatting/registry.hpp mapnik-3.1.0+ds/include/mapnik/text/formatting/registry.hpp --- mapnik-3.0.23+ds/include/mapnik/text/formatting/registry.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/formatting/registry.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/formatting/text.hpp mapnik-3.1.0+ds/include/mapnik/text/formatting/text.hpp --- mapnik-3.0.23+ds/include/mapnik/text/formatting/text.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/formatting/text.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/glyph_info.hpp mapnik-3.1.0+ds/include/mapnik/text/glyph_info.hpp --- mapnik-3.0.23+ds/include/mapnik/text/glyph_info.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/glyph_info.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/glyph_positions.hpp mapnik-3.1.0+ds/include/mapnik/text/glyph_positions.hpp --- mapnik-3.0.23+ds/include/mapnik/text/glyph_positions.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/glyph_positions.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/harfbuzz_shaper.hpp mapnik-3.1.0+ds/include/mapnik/text/harfbuzz_shaper.hpp --- mapnik-3.0.23+ds/include/mapnik/text/harfbuzz_shaper.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/harfbuzz_shaper.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/icu_shaper.hpp mapnik-3.1.0+ds/include/mapnik/text/icu_shaper.hpp --- mapnik-3.0.23+ds/include/mapnik/text/icu_shaper.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/icu_shaper.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/itemizer.hpp mapnik-3.1.0+ds/include/mapnik/text/itemizer.hpp --- mapnik-3.0.23+ds/include/mapnik/text/itemizer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/itemizer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/placement_finder.hpp mapnik-3.1.0+ds/include/mapnik/text/placement_finder.hpp --- mapnik-3.0.23+ds/include/mapnik/text/placement_finder.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/placement_finder.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/placement_finder_impl.hpp mapnik-3.1.0+ds/include/mapnik/text/placement_finder_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/text/placement_finder_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/placement_finder_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/placements/base.hpp mapnik-3.1.0+ds/include/mapnik/text/placements/base.hpp --- mapnik-3.0.23+ds/include/mapnik/text/placements/base.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/placements/base.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/placements/dummy.hpp mapnik-3.1.0+ds/include/mapnik/text/placements/dummy.hpp --- mapnik-3.0.23+ds/include/mapnik/text/placements/dummy.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/placements/dummy.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/placements/list.hpp mapnik-3.1.0+ds/include/mapnik/text/placements/list.hpp --- mapnik-3.0.23+ds/include/mapnik/text/placements/list.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/placements/list.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/placements/registry.hpp mapnik-3.1.0+ds/include/mapnik/text/placements/registry.hpp --- mapnik-3.0.23+ds/include/mapnik/text/placements/registry.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/placements/registry.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/placements/simple.hpp mapnik-3.1.0+ds/include/mapnik/text/placements/simple.hpp --- mapnik-3.0.23+ds/include/mapnik/text/placements/simple.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/placements/simple.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/properties_util.hpp mapnik-3.1.0+ds/include/mapnik/text/properties_util.hpp --- mapnik-3.0.23+ds/include/mapnik/text/properties_util.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/properties_util.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/renderer.hpp mapnik-3.1.0+ds/include/mapnik/text/renderer.hpp --- mapnik-3.0.23+ds/include/mapnik/text/renderer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/renderer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/symbolizer_helpers.hpp mapnik-3.1.0+ds/include/mapnik/text/symbolizer_helpers.hpp --- mapnik-3.0.23+ds/include/mapnik/text/symbolizer_helpers.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/symbolizer_helpers.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/text_layout.hpp mapnik-3.1.0+ds/include/mapnik/text/text_layout.hpp --- mapnik-3.0.23+ds/include/mapnik/text/text_layout.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/text_layout.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/text_line.hpp mapnik-3.1.0+ds/include/mapnik/text/text_line.hpp --- mapnik-3.0.23+ds/include/mapnik/text/text_line.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/text_line.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/text/text_properties.hpp mapnik-3.1.0+ds/include/mapnik/text/text_properties.hpp --- mapnik-3.0.23+ds/include/mapnik/text/text_properties.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/text/text_properties.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/tiff_io.hpp mapnik-3.1.0+ds/include/mapnik/tiff_io.hpp --- mapnik-3.0.23+ds/include/mapnik/tiff_io.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/tiff_io.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/timer.hpp mapnik-3.1.0+ds/include/mapnik/timer.hpp --- mapnik-3.0.23+ds/include/mapnik/timer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/timer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/tolerance_iterator.hpp mapnik-3.1.0+ds/include/mapnik/tolerance_iterator.hpp --- mapnik-3.0.23+ds/include/mapnik/tolerance_iterator.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/tolerance_iterator.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/transform_expression_grammar.hpp mapnik-3.1.0+ds/include/mapnik/transform_expression_grammar.hpp --- mapnik-3.0.23+ds/include/mapnik/transform_expression_grammar.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/transform_expression_grammar.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/transform_expression_grammar_impl.hpp mapnik-3.1.0+ds/include/mapnik/transform_expression_grammar_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/transform_expression_grammar_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/transform_expression_grammar_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/transform_expression.hpp mapnik-3.1.0+ds/include/mapnik/transform_expression.hpp --- mapnik-3.0.23+ds/include/mapnik/transform_expression.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/transform_expression.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/transform_path_adapter.hpp mapnik-3.1.0+ds/include/mapnik/transform_path_adapter.hpp --- mapnik-3.0.23+ds/include/mapnik/transform_path_adapter.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/transform_path_adapter.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/transform_processor.hpp mapnik-3.1.0+ds/include/mapnik/transform_processor.hpp --- mapnik-3.0.23+ds/include/mapnik/transform_processor.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/transform_processor.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/unicode.hpp mapnik-3.1.0+ds/include/mapnik/unicode.hpp --- mapnik-3.0.23+ds/include/mapnik/unicode.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/unicode.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/char_array_buffer.hpp mapnik-3.1.0+ds/include/mapnik/util/char_array_buffer.hpp --- mapnik-3.0.23+ds/include/mapnik/util/char_array_buffer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/char_array_buffer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/const_rendering_buffer.hpp mapnik-3.1.0+ds/include/mapnik/util/const_rendering_buffer.hpp --- mapnik-3.0.23+ds/include/mapnik/util/const_rendering_buffer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/const_rendering_buffer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/container_adapter.hpp mapnik-3.1.0+ds/include/mapnik/util/container_adapter.hpp --- mapnik-3.0.23+ds/include/mapnik/util/container_adapter.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/container_adapter.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/conversions.hpp mapnik-3.1.0+ds/include/mapnik/util/conversions.hpp --- mapnik-3.0.23+ds/include/mapnik/util/conversions.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/conversions.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/dasharray_parser.hpp mapnik-3.1.0+ds/include/mapnik/util/dasharray_parser.hpp --- mapnik-3.0.23+ds/include/mapnik/util/dasharray_parser.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/dasharray_parser.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/featureset_buffer.hpp mapnik-3.1.0+ds/include/mapnik/util/featureset_buffer.hpp --- mapnik-3.0.23+ds/include/mapnik/util/featureset_buffer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/featureset_buffer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/feature_to_geojson.hpp mapnik-3.1.0+ds/include/mapnik/util/feature_to_geojson.hpp --- mapnik-3.0.23+ds/include/mapnik/util/feature_to_geojson.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/feature_to_geojson.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/file_io.hpp mapnik-3.1.0+ds/include/mapnik/util/file_io.hpp --- mapnik-3.0.23+ds/include/mapnik/util/file_io.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/file_io.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/fs.hpp mapnik-3.1.0+ds/include/mapnik/util/fs.hpp --- mapnik-3.0.23+ds/include/mapnik/util/fs.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/fs.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/geometry_to_ds_type.hpp mapnik-3.1.0+ds/include/mapnik/util/geometry_to_ds_type.hpp --- mapnik-3.0.23+ds/include/mapnik/util/geometry_to_ds_type.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/geometry_to_ds_type.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/geometry_to_geojson.hpp mapnik-3.1.0+ds/include/mapnik/util/geometry_to_geojson.hpp --- mapnik-3.0.23+ds/include/mapnik/util/geometry_to_geojson.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/geometry_to_geojson.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/geometry_to_svg.hpp mapnik-3.1.0+ds/include/mapnik/util/geometry_to_svg.hpp --- mapnik-3.0.23+ds/include/mapnik/util/geometry_to_svg.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/geometry_to_svg.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/geometry_to_wkb.hpp mapnik-3.1.0+ds/include/mapnik/util/geometry_to_wkb.hpp --- mapnik-3.0.23+ds/include/mapnik/util/geometry_to_wkb.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/geometry_to_wkb.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/geometry_to_wkt.hpp mapnik-3.1.0+ds/include/mapnik/util/geometry_to_wkt.hpp --- mapnik-3.0.23+ds/include/mapnik/util/geometry_to_wkt.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/geometry_to_wkt.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/hsl.hpp mapnik-3.1.0+ds/include/mapnik/util/hsl.hpp --- mapnik-3.0.23+ds/include/mapnik/util/hsl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/hsl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/is_clockwise.hpp mapnik-3.1.0+ds/include/mapnik/util/is_clockwise.hpp --- mapnik-3.0.23+ds/include/mapnik/util/is_clockwise.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/is_clockwise.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/math.hpp mapnik-3.1.0+ds/include/mapnik/util/math.hpp --- mapnik-3.0.23+ds/include/mapnik/util/math.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/math.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/name_to_int.hpp mapnik-3.1.0+ds/include/mapnik/util/name_to_int.hpp --- mapnik-3.0.23+ds/include/mapnik/util/name_to_int.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/name_to_int.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2017 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/noncopyable.hpp mapnik-3.1.0+ds/include/mapnik/util/noncopyable.hpp --- mapnik-3.0.23+ds/include/mapnik/util/noncopyable.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/noncopyable.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/path_iterator.hpp mapnik-3.1.0+ds/include/mapnik/util/path_iterator.hpp --- mapnik-3.0.23+ds/include/mapnik/util/path_iterator.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/path_iterator.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/rounding_cast.hpp mapnik-3.1.0+ds/include/mapnik/util/rounding_cast.hpp --- mapnik-3.0.23+ds/include/mapnik/util/rounding_cast.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/rounding_cast.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/singleton.hpp mapnik-3.1.0+ds/include/mapnik/util/singleton.hpp --- mapnik-3.0.23+ds/include/mapnik/util/singleton.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/singleton.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/spatial_index.hpp mapnik-3.1.0+ds/include/mapnik/util/spatial_index.hpp --- mapnik-3.0.23+ds/include/mapnik/util/spatial_index.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/spatial_index.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/spirit_transform_attribute.hpp mapnik-3.1.0+ds/include/mapnik/util/spirit_transform_attribute.hpp --- mapnik-3.0.23+ds/include/mapnik/util/spirit_transform_attribute.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/spirit_transform_attribute.hpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,216 +0,0 @@ -/***************************************************************************** - * - * This file is part of Mapnik (c++ mapping toolkit) - * - * Copyright (C) 2015 Artem Pavlenko - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - *****************************************************************************/ - -#ifndef MAPNIK_UTIL_SPIRIT_TRANSFORM_ATTRIBUTE_HPP -#define MAPNIK_UTIL_SPIRIT_TRANSFORM_ATTRIBUTE_HPP - -#include -#include - -#include - -#pragma GCC diagnostic push -#include -#include -#pragma GCC diagnostic pop - -namespace boost { namespace spirit { namespace traits { - - template <> - struct transform_attribute const, - mapnik::geometry::point const&, karma::domain> - { - using type = mapnik::geometry::point const&; - static type pre(mapnik::geometry::geometry const& geom) - { - return mapnik::util::get >(geom); - } - }; - - template <> - struct transform_attribute const, - mapnik::geometry::line_string const&, karma::domain> - { - using type = mapnik::geometry::line_string const&; - static type pre(mapnik::geometry::geometry const& geom) - { - return mapnik::util::get >(geom); - } - }; - - template <> - struct transform_attribute const, - mapnik::geometry::polygon const&, karma::domain> - { - using type = mapnik::geometry::polygon const&; - static type pre(mapnik::geometry::geometry const& geom) - { - return mapnik::util::get >(geom); - } - }; - - template <> - struct transform_attribute const, - mapnik::geometry::polygon::rings_container const&, karma::domain> - { - using type = mapnik::geometry::polygon::rings_container const&; - static type pre(mapnik::geometry::polygon const& poly) - { - return poly.interior_rings; - } - }; - - template <> - struct transform_attribute const, - mapnik::geometry::multi_point const&, karma::domain> - { - using type = mapnik::geometry::multi_point const&; - static type pre(mapnik::geometry::geometry const& geom) - { - return mapnik::util::get >(geom); - } - }; - - template <> - struct transform_attribute const, - mapnik::geometry::multi_line_string const&, karma::domain> - { - using type = mapnik::geometry::multi_line_string const&; - static type pre(mapnik::geometry::geometry const& geom) - { - return mapnik::util::get >(geom); - } - }; - - template <> - struct transform_attribute const, - mapnik::geometry::multi_polygon const&, karma::domain> - { - using type = mapnik::geometry::multi_polygon const&; - static type pre(mapnik::geometry::geometry const& geom) - { - return mapnik::util::get >(geom); - } - }; - - template <> - struct transform_attribute const, - mapnik::geometry::geometry_collection const&, karma::domain> - { - using type = mapnik::geometry::geometry_collection const&; - static type pre(mapnik::geometry::geometry const& geom) - { - return mapnik::util::get >(geom); - } - }; - - template <> - struct transform_attribute const, - mapnik::geometry::point const&, karma::domain> - { - using type = mapnik::geometry::point const&; - static type pre(mapnik::geometry::geometry const& geom) - { - return mapnik::util::get >(geom); - } - }; - - template <> - struct transform_attribute const, - mapnik::geometry::line_string const&, karma::domain> - { - using type = mapnik::geometry::line_string const&; - static type pre(mapnik::geometry::geometry const& geom) - { - return mapnik::util::get >(geom); - } - }; - - template <> - struct transform_attribute const, - mapnik::geometry::polygon const&, karma::domain> - { - using type = mapnik::geometry::polygon const&; - static type pre(mapnik::geometry::geometry const& geom) - { - return mapnik::util::get >(geom); - } - }; - - template <> - struct transform_attribute const, - mapnik::geometry::polygon::rings_container const&, karma::domain> - { - using type = mapnik::geometry::polygon::rings_container const&; - static type pre(mapnik::geometry::polygon const& poly) - { - return poly.interior_rings; - } - }; - - template <> - struct transform_attribute const, - mapnik::geometry::multi_point const&, karma::domain> - { - using type = mapnik::geometry::multi_point const&; - static type pre(mapnik::geometry::geometry const& geom) - { - return mapnik::util::get >(geom); - } - }; - - template <> - struct transform_attribute const, - mapnik::geometry::multi_line_string const&, karma::domain> - { - using type = mapnik::geometry::multi_line_string const&; - static type pre(mapnik::geometry::geometry const& geom) - { - return mapnik::util::get >(geom); - } - }; - - template <> - struct transform_attribute const, - mapnik::geometry::multi_polygon const&, karma::domain> - { - using type = mapnik::geometry::multi_polygon const&; - static type pre(mapnik::geometry::geometry const& geom) - { - return mapnik::util::get >(geom); - } - }; - - template <> - struct transform_attribute const, - mapnik::geometry::geometry_collection const&, karma::domain> - { - using type = mapnik::geometry::geometry_collection const&; - static type pre(mapnik::geometry::geometry const& geom) - { - return mapnik::util::get >(geom); - } - }; - -}}} - -#endif // MAPNIK_UTIL_SPIRIT_TRANSFORM_ATTRIBUTE_HPP diff -Nru mapnik-3.0.23+ds/include/mapnik/util/timer.hpp mapnik-3.1.0+ds/include/mapnik/util/timer.hpp --- mapnik-3.0.23+ds/include/mapnik/util/timer.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/timer.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/trim.hpp mapnik-3.1.0+ds/include/mapnik/util/trim.hpp --- mapnik-3.0.23+ds/include/mapnik/util/trim.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/trim.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/utf_conv_win.hpp mapnik-3.1.0+ds/include/mapnik/util/utf_conv_win.hpp --- mapnik-3.0.23+ds/include/mapnik/util/utf_conv_win.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/utf_conv_win.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/variant.hpp mapnik-3.1.0+ds/include/mapnik/util/variant.hpp --- mapnik-3.0.23+ds/include/mapnik/util/variant.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/variant.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/util/variant_io.hpp mapnik-3.1.0+ds/include/mapnik/util/variant_io.hpp --- mapnik-3.0.23+ds/include/mapnik/util/variant_io.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/util/variant_io.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/value_error.hpp mapnik-3.1.0+ds/include/mapnik/value_error.hpp --- mapnik-3.0.23+ds/include/mapnik/value_error.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/value_error.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/value_hash.hpp mapnik-3.1.0+ds/include/mapnik/value_hash.hpp --- mapnik-3.0.23+ds/include/mapnik/value_hash.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/value_hash.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/value.hpp mapnik-3.1.0+ds/include/mapnik/value.hpp --- mapnik-3.0.23+ds/include/mapnik/value.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/value.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/value_types.hpp mapnik-3.1.0+ds/include/mapnik/value_types.hpp --- mapnik-3.0.23+ds/include/mapnik/value_types.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/value_types.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/version.hpp mapnik-3.1.0+ds/include/mapnik/version.hpp --- mapnik-3.0.23+ds/include/mapnik/version.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/version.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -26,8 +26,8 @@ #include #define MAPNIK_MAJOR_VERSION 3 -#define MAPNIK_MINOR_VERSION 0 -#define MAPNIK_PATCH_VERSION 23 +#define MAPNIK_MINOR_VERSION 1 +#define MAPNIK_PATCH_VERSION 0 #define MAPNIK_VERSION (MAPNIK_MAJOR_VERSION*100000) + (MAPNIK_MINOR_VERSION*100) + (MAPNIK_PATCH_VERSION) diff -Nru mapnik-3.0.23+ds/include/mapnik/vertex_adapters.hpp mapnik-3.1.0+ds/include/mapnik/vertex_adapters.hpp --- mapnik-3.0.23+ds/include/mapnik/vertex_adapters.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/vertex_adapters.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/vertex_cache.hpp mapnik-3.1.0+ds/include/mapnik/vertex_cache.hpp --- mapnik-3.0.23+ds/include/mapnik/vertex_cache.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/vertex_cache.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/vertex_converters.hpp mapnik-3.1.0+ds/include/mapnik/vertex_converters.hpp --- mapnik-3.0.23+ds/include/mapnik/vertex_converters.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/vertex_converters.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/vertex.hpp mapnik-3.1.0+ds/include/mapnik/vertex.hpp --- mapnik-3.0.23+ds/include/mapnik/vertex.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/vertex.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/vertex_processor.hpp mapnik-3.1.0+ds/include/mapnik/vertex_processor.hpp --- mapnik-3.0.23+ds/include/mapnik/vertex_processor.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/vertex_processor.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/vertex_vector.hpp mapnik-3.1.0+ds/include/mapnik/vertex_vector.hpp --- mapnik-3.0.23+ds/include/mapnik/vertex_vector.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/vertex_vector.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/view_strategy.hpp mapnik-3.1.0+ds/include/mapnik/view_strategy.hpp --- mapnik-3.0.23+ds/include/mapnik/view_strategy.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/view_strategy.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/view_transform.hpp mapnik-3.1.0+ds/include/mapnik/view_transform.hpp --- mapnik-3.0.23+ds/include/mapnik/view_transform.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/view_transform.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/warning_ignore_agg.hpp mapnik-3.1.0+ds/include/mapnik/warning_ignore_agg.hpp --- mapnik-3.0.23+ds/include/mapnik/warning_ignore_agg.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/warning_ignore_agg.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/warning_ignore.hpp mapnik-3.1.0+ds/include/mapnik/warning_ignore.hpp --- mapnik-3.0.23+ds/include/mapnik/warning_ignore.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/warning_ignore.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/warp.hpp mapnik-3.1.0+ds/include/mapnik/warp.hpp --- mapnik-3.0.23+ds/include/mapnik/warp.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/warp.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/webp_io.hpp mapnik-3.1.0+ds/include/mapnik/webp_io.hpp --- mapnik-3.0.23+ds/include/mapnik/webp_io.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/webp_io.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/well_known_srs.hpp mapnik-3.1.0+ds/include/mapnik/well_known_srs.hpp --- mapnik-3.0.23+ds/include/mapnik/well_known_srs.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/well_known_srs.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/wkb.hpp mapnik-3.1.0+ds/include/mapnik/wkb.hpp --- mapnik-3.0.23+ds/include/mapnik/wkb.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/wkb.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/wkt/wkt_factory.hpp mapnik-3.1.0+ds/include/mapnik/wkt/wkt_factory.hpp --- mapnik-3.0.23+ds/include/mapnik/wkt/wkt_factory.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/wkt/wkt_factory.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,6 +23,8 @@ #ifndef MAPNIK_WKT_FACTORY_HPP #define MAPNIK_WKT_FACTORY_HPP +#include + // mapnik #include diff -Nru mapnik-3.0.23+ds/include/mapnik/wkt/wkt_generator_grammar.hpp mapnik-3.1.0+ds/include/mapnik/wkt/wkt_generator_grammar.hpp --- mapnik-3.0.23+ds/include/mapnik/wkt/wkt_generator_grammar.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/wkt/wkt_generator_grammar.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2017 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/wkt/wkt_generator_grammar_impl.hpp mapnik-3.1.0+ds/include/mapnik/wkt/wkt_generator_grammar_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/wkt/wkt_generator_grammar_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/wkt/wkt_generator_grammar_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2017 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/wkt/wkt_grammar.hpp mapnik-3.1.0+ds/include/mapnik/wkt/wkt_grammar.hpp --- mapnik-3.0.23+ds/include/mapnik/wkt/wkt_grammar.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/wkt/wkt_grammar.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/wkt/wkt_grammar_impl.hpp mapnik-3.1.0+ds/include/mapnik/wkt/wkt_grammar_impl.hpp --- mapnik-3.0.23+ds/include/mapnik/wkt/wkt_grammar_impl.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/wkt/wkt_grammar_impl.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/xml_attribute_cast.hpp mapnik-3.1.0+ds/include/mapnik/xml_attribute_cast.hpp --- mapnik-3.0.23+ds/include/mapnik/xml_attribute_cast.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/xml_attribute_cast.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/xml_loader.hpp mapnik-3.1.0+ds/include/mapnik/xml_loader.hpp --- mapnik-3.0.23+ds/include/mapnik/xml_loader.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/xml_loader.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/xml_node.hpp mapnik-3.1.0+ds/include/mapnik/xml_node.hpp --- mapnik-3.0.23+ds/include/mapnik/xml_node.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/xml_node.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/include/mapnik/xml_tree.hpp mapnik-3.1.0+ds/include/mapnik/xml_tree.hpp --- mapnik-3.0.23+ds/include/mapnik/xml_tree.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/include/mapnik/xml_tree.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/csv/csv_datasource.cpp mapnik-3.1.0+ds/plugins/input/csv/csv_datasource.cpp --- mapnik-3.0.23+ds/plugins/input/csv/csv_datasource.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/csv/csv_datasource.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/csv/csv_datasource.hpp mapnik-3.1.0+ds/plugins/input/csv/csv_datasource.hpp --- mapnik-3.0.23+ds/plugins/input/csv/csv_datasource.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/csv/csv_datasource.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/csv/csv_featureset.cpp mapnik-3.1.0+ds/plugins/input/csv/csv_featureset.cpp --- mapnik-3.0.23+ds/plugins/input/csv/csv_featureset.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/csv/csv_featureset.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/csv/csv_featureset.hpp mapnik-3.1.0+ds/plugins/input/csv/csv_featureset.hpp --- mapnik-3.0.23+ds/plugins/input/csv/csv_featureset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/csv/csv_featureset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/csv/csv_getline.hpp mapnik-3.1.0+ds/plugins/input/csv/csv_getline.hpp --- mapnik-3.0.23+ds/plugins/input/csv/csv_getline.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/csv/csv_getline.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/csv/csv_index_featureset.cpp mapnik-3.1.0+ds/plugins/input/csv/csv_index_featureset.cpp --- mapnik-3.0.23+ds/plugins/input/csv/csv_index_featureset.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/csv/csv_index_featureset.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/csv/csv_index_featureset.hpp mapnik-3.1.0+ds/plugins/input/csv/csv_index_featureset.hpp --- mapnik-3.0.23+ds/plugins/input/csv/csv_index_featureset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/csv/csv_index_featureset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/csv/csv_inline_featureset.cpp mapnik-3.1.0+ds/plugins/input/csv/csv_inline_featureset.cpp --- mapnik-3.0.23+ds/plugins/input/csv/csv_inline_featureset.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/csv/csv_inline_featureset.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/csv/csv_inline_featureset.hpp mapnik-3.1.0+ds/plugins/input/csv/csv_inline_featureset.hpp --- mapnik-3.0.23+ds/plugins/input/csv/csv_inline_featureset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/csv/csv_inline_featureset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/csv/csv_utils.cpp mapnik-3.1.0+ds/plugins/input/csv/csv_utils.cpp --- mapnik-3.0.23+ds/plugins/input/csv/csv_utils.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/csv/csv_utils.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/csv/csv_utils.hpp mapnik-3.1.0+ds/plugins/input/csv/csv_utils.hpp --- mapnik-3.0.23+ds/plugins/input/csv/csv_utils.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/csv/csv_utils.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/gdal/gdal_datasource.cpp mapnik-3.1.0+ds/plugins/input/gdal/gdal_datasource.cpp --- mapnik-3.0.23+ds/plugins/input/gdal/gdal_datasource.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/gdal/gdal_datasource.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/gdal/gdal_datasource.hpp mapnik-3.1.0+ds/plugins/input/gdal/gdal_datasource.hpp --- mapnik-3.0.23+ds/plugins/input/gdal/gdal_datasource.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/gdal/gdal_datasource.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/gdal/gdal_featureset.cpp mapnik-3.1.0+ds/plugins/input/gdal/gdal_featureset.cpp --- mapnik-3.0.23+ds/plugins/input/gdal/gdal_featureset.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/gdal/gdal_featureset.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/gdal/gdal_featureset.hpp mapnik-3.1.0+ds/plugins/input/gdal/gdal_featureset.hpp --- mapnik-3.0.23+ds/plugins/input/gdal/gdal_featureset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/gdal/gdal_featureset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/geojson/geojson_datasource.cpp mapnik-3.1.0+ds/plugins/input/geojson/geojson_datasource.cpp --- mapnik-3.0.23+ds/plugins/input/geojson/geojson_datasource.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/geojson/geojson_datasource.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/geojson/geojson_datasource.hpp mapnik-3.1.0+ds/plugins/input/geojson/geojson_datasource.hpp --- mapnik-3.0.23+ds/plugins/input/geojson/geojson_datasource.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/geojson/geojson_datasource.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/geojson/geojson_featureset.cpp mapnik-3.1.0+ds/plugins/input/geojson/geojson_featureset.cpp --- mapnik-3.0.23+ds/plugins/input/geojson/geojson_featureset.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/geojson/geojson_featureset.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/geojson/geojson_featureset.hpp mapnik-3.1.0+ds/plugins/input/geojson/geojson_featureset.hpp --- mapnik-3.0.23+ds/plugins/input/geojson/geojson_featureset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/geojson/geojson_featureset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/geojson/geojson_index_featureset.cpp mapnik-3.1.0+ds/plugins/input/geojson/geojson_index_featureset.cpp --- mapnik-3.0.23+ds/plugins/input/geojson/geojson_index_featureset.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/geojson/geojson_index_featureset.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/geojson/geojson_index_featureset.hpp mapnik-3.1.0+ds/plugins/input/geojson/geojson_index_featureset.hpp --- mapnik-3.0.23+ds/plugins/input/geojson/geojson_index_featureset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/geojson/geojson_index_featureset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/geojson/geojson_memory_index_featureset.cpp mapnik-3.1.0+ds/plugins/input/geojson/geojson_memory_index_featureset.cpp --- mapnik-3.0.23+ds/plugins/input/geojson/geojson_memory_index_featureset.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/geojson/geojson_memory_index_featureset.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/geojson/geojson_memory_index_featureset.hpp mapnik-3.1.0+ds/plugins/input/geojson/geojson_memory_index_featureset.hpp --- mapnik-3.0.23+ds/plugins/input/geojson/geojson_memory_index_featureset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/geojson/geojson_memory_index_featureset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/ogr/ogr_converter.cpp mapnik-3.1.0+ds/plugins/input/ogr/ogr_converter.cpp --- mapnik-3.0.23+ds/plugins/input/ogr/ogr_converter.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/ogr/ogr_converter.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/ogr/ogr_converter.hpp mapnik-3.1.0+ds/plugins/input/ogr/ogr_converter.hpp --- mapnik-3.0.23+ds/plugins/input/ogr/ogr_converter.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/ogr/ogr_converter.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/ogr/ogr_datasource.cpp mapnik-3.1.0+ds/plugins/input/ogr/ogr_datasource.cpp --- mapnik-3.0.23+ds/plugins/input/ogr/ogr_datasource.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/ogr/ogr_datasource.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/ogr/ogr_datasource.hpp mapnik-3.1.0+ds/plugins/input/ogr/ogr_datasource.hpp --- mapnik-3.0.23+ds/plugins/input/ogr/ogr_datasource.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/ogr/ogr_datasource.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/ogr/ogr_featureset.cpp mapnik-3.1.0+ds/plugins/input/ogr/ogr_featureset.cpp --- mapnik-3.0.23+ds/plugins/input/ogr/ogr_featureset.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/ogr/ogr_featureset.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/ogr/ogr_featureset.hpp mapnik-3.1.0+ds/plugins/input/ogr/ogr_featureset.hpp --- mapnik-3.0.23+ds/plugins/input/ogr/ogr_featureset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/ogr/ogr_featureset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/ogr/ogr_index_featureset.cpp mapnik-3.1.0+ds/plugins/input/ogr/ogr_index_featureset.cpp --- mapnik-3.0.23+ds/plugins/input/ogr/ogr_index_featureset.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/ogr/ogr_index_featureset.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/ogr/ogr_index_featureset.hpp mapnik-3.1.0+ds/plugins/input/ogr/ogr_index_featureset.hpp --- mapnik-3.0.23+ds/plugins/input/ogr/ogr_index_featureset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/ogr/ogr_index_featureset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/ogr/ogr_index.hpp mapnik-3.1.0+ds/plugins/input/ogr/ogr_index.hpp --- mapnik-3.0.23+ds/plugins/input/ogr/ogr_index.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/ogr/ogr_index.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/ogr/ogr_layer_ptr.hpp mapnik-3.1.0+ds/plugins/input/ogr/ogr_layer_ptr.hpp --- mapnik-3.0.23+ds/plugins/input/ogr/ogr_layer_ptr.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/ogr/ogr_layer_ptr.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/pgraster/pgraster_datasource.cpp mapnik-3.1.0+ds/plugins/input/pgraster/pgraster_datasource.cpp --- mapnik-3.0.23+ds/plugins/input/pgraster/pgraster_datasource.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/pgraster/pgraster_datasource.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/pgraster/pgraster_datasource.hpp mapnik-3.1.0+ds/plugins/input/pgraster/pgraster_datasource.hpp --- mapnik-3.0.23+ds/plugins/input/pgraster/pgraster_datasource.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/pgraster/pgraster_datasource.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/pgraster/pgraster_featureset.cpp mapnik-3.1.0+ds/plugins/input/pgraster/pgraster_featureset.cpp --- mapnik-3.0.23+ds/plugins/input/pgraster/pgraster_featureset.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/pgraster/pgraster_featureset.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/pgraster/pgraster_featureset.hpp mapnik-3.1.0+ds/plugins/input/pgraster/pgraster_featureset.hpp --- mapnik-3.0.23+ds/plugins/input/pgraster/pgraster_featureset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/pgraster/pgraster_featureset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/pgraster/pgraster_wkb_reader.cpp mapnik-3.1.0+ds/plugins/input/pgraster/pgraster_wkb_reader.cpp --- mapnik-3.0.23+ds/plugins/input/pgraster/pgraster_wkb_reader.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/pgraster/pgraster_wkb_reader.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/pgraster/pgraster_wkb_reader.hpp mapnik-3.1.0+ds/plugins/input/pgraster/pgraster_wkb_reader.hpp --- mapnik-3.0.23+ds/plugins/input/pgraster/pgraster_wkb_reader.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/pgraster/pgraster_wkb_reader.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/postgis/asyncresultset.hpp mapnik-3.1.0+ds/plugins/input/postgis/asyncresultset.hpp --- mapnik-3.0.23+ds/plugins/input/postgis/asyncresultset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/postgis/asyncresultset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/postgis/connection.hpp mapnik-3.1.0+ds/plugins/input/postgis/connection.hpp --- mapnik-3.0.23+ds/plugins/input/postgis/connection.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/postgis/connection.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/postgis/connection_manager.hpp mapnik-3.1.0+ds/plugins/input/postgis/connection_manager.hpp --- mapnik-3.0.23+ds/plugins/input/postgis/connection_manager.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/postgis/connection_manager.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/postgis/cursorresultset.hpp mapnik-3.1.0+ds/plugins/input/postgis/cursorresultset.hpp --- mapnik-3.0.23+ds/plugins/input/postgis/cursorresultset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/postgis/cursorresultset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/postgis/numeric2string.hpp mapnik-3.1.0+ds/plugins/input/postgis/numeric2string.hpp --- mapnik-3.0.23+ds/plugins/input/postgis/numeric2string.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/postgis/numeric2string.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/postgis/postgis_datasource.cpp mapnik-3.1.0+ds/plugins/input/postgis/postgis_datasource.cpp --- mapnik-3.0.23+ds/plugins/input/postgis/postgis_datasource.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/postgis/postgis_datasource.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/postgis/postgis_datasource.hpp mapnik-3.1.0+ds/plugins/input/postgis/postgis_datasource.hpp --- mapnik-3.0.23+ds/plugins/input/postgis/postgis_datasource.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/postgis/postgis_datasource.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/postgis/postgis_featureset.cpp mapnik-3.1.0+ds/plugins/input/postgis/postgis_featureset.cpp --- mapnik-3.0.23+ds/plugins/input/postgis/postgis_featureset.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/postgis/postgis_featureset.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/postgis/postgis_featureset.hpp mapnik-3.1.0+ds/plugins/input/postgis/postgis_featureset.hpp --- mapnik-3.0.23+ds/plugins/input/postgis/postgis_featureset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/postgis/postgis_featureset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/postgis/resultset.hpp mapnik-3.1.0+ds/plugins/input/postgis/resultset.hpp --- mapnik-3.0.23+ds/plugins/input/postgis/resultset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/postgis/resultset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/raster/raster_datasource.cpp mapnik-3.1.0+ds/plugins/input/raster/raster_datasource.cpp --- mapnik-3.0.23+ds/plugins/input/raster/raster_datasource.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/raster/raster_datasource.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/raster/raster_datasource.hpp mapnik-3.1.0+ds/plugins/input/raster/raster_datasource.hpp --- mapnik-3.0.23+ds/plugins/input/raster/raster_datasource.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/raster/raster_datasource.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/raster/raster_featureset.cpp mapnik-3.1.0+ds/plugins/input/raster/raster_featureset.cpp --- mapnik-3.0.23+ds/plugins/input/raster/raster_featureset.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/raster/raster_featureset.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/raster/raster_featureset.hpp mapnik-3.1.0+ds/plugins/input/raster/raster_featureset.hpp --- mapnik-3.0.23+ds/plugins/input/raster/raster_featureset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/raster/raster_featureset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/raster/raster_info.cpp mapnik-3.1.0+ds/plugins/input/raster/raster_info.cpp --- mapnik-3.0.23+ds/plugins/input/raster/raster_info.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/raster/raster_info.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/raster/raster_info.hpp mapnik-3.1.0+ds/plugins/input/raster/raster_info.hpp --- mapnik-3.0.23+ds/plugins/input/raster/raster_info.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/raster/raster_info.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/shape/dbfile.cpp mapnik-3.1.0+ds/plugins/input/shape/dbfile.cpp --- mapnik-3.0.23+ds/plugins/input/shape/dbfile.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/shape/dbfile.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/shape/dbfile.hpp mapnik-3.1.0+ds/plugins/input/shape/dbfile.hpp --- mapnik-3.0.23+ds/plugins/input/shape/dbfile.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/shape/dbfile.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/shape/dbf_test.cpp mapnik-3.1.0+ds/plugins/input/shape/dbf_test.cpp --- mapnik-3.0.23+ds/plugins/input/shape/dbf_test.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/shape/dbf_test.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/shape/shape_datasource.cpp mapnik-3.1.0+ds/plugins/input/shape/shape_datasource.cpp --- mapnik-3.0.23+ds/plugins/input/shape/shape_datasource.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/shape/shape_datasource.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/shape/shape_datasource.hpp mapnik-3.1.0+ds/plugins/input/shape/shape_datasource.hpp --- mapnik-3.0.23+ds/plugins/input/shape/shape_datasource.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/shape/shape_datasource.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/shape/shape_featureset.cpp mapnik-3.1.0+ds/plugins/input/shape/shape_featureset.cpp --- mapnik-3.0.23+ds/plugins/input/shape/shape_featureset.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/shape/shape_featureset.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/shape/shape_featureset.hpp mapnik-3.1.0+ds/plugins/input/shape/shape_featureset.hpp --- mapnik-3.0.23+ds/plugins/input/shape/shape_featureset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/shape/shape_featureset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/shape/shapefile.hpp mapnik-3.1.0+ds/plugins/input/shape/shapefile.hpp --- mapnik-3.0.23+ds/plugins/input/shape/shapefile.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/shape/shapefile.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/shape/shape_index_featureset.cpp mapnik-3.1.0+ds/plugins/input/shape/shape_index_featureset.cpp --- mapnik-3.0.23+ds/plugins/input/shape/shape_index_featureset.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/shape/shape_index_featureset.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/shape/shape_index_featureset.hpp mapnik-3.1.0+ds/plugins/input/shape/shape_index_featureset.hpp --- mapnik-3.0.23+ds/plugins/input/shape/shape_index_featureset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/shape/shape_index_featureset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/shape/shape_io.cpp mapnik-3.1.0+ds/plugins/input/shape/shape_io.cpp --- mapnik-3.0.23+ds/plugins/input/shape/shape_io.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/shape/shape_io.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/shape/shape_io.hpp mapnik-3.1.0+ds/plugins/input/shape/shape_io.hpp --- mapnik-3.0.23+ds/plugins/input/shape/shape_io.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/shape/shape_io.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/shape/shape_utils.cpp mapnik-3.1.0+ds/plugins/input/shape/shape_utils.cpp --- mapnik-3.0.23+ds/plugins/input/shape/shape_utils.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/shape/shape_utils.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/shape/shape_utils.hpp mapnik-3.1.0+ds/plugins/input/shape/shape_utils.hpp --- mapnik-3.0.23+ds/plugins/input/shape/shape_utils.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/shape/shape_utils.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/sqlite/sqlite_connection.hpp mapnik-3.1.0+ds/plugins/input/sqlite/sqlite_connection.hpp --- mapnik-3.0.23+ds/plugins/input/sqlite/sqlite_connection.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/sqlite/sqlite_connection.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/sqlite/sqlite_datasource.cpp mapnik-3.1.0+ds/plugins/input/sqlite/sqlite_datasource.cpp --- mapnik-3.0.23+ds/plugins/input/sqlite/sqlite_datasource.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/sqlite/sqlite_datasource.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/sqlite/sqlite_datasource.hpp mapnik-3.1.0+ds/plugins/input/sqlite/sqlite_datasource.hpp --- mapnik-3.0.23+ds/plugins/input/sqlite/sqlite_datasource.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/sqlite/sqlite_datasource.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/sqlite/sqlite_featureset.cpp mapnik-3.1.0+ds/plugins/input/sqlite/sqlite_featureset.cpp --- mapnik-3.0.23+ds/plugins/input/sqlite/sqlite_featureset.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/sqlite/sqlite_featureset.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/sqlite/sqlite_featureset.hpp mapnik-3.1.0+ds/plugins/input/sqlite/sqlite_featureset.hpp --- mapnik-3.0.23+ds/plugins/input/sqlite/sqlite_featureset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/sqlite/sqlite_featureset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/sqlite/sqlite_prepared.hpp mapnik-3.1.0+ds/plugins/input/sqlite/sqlite_prepared.hpp --- mapnik-3.0.23+ds/plugins/input/sqlite/sqlite_prepared.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/sqlite/sqlite_prepared.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/sqlite/sqlite_resultset.hpp mapnik-3.1.0+ds/plugins/input/sqlite/sqlite_resultset.hpp --- mapnik-3.0.23+ds/plugins/input/sqlite/sqlite_resultset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/sqlite/sqlite_resultset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/sqlite/sqlite_utils.hpp mapnik-3.1.0+ds/plugins/input/sqlite/sqlite_utils.hpp --- mapnik-3.0.23+ds/plugins/input/sqlite/sqlite_utils.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/sqlite/sqlite_utils.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/topojson/topojson_datasource.cpp mapnik-3.1.0+ds/plugins/input/topojson/topojson_datasource.cpp --- mapnik-3.0.23+ds/plugins/input/topojson/topojson_datasource.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/topojson/topojson_datasource.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/topojson/topojson_datasource.hpp mapnik-3.1.0+ds/plugins/input/topojson/topojson_datasource.hpp --- mapnik-3.0.23+ds/plugins/input/topojson/topojson_datasource.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/topojson/topojson_datasource.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/topojson/topojson_featureset.cpp mapnik-3.1.0+ds/plugins/input/topojson/topojson_featureset.cpp --- mapnik-3.0.23+ds/plugins/input/topojson/topojson_featureset.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/topojson/topojson_featureset.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/plugins/input/topojson/topojson_featureset.hpp mapnik-3.1.0+ds/plugins/input/topojson/topojson_featureset.hpp --- mapnik-3.0.23+ds/plugins/input/topojson/topojson_featureset.hpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/plugins/input/topojson/topojson_featureset.hpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/SConstruct mapnik-3.1.0+ds/SConstruct --- mapnik-3.0.23+ds/SConstruct 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/SConstruct 2021-01-08 11:20:06.000000000 +0000 @@ -42,7 +42,7 @@ DEFAULT_CC = "cc" DEFAULT_CXX = "c++" -DEFAULT_CXX11_CXXFLAGS = " -std=c++11 -DU_USING_ICU_NAMESPACE=0" +DEFAULT_CXX11_CXXFLAGS = " -std=c++14 -DU_USING_ICU_NAMESPACE=0" DEFAULT_CXX11_LINKFLAGS = "" if sys.platform == 'darwin': # homebrew default @@ -62,7 +62,7 @@ SCONF_TEMP_DIR = '.sconf_temp' # auto-search directories for boost libs/headers BOOST_SEARCH_PREFIXES = ['/usr/local','/opt/local','/sw','/usr',] -BOOST_MIN_VERSION = '1.47' +BOOST_MIN_VERSION = '1.61' #CAIRO_MIN_VERSION = '1.8.0' HARFBUZZ_MIN_VERSION = (0, 9, 34) @@ -615,7 +615,7 @@ # and thus breaks knowledge below that gdal worked # TODO - upgrade our scons logic to support Framework linking if env['PLATFORM'] == 'Darwin': - value = call(cmd,silent=True) + value = call(cmd,silent=True).decode("utf-8") if value and '-framework GDAL' in value: env['LIBS'].append('gdal') if os.path.exists('/Library/Frameworks/GDAL.framework/unix/lib'): @@ -1168,12 +1168,12 @@ return True return False -def supports_cxx11(context,silent=False): +def supports_cxx14(context,silent=False): ret = context.TryRun(""" int main() { -#if __cplusplus >= 201103 +#if __cplusplus >= 201402L return 0; #else return -1; @@ -1182,7 +1182,7 @@ """, '.cpp') if not silent: - context.Message('Checking if compiler (%s) supports -std=c++11 flag... ' % context.env.get('CXX','CXX')) + context.Message('Checking if compiler (%s) supports -std=c++14 flag... ' % context.env.get('CXX','CXX')) if silent: context.did_show_result=1 context.Result(ret[0]) @@ -1214,7 +1214,7 @@ 'harfbuzz_with_freetype_support': harfbuzz_with_freetype_support, 'boost_regex_has_icu' : boost_regex_has_icu, 'sqlite_has_rtree' : sqlite_has_rtree, - 'supports_cxx11' : supports_cxx11, + 'supports_cxx14' : supports_cxx14, 'CheckBoostScopedEnum' : CheckBoostScopedEnum, } @@ -1398,6 +1398,7 @@ ] OPTIONAL_LIBSHEADERS = [] + CHECK_PKG_CONFIG = conf.CheckPKGConfig('0.15.0') if env.get('FREETYPE_LIBS') or env.get('FREETYPE_INCLUDES'): REQUIRED_LIBSHEADERS.insert(0,['freetype','ft2build.h',True,'C']) if env.get('FREETYPE_INCLUDES'): @@ -1406,6 +1407,21 @@ if env.get('FREETYPE_LIBS'): lib_path = env['FREETYPE_LIBS'] env.AppendUnique(LIBPATH = fix_path(lib_path)) + elif CHECK_PKG_CONFIG and conf.CheckPKG('freetype2'): + # Freetype 2.9+ doesn't use freetype-config and uses pkg-config instead + cmd = 'pkg-config freetype2 --libs --cflags' + if env['RUNTIME_LINK'] == 'static': + cmd += ' --static' + + temp_env = Environment(ENV=os.environ) + try: + temp_env.ParseConfig(cmd) + for lib in temp_env['LIBS']: + env.AppendUnique(LIBPATH = fix_path(lib)) + for inc in temp_env['CPPPATH']: + env.AppendUnique(CPPPATH = fix_path(inc)) + except OSError as e: + pass elif conf.parse_config('FREETYPE_CONFIG'): # check if freetype links to bz2 if env['RUNTIME_LINK'] == 'static': @@ -1488,9 +1504,9 @@ if env['PRIORITIZE_LINKING']: conf.prioritize_paths(silent=True) - # test for C++11 support, which is required - if not env['HOST'] and not conf.supports_cxx11(): - color_print(1,"C++ compiler does not support C++11 standard (-std=c++11), which is required. Please upgrade your compiler") + # test for C++14 support, which is required + if not env['HOST'] and not conf.supports_cxx14(): + color_print(1,"C++ compiler does not support C++14 standard (-std=c++14), which is required. Please upgrade your compiler") Exit(1) if not env['HOST']: @@ -1635,9 +1651,6 @@ color_print(1,'%s not detected on your system' % env['QUERIED_ICU_DATA'] ) env['MISSING_DEPS'].append('ICU_DATA') - - CHECK_PKG_CONFIG = conf.CheckPKGConfig('0.15.0') - if len(env['REQUESTED_PLUGINS']): if env['HOST']: for plugin in env['REQUESTED_PLUGINS']: diff -Nru mapnik-3.0.23+ds/scripts/publish_release.sh mapnik-3.1.0+ds/scripts/publish_release.sh --- mapnik-3.0.23+ds/scripts/publish_release.sh 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/scripts/publish_release.sh 2021-01-08 11:20:06.000000000 +0000 @@ -111,8 +111,9 @@ # create draft release curl --data "{\"tag_name\": \"${MAPNIK_VERSION}\",\"target_commitish\": \"master\",\"name\": \"${MAPNIK_VERSION}\",\"body\": \"${RELEASE_NOTES}\",\"draft\": ${IS_DRAFT},\"prerelease\": ${IS_PRERELEASE}}" \ -https://api.github.com/repos/mapnik/mapnik/releases?access_token=${GITHUB_TOKEN_MAPNIK_PUBLIC_REPO} \ -> create_response.json + -H "Authorization: token ${GITHUB_TOKEN_MAPNIK_PUBLIC_REPO}" \ + https://api.github.com/repos/mapnik/mapnik/releases \ + > create_response.json cat create_response.json # parse out upload url and form it up to post tarball UPLOAD_URL=$(python -c "import json;print json.load(open('create_response.json'))['upload_url'].replace('{?name,label}','?name=${TARBALL_COMPRESSED}')") diff -Nru mapnik-3.0.23+ds/src/agg/agg_renderer.cpp mapnik-3.1.0+ds/src/agg/agg_renderer.cpp --- mapnik-3.0.23+ds/src/agg/agg_renderer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/agg/agg_renderer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/agg/process_building_symbolizer.cpp mapnik-3.1.0+ds/src/agg/process_building_symbolizer.cpp --- mapnik-3.0.23+ds/src/agg/process_building_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/agg/process_building_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/agg/process_debug_symbolizer.cpp mapnik-3.1.0+ds/src/agg/process_debug_symbolizer.cpp --- mapnik-3.0.23+ds/src/agg/process_debug_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/agg/process_debug_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/agg/process_dot_symbolizer.cpp mapnik-3.1.0+ds/src/agg/process_dot_symbolizer.cpp --- mapnik-3.0.23+ds/src/agg/process_dot_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/agg/process_dot_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/agg/process_group_symbolizer.cpp mapnik-3.1.0+ds/src/agg/process_group_symbolizer.cpp --- mapnik-3.0.23+ds/src/agg/process_group_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/agg/process_group_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -55,11 +55,11 @@ template <> struct thunk_renderer : render_thunk_list_dispatch { - using renderer_type = agg_renderer; - using buffer_type = renderer_type::buffer_type; + using agg_renderer_type = agg_renderer; + using buffer_type = agg_renderer_type::buffer_type; using text_renderer_type = agg_text_renderer; - thunk_renderer(renderer_type &ren, + thunk_renderer(agg_renderer_type &ren, std::unique_ptr const& ras_ptr, buffer_type *buf, renderer_common &common) @@ -75,7 +75,6 @@ using pixfmt_comp_type = agg::pixfmt_custom_blend_rgba; using renderer_base = agg::renderer_base; using renderer_type = agg::renderer_scanline_aa_solid; - using svg_attribute_type = agg::pod_bvector; using svg_renderer_type = svg::svg_renderer_agg const& ras_ptr_; buffer_type *buf_; renderer_common &common_; diff -Nru mapnik-3.0.23+ds/src/agg/process_line_pattern_symbolizer.cpp mapnik-3.1.0+ds/src/agg/process_line_pattern_symbolizer.cpp --- mapnik-3.0.23+ds/src/agg/process_line_pattern_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/agg/process_line_pattern_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -211,8 +211,8 @@ private: void render_by_pattern_type(image_rgba8 const& pattern_image) const { - line_pattern_enum pattern = get(sym_, feature_, common_.vars_); - switch (pattern) + line_pattern_enum pattern_e = get(sym_, feature_, common_.vars_); + switch (pattern_e) { case LINE_PATTERN_WARP: { diff -Nru mapnik-3.0.23+ds/src/agg/process_line_symbolizer.cpp mapnik-3.1.0+ds/src/agg/process_line_symbolizer.cpp --- mapnik-3.0.23+ds/src/agg/process_line_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/agg/process_line_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/agg/process_markers_symbolizer.cpp mapnik-3.1.0+ds/src/agg/process_markers_symbolizer.cpp --- mapnik-3.0.23+ds/src/agg/process_markers_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/agg/process_markers_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -117,7 +117,6 @@ using pixfmt_comp_type = agg::pixfmt_custom_blend_rgba; using renderer_base = agg::renderer_base; using renderer_type = agg::renderer_scanline_aa_solid; - using svg_attribute_type = agg::pod_bvector; using svg_renderer_type = svg_renderer_agg(sym, feature, common_.vars_); - switch (pattern) + line_pattern_enum pattern_e = get(sym, feature, common_.vars_); + switch (pattern_e) { case LINE_PATTERN_WARP: { diff -Nru mapnik-3.0.23+ds/src/cairo/process_line_symbolizer.cpp mapnik-3.1.0+ds/src/cairo/process_line_symbolizer.cpp --- mapnik-3.0.23+ds/src/cairo/process_line_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/cairo/process_line_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/cairo/process_markers_symbolizer.cpp mapnik-3.1.0+ds/src/cairo/process_markers_symbolizer.cpp --- mapnik-3.0.23+ds/src/cairo/process_markers_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/cairo/process_markers_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/cairo/process_point_symbolizer.cpp mapnik-3.1.0+ds/src/cairo/process_point_symbolizer.cpp --- mapnik-3.0.23+ds/src/cairo/process_point_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/cairo/process_point_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/cairo/process_polygon_pattern_symbolizer.cpp mapnik-3.1.0+ds/src/cairo/process_polygon_pattern_symbolizer.cpp --- mapnik-3.0.23+ds/src/cairo/process_polygon_pattern_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/cairo/process_polygon_pattern_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/cairo/process_polygon_symbolizer.cpp mapnik-3.1.0+ds/src/cairo/process_polygon_symbolizer.cpp --- mapnik-3.0.23+ds/src/cairo/process_polygon_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/cairo/process_polygon_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/cairo/process_raster_symbolizer.cpp mapnik-3.1.0+ds/src/cairo/process_raster_symbolizer.cpp --- mapnik-3.0.23+ds/src/cairo/process_raster_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/cairo/process_raster_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/cairo/process_text_symbolizer.cpp mapnik-3.1.0+ds/src/cairo/process_text_symbolizer.cpp --- mapnik-3.0.23+ds/src/cairo/process_text_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/cairo/process_text_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/cairo_io.cpp mapnik-3.1.0+ds/src/cairo_io.cpp --- mapnik-3.0.23+ds/src/cairo_io.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/cairo_io.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/color.cpp mapnik-3.1.0+ds/src/color.cpp --- mapnik-3.0.23+ds/src/color.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/color.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/color_factory.cpp mapnik-3.1.0+ds/src/color_factory.cpp --- mapnik-3.0.23+ds/src/color_factory.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/color_factory.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/conversions.cpp mapnik-3.1.0+ds/src/conversions.cpp --- mapnik-3.0.23+ds/src/conversions.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/conversions.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/css_color_grammar.cpp mapnik-3.1.0+ds/src/css_color_grammar.cpp --- mapnik-3.0.23+ds/src/css_color_grammar.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/css_color_grammar.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/dasharray_parser.cpp mapnik-3.1.0+ds/src/dasharray_parser.cpp --- mapnik-3.0.23+ds/src/dasharray_parser.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/dasharray_parser.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/datasource_cache.cpp mapnik-3.1.0+ds/src/datasource_cache.cpp --- mapnik-3.0.23+ds/src/datasource_cache.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/datasource_cache.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/datasource_cache_static.cpp mapnik-3.1.0+ds/src/datasource_cache_static.cpp --- mapnik-3.0.23+ds/src/datasource_cache_static.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/datasource_cache_static.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/debug.cpp mapnik-3.1.0+ds/src/debug.cpp --- mapnik-3.0.23+ds/src/debug.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/debug.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/expression.cpp mapnik-3.1.0+ds/src/expression.cpp --- mapnik-3.0.23+ds/src/expression.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/expression.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/expression_grammar.cpp mapnik-3.1.0+ds/src/expression_grammar.cpp --- mapnik-3.0.23+ds/src/expression_grammar.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/expression_grammar.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/expression_node.cpp mapnik-3.1.0+ds/src/expression_node.cpp --- mapnik-3.0.23+ds/src/expression_node.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/expression_node.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/expression_string.cpp mapnik-3.1.0+ds/src/expression_string.cpp --- mapnik-3.0.23+ds/src/expression_string.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/expression_string.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/feature_kv_iterator.cpp mapnik-3.1.0+ds/src/feature_kv_iterator.cpp --- mapnik-3.0.23+ds/src/feature_kv_iterator.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/feature_kv_iterator.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/feature_style_processor.cpp mapnik-3.1.0+ds/src/feature_style_processor.cpp --- mapnik-3.0.23+ds/src/feature_style_processor.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/feature_style_processor.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/feature_type_style.cpp mapnik-3.1.0+ds/src/feature_type_style.cpp --- mapnik-3.0.23+ds/src/feature_type_style.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/feature_type_style.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/font_engine_freetype.cpp mapnik-3.1.0+ds/src/font_engine_freetype.cpp --- mapnik-3.0.23+ds/src/font_engine_freetype.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/font_engine_freetype.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/font_set.cpp mapnik-3.1.0+ds/src/font_set.cpp --- mapnik-3.0.23+ds/src/font_set.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/font_set.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/fs.cpp mapnik-3.1.0+ds/src/fs.cpp --- mapnik-3.0.23+ds/src/fs.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/fs.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/function_call.cpp mapnik-3.1.0+ds/src/function_call.cpp --- mapnik-3.0.23+ds/src/function_call.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/function_call.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/geometry/interior.cpp mapnik-3.1.0+ds/src/geometry/interior.cpp --- mapnik-3.0.23+ds/src/geometry/interior.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/geometry/interior.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2017 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/geometry_envelope.cpp mapnik-3.1.0+ds/src/geometry_envelope.cpp --- mapnik-3.0.23+ds/src/geometry_envelope.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/geometry_envelope.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/geometry_reprojection.cpp mapnik-3.1.0+ds/src/geometry_reprojection.cpp --- mapnik-3.0.23+ds/src/geometry_reprojection.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/geometry_reprojection.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/glibc_workaround.cpp mapnik-3.1.0+ds/src/glibc_workaround.cpp --- mapnik-3.0.23+ds/src/glibc_workaround.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/glibc_workaround.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2017 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/gradient.cpp mapnik-3.1.0+ds/src/gradient.cpp --- mapnik-3.0.23+ds/src/gradient.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/gradient.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/grid/grid.cpp mapnik-3.1.0+ds/src/grid/grid.cpp --- mapnik-3.0.23+ds/src/grid/grid.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/grid/grid.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/grid/grid_renderer.cpp mapnik-3.1.0+ds/src/grid/grid_renderer.cpp --- mapnik-3.0.23+ds/src/grid/grid_renderer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/grid/grid_renderer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/grid/process_building_symbolizer.cpp mapnik-3.1.0+ds/src/grid/process_building_symbolizer.cpp --- mapnik-3.0.23+ds/src/grid/process_building_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/grid/process_building_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/grid/process_group_symbolizer.cpp mapnik-3.1.0+ds/src/grid/process_group_symbolizer.cpp --- mapnik-3.0.23+ds/src/grid/process_group_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/grid/process_group_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -71,20 +71,19 @@ { using buf_type = grid_rendering_buffer; using pixfmt_type = typename grid_renderer_base_type::pixfmt_type; - using renderer_type = agg::renderer_scanline_bin_solid; + using marker_renderer_type = agg::renderer_scanline_bin_solid; using namespace mapnik::svg; - using svg_attribute_type = agg::pod_bvector; using svg_renderer_type = svg_renderer_agg; buf_type render_buf(pixmap_.raw_data(), common_.width_, common_.height_, common_.width_); ras_.reset(); pixfmt_type pixf(render_buf); grid_renderer_base_type renb(pixf); - renderer_type ren(renb); + marker_renderer_type ren(renb); vertex_stl_adapter stl_storage(thunk.src_->source()); svg_path_adapter svg_path(stl_storage); svg_renderer_type svg_renderer(svg_path, thunk.attrs_); @@ -100,12 +99,12 @@ { using buf_type = grid_rendering_buffer; using pixfmt_type = typename grid_renderer_base_type::pixfmt_type; - using renderer_type = agg::renderer_scanline_bin_solid; + using marker_renderer_type = agg::renderer_scanline_bin_solid; buf_type render_buf(pixmap_.raw_data(), common_.width_, common_.height_, common_.width_); ras_.reset(); pixfmt_type pixf(render_buf); grid_renderer_base_type renb(pixf); - renderer_type ren(renb); + marker_renderer_type ren(renb); agg::trans_affine offset_tr = thunk.tr_; offset_tr.translate(offset_.x, offset_.y); render_raster_marker(ren, ras_, thunk.src_, feature_, offset_tr, thunk.opacity_); diff -Nru mapnik-3.0.23+ds/src/grid/process_line_pattern_symbolizer.cpp mapnik-3.1.0+ds/src/grid/process_line_pattern_symbolizer.cpp --- mapnik-3.0.23+ds/src/grid/process_line_pattern_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/grid/process_line_pattern_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/grid/process_line_symbolizer.cpp mapnik-3.1.0+ds/src/grid/process_line_symbolizer.cpp --- mapnik-3.0.23+ds/src/grid/process_line_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/grid/process_line_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/grid/process_markers_symbolizer.cpp mapnik-3.1.0+ds/src/grid/process_markers_symbolizer.cpp --- mapnik-3.0.23+ds/src/grid/process_markers_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/grid/process_markers_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -143,7 +143,6 @@ using renderer_type = agg::renderer_scanline_bin_solid; using namespace mapnik::svg; - using svg_attribute_type = agg::pod_bvector; using svg_renderer_type = svg_renderer_aggreset(); box2d clip_box = common_.query_extent_; - using context_type = detail::grid_markers_renderer_context; - context_type renderer_context(feature, render_buf, *ras_ptr, pixmap_); + using grid_context_type = detail::grid_markers_renderer_context; + grid_context_type renderer_context(feature, render_buf, *ras_ptr, pixmap_); render_markers_symbolizer( sym, feature, prj_trans, common_, clip_box, renderer_context); diff -Nru mapnik-3.0.23+ds/src/grid/process_point_symbolizer.cpp mapnik-3.1.0+ds/src/grid/process_point_symbolizer.cpp --- mapnik-3.0.23+ds/src/grid/process_point_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/grid/process_point_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/grid/process_polygon_pattern_symbolizer.cpp mapnik-3.1.0+ds/src/grid/process_polygon_pattern_symbolizer.cpp --- mapnik-3.0.23+ds/src/grid/process_polygon_pattern_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/grid/process_polygon_pattern_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/grid/process_polygon_symbolizer.cpp mapnik-3.1.0+ds/src/grid/process_polygon_symbolizer.cpp --- mapnik-3.0.23+ds/src/grid/process_polygon_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/grid/process_polygon_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/grid/process_raster_symbolizer.cpp mapnik-3.1.0+ds/src/grid/process_raster_symbolizer.cpp --- mapnik-3.0.23+ds/src/grid/process_raster_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/grid/process_raster_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/grid/process_shield_symbolizer.cpp mapnik-3.1.0+ds/src/grid/process_shield_symbolizer.cpp --- mapnik-3.0.23+ds/src/grid/process_shield_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/grid/process_shield_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/grid/process_text_symbolizer.cpp mapnik-3.1.0+ds/src/grid/process_text_symbolizer.cpp --- mapnik-3.0.23+ds/src/grid/process_text_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/grid/process_text_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/group/group_layout_manager.cpp mapnik-3.1.0+ds/src/group/group_layout_manager.cpp --- mapnik-3.0.23+ds/src/group/group_layout_manager.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/group/group_layout_manager.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/group/group_rule.cpp mapnik-3.1.0+ds/src/group/group_rule.cpp --- mapnik-3.0.23+ds/src/group/group_rule.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/group/group_rule.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/group/group_symbolizer_helper.cpp mapnik-3.1.0+ds/src/group/group_symbolizer_helper.cpp --- mapnik-3.0.23+ds/src/group/group_symbolizer_helper.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/group/group_symbolizer_helper.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/image_any.cpp mapnik-3.1.0+ds/src/image_any.cpp --- mapnik-3.0.23+ds/src/image_any.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/image_any.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/image_compositing.cpp mapnik-3.1.0+ds/src/image_compositing.cpp --- mapnik-3.0.23+ds/src/image_compositing.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/image_compositing.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/image_copy.cpp mapnik-3.1.0+ds/src/image_copy.cpp --- mapnik-3.0.23+ds/src/image_copy.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/image_copy.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/image.cpp mapnik-3.1.0+ds/src/image.cpp --- mapnik-3.0.23+ds/src/image.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/image.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/image_filter_grammar.cpp mapnik-3.1.0+ds/src/image_filter_grammar.cpp --- mapnik-3.0.23+ds/src/image_filter_grammar.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/image_filter_grammar.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/image_filter_types.cpp mapnik-3.1.0+ds/src/image_filter_types.cpp --- mapnik-3.0.23+ds/src/image_filter_types.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/image_filter_types.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/image_options.cpp mapnik-3.1.0+ds/src/image_options.cpp --- mapnik-3.0.23+ds/src/image_options.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/image_options.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/image_reader.cpp mapnik-3.1.0+ds/src/image_reader.cpp --- mapnik-3.0.23+ds/src/image_reader.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/image_reader.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/image_scaling.cpp mapnik-3.1.0+ds/src/image_scaling.cpp --- mapnik-3.0.23+ds/src/image_scaling.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/image_scaling.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/image_util.cpp mapnik-3.1.0+ds/src/image_util.cpp --- mapnik-3.0.23+ds/src/image_util.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/image_util.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/image_util_jpeg.cpp mapnik-3.1.0+ds/src/image_util_jpeg.cpp --- mapnik-3.0.23+ds/src/image_util_jpeg.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/image_util_jpeg.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/image_util_png.cpp mapnik-3.1.0+ds/src/image_util_png.cpp --- mapnik-3.0.23+ds/src/image_util_png.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/image_util_png.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/image_util_tiff.cpp mapnik-3.1.0+ds/src/image_util_tiff.cpp --- mapnik-3.0.23+ds/src/image_util_tiff.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/image_util_tiff.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/image_util_webp.cpp mapnik-3.1.0+ds/src/image_util_webp.cpp --- mapnik-3.0.23+ds/src/image_util_webp.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/image_util_webp.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/image_view_any.cpp mapnik-3.1.0+ds/src/image_view_any.cpp --- mapnik-3.0.23+ds/src/image_view_any.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/image_view_any.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/image_view.cpp mapnik-3.1.0+ds/src/image_view.cpp --- mapnik-3.0.23+ds/src/image_view.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/image_view.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/jpeg_reader.cpp mapnik-3.1.0+ds/src/jpeg_reader.cpp --- mapnik-3.0.23+ds/src/jpeg_reader.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/jpeg_reader.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/json/generic_json.cpp mapnik-3.1.0+ds/src/json/generic_json.cpp --- mapnik-3.0.23+ds/src/json/generic_json.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/json/generic_json.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/json/mapnik_geometry_to_geojson.cpp mapnik-3.1.0+ds/src/json/mapnik_geometry_to_geojson.cpp --- mapnik-3.0.23+ds/src/json/mapnik_geometry_to_geojson.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/json/mapnik_geometry_to_geojson.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/json/mapnik_json_feature_collection_grammar.cpp mapnik-3.1.0+ds/src/json/mapnik_json_feature_collection_grammar.cpp --- mapnik-3.0.23+ds/src/json/mapnik_json_feature_collection_grammar.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/json/mapnik_json_feature_collection_grammar.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/json/mapnik_json_feature_grammar.cpp mapnik-3.1.0+ds/src/json/mapnik_json_feature_grammar.cpp --- mapnik-3.0.23+ds/src/json/mapnik_json_feature_grammar.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/json/mapnik_json_feature_grammar.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/json/mapnik_json_generator_grammar.cpp mapnik-3.1.0+ds/src/json/mapnik_json_generator_grammar.cpp --- mapnik-3.0.23+ds/src/json/mapnik_json_generator_grammar.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/json/mapnik_json_generator_grammar.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,6 +29,6 @@ using sink_type = std::back_insert_iterator; -template struct mapnik::json::properties_generator_grammar; +template struct mapnik::json::properties_generator_grammar; template struct mapnik::json::feature_generator_grammar; template struct mapnik::json::geometry_generator_grammar >; diff -Nru mapnik-3.0.23+ds/src/json/mapnik_json_geometry_grammar.cpp mapnik-3.1.0+ds/src/json/mapnik_json_geometry_grammar.cpp --- mapnik-3.0.23+ds/src/json/mapnik_json_geometry_grammar.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/json/mapnik_json_geometry_grammar.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/json/mapnik_json_geometry_parser.cpp mapnik-3.1.0+ds/src/json/mapnik_json_geometry_parser.cpp --- mapnik-3.0.23+ds/src/json/mapnik_json_geometry_parser.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/json/mapnik_json_geometry_parser.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/json/mapnik_json_positions_grammar.cpp mapnik-3.1.0+ds/src/json/mapnik_json_positions_grammar.cpp --- mapnik-3.0.23+ds/src/json/mapnik_json_positions_grammar.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/json/mapnik_json_positions_grammar.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/json/mapnik_topojson_grammar.cpp mapnik-3.1.0+ds/src/json/mapnik_topojson_grammar.cpp --- mapnik-3.0.23+ds/src/json/mapnik_topojson_grammar.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/json/mapnik_topojson_grammar.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/layer.cpp mapnik-3.1.0+ds/src/layer.cpp --- mapnik-3.0.23+ds/src/layer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/layer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/libxml2_loader.cpp mapnik-3.1.0+ds/src/libxml2_loader.cpp --- mapnik-3.0.23+ds/src/libxml2_loader.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/libxml2_loader.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/load_map.cpp mapnik-3.1.0+ds/src/load_map.cpp --- mapnik-3.0.23+ds/src/load_map.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/load_map.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/map.cpp mapnik-3.1.0+ds/src/map.cpp --- mapnik-3.0.23+ds/src/map.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/map.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/mapped_memory_cache.cpp mapnik-3.1.0+ds/src/mapped_memory_cache.cpp --- mapnik-3.0.23+ds/src/mapped_memory_cache.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/mapped_memory_cache.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/marker_cache.cpp mapnik-3.1.0+ds/src/marker_cache.cpp --- mapnik-3.0.23+ds/src/marker_cache.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/marker_cache.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2017 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/marker_helpers.cpp mapnik-3.1.0+ds/src/marker_helpers.cpp --- mapnik-3.0.23+ds/src/marker_helpers.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/marker_helpers.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/math.cpp mapnik-3.1.0+ds/src/math.cpp --- mapnik-3.0.23+ds/src/math.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/math.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/memory_datasource.cpp mapnik-3.1.0+ds/src/memory_datasource.cpp --- mapnik-3.0.23+ds/src/memory_datasource.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/memory_datasource.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/palette.cpp mapnik-3.1.0+ds/src/palette.cpp --- mapnik-3.0.23+ds/src/palette.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/palette.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/params.cpp mapnik-3.1.0+ds/src/params.cpp --- mapnik-3.0.23+ds/src/params.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/params.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/parse_path.cpp mapnik-3.1.0+ds/src/parse_path.cpp --- mapnik-3.0.23+ds/src/parse_path.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/parse_path.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/parse_transform.cpp mapnik-3.1.0+ds/src/parse_transform.cpp --- mapnik-3.0.23+ds/src/parse_transform.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/parse_transform.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/plugin.cpp mapnik-3.1.0+ds/src/plugin.cpp --- mapnik-3.0.23+ds/src/plugin.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/plugin.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/png_reader.cpp mapnik-3.1.0+ds/src/png_reader.cpp --- mapnik-3.0.23+ds/src/png_reader.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/png_reader.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/projection.cpp mapnik-3.1.0+ds/src/projection.cpp --- mapnik-3.0.23+ds/src/projection.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/projection.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/proj_transform.cpp mapnik-3.1.0+ds/src/proj_transform.cpp --- mapnik-3.0.23+ds/src/proj_transform.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/proj_transform.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/rapidxml_loader.cpp mapnik-3.1.0+ds/src/rapidxml_loader.cpp --- mapnik-3.0.23+ds/src/rapidxml_loader.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/rapidxml_loader.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/raster_colorizer.cpp mapnik-3.1.0+ds/src/raster_colorizer.cpp --- mapnik-3.0.23+ds/src/raster_colorizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/raster_colorizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/renderer_common/pattern_alignment.cpp mapnik-3.1.0+ds/src/renderer_common/pattern_alignment.cpp --- mapnik-3.0.23+ds/src/renderer_common/pattern_alignment.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/renderer_common/pattern_alignment.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/renderer_common/render_group_symbolizer.cpp mapnik-3.1.0+ds/src/renderer_common/render_group_symbolizer.cpp --- mapnik-3.0.23+ds/src/renderer_common/render_group_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/renderer_common/render_group_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/renderer_common/render_markers_symbolizer.cpp mapnik-3.1.0+ds/src/renderer_common/render_markers_symbolizer.cpp --- mapnik-3.0.23+ds/src/renderer_common/render_markers_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/renderer_common/render_markers_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/renderer_common/render_pattern.cpp mapnik-3.1.0+ds/src/renderer_common/render_pattern.cpp --- mapnik-3.0.23+ds/src/renderer_common/render_pattern.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/renderer_common/render_pattern.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/renderer_common/render_thunk_extractor.cpp mapnik-3.1.0+ds/src/renderer_common/render_thunk_extractor.cpp --- mapnik-3.0.23+ds/src/renderer_common/render_thunk_extractor.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/renderer_common/render_thunk_extractor.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/renderer_common.cpp mapnik-3.1.0+ds/src/renderer_common.cpp --- mapnik-3.0.23+ds/src/renderer_common.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/renderer_common.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/request.cpp mapnik-3.1.0+ds/src/request.cpp --- mapnik-3.0.23+ds/src/request.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/request.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/rule.cpp mapnik-3.1.0+ds/src/rule.cpp --- mapnik-3.0.23+ds/src/rule.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/rule.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/save_map.cpp mapnik-3.1.0+ds/src/save_map.cpp --- mapnik-3.0.23+ds/src/save_map.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/save_map.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/scale_denominator.cpp mapnik-3.1.0+ds/src/scale_denominator.cpp --- mapnik-3.0.23+ds/src/scale_denominator.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/scale_denominator.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/svg/output/process_line_symbolizer.cpp mapnik-3.1.0+ds/src/svg/output/process_line_symbolizer.cpp --- mapnik-3.0.23+ds/src/svg/output/process_line_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/svg/output/process_line_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/svg/output/process_polygon_symbolizer.cpp mapnik-3.1.0+ds/src/svg/output/process_polygon_symbolizer.cpp --- mapnik-3.0.23+ds/src/svg/output/process_polygon_symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/svg/output/process_polygon_symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/svg/output/process_symbolizers.cpp mapnik-3.1.0+ds/src/svg/output/process_symbolizers.cpp --- mapnik-3.0.23+ds/src/svg/output/process_symbolizers.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/svg/output/process_symbolizers.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/svg/output/svg_generator.cpp mapnik-3.1.0+ds/src/svg/output/svg_generator.cpp --- mapnik-3.0.23+ds/src/svg/output/svg_generator.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/svg/output/svg_generator.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/svg/output/svg_output_attributes.cpp mapnik-3.1.0+ds/src/svg/output/svg_output_attributes.cpp --- mapnik-3.0.23+ds/src/svg/output/svg_output_attributes.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/svg/output/svg_output_attributes.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/svg/output/svg_output_grammars.cpp mapnik-3.1.0+ds/src/svg/output/svg_output_grammars.cpp --- mapnik-3.0.23+ds/src/svg/output/svg_output_grammars.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/svg/output/svg_output_grammars.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/svg/output/svg_renderer.cpp mapnik-3.1.0+ds/src/svg/output/svg_renderer.cpp --- mapnik-3.0.23+ds/src/svg/output/svg_renderer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/svg/output/svg_renderer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/svg/svg_parser.cpp mapnik-3.1.0+ds/src/svg/svg_parser.cpp --- mapnik-3.0.23+ds/src/svg/svg_parser.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/svg/svg_parser.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2017 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/svg/svg_path_parser.cpp mapnik-3.1.0+ds/src/svg/svg_path_parser.cpp --- mapnik-3.0.23+ds/src/svg/svg_path_parser.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/svg/svg_path_parser.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/svg/svg_points_parser.cpp mapnik-3.1.0+ds/src/svg/svg_points_parser.cpp --- mapnik-3.0.23+ds/src/svg/svg_points_parser.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/svg/svg_points_parser.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/svg/svg_transform_parser.cpp mapnik-3.1.0+ds/src/svg/svg_transform_parser.cpp --- mapnik-3.0.23+ds/src/svg/svg_transform_parser.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/svg/svg_transform_parser.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/symbolizer.cpp mapnik-3.1.0+ds/src/symbolizer.cpp --- mapnik-3.0.23+ds/src/symbolizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/symbolizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/symbolizer_enumerations.cpp mapnik-3.1.0+ds/src/symbolizer_enumerations.cpp --- mapnik-3.0.23+ds/src/symbolizer_enumerations.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/symbolizer_enumerations.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/symbolizer_keys.cpp mapnik-3.1.0+ds/src/symbolizer_keys.cpp --- mapnik-3.0.23+ds/src/symbolizer_keys.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/symbolizer_keys.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/face.cpp mapnik-3.1.0+ds/src/text/face.cpp --- mapnik-3.0.23+ds/src/text/face.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/face.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/font_feature_settings.cpp mapnik-3.1.0+ds/src/text/font_feature_settings.cpp --- mapnik-3.0.23+ds/src/text/font_feature_settings.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/font_feature_settings.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/font_library.cpp mapnik-3.1.0+ds/src/text/font_library.cpp --- mapnik-3.0.23+ds/src/text/font_library.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/font_library.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/formatting/base.cpp mapnik-3.1.0+ds/src/text/formatting/base.cpp --- mapnik-3.0.23+ds/src/text/formatting/base.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/formatting/base.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/formatting/format.cpp mapnik-3.1.0+ds/src/text/formatting/format.cpp --- mapnik-3.0.23+ds/src/text/formatting/format.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/formatting/format.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/formatting/layout.cpp mapnik-3.1.0+ds/src/text/formatting/layout.cpp --- mapnik-3.0.23+ds/src/text/formatting/layout.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/formatting/layout.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/formatting/list.cpp mapnik-3.1.0+ds/src/text/formatting/list.cpp --- mapnik-3.0.23+ds/src/text/formatting/list.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/formatting/list.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/formatting/registry.cpp mapnik-3.1.0+ds/src/text/formatting/registry.cpp --- mapnik-3.0.23+ds/src/text/formatting/registry.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/formatting/registry.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/formatting/text.cpp mapnik-3.1.0+ds/src/text/formatting/text.cpp --- mapnik-3.0.23+ds/src/text/formatting/text.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/formatting/text.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/glyph_positions.cpp mapnik-3.1.0+ds/src/text/glyph_positions.cpp --- mapnik-3.0.23+ds/src/text/glyph_positions.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/glyph_positions.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/itemizer.cpp mapnik-3.1.0+ds/src/text/itemizer.cpp --- mapnik-3.0.23+ds/src/text/itemizer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/itemizer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/placement_finder.cpp mapnik-3.1.0+ds/src/text/placement_finder.cpp --- mapnik-3.0.23+ds/src/text/placement_finder.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/placement_finder.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/placements/base.cpp mapnik-3.1.0+ds/src/text/placements/base.cpp --- mapnik-3.0.23+ds/src/text/placements/base.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/placements/base.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/placements/dummy.cpp mapnik-3.1.0+ds/src/text/placements/dummy.cpp --- mapnik-3.0.23+ds/src/text/placements/dummy.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/placements/dummy.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/placements/list.cpp mapnik-3.1.0+ds/src/text/placements/list.cpp --- mapnik-3.0.23+ds/src/text/placements/list.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/placements/list.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/placements/registry.cpp mapnik-3.1.0+ds/src/text/placements/registry.cpp --- mapnik-3.0.23+ds/src/text/placements/registry.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/placements/registry.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/placements/simple.cpp mapnik-3.1.0+ds/src/text/placements/simple.cpp --- mapnik-3.0.23+ds/src/text/placements/simple.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/placements/simple.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/properties_util.cpp mapnik-3.1.0+ds/src/text/properties_util.cpp --- mapnik-3.0.23+ds/src/text/properties_util.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/properties_util.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/renderer.cpp mapnik-3.1.0+ds/src/text/renderer.cpp --- mapnik-3.0.23+ds/src/text/renderer.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/renderer.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/symbolizer_helpers.cpp mapnik-3.1.0+ds/src/text/symbolizer_helpers.cpp --- mapnik-3.0.23+ds/src/text/symbolizer_helpers.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/symbolizer_helpers.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/text_layout.cpp mapnik-3.1.0+ds/src/text/text_layout.cpp --- mapnik-3.0.23+ds/src/text/text_layout.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/text_layout.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/text_line.cpp mapnik-3.1.0+ds/src/text/text_line.cpp --- mapnik-3.0.23+ds/src/text/text_line.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/text_line.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/text/text_properties.cpp mapnik-3.1.0+ds/src/text/text_properties.cpp --- mapnik-3.0.23+ds/src/text/text_properties.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/text/text_properties.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/tiff_reader.cpp mapnik-3.1.0+ds/src/tiff_reader.cpp --- mapnik-3.0.23+ds/src/tiff_reader.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/tiff_reader.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2017 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -41,6 +41,7 @@ // stl #include #include +#include namespace mapnik { namespace detail { diff -Nru mapnik-3.0.23+ds/src/transform_expression.cpp mapnik-3.1.0+ds/src/transform_expression.cpp --- mapnik-3.0.23+ds/src/transform_expression.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/transform_expression.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/transform_expression_grammar.cpp mapnik-3.1.0+ds/src/transform_expression_grammar.cpp --- mapnik-3.0.23+ds/src/transform_expression_grammar.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/transform_expression_grammar.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/twkb.cpp mapnik-3.1.0+ds/src/twkb.cpp --- mapnik-3.0.23+ds/src/twkb.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/twkb.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/unicode.cpp mapnik-3.1.0+ds/src/unicode.cpp --- mapnik-3.0.23+ds/src/unicode.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/unicode.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/util/utf_conv_win.cpp mapnik-3.1.0+ds/src/util/utf_conv_win.cpp --- mapnik-3.0.23+ds/src/util/utf_conv_win.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/util/utf_conv_win.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/value.cpp mapnik-3.1.0+ds/src/value.cpp --- mapnik-3.0.23+ds/src/value.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/value.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/vertex_adapters.cpp mapnik-3.1.0+ds/src/vertex_adapters.cpp --- mapnik-3.0.23+ds/src/vertex_adapters.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/vertex_adapters.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2016 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/vertex_cache.cpp mapnik-3.1.0+ds/src/vertex_cache.cpp --- mapnik-3.0.23+ds/src/vertex_cache.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/vertex_cache.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/warp.cpp mapnik-3.1.0+ds/src/warp.cpp --- mapnik-3.0.23+ds/src/warp.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/warp.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/webp_reader.cpp mapnik-3.1.0+ds/src/webp_reader.cpp --- mapnik-3.0.23+ds/src/webp_reader.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/webp_reader.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/well_known_srs.cpp mapnik-3.1.0+ds/src/well_known_srs.cpp --- mapnik-3.0.23+ds/src/well_known_srs.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/well_known_srs.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/wkb.cpp mapnik-3.1.0+ds/src/wkb.cpp --- mapnik-3.0.23+ds/src/wkb.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/wkb.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/wkt/mapnik_wkt_generator_grammar.cpp mapnik-3.1.0+ds/src/wkt/mapnik_wkt_generator_grammar.cpp --- mapnik-3.0.23+ds/src/wkt/mapnik_wkt_generator_grammar.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/wkt/mapnik_wkt_generator_grammar.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/wkt/mapnik_wkt_grammar.cpp mapnik-3.1.0+ds/src/wkt/mapnik_wkt_grammar.cpp --- mapnik-3.0.23+ds/src/wkt/mapnik_wkt_grammar.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/wkt/mapnik_wkt_grammar.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/src/xml_tree.cpp mapnik-3.1.0+ds/src/xml_tree.cpp --- mapnik-3.0.23+ds/src/xml_tree.cpp 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/src/xml_tree.cpp 2021-01-08 11:20:06.000000000 +0000 @@ -2,7 +2,7 @@ * * This file is part of Mapnik (c++ mapping toolkit) * - * Copyright (C) 2015 Artem Pavlenko + * Copyright (C) 2021 Artem Pavlenko * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff -Nru mapnik-3.0.23+ds/.travis.yml mapnik-3.1.0+ds/.travis.yml --- mapnik-3.0.23+ds/.travis.yml 2020-02-18 09:18:42.000000000 +0000 +++ mapnik-3.1.0+ds/.travis.yml 2021-01-08 11:20:06.000000000 +0000 @@ -21,16 +21,6 @@ matrix: include: - os: linux - name: Linux gcc-6 - env: >- - CXX="ccache g++-6" - CC="gcc-6" - addons: - postgresql: "9.4" - apt: - sources: [ 'ubuntu-toolchain-r-test'] - packages: [ 'libstdc++-6-dev', 'g++-6', 'xutils-dev', 'postgresql-9.4-postgis-2.3' ] - - os: linux name: Linux clang-3.9 env: >- CXX="ccache clang++-3.9 -Qunused-arguments"