summaryrefslogtreecommitdiffstats
path: root/src/extension/internal/cairo-renderer.cpp
diff options
context:
space:
mode:
authorPatrick Storz <eduard.braun2@gmx.de>2019-07-06 19:50:57 +0000
committerPatrick Storz <eduard.braun2@gmx.de>2019-07-10 18:15:54 +0000
commit2185fad3b6170529ad07aaa0d05874e4c80befa8 (patch)
tree696a302b3602aaf5ba70af09ef16623c005be6c5 /src/extension/internal/cairo-renderer.cpp
parentEnhancements for --export-type command line option (diff)
downloadinkscape-2185fad3b6170529ad07aaa0d05874e4c80befa8.tar.gz
inkscape-2185fad3b6170529ad07aaa0d05874e4c80befa8.zip
cairo-renderer: / cairo-render-context: whitespace fixes
Diffstat (limited to 'src/extension/internal/cairo-renderer.cpp')
-rw-r--r--src/extension/internal/cairo-renderer.cpp22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/extension/internal/cairo-renderer.cpp b/src/extension/internal/cairo-renderer.cpp
index c5477e3c2..be8155991 100644
--- a/src/extension/internal/cairo-renderer.cpp
+++ b/src/extension/internal/cairo-renderer.cpp
@@ -215,7 +215,7 @@ static void sp_shape_render(SPShape *shape, CairoRenderContext *ctx)
SPMarker* marker = shape->_marker[i];
for(Geom::PathVector::const_iterator path_it = pathv.begin(); path_it != pathv.end(); ++path_it) {
// START position
- if ( path_it != pathv.begin()
+ if ( path_it != pathv.begin()
&& ! ((path_it == (pathv.end()-1)) && (path_it->size_default() == 0)) ) // if this is the last path and it is a moveto-only, there is no mid marker there
{
Geom::Affine tr;
@@ -305,7 +305,6 @@ static void sp_shape_render(SPShape *shape, CairoRenderContext *ctx)
static void sp_group_render(SPGroup *group, CairoRenderContext *ctx)
{
CairoRenderer *renderer = ctx->getRenderer();
- //TRACE(("sp_group_render opacity: %f\n", SP_SCALE24_TO_FLOAT(item->style->opacity.value)));
std::vector<SPObject*> l(group->childList(false));
for(std::vector<SPObject*>::const_iterator x = l.begin(); x!= l.end(); ++x){
@@ -377,13 +376,12 @@ static void sp_image_render(SPImage *image, CairoRenderContext *ctx)
Geom::Scale s(width / (double)w, height / (double)h);
Geom::Affine t(s * tp);
- ctx->renderImage(image->pixbuf, t, image->style);
+ ctx->renderImage(image->pixbuf, t, image->style);
}
static void sp_anchor_render(SPAnchor *a, CairoRenderContext *ctx)
{
CairoRenderer *renderer = ctx->getRenderer();
- //TRACE(("sp_group_render opacity: %f\n", SP_SCALE24_TO_FLOAT(item->style->opacity.value)));
std::vector<SPObject*> l(a->childList(false));
if (a->href)
@@ -502,7 +500,7 @@ static void sp_asbitmap_render(SPItem *item, CairoRenderContext *ctx)
double shift_y = bbox->top();
// For default 96 dpi, snap bitmap to pixel grid
- if (res == Inkscape::Util::Quantity::convert(1, "in", "px")) {
+ if (res == Inkscape::Util::Quantity::convert(1, "in", "px")) {
shift_x = round (shift_x);
shift_y = round (shift_y);
}
@@ -522,7 +520,7 @@ static void sp_asbitmap_render(SPItem *item, CairoRenderContext *ctx)
std::unique_ptr<Inkscape::Pixbuf> pb(
sp_generate_internal_bitmap(document, nullptr,
- bbox->min()[Geom::X], bbox->min()[Geom::Y], bbox->max()[Geom::X], bbox->max()[Geom::Y],
+ bbox->min()[Geom::X], bbox->min()[Geom::Y], bbox->max()[Geom::X], bbox->max()[Geom::Y],
width, height, res, res, (guint32) 0xffffff00, item ));
if (pb) {
@@ -585,12 +583,12 @@ static void sp_item_invoke_render(SPItem *item, CairoRenderContext *ctx)
TRACE(("image\n"));
sp_image_render(image, ctx);
} else {
- SPGroup *group = dynamic_cast<SPGroup *>(item);
- if (group) {
- TRACE(("<g>\n"));
- sp_group_render(group, ctx);
- }
- }
+ SPGroup *group = dynamic_cast<SPGroup *>(item);
+ if (group) {
+ TRACE(("<g>\n"));
+ sp_group_render(group, ctx);
+ }
+ }
}
}
}