archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2026-01-25 16:47:07 +00:00
Code Issues Projects Releases Wiki Activity

bump version to 0.7.1, merge r1596,r1604,r1605,r1625, and fix #512 and #504

Browse Source
This commit is contained in:
Dane Springmeyer 2010-02-19 19:11:17 +00:00
parent 2e957c9885
commit 3a80dffb6e
8 changed files with 54 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG
View File

@ -12,6 +12,13 @@ For a complete change history, see the SVN log.
Mapnik 0.7.1 Release
--------------------
- AGG Renderer - Enforced default gamma function on all symbolizers to ensure proper antialiasing
even when gamma is modified on the PolygonSymbolizer. (#512)
Mapnik 0.7.0 Release
--------------------

26
SConstruct
View File

@ -688,6 +688,18 @@ if not preconfigured:
else:
env['SKIPPED_DEPS'].extend(['cairo','cairomm'])
# allow for mac osx /usr/lib/libicucore.dylib compatibility
# requires custom supplied headers since Apple does not include them
# details: http://lists.apple.com/archives/xcode-users/2005/Jun/msg00633.html
# To use system lib download and make && make install one of these:
# http://www.opensource.apple.com/tarballs/ICU/
# then copy the headers to a location that mapnik will find
if 'core' in env['ICU_LIB_NAME']:
env.Append(CXXFLAGS = '-DU_HIDE_DRAFT_API')
env.Append(CXXFLAGS = '-DUDISABLE_RENAMING')
if os.path.exists(env['ICU_LIB_NAME']):
env['ICU_LIB_NAME'] = os.path.basename(env['ICU_LIB_NAME']).replace('.dylib','').replace('lib','')
LIBSHEADERS = [
['m', 'math.h', True,'C'],
['ltdl', 'ltdl.h', True,'C'],
@ -699,15 +711,6 @@ if not preconfigured:
[env['ICU_LIB_NAME'],'unicode/unistr.h',True,'C++'],
]
# allow for mac osx /usr/lib/libicucore.dylib compatibility
# requires custom supplied headers since Apple does not include them
# details: http://lists.apple.com/archives/xcode-users/2005/Jun/msg00633.html
# To use system lib download and make && make install one of these:
# http://www.opensource.apple.com/tarballs/ICU/
# then copy the headers to a location that mapnik will find
if env['ICU_LIB_NAME'] == 'icucore':
env.Append(CXXFLAGS = '-DU_HIDE_DRAFT_API')
env.Append(CXXFLAGS = '-DUDISABLE_RENAMING')
for libinfo in LIBSHEADERS:
if not conf.CheckLibWithHeader(libinfo[0], libinfo[1], libinfo[3]):
@ -868,7 +871,7 @@ if not preconfigured:
# fetch the mapnik version header in order to set the
# ABI version used to build libmapnik.so on linux in src/SConscript
abi = conf.GetMapnikLibVersion()
abi_fallback = [0,7,0]
abi_fallback = [0,7,1]
if not abi:
color_print(1,'Problem encountered parsing mapnik version, falling back to %s' % abi_fallback)
env['ABI_VERSION'] = abi_fallback
@ -1022,6 +1025,9 @@ if not preconfigured:
# autogenerate help on default/current SCons options
Help(opts.GenerateHelpText(env))
#env.Prepend(CPPPATH = '/usr/local/include')
#env.Prepend(LIBPATH = '/usr/local/lib')
#### Builds ####
if not HELP_REQUESTED:
# export env so it is available in Sconscript files

2
include/mapnik/version.hpp
View File

@ -24,7 +24,7 @@
#ifndef MAPNIK_VERSION_HPP
#define MAPNIK_VERSION_HPP
#define MAPNIK_VERSION 700
#define MAPNIK_VERSION 701
#endif //MAPNIK_VERSION_HPP

9
plugins/input/shape/shape_featureset.cpp
View File

@ -90,7 +90,14 @@ feature_ptr shape_featureset<filterT>::next()
{
double x=shape_.shp().read_double();
double y=shape_.shp().read_double();
shape_.shp().skip(8*2); // m, z
// skip z
shape_.shp().skip(8);
//skip m if exists
if ( shape_.reclength_ == 8 + 36)
{
shape_.shp().skip(8);
}
geometry2d * point=new point_impl;
point->move_to(x,y);
feature->add_geometry(point);

9
plugins/input/shape/shape_index_featureset.cpp
View File

@ -111,7 +111,14 @@ feature_ptr shape_index_featureset<filterT>::next()
{
double x=shape_.shp().read_double();
double y=shape_.shp().read_double();
shape_.shp().skip(8*2); // skip m,z
// skip z
shape_.shp().skip(8);
//skip m if exists
if ( shape_.reclength_ == 8 + 36)
{
shape_.shp().skip(8);
}
geometry2d * point = new point_impl;
point->move_to(x,y);
feature->add_geometry(point);

2
src/SConscript
View File

@ -64,7 +64,7 @@ if env['PLATFORM'] == 'Darwin':
else:
lib_path = 'libmapnik.dylib'
linkflags = '-Wl,-install_name,%s' % lib_path
linkflags += ' -current_version 0.7.0 -compatibility_version 0.7.0'
linkflags += ' -current_version 0.7.1 -compatibility_version 0.7.0'
elif env['PLATFORM'] == 'SunOS' and env['CXX'].startswith('CC'):
linkflags = '-R. -h libmapnik.so'
else: # Linux and others

8
src/agg_renderer.cpp
View File

@ -188,7 +188,6 @@ namespace mapnik
renderer ren(renb);
ras_ptr->reset();
ras_ptr->gamma(agg::gamma_linear(0.0, sym.get_gamma()));
for (unsigned i=0;i<feature.num_geometries();++i)
@ -234,7 +233,9 @@ namespace mapnik
renderer ren(renb);
agg::scanline_u8 sl;
ras_ptr->reset();
ras_ptr->reset();
ras_ptr->gamma(agg::gamma_linear());
double height = 0.7071 * sym.height(); // height in meters
for (unsigned i=0;i<feature.num_geometries();++i)
@ -341,6 +342,7 @@ namespace mapnik
unsigned a=col.alpha();
renderer ren(renb);
ras_ptr->reset();
ras_ptr->gamma(agg::gamma_linear());
agg::scanline_p8 sl;
for (unsigned i=0;i<feature.num_geometries();++i)
@ -669,6 +671,7 @@ namespace mapnik
agg::scanline_u8 sl;
ras_ptr->reset();
ras_ptr->gamma(agg::gamma_linear());
ImageData32 const& pattern = * sym.get_image();
unsigned w=pattern.width();
@ -768,6 +771,7 @@ namespace mapnik
typedef agg::renderer_scanline_aa_solid<ren_base> renderer;
arrow arrow_;
ras_ptr->reset();
ras_ptr->gamma(agg::gamma_linear());
agg::scanline_u8 sl;
agg::rendering_buffer buf(pixmap_.raw_data(),width_,height_, width_ * 4);

8
utils/shapeindex/shapeindex.cpp
View File

@ -174,6 +174,7 @@ int main (int argc,char** argv)
{
double x=shp.read_double();
double y=shp.read_double();
// skip m
shp.read_double();
item_ext=Envelope<double>(x,y,x,y);
@ -182,8 +183,13 @@ int main (int argc,char** argv)
{
double x=shp.read_double();
double y=shp.read_double();
// skip z
shp.read_double();
shp.read_double();
//skip m if exists
if ( content_length == 8 + 36)
{
shp.read_double();
}
item_ext=Envelope<double>(x,y,x,y);
}