mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-30 22:25:12 +00:00
Code Issues Releases Wiki Activity

Store StickerData::image in unique_ptr.

Browse Source
This commit is contained in:
John Preston
2018-11-09 19:16:47 +04:00
parent e5949dbb86
commit f1c06d6743
6 changed files with 79 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
Telegram/SourceFiles/data/data_document.cpp
View File

@@ -41,8 +41,8 @@ Core::MediaActiveCache<DocumentData> &ActiveCache() {
}
int64 ComputeUsage(StickerData *sticker) {
return (sticker != nullptr && !sticker->img->isNull())
? sticker->img->width() * sticker->img->height() * 4
return (sticker != nullptr && sticker->image != nullptr)
? sticker->image->width() * sticker->image->height() * 4
: 0;
}
@@ -585,12 +585,9 @@ void DocumentData::unload() {
// Forget thumb only when image cache limit exceeds.
//thumb->unload();
if (sticker()) {
if (!sticker()->img->isNull()) {
if (sticker()->image) {
ActiveCache().decrement(ComputeUsage(sticker()));
// Should be std::unique_ptr<Image>.
delete sticker()->img.get();
sticker()->img = ImagePtr();
sticker()->image = nullptr;
}
}
_replyPreview = nullptr;
@@ -736,16 +733,17 @@ bool DocumentData::loaded(FilePathResolveType type) const {
that->_data = _loader->bytes();
ActiveCache().increment(that->_data.size());
if (that->sticker()
&& that->sticker()->img->isNull()
&& !that->sticker()->image
&& !_loader->imageData().isNull()) {
that->sticker()->img = Images::Create(
_data,
_loader->imageFormat(),
_loader->imageData());
that->sticker()->image = std::make_unique<Image>(
std::make_unique<Images::LocalFileSource>(
QString(),
_data,
_loader->imageFormat(),
_loader->imageData()));
ActiveCache().increment(ComputeUsage(that->sticker()));
}
if (!that->_data.isEmpty()
|| (that->sticker() && !that->sticker()->img->isNull())) {
if (!that->_data.isEmpty() || that->getStickerImage()) {
ActiveCache().up(that);
}
@@ -1066,15 +1064,26 @@ void DocumentData::checkSticker() {
if (!data) return;
automaticLoad(stickerSetOrigin(), nullptr);
if (data->img->isNull() && loaded()) {
if (!data->image && loaded()) {
if (_data.isEmpty()) {
const auto &loc = location(true);
if (loc.accessEnable()) {
data->img = Images::Create(loc.name(), "WEBP");
data->image = std::make_unique<Image>(
std::make_unique<Images::LocalFileSource>(
loc.name(),
QByteArray(),
"WEBP"));
loc.accessDisable();
}
} else {
data->img = Images::Create(_data, "WEBP");
auto format = QByteArray("WEBP");
auto image = App::readImage(_data, &format, false);
data->image = std::make_unique<Image>(
std::make_unique<Images::LocalFileSource>(
QString(),
_data,
format,
std::move(image)));
}
if (const auto usage = ComputeUsage(data)) {
ActiveCache().increment(usage);
@@ -1091,13 +1100,21 @@ void DocumentData::checkStickerThumb() {
}
}
ImagePtr DocumentData::getStickerThumb() {
if (hasGoodStickerThumb()) {
return thumb;
} else if (const auto data = sticker()) {
return data->img;
Image *DocumentData::getStickerImage() {
checkSticker();
if (const auto data = sticker()) {
return data->image.get();
}
return ImagePtr();
return nullptr;
}
Image *DocumentData::getStickerThumb() {
if (hasGoodStickerThumb()) {
return thumb->isNull() ? nullptr : thumb.get();
} else if (const auto data = sticker()) {
return data->image.get();
}
return nullptr;
}
Data::FileOrigin DocumentData::stickerSetOrigin() const {