Merge pull request #1100 from hunbernd/feature/image-embed3

Fixed resize bug
This commit is contained in:
csoler 2017-11-05 19:37:03 +01:00 committed by GitHub
commit 225058a9dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -64,9 +64,10 @@ bool ImageUtil::optimizeSize(QString &html, const QImage& original, QImage &opti
//Downscale the image to fit into maxPixels //Downscale the image to fit into maxPixels
double whratio = (qreal)original.width() / (qreal)original.height(); double whratio = (qreal)original.width() / (qreal)original.height();
int maxwidth; int maxwidth;
if(maxPixels > 0) if(maxPixels > 0) {
maxwidth = (int)sqrt((double)(maxPixels) * whratio); int maxwidth2 = (int)sqrt((double)(maxPixels) * whratio);
else maxwidth = (original.width() > maxwidth2) ? maxwidth2 : original.width();
} else
maxwidth = original.width(); maxwidth = original.width();
int minwidth = (int)sqrt(100.0 * whratio); int minwidth = (int)sqrt(100.0 * whratio);