[python-mapnik] 01/10: Imported Upstream version 0.0~20160217-d57dce9
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Feb 26 23:34:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository python-mapnik.
commit 3ea6787c07b0374e58b1a046389ec5c4086367e9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Feb 27 00:01:29 2016 +0100
Imported Upstream version 0.0~20160217-d57dce9
---
mapnik/__init__.py | 24 ++++++------
setup.py | 42 +++++++++++++--------
src/mapnik_datasource.cpp | 1 +
src/mapnik_feature.cpp | 1 +
src/mapnik_featureset.cpp | 1 +
src/mapnik_geometry.cpp | 1 +
src/mapnik_image.cpp | 1 +
src/mapnik_map.cpp | 2 +-
src/mapnik_value_converter.hpp | 6 +--
test/python_tests/image_encoding_speed_test.py | 4 +-
.../images/pycairo/cairo-cairo-expected.png | Bin 3624 -> 4439 bytes
.../images/pycairo/cairo-cairo-expected.svg | 41 ++++++++++----------
test/python_tests/png_encoding_test.py | 4 +-
13 files changed, 72 insertions(+), 56 deletions(-)
diff --git a/mapnik/__init__.py b/mapnik/__init__.py
index 8fea8de..5df6b33 100644
--- a/mapnik/__init__.py
+++ b/mapnik/__init__.py
@@ -1,20 +1,20 @@
#
-# This file is part of Mapnik (C++/Python mapping toolkit)
-# Copyright (C) 2014 Artem Pavlenko
+# This file is part of Mapnik (c++ mapping toolkit)
+# Copyright (C) 2015 Artem Pavlenko
#
-# Mapnik is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or any later version.
+# 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 program is distributed in the hope that it will be useful,
+# 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 General Public License for more details.
+# 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 General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 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
#
"""Mapnik Python module.
diff --git a/setup.py b/setup.py
index d59e0cf..64964d2 100755
--- a/setup.py
+++ b/setup.py
@@ -83,19 +83,19 @@ class WhichBoostCommand(Command):
cflags = sysconfig.get_config_var('CFLAGS')
sysconfig._config_vars['CFLAGS'] = re.sub(
- ' +', ' ', cflags.replace('-g', '').replace('-Os', '').replace('-arch i386', ''))
+ ' +', ' ', cflags.replace('-g ', '').replace('-Os', '').replace('-arch i386', ''))
opt = sysconfig.get_config_var('OPT')
sysconfig._config_vars['OPT'] = re.sub(
- ' +', ' ', opt.replace('-g', '').replace('-Os', ''))
+ ' +', ' ', opt.replace('-g ', '').replace('-Os', ''))
ldshared = sysconfig.get_config_var('LDSHARED')
sysconfig._config_vars['LDSHARED'] = re.sub(
- ' +', ' ', ldshared.replace('-g', '').replace('-Os', '').replace('-arch i386', ''))
+ ' +', ' ', ldshared.replace('-g ', '').replace('-Os', '').replace('-arch i386', ''))
ldflags = sysconfig.get_config_var('LDFLAGS')
sysconfig._config_vars['LDFLAGS'] = re.sub(
- ' +', ' ', ldflags.replace('-g', '').replace('-Os', '').replace('-arch i386', ''))
+ ' +', ' ', ldflags.replace('-g ', '').replace('-Os', '').replace('-arch i386', ''))
pycflags = sysconfig.get_config_var('PY_CFLAGS')
sysconfig._config_vars['PY_CFLAGS'] = re.sub(
- ' +', ' ', pycflags.replace('-g', '').replace('-Os', '').replace('-arch i386', ''))
+ ' +', ' ', pycflags.replace('-g ', '').replace('-Os', '').replace('-arch i386', ''))
sysconfig._config_vars['CFLAGSFORSHARED'] = ''
os.environ['ARCHFLAGS'] = ''
@@ -125,6 +125,9 @@ else:
f_paths.write('import os\n')
f_paths.write('\n')
+input_plugin_path = check_output([mapnik_config, '--input-plugins'])
+font_path = check_output([mapnik_config, '--fonts'])
+
if mason_build:
try:
if sys.platform == 'darwin':
@@ -135,7 +138,6 @@ if mason_build:
shutil.copyfile(f, os.path.join('mapnik', base_f))
except shutil.Error:
pass
- input_plugin_path = check_output([mapnik_config, '--input-plugins'])
input_plugin_files = os.listdir(input_plugin_path)
input_plugin_files = [os.path.join(
input_plugin_path, f) for f in input_plugin_files]
@@ -147,7 +149,6 @@ if mason_build:
'mapnik', 'plugins', 'input', os.path.basename(f)))
except shutil.Error:
pass
- font_path = check_output([mapnik_config, '--fonts'])
font_files = os.listdir(font_path)
font_files = [os.path.join(font_path, f) for f in font_files]
if not os.path.exists(os.path.join('mapnik', 'plugins', 'fonts')):
@@ -161,18 +162,21 @@ if mason_build:
if create_paths:
f_paths.write(
'mapniklibpath = os.path.join(os.path.dirname(os.path.realpath(__file__)), "plugins")\n')
+ f_paths.write("inputpluginspath = os.path.join(mapniklibpath,'input')\n")
+ f_paths.write("fontscollectionpath = os.path.join(mapniklibpath,'fonts')\n")
elif create_paths:
- f_paths.write("mapniklibpath = '" + lib_path + "/mapnik'\n")
+ if os.environ.get('LIB_DIR_NAME'):
+ mapnik_lib_path = lib_path + os.environ.get('LIB_DIR_NAME')
+ else:
+ mapnik_lib_path = lib_path + "/mapnik"
+ f_paths.write("mapniklibpath = '{path}'\n".format(path=mapnik_lib_path))
f_paths.write('mapniklibpath = os.path.normpath(mapniklibpath)\n')
+ f_paths.write(
+ "inputpluginspath = '{path}'\n".format(path=input_plugin_path))
+ f_paths.write(
+ "fontscollectionpath = '{path}'\n".format(path=font_path))
if create_paths:
- f_paths.write("inputpluginspath = os.path.join(mapniklibpath,'input')\n")
- if os.environ.get('SYSTEM_FONTS'):
- font_path = "os.path.normpath('{path}')".format(path=os.environ.get('SYSTEM_FONTS'))
- else:
- font_path = "os.path.join(mapniklibpath,'fonts')"
- f_paths.write(
- "fontscollectionpath = {path}\n".format(path=font_path))
f_paths.write(
"__all__ = [mapniklibpath,inputpluginspath,fontscollectionpath]\n")
f_paths.close()
@@ -232,6 +236,14 @@ if proj_path:
extra_comp_args = check_output([mapnik_config, '--cflags']).split(' ')
+if os.environ.get("PYCAIRO", "false") == "true":
+ try:
+ extra_comp_args.append('-DHAVE_PYCAIRO')
+ extra_comp_args.extend(check_output(["pkg-config", '--cflags', 'pycairo']).strip().split(' '))
+ linkflags.extend(check_output(["pkg-config", '--libs', 'pycairo']).strip().split(' '))
+ except:
+ raise Exception("Failed to find compiler options for pycairo")
+
if sys.platform == 'darwin':
extra_comp_args.append('-mmacosx-version-min=10.8')
# silence warning coming from boost python macros which
diff --git a/src/mapnik_datasource.cpp b/src/mapnik_datasource.cpp
index c35e5c0..bf3afb3 100644
--- a/src/mapnik_datasource.cpp
+++ b/src/mapnik_datasource.cpp
@@ -202,6 +202,7 @@ void export_datasource()
"These vary depending on the type of data source.")
.def(self == self)
;
+ register_ptr_to_python<std::shared_ptr<datasource> >();
def("CreateDatasource",&create_datasource);
diff --git a/src/mapnik_feature.cpp b/src/mapnik_feature.cpp
index d77b9ee..07c9f73 100644
--- a/src/mapnik_feature.cpp
+++ b/src/mapnik_feature.cpp
@@ -237,4 +237,5 @@ void export_feature()
.def("from_geojson",from_geojson_impl)
.staticmethod("from_geojson")
;
+ register_ptr_to_python<std::shared_ptr<mapnik::feature_impl> >();
}
diff --git a/src/mapnik_featureset.cpp b/src/mapnik_featureset.cpp
index e19348f..87aae04 100644
--- a/src/mapnik_featureset.cpp
+++ b/src/mapnik_featureset.cpp
@@ -93,4 +93,5 @@ void export_featureset()
"<mapnik.Feature object at 0x105e64140>\n"
)
;
+ register_ptr_to_python<std::shared_ptr<mapnik::Featureset> >();
}
diff --git a/src/mapnik_geometry.cpp b/src/mapnik_geometry.cpp
index b051c72..22124d5 100644
--- a/src/mapnik_geometry.cpp
+++ b/src/mapnik_geometry.cpp
@@ -290,4 +290,5 @@ void export_geometry()
//.def("to_svg",&to_svg)
// TODO add other geometry_type methods
;
+ register_ptr_to_python<std::shared_ptr<geometry<double>> >();
}
diff --git a/src/mapnik_image.cpp b/src/mapnik_image.cpp
index da62680..b59fa6b 100644
--- a/src/mapnik_image.cpp
+++ b/src/mapnik_image.cpp
@@ -470,5 +470,6 @@ void export_image()
.staticmethod("from_cairo")
#endif
;
+ register_ptr_to_python<std::shared_ptr<image_any> >();
}
diff --git a/src/mapnik_map.cpp b/src/mapnik_map.cpp
index 3320c12..4d04748 100644
--- a/src/mapnik_map.cpp
+++ b/src/mapnik_map.cpp
@@ -389,7 +389,7 @@ void export_map()
"by specifying a Mapnik Box2d.\n"
"\n"
"Usage:\n"
- ">>> extext = Box2d(-180.0, -90.0, 180.0, 90.0)\n"
+ ">>> extent = Box2d(-180.0, -90.0, 180.0, 90.0)\n"
">>> m.zoom_to_box(extent)\n"
)
diff --git a/src/mapnik_value_converter.hpp b/src/mapnik_value_converter.hpp
index dbb9e87..626c415 100644
--- a/src/mapnik_value_converter.hpp
+++ b/src/mapnik_value_converter.hpp
@@ -55,9 +55,9 @@ namespace boost { namespace python {
PyObject * operator() (mapnik::value_unicode_string const& s) const
{
- std::string buffer;
- mapnik::to_utf8(s,buffer);
- return ::PyUnicode_DecodeUTF8(buffer.c_str(),implicit_cast<ssize_t>(buffer.length()),0);
+ const char* data = reinterpret_cast<const char*>(s.getBuffer());
+ Py_ssize_t size = implicit_cast<Py_ssize_t>(s.length() * sizeof(s[0]));
+ return ::PyUnicode_DecodeUTF16(data, size, nullptr, nullptr);
}
PyObject * operator() (mapnik::value_null const& /*s*/) const
diff --git a/test/python_tests/image_encoding_speed_test.py b/test/python_tests/image_encoding_speed_test.py
index 13b824b..4d99046 100644
--- a/test/python_tests/image_encoding_speed_test.py
+++ b/test/python_tests/image_encoding_speed_test.py
@@ -45,9 +45,7 @@ combinations = ['png',
'png:z=1:s=huff',
'png:z=1:s=rle',
'png8:m=h:g=2.0',
- 'png8:m=h:g=1.0',
- 'png:e=miniz',
- 'png8:e=miniz'
+ 'png8:m=h:g=1.0'
]
tiles = [
diff --git a/test/python_tests/images/pycairo/cairo-cairo-expected.png b/test/python_tests/images/pycairo/cairo-cairo-expected.png
index 3a99f5e..687440c 100644
Binary files a/test/python_tests/images/pycairo/cairo-cairo-expected.png and b/test/python_tests/images/pycairo/cairo-cairo-expected.png differ
diff --git a/test/python_tests/images/pycairo/cairo-cairo-expected.svg b/test/python_tests/images/pycairo/cairo-cairo-expected.svg
index 18d7343..c120f58 100644
--- a/test/python_tests/images/pycairo/cairo-cairo-expected.svg
+++ b/test/python_tests/images/pycairo/cairo-cairo-expected.svg
@@ -3,45 +3,48 @@
<defs>
<g>
<symbol overflow="visible" id="glyph0-0">
-<path style="stroke:none;" d="M 9.371094 -12.722656 L 9.464844 -12.722656 L 9.5625 -12.703125 L 9.273438 -12.703125 Z M 1.59375 -12.722656 L 1.6875 -12.722656 L 1.785156 -12.703125 L 1.496094 -12.703125 Z M 9.273438 -12.703125 L 9.5625 -12.703125 L 9.652344 -12.667969 L 9.183594 -12.667969 Z M 1.496094 -12.703125 L 1.785156 -12.703125 L 1.875 -12.667969 L 1.40625 -12.667969 Z M 9.183594 -12.667969 L 9.652344 -12.667969 L 9.734375 -12.617188 L 9.101562 -12.617188 Z M 1.40625 -12.667969 L [...]
+<path style="stroke:none;" d="M 1 3.53125 L 1 -14.109375 L 11 -14.109375 L 11 3.53125 Z M 2.125 2.421875 L 9.890625 2.421875 L 9.890625 -12.984375 L 2.125 -12.984375 Z M 2.125 2.421875 "/>
</symbol>
<symbol overflow="visible" id="glyph0-1">
-<path style="stroke:none;" d="M 5.25 -8.832031 L 5.347656 -8.828125 L 4.941406 -8.828125 Z M 4.941406 -8.828125 L 5.347656 -8.828125 L 5.832031 -8.808594 L 4.726562 -8.808594 Z M 4.726562 -8.808594 L 5.832031 -8.808594 L 5.882812 -8.800781 L 4.644531 -8.800781 Z M 4.644531 -8.800781 L 5.882812 -8.800781 L 6.363281 -8.726562 L 4.191406 -8.726562 Z M 4.191406 -8.726562 L 6.363281 -8.726562 L 6.421875 -8.710938 L 4.097656 -8.710938 Z M 4.097656 -8.710938 L 6.421875 -8.710938 L 6.832031 -8.6 [...]
+<path style="stroke:none;" d="M 1.96875 -14.578125 L 3.9375 -14.578125 L 3.9375 -8.609375 L 11.109375 -8.609375 L 11.109375 -14.578125 L 13.078125 -14.578125 L 13.078125 0 L 11.109375 0 L 11.109375 -6.9375 L 3.9375 -6.9375 L 3.9375 0 L 1.96875 0 Z M 1.96875 -14.578125 "/>
</symbol>
<symbol overflow="visible" id="glyph0-2">
-<path style="stroke:none;" d="M 1.59375 -12.722656 L 1.6875 -12.722656 L 1.785156 -12.703125 L 1.496094 -12.703125 Z M 1.496094 -12.703125 L 1.785156 -12.703125 L 1.875 -12.667969 L 1.40625 -12.667969 Z M 1.40625 -12.667969 L 1.875 -12.667969 L 1.957031 -12.617188 L 1.324219 -12.617188 Z M 1.324219 -12.617188 L 1.957031 -12.617188 L 2.03125 -12.550781 L 1.25 -12.550781 Z M 1.25 -12.550781 L 2.03125 -12.550781 L 2.089844 -12.472656 L 1.191406 -12.472656 Z M 1.191406 -12.472656 L 2.089844 [...]
+<path style="stroke:none;" d="M 11.234375 -5.921875 L 11.234375 -5.046875 L 2.984375 -5.046875 C 3.054688 -3.804688 3.425781 -2.859375 4.09375 -2.203125 C 4.757812 -1.554688 5.691406 -1.234375 6.890625 -1.234375 C 7.578125 -1.234375 8.242188 -1.316406 8.890625 -1.484375 C 9.535156 -1.660156 10.179688 -1.914062 10.828125 -2.25 L 10.828125 -0.5625 C 10.179688 -0.28125 9.519531 -0.0703125 8.84375 0.0625 C 8.164062 0.207031 7.476562 0.28125 6.78125 0.28125 C 5.03125 0.28125 3.644531 -0.22265 [...]
</symbol>
<symbol overflow="visible" id="glyph0-3">
-<path style="stroke:none;" d="M 5.25 -8.832031 L 5.546875 -8.828125 L 4.941406 -8.828125 Z M 4.941406 -8.828125 L 5.546875 -8.828125 L 5.855469 -8.800781 L 4.644531 -8.800781 Z M 4.644531 -8.800781 L 5.855469 -8.800781 L 6.390625 -8.710938 L 4.097656 -8.710938 Z M 4.097656 -8.710938 L 6.390625 -8.710938 L 6.878906 -8.570312 L 3.609375 -8.570312 Z M 3.609375 -8.570312 L 6.878906 -8.570312 L 7.117188 -8.476562 L 3.367188 -8.476562 Z M 3.367188 -8.476562 L 7.117188 -8.476562 L 7.140625 -8.4 [...]
+<path style="stroke:none;" d="M 1.890625 -15.203125 L 3.6875 -15.203125 L 3.6875 0 L 1.890625 0 Z M 1.890625 -15.203125 "/>
</symbol>
<symbol overflow="visible" id="glyph0-4">
-<path style="stroke:none;" d=""/>
+<path style="stroke:none;" d="M 6.125 -9.671875 C 5.15625 -9.671875 4.390625 -9.296875 3.828125 -8.546875 C 3.273438 -7.796875 3 -6.765625 3 -5.453125 C 3 -4.148438 3.273438 -3.117188 3.828125 -2.359375 C 4.390625 -1.609375 5.15625 -1.234375 6.125 -1.234375 C 7.082031 -1.234375 7.835938 -1.609375 8.390625 -2.359375 C 8.953125 -3.117188 9.234375 -4.148438 9.234375 -5.453125 C 9.234375 -6.753906 8.953125 -7.78125 8.390625 -8.53125 C 7.835938 -9.289062 7.082031 -9.671875 6.125 -9.671875 Z M [...]
</symbol>
<symbol overflow="visible" id="glyph0-5">
-<path style="stroke:none;" d="M 10.480469 -12.722656 L 10.574219 -12.722656 L 10.671875 -12.703125 L 10.382812 -12.703125 Z M 1.59375 -12.722656 L 1.6875 -12.722656 L 1.785156 -12.703125 L 1.496094 -12.703125 Z M 10.382812 -12.703125 L 10.671875 -12.703125 L 10.761719 -12.667969 L 10.292969 -12.667969 Z M 1.496094 -12.703125 L 1.785156 -12.703125 L 1.875 -12.667969 L 1.40625 -12.667969 Z M 10.292969 -12.667969 L 10.761719 -12.667969 L 10.84375 -12.617188 L 10.210938 -12.617188 Z M 1.4062 [...]
+<path style="stroke:none;" d=""/>
</symbol>
<symbol overflow="visible" id="glyph0-6">
-<path style="stroke:none;" d="M 5.25 -8.832031 L 5.425781 -8.828125 L 4.941406 -8.828125 Z M 4.941406 -8.828125 L 5.425781 -8.828125 L 5.769531 -8.820312 L 4.855469 -8.820312 Z M 8.257812 -8.832031 L 8.351562 -8.832031 L 8.449219 -8.8125 L 8.160156 -8.8125 Z M 4.855469 -8.820312 L 5.769531 -8.820312 L 5.941406 -8.800781 L 4.644531 -8.800781 Z M 8.160156 -8.8125 L 8.449219 -8.8125 L 8.539062 -8.777344 L 8.070312 -8.777344 Z M 4.644531 -8.800781 L 5.941406 -8.800781 L 6.28125 -8.761719 L 4 [...]
+<path style="stroke:none;" d="M 1.96875 -14.578125 L 4.90625 -14.578125 L 8.625 -4.65625 L 12.359375 -14.578125 L 15.296875 -14.578125 L 15.296875 0 L 13.375 0 L 13.375 -12.796875 L 9.625 -2.796875 L 7.640625 -2.796875 L 3.875 -12.796875 L 3.875 0 L 1.96875 0 Z M 1.96875 -14.578125 "/>
</symbol>
<symbol overflow="visible" id="glyph0-7">
-<path style="stroke:none;" d="M 4.695312 -8.832031 L 4.992188 -8.828125 L 4.613281 -8.828125 Z M 1.59375 -8.832031 L 1.6875 -8.832031 L 1.785156 -8.8125 L 1.496094 -8.8125 Z M 4.613281 -8.828125 L 4.992188 -8.828125 L 5.25 -8.804688 L 4.140625 -8.804688 Z M 4.140625 -8.804688 L 5.25 -8.804688 L 5.289062 -8.800781 L 4.105469 -8.800781 Z M 1.496094 -8.8125 L 1.785156 -8.8125 L 1.875 -8.777344 L 1.40625 -8.777344 Z M 4.105469 -8.800781 L 5.289062 -8.800781 L 5.457031 -8.773438 L 3.878906 -8 [...]
+<path style="stroke:none;" d="M 6.859375 -5.5 C 5.398438 -5.5 4.390625 -5.332031 3.828125 -5 C 3.273438 -4.664062 3 -4.097656 3 -3.296875 C 3 -2.660156 3.207031 -2.15625 3.625 -1.78125 C 4.050781 -1.40625 4.625 -1.21875 5.34375 -1.21875 C 6.34375 -1.21875 7.140625 -1.570312 7.734375 -2.28125 C 8.335938 -2.988281 8.640625 -3.925781 8.640625 -5.09375 L 8.640625 -5.5 Z M 10.4375 -6.234375 L 10.4375 0 L 8.640625 0 L 8.640625 -1.65625 C 8.234375 -1 7.722656 -0.507812 7.109375 -0.1875 C 6.4921 [...]
+</symbol>
+<symbol overflow="visible" id="glyph0-8">
+<path style="stroke:none;" d="M 3.625 -1.640625 L 3.625 4.15625 L 1.8125 4.15625 L 1.8125 -10.9375 L 3.625 -10.9375 L 3.625 -9.28125 C 4 -9.925781 4.472656 -10.40625 5.046875 -10.71875 C 5.628906 -11.039062 6.320312 -11.203125 7.125 -11.203125 C 8.445312 -11.203125 9.523438 -10.671875 10.359375 -9.609375 C 11.191406 -8.554688 11.609375 -7.171875 11.609375 -5.453125 C 11.609375 -3.734375 11.191406 -2.347656 10.359375 -1.296875 C 9.523438 -0.242188 8.445312 0.28125 7.125 0.28125 C 6.320312 [...]
</symbol>
</g>
</defs>
<g id="surface1">
<rect x="0" y="0" width="512" height="512" style="fill:rgb(27.45098%,50.980392%,70.588235%);fill-opacity:1;stroke:none;"/>
-<path style="fill-rule:nonzero;fill:rgb(0%,0%,100%);fill-opacity:1;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:4;" d="M 5 0 L 4.503906 2.167969 L 3.117188 3.910156 L 1.113281 4.875 L -1.113281 4.875 L -3.117188 3.910156 L -4.503906 2.167969 L -5 0 L -4.503906 -2.167969 L -3.117188 -3.910156 L -1.113281 -4.875 L 1.113281 -4.875 L 3.117188 -3.910156 L 4.503906 -2.167969 Z " transform="matrix(1,0,0,1,256,256)"/>
+<path style="fill-rule:nonzero;fill:rgb(0%,0%,100%);fill-opacity:1;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:4;" d="M 5 0 L 4.503906 2.167969 L 3.117188 3.910156 L 1.113281 4.875 L -1.113281 4.875 L -3.117188 3.910156 L -4.503906 2.167969 L -5 0 L -4.503906 -2.167969 L -3.117188 -3.910156 L -1.113281 -4.875 L 1.113281 -4.875 L 3.117188 -3.910156 L 4.503906 -2.167969 Z M 5 0 " transform="matrix(1,0,0,1,256,256)"/>
<g style="fill:rgb(0%,0%,0%);fill-opacity:1;">
- <use xlink:href="#glyph0-0" x="218.722656" y="24.5"/>
- <use xlink:href="#glyph0-1" x="229.778212" y="24.5"/>
- <use xlink:href="#glyph0-2" x="239.722656" y="24.5"/>
- <use xlink:href="#glyph0-2" x="243.000434" y="24.5"/>
- <use xlink:href="#glyph0-3" x="246.278212" y="24.5"/>
- <use xlink:href="#glyph0-4" x="256.778212" y="24.5"/>
- <use xlink:href="#glyph0-5" x="261.167101" y="24.5"/>
- <use xlink:href="#glyph0-6" x="273.333767" y="24.5"/>
- <use xlink:href="#glyph0-7" x="283.278212" y="24.5"/>
+ <use xlink:href="#glyph0-1" x="205.929688" y="25.523438"/>
+ <use xlink:href="#glyph0-2" x="220.96875" y="25.523438"/>
+ <use xlink:href="#glyph0-3" x="233.273438" y="25.523438"/>
+ <use xlink:href="#glyph0-3" x="238.830078" y="25.523438"/>
+ <use xlink:href="#glyph0-4" x="244.386719" y="25.523438"/>
+ <use xlink:href="#glyph0-5" x="256.623047" y="25.523438"/>
+ <use xlink:href="#glyph0-6" x="262.980469" y="25.523438"/>
+ <use xlink:href="#glyph0-7" x="280.236328" y="25.523438"/>
+ <use xlink:href="#glyph0-8" x="292.492188" y="25.523438"/>
</g>
-<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 0 0 L 512 0 L 512 512 L 0 512 Z M 6 6 L 506 6 L 506 506 L 6 506 Z "/>
+<path style="fill:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:10;" d="M 0 0 L 512 0 L 512 512 L 0 512 Z M 6 6 L 506 6 L 506 506 L 6 506 Z M 6 6 "/>
</g>
</svg>
diff --git a/test/python_tests/png_encoding_test.py b/test/python_tests/png_encoding_test.py
index 8650607..8916f0f 100644
--- a/test/python_tests/png_encoding_test.py
+++ b/test/python_tests/png_encoding_test.py
@@ -34,9 +34,7 @@ if mapnik.has_png():
'png8:m=h:t=0',
'png8:m=h:c=1:t=0',
'png8:m=h:t=1',
- 'png8:m=h:t=2',
- 'png32:e=miniz',
- 'png8:e=miniz'
+ 'png8:m=h:t=2'
]
# Todo - use itertools.product
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-mapnik.git
More information about the Pkg-grass-devel
mailing list