diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.h b/Telegram/SourceFiles/boxes/edit_caption_box.h index 836ce3538..be293164c 100644 --- a/Telegram/SourceFiles/boxes/edit_caption_box.h +++ b/Telegram/SourceFiles/boxes/edit_caption_box.h @@ -61,7 +61,6 @@ private: object_ptr _field = { nullptr }; int _thumbx = 0; - int _thumby = 0; int _thumbw = 0; int _thumbh = 0; Text _name; diff --git a/Telegram/SourceFiles/storage/localimageloader.cpp b/Telegram/SourceFiles/storage/localimageloader.cpp index 5e3df513b..5faf9a54b 100644 --- a/Telegram/SourceFiles/storage/localimageloader.cpp +++ b/Telegram/SourceFiles/storage/localimageloader.cpp @@ -196,8 +196,8 @@ FileLoadResult::FileLoadResult( : taskId(taskId) , id(id) , to(to) -, caption(caption) -, album(std::move(album)) { +, album(std::move(album)) +, caption(caption) { } FileLoadTask::FileLoadTask( diff --git a/Telegram/SourceFiles/ui/images.h b/Telegram/SourceFiles/ui/images.h index e8d73fc3f..ff9060b94 100644 --- a/Telegram/SourceFiles/ui/images.h +++ b/Telegram/SourceFiles/ui/images.h @@ -195,7 +195,16 @@ inline bool operator!=(const WebFileImageLocation &a, const WebFileImageLocation namespace Images { QImage prepareBlur(QImage image); -void prepareRound(QImage &image, ImageRoundRadius radius, RectParts corners = RectPart::AllCorners, QRect target = QRect()); +void prepareRound( + QImage &image, + ImageRoundRadius radius, + RectParts corners = RectPart::AllCorners, + QRect target = QRect()); +void prepareRound( + QImage &image, + QImage *cornerMasks, + RectParts corners = RectPart::AllCorners, + QRect target = QRect()); void prepareCircle(QImage &image); QImage prepareColored(style::color add, QImage image); QImage prepareOpaque(QImage image);