Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-03 11:00:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2769 from defnax/thumbnailfixchannelpost

Browse Source 
Fix transparency for channel post thumbnails
This commit is contained in:
csoler 2023-09-19 15:19:21 +02:00 committed by GitHub
commit 4cb36a5b69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
retroshare-gui/src/gui/gxschannels/CreateGxsChannelMsg.cpp
View File

@ -35,6 +35,7 @@
#include "util/rsdir.h" #include "util/rsdir.h"
#include "util/qtthreadsutils.h" #include "util/qtthreadsutils.h"
#include "util/RichTextEdit.h" #include "util/RichTextEdit.h"
#include "util/imageutil.h"
#include <retroshare/rsfiles.h> #include <retroshare/rsfiles.h>
@ -607,11 +608,13 @@ bool CreateGxsChannelMsg::setThumbNail(const std::string& path, int frame){
if(imageBuffer == NULL) if(imageBuffer == NULL)
return false; return false;
QImage tNail(imageBuffer, width, height, QImage::Format_RGB32); QImage tNail(imageBuffer, width, height, QImage::Format_RGBA32);
QByteArray ba; QByteArray ba;
QBuffer buffer(&ba); QBuffer buffer(&ba);
bool has_transparency = ImageUtil::hasAlphaContent(tNail.toImage());
buffer.open(QIODevice::WriteOnly); buffer.open(QIODevice::WriteOnly);
tNail.save(&buffer, "JPG"); tNail.save(&buffer, has_transparency?"PNG":"JPG");
QPixmap img; QPixmap img;
img.loadFromData(ba, "PNG"); img.loadFromData(ba, "PNG");
img = img.scaled(thumbnail_label->width(), thumbnail_label->height(), Qt::KeepAspectRatio, Qt::SmoothTransformation); img = img.scaled(thumbnail_label->width(), thumbnail_label->height(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
@ -797,15 +800,19 @@ void CreateGxsChannelMsg::sendMessage(const std::string &subject, const std::str
QByteArray ba; QByteArray ba;
QBuffer buffer(&ba); QBuffer buffer(&ba);
RsGxsImage image; RsGxsImage image;
QPixmap pixmap;
pixmap = preview_W->getCroppedScaledPicture();
QImage qimg = pixmap.toImage();
bool has_transparency = ImageUtil::hasAlphaContent(qimg);
if(!picture.isNull()) if(!picture.isNull())
{ {
// send chan image // send chan image
buffer.open(QIODevice::WriteOnly); buffer.open(QIODevice::WriteOnly);
preview_W->getCroppedScaledPicture().save(&buffer, "JPG"); // writes image into ba in PNG format preview_W->getCroppedScaledPicture().save(&buffer, has_transparency?"PNG":"JPG"); // writes image into ba in PNG format
image.copy((uint8_t *) ba.data(), ba.size()); image.copy((uint8_t *) ba.data(), ba.size());
} }
std::string error_string; std::string error_string;