made caller/concurrent rules tighter

2019-08-20 23:29:11 +02:00
parent 7d842e6cf7
commit 14222f84f2
9 changed files with 36 additions and 15 deletions
@@ -327,7 +327,7 @@ int Image::height() const
    assertInGuiThread();

    if (auto pixmap = this->frames_->first())
-        return pixmap->height() * this->scale_;
+        return int(pixmap->height() * this->scale_);
    else
        return 16;
 }
@@ -336,7 +336,6 @@ void Image::load()
 {
    NetworkRequest(this->url().string)
        .concurrent()
-        .caller(&this->object_)
        .cache()
        .onSuccess([that = this, weak = weakOf(this)](auto result) -> Outcome {
            auto shared = weak.lock();