Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-22 22:21:09 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1153 from csoler/v0.6-TorOnly

Browse source 
V0.6 tor only
This commit is contained in:
csoler 2018-02-11 20:49:45 +01:00 • committed by GitHub
commit 7a2d874863
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
105 changed files with 7078 additions and 258 deletions
Download patch file Download diff file Expand all files Collapse all files

4
retroshare-gui/src/util/HandleRichText.cpp
View file

@ -36,7 +36,7 @@
#include "gui/RetroShareLink.h"
#include "util/ObjectPainter.h"
#include "util/imageutil.h"
#include "util/rsscopetimer.h"
#include "util/rstime.h"
#include <iostream>
@ -1153,7 +1153,7 @@ bool RsHtml::makeEmbeddedImage(const QString &fileName, QString &embeddedImage,
/** Converts image to embedded image HTML fragment **/
bool RsHtml::makeEmbeddedImage(const QImage &originalImage, QString &embeddedImage, const int maxPixels, const int maxBytes)
{
RsScopeTimer s("Embed image");
rstime::RsScopeTimer s("Embed image");
QImage opt;
return ImageUtil::optimizeSize(embeddedImage, originalImage, opt, maxPixels, maxBytes);
}