From 3eae8aa890673270d0907d55395ccaf5368cea37 Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Thu, 5 Oct 2017 17:33:06 +0300
Subject: Extract a base class, SPDimensions.

From two places getting rid of duplicate code.
---
 src/sp-dimensions.cpp | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 src/sp-dimensions.cpp

(limited to 'src/sp-dimensions.cpp')

diff --git a/src/sp-dimensions.cpp b/src/sp-dimensions.cpp
new file mode 100644
index 000000000..2eb495219
--- /dev/null
+++ b/src/sp-dimensions.cpp
@@ -0,0 +1,50 @@
+/*
+ * SVG dimensions implementation
+ *
+ * Authors:
+ *   Lauris Kaplinski <lauris@kaplinski.com>
+ *   Edward Flick (EAF)
+ *   Abhishek Sharma
+ *   Jon A. Cruz <jon@joncruz.org>
+ *
+ * Copyright (C) 1999-2005 Authors
+ * Copyright (C) 2000-2001 Ximian, Inc.
+ *
+ * Released under GNU GPL, read the file 'COPYING' for more information
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include "sp-dimensions.h"
+#include "sp-item.h"
+
+void SPDimensions::calcDimsFromParentViewport(const SPItemCtx *ictx)
+{
+    if (this->x.unit == SVGLength::PERCENT) {
+        this->x.computed = this->x.value * ictx->viewport.width();
+    }
+
+    if (this->y.unit == SVGLength::PERCENT) {
+        this->y.computed = this->y.value * ictx->viewport.height();
+    }
+
+    if (this->width.unit == SVGLength::PERCENT) {
+        this->width.computed = this->width.value * ictx->viewport.width();
+    }
+
+    if (this->height.unit == SVGLength::PERCENT) {
+        this->height.computed = this->height.value * ictx->viewport.height();
+    }
+}
+
+/*
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :
-- 
cgit v1.2.3


From b4b96eb22c978024da8841f9184b1c7d85140ffd Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Thu, 5 Oct 2017 18:34:42 +0300
Subject: Extract SPDimensions from spfilters

---
 src/sp-dimensions.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/sp-dimensions.cpp')

diff --git a/src/sp-dimensions.cpp b/src/sp-dimensions.cpp
index 2eb495219..f39b98945 100644
--- a/src/sp-dimensions.cpp
+++ b/src/sp-dimensions.cpp
@@ -19,21 +19,26 @@
 #include "sp-dimensions.h"
 #include "sp-item.h"
 
-void SPDimensions::calcDimsFromParentViewport(const SPItemCtx *ictx)
+void SPDimensions::calcDimsFromParentViewport(const SPItemCtx *ictx, bool assign_to_set)
 {
+#define ASSIGN(field) { if (assign_to_set) { field._set = true; } }
     if (this->x.unit == SVGLength::PERCENT) {
+        ASSIGN(x);
         this->x.computed = this->x.value * ictx->viewport.width();
     }
 
     if (this->y.unit == SVGLength::PERCENT) {
+        ASSIGN(y);
         this->y.computed = this->y.value * ictx->viewport.height();
     }
 
     if (this->width.unit == SVGLength::PERCENT) {
+        ASSIGN(width);
         this->width.computed = this->width.value * ictx->viewport.width();
     }
 
     if (this->height.unit == SVGLength::PERCENT) {
+        ASSIGN(height);
         this->height.computed = this->height.value * ictx->viewport.height();
     }
 }
-- 
cgit v1.2.3