Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2013-08-31 00:06:29 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2013-08-31 07:09:01 (GMT) |
| commit | 2f8ef07f7ac166ee073510fa7fca3c2b353cb9c2 (patch) | |
| tree | 90a457f3867b3eaead5d5aa63e7c3ae26a27fb0f /Swift | |
| parent | 36de32c1a64fb814db18cafc7646feff144b5dbe (diff) | |
| download | swift-contrib-2f8ef07f7ac166ee073510fa7fca3c2b353cb9c2.zip swift-contrib-2f8ef07f7ac166ee073510fa7fca3c2b353cb9c2.tar.bz2 | |
Fix Qt warnings in avatar loading and add multi-line support to Base64 decoder.
Change-Id: I451cd5e8a0258e2b6c87fffd1996cdd7319847a4
License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/QtUI/QtScaledAvatarCache.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Swift/QtUI/QtScaledAvatarCache.cpp b/Swift/QtUI/QtScaledAvatarCache.cpp index 6abff87..46ec2fc 100644 --- a/Swift/QtUI/QtScaledAvatarCache.cpp +++ b/Swift/QtUI/QtScaledAvatarCache.cpp @@ -15,4 +15,7 @@ #include <QByteArray> +#include <Swiften/Base/Log.h> +#include <Swift/QtUI/QtSwiftUtil.h> + namespace Swift { @@ -32,5 +35,5 @@ QString QtScaledAvatarCache::getScaledAvatarPath(const QString& path) { if (!QFileInfo(targetFile).exists()) { QPixmap avatarPixmap; - avatarPixmap.load(path); + if (avatarPixmap.load(path)) { QPixmap maskedAvatar(avatarPixmap.size()); maskedAvatar.fill(QColor(0, 0, 0, 0)); @@ -45,4 +48,7 @@ QString QtScaledAvatarCache::getScaledAvatarPath(const QString& path) { return path; } + } else { + SWIFT_LOG(debug) << "Failed to load " << Q2PSTRING(path) << std::endl; + } } return targetFile; |