diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-12-08 01:24:07 +0000 |
|---|---|---|
| committer | jabiertxof <jabier.arraiza@marker.es> | 2015-12-08 01:24:07 +0000 |
| commit | 08a6877d14c0b90e7fe661383f15f20a2a03bd2c (patch) | |
| tree | 854008faa6cdc3a0546b2a7d84f6505fa1058f76 /src/extension/internal/cairo-render-context.cpp | |
| parent | Add rect to SP Control point on locked guides (diff) | |
| parent | static code analysis (diff) | |
| download | inkscape-08a6877d14c0b90e7fe661383f15f20a2a03bd2c.tar.gz inkscape-08a6877d14c0b90e7fe661383f15f20a2a03bd2c.zip | |
update to trunk
(bzr r14500.1.14)
Diffstat (limited to 'src/extension/internal/cairo-render-context.cpp')
| -rw-r--r-- | src/extension/internal/cairo-render-context.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp index c3e416184..97b84606f 100644 --- a/src/extension/internal/cairo-render-context.cpp +++ b/src/extension/internal/cairo-render-context.cpp @@ -1182,7 +1182,7 @@ CairoRenderContext::_createHatchPainter(SPPaintServer const *const paintserver, std::vector<SPHatchPath *> children(evil->hatchPaths()); for (int i = 0; i < overflow_steps; i++) { - for (std::vector<SPHatchPath *>::iterator iter = children.begin(); iter != children.end(); iter++) { + for (std::vector<SPHatchPath *>::iterator iter = children.begin(); iter != children.end(); ++iter) { SPHatchPath *path = *iter; _renderer->renderHatchPath(pattern_ctx, *path, dkey); } @@ -1677,8 +1677,8 @@ CairoRenderContext::renderGlyphtext(PangoFont *font, Geom::Affine const &font_ma cairo_save(_cr); cairo_set_font_face(_cr, font_face); - if (fc_pattern && FcPatternGetDouble(fc_pattern, FC_PIXEL_SIZE, 0, &size) != FcResultMatch) - size = 12.0; + //if (fc_pattern && FcPatternGetDouble(fc_pattern, FC_PIXEL_SIZE, 0, &size) != FcResultMatch) + // size = 12.0; // set the given font matrix cairo_matrix_t matrix; |