RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Alpha version 0.10.25: crash fix in aligned image creation.

This commit is contained in:
John Preston 2017-01-05 15:38:40 +04:00
parent 019939a09d
commit 0edca8cfdb
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/Resources/winrc/Telegram.rc
View File

@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,10,24,0
PRODUCTVERSION 0,10,24,0
FILEVERSION 0,10,25,0
PRODUCTVERSION 0,10,25,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -51,10 +51,10 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileVersion", "0.10.24.0"
VALUE "FileVersion", "0.10.25.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.10.24.0"
VALUE "ProductVersion", "0.10.25.0"
END
END
BLOCK "VarFileInfo"

8
Telegram/Resources/winrc/Updater.rc
View File

@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,10,24,0
PRODUCTVERSION 0,10,24,0
FILEVERSION 0,10,25,0
PRODUCTVERSION 0,10,25,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -43,10 +43,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileDescription", "Telegram Updater"
VALUE "FileVersion", "0.10.24.0"
VALUE "FileVersion", "0.10.25.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.10.24.0"
VALUE "ProductVersion", "0.10.25.0"
END
END
BLOCK "VarFileInfo"

4
Telegram/SourceFiles/core/version.h
View File

@ -24,7 +24,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#define BETA_VERSION_MACRO (0ULL)
constexpr int AppVersion = 10024;
constexpr str_const AppVersionStr = "0.10.24";
constexpr int AppVersion = 10025;
constexpr str_const AppVersionStr = "0.10.25";
constexpr bool AppAlphaVersion = true;
constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;

2
Telegram/SourceFiles/media/media_clip_ffmpeg.cpp
View File

@ -47,7 +47,7 @@ QImage createAlignedImage(QSize size) {
auto buffer = new uchar[bytesperline * height + kAlignImageBy];
auto cleanupdata = static_cast<void*>(buffer);
auto bufferval = reinterpret_cast<uintptr_t>(buffer);
auto alignedbuffer = buffer + ((bufferval % kAlignImageBy) ? (bufferval - (bufferval % kAlignImageBy)) : 0);
auto alignedbuffer = buffer + ((bufferval % kAlignImageBy) ? (kAlignImageBy - (bufferval % kAlignImageBy)) : 0);
return QImage(alignedbuffer, width, height, bytesperline, QImage::Format_ARGB32, alignedImageBufferCleanupHandler, cleanupdata);
}

6
Telegram/build/version
View File

@ -1,6 +1,6 @@
AppVersion 10024
AppVersion 10025
AppVersionStrMajor 0.10
AppVersionStrSmall 0.10.24
AppVersionStr 0.10.24
AppVersionStrSmall 0.10.25
AppVersionStr 0.10.25
AlphaChannel 1
BetaVersion 0