[bugfix] unable to upload image data

klesh · Apr 6, 2020 · dfa104f · dfa104f
1 parent 3ae1fc2
commit dfa104f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/core/uploadservice.cpp b/src/core/uploadservice.cpp
@@ -59,10 +59,9 @@ void UploadService::upload(QList<Clip> &clips)
 
     // build up job list
     for (auto &clip : clips) {
-        clip.freePixmap(); // no need pixmap anymore, free it up
         QByteArray imageBytes;
 
-        if (clip.isImage && (imageCompressionEanbled || imageWartermarkEnabled)) {
+        if (clip.isImage && (!clip.isFile || imageCompressionEanbled || imageWartermarkEnabled)) {
             // detect format and initialize quality
             QByteArray fmt = "jpg";
             int quality = -1;
@@ -101,6 +100,7 @@ void UploadService::upload(QList<Clip> &clips)
             buffer.open(QIODevice::WriteOnly);
             pixmap.save(&buffer, fmt, quality);
         }
+        clip.freePixmap(); // no need pixmap anymore, free it up
 
         for (auto &server : servers) {
             UploadJob job;

diff --git a/src/models/clip.h b/src/models/clip.h
@@ -30,7 +30,7 @@ struct Clip
         if (isFile) {
             _pixmap.load(data.toUrl().toLocalFile());
         } else {
-            _pixmap = qvariant_cast<QPixmap>(data);
+            _pixmap = QPixmap::fromImage(qvariant_cast<QImage>(data));
         }
         return _pixmap;
     }