summaryrefslogtreecommitdiff
path: root/capi
diff options
context:
space:
mode:
authorRazrFalcon <razrfalcon@gmail.com>2018-06-08 21:45:28 +0300
committerRazrFalcon <razrfalcon@gmail.com>2018-06-08 21:45:28 +0300
commitcc0dcb697c17888a05b1e4ded11ef6f13a333daf (patch)
tree15581d88302064bdc2d01c51f8a1a0261d6f3184 /capi
parent8e1a14f54b3e154d434dcf78f92b3a05562fb176 (diff)
(c-api) Qt wrapper refactoring.
Diffstat (limited to 'capi')
-rw-r--r--capi/Cargo.toml2
-rw-r--r--capi/qt-wrapper/ResvgQt.cpp26
2 files changed, 13 insertions, 15 deletions
diff --git a/capi/Cargo.toml b/capi/Cargo.toml
index 3e59759..f5e986c 100644
--- a/capi/Cargo.toml
+++ b/capi/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "resvg-capi"
-version = "0.2.0"
+version = "0.3.0"
authors = ["Evgeniy Reizner <razrfalcon@gmail.com>"]
keywords = ["svg", "render", "raster", "capi"]
license = "MPL-2.0"
diff --git a/capi/qt-wrapper/ResvgQt.cpp b/capi/qt-wrapper/ResvgQt.cpp
index dcbd769..b9f6e0f 100644
--- a/capi/qt-wrapper/ResvgQt.cpp
+++ b/capi/qt-wrapper/ResvgQt.cpp
@@ -18,6 +18,17 @@ extern "C" {
#include <QDebug>
+static void initOptions(resvg_options &opt)
+{
+ resvg_init_options(&opt);
+
+ const auto screens = qApp->screens();
+ if (!screens.isEmpty()) {
+ const auto screen = screens.at(0);
+ opt.dpi = screen->logicalDotsPerInch() * screen->devicePixelRatio();
+ }
+}
+
class ResvgRendererPrivate
{
public:
@@ -38,6 +49,7 @@ public:
opt.path = NULL;
}
+ initOptions(opt);
viewBox = QRectF();
errMsg = QString();
}
@@ -48,18 +60,6 @@ public:
QString errMsg;
};
-
-static void initOptions(resvg_options &opt)
-{
- resvg_init_options(&opt);
-
- const auto screens = qApp->screens();
- if (!screens.isEmpty()) {
- const auto screen = screens.at(0);
- opt.dpi = screen->logicalDotsPerInch() * screen->devicePixelRatio();
- }
-}
-
static QString errorToString(const int err)
{
switch (err) {
@@ -116,7 +116,6 @@ bool ResvgRenderer::load(const QString &filePath)
}
d->reset();
- initOptions(d->opt);
const auto utf8Str = filePath.toUtf8();
const auto rawFilePath = utf8Str.constData();
@@ -137,7 +136,6 @@ bool ResvgRenderer::load(const QString &filePath)
bool ResvgRenderer::load(const QByteArray &data)
{
d->reset();
- initOptions(d->opt);
const auto err = resvg_parse_tree_from_data(data.constData(), data.size(), &d->opt, &d->tree);
if (err != RESVG_OK) {