sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:mapnik/mapnik

Browse source
This commit is contained in:
Dane Springmeyer 2013-01-02 13:57:05 -08:00
commit e094776fc5
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/cairo_renderer.cpp
View file

@ -1158,7 +1158,8 @@ void render_vector_marker(cairo_context & context, pixel_position const& pos, ma
else if(attr.fill_flag) else if(attr.fill_flag)
{ {
double fill_opacity = attr.fill_opacity * opacity * attr.fill_color.opacity(); double fill_opacity = attr.fill_opacity * opacity * attr.fill_color.opacity();
context.set_color(attr.fill_color.r,attr.fill_color.g,attr.fill_color.b, fill_opacity); context.set_color(attr.fill_color.r/255.0,attr.fill_color.g/255.0,
attr.fill_color.b/255.0, fill_opacity);
context.fill(); context.fill();
} }
} }
@ -1179,7 +1180,8 @@ void render_vector_marker(cairo_context & context, pixel_position const& pos, ma
else if (attr.stroke_flag) else if (attr.stroke_flag)
{ {
double stroke_opacity = attr.stroke_opacity * opacity * attr.stroke_color.opacity(); double stroke_opacity = attr.stroke_opacity * opacity * attr.stroke_color.opacity();
context.set_color(attr.stroke_color.r,attr.stroke_color.g,attr.stroke_color.b, stroke_opacity); context.set_color(attr.stroke_color.r/255.0,attr.stroke_color.g/255.0,
attr.stroke_color.b/255.0, stroke_opacity);
context.set_line_width(attr.stroke_width); context.set_line_width(attr.stroke_width);
context.set_line_cap(line_cap_enum(attr.line_cap)); context.set_line_cap(line_cap_enum(attr.line_cap));
context.set_line_join(line_join_enum(attr.line_join)); context.set_line_join(line_join_enum(attr.line_join));