(c-api) Qt wrapper refactoring.

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) {