RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-01-25 16:54:25 +00:00
Code Issues Projects Releases Wiki Activity

Use private Qt color API only in official build.

Browse Source 
Fixes #6219.
This commit is contained in:
John Preston 2019-07-09 13:43:57 +02:00
parent 8008d8a3d4
commit 0710dde4d5
2 changed files with 71 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
Telegram/SourceFiles/ffmpeg/ffmpeg_utility.cpp
View File

@ -11,7 +11,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include "logs.h"
#include <QImage>
#ifdef TDESKTOP_OFFICIAL_TARGET
#include <private/qdrawhelper_p.h>
#endif // TDESKTOP_OFFICIAL_TARGET
extern "C" {
#include <libavutil/opt.h>
@ -44,6 +47,58 @@ void AlignedImageBufferCleanupHandler(void* data) {
&& !(image.bytesPerLine() % kAlignImageBy);
}
void UnPremultiplyLine(uchar *dst, const uchar *src, int intsCount) {
#ifdef TDESKTOP_OFFICIAL_TARGET
const auto layout = &qPixelLayouts[QImage::Format_ARGB32];
const auto convert = layout->convertFromARGB32PM;
#else // TDESKTOP_OFFICIAL_TARGET
const auto layout = nullptr;
const auto convert = [](
uint *dst,
const uint *src,
int count,
std::nullptr_t,
std::nullptr_t) {
for (auto i = 0; i != count; ++i) {
dst[i] = qUnpremultiply(src[i]);
}
};
#endif // TDESKTOP_OFFICIAL_TARGET
convert(
reinterpret_cast<uint*>(dst),
reinterpret_cast<const uint*>(src),
intsCount,
layout,
nullptr);
}
void PremultiplyLine(uchar *dst, const uchar *src, int intsCount) {
#ifdef TDESKTOP_OFFICIAL_TARGET
const auto layout = &qPixelLayouts[QImage::Format_ARGB32];
const auto convert = layout->convertToARGB32PM;
#else // TDESKTOP_OFFICIAL_TARGET
const auto layout = nullptr;
const auto convert = [](
uint *dst,
const uint *src,
int count,
std::nullptr_t,
std::nullptr_t) {
for (auto i = 0; i != count; ++i) {
dst[i] = qPremultiply(src[i]);
}
};
#endif // TDESKTOP_OFFICIAL_TARGET
convert(
reinterpret_cast<uint*>(dst),
reinterpret_cast<const uint*>(src),
intsCount,
layout,
nullptr);
}
} // namespace
IOPointer MakeIOPointer(
@ -360,58 +415,35 @@ void UnPremultiply(QImage &to, const QImage &from) {
if (!GoodStorageForFrame(to, from.size())) {
to = CreateFrameStorage(from.size());
}
const auto layout = &qPixelLayouts[QImage::Format_ARGB32];
const auto convert = layout->convertFromARGB32PM;
const auto fromPerLine = from.bytesPerLine();
const auto toPerLine = to.bytesPerLine();
const auto width = from.width();
const auto height = from.height();
auto fromBytes = from.bits();
auto toBytes = to.bits();
if (fromPerLine != width * 4 || toPerLine != width * 4) {
auto fromBytes = from.bits();
auto toBytes = to.bits();
for (auto i = 0; i != to.height(); ++i) {
convert(
reinterpret_cast<uint*>(toBytes),
reinterpret_cast<const uint*>(fromBytes),
width,
layout,
nullptr);
for (auto i = 0; i != height; ++i) {
UnPremultiplyLine(toBytes, fromBytes, width);
fromBytes += fromPerLine;
toBytes += toPerLine;
}
} else {
convert(
reinterpret_cast<uint*>(to.bits()),
reinterpret_cast<const uint*>(from.bits()),
from.width() * from.height(),
layout,
nullptr);
UnPremultiplyLine(toBytes, fromBytes, width * height);
}
}
void PremultiplyInplace(QImage &image) {
const auto layout = &qPixelLayouts[QImage::Format_ARGB32];
const auto convert = layout->convertToARGB32PM;
const auto perLine = image.bytesPerLine();
const auto width = image.width();
const auto height = image.height();
auto bytes = image.bits();
if (perLine != width * 4) {
auto bytes = image.bits();
for (auto i = 0; i != image.height(); ++i) {
convert(
reinterpret_cast<uint*>(bytes),
reinterpret_cast<const uint*>(bytes),
width,
layout,
nullptr);
for (auto i = 0; i != height; ++i) {
PremultiplyLine(bytes, bytes, width);
bytes += perLine;
}
} else {
convert(
reinterpret_cast<uint*>(image.bits()),
reinterpret_cast<const uint*>(image.bits()),
image.width() * image.height(),
layout,
nullptr);
PremultiplyLine(bytes, bytes, width * height);
}
}

6
Telegram/gyp/lib_ffmpeg.gyp
View File

@ -46,7 +46,11 @@
'<(src_loc)/ffmpeg/ffmpeg_utility.cpp',
'<(src_loc)/ffmpeg/ffmpeg_utility.h',
],
'conditions': [[ 'build_macold', {
'conditions': [[ '"<(official_build_target)" != ""', {
'defines': [
'TDESKTOP_OFFICIAL_TARGET=<(official_build_target)',
],
}], [ 'build_macold', {
'xcode_settings': {
'OTHER_CPLUSPLUSFLAGS': [ '-nostdinc++' ],
},