Closed alpha version 4.1.1.1: Fix build with GCC.

This commit is contained in:
John Preston 2022-09-10 11:07:08 +04:00
parent 4ab34e3727
commit 03e90840de
5 changed files with 1 additions and 22 deletions

View File

@ -73,23 +73,6 @@ bool operator==(const Descriptor &a, const Descriptor &b) {
&& (a.fromSettings == b.fromSettings);
}
[[nodiscard]] int ComputeX(int column, int columns) {
const auto skip = st::premiumReactionWidthSkip;
const auto fullWidth = columns * skip;
const auto left = (st::boxWideWidth - fullWidth) / 2;
return left + column * skip + (skip / 2);
}
[[nodiscard]] int ComputeY(int row, int rows) {
const auto middle = (rows > 3)
? (st::premiumReactionInfoTop / 2)
: st::premiumReactionsMiddle;
const auto skip = st::premiumReactionHeightSkip;
const auto fullHeight = rows * skip;
const auto top = middle - (fullHeight / 2);
return top + row * skip + (skip / 2);
}
struct Preload {
Descriptor descriptor;
std::shared_ptr<Data::DocumentMedia> media;

View File

@ -701,7 +701,6 @@ QImage Gif::prepareThumbCache(QSize outer) const {
const auto good = _dataMedia->goodThumbnail();
const auto normal = good ? good : _dataMedia->thumbnail();
const auto videothumb = normal ? nullptr : _videoThumbnailFrame.get();
const auto ratio = style::DevicePixelRatio();
auto blurred = (!good
&& normal
&& (normal->width() < kUseNonBlurredThreshold)

View File

@ -385,7 +385,6 @@ QImage Photo::prepareImageCache(
QImage Photo::prepareImageCache(QSize outer) const {
using Size = PhotoSize;
const auto large = _dataMedia->image(Size::Large);
const auto ratio = style::DevicePixelRatio();
auto blurred = (Image*)nullptr;
if (const auto embedded = _dataMedia->thumbnailInline()) {
blurred = embedded;

View File

@ -639,8 +639,6 @@ ChosenReaction Selector::lookupChosen(const Data::ReactionId &id) const {
if (result.icon.isNull()) {
return result;
}
const auto between = st::reactionCornerSkip;
const auto oneHeight = (st::reactionCornerSize.height() + between);
const auto rect = QRect(_skipx + index * _size, _skipy, _size, _size);
const auto imageSize = _strip->computeOverSize();
result.globalGeometry = mapToGlobal(QRect(

@ -1 +1 @@
Subproject commit e16cff487ddd01522436f8a2789a8cff3b4c1da6
Subproject commit 38875a85be4d5639f078068385c6fe7c9af05faa