From 0edca8cfdb27987989bfb3284b3443f8981b3627 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 5 Jan 2017 15:38:40 +0400 Subject: [PATCH] Alpha version 0.10.25: crash fix in aligned image creation. --- Telegram/Resources/winrc/Telegram.rc | 8 ++++---- Telegram/Resources/winrc/Updater.rc | 8 ++++---- Telegram/SourceFiles/core/version.h | 4 ++-- Telegram/SourceFiles/media/media_clip_ffmpeg.cpp | 2 +- Telegram/build/version | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 7a459e87f..6bb6f8c9e 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -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" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index a68fa3b00..beb640667 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -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" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index da219f7eb..7ac6824b4 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -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; diff --git a/Telegram/SourceFiles/media/media_clip_ffmpeg.cpp b/Telegram/SourceFiles/media/media_clip_ffmpeg.cpp index b5e1a6661..b2edae852 100644 --- a/Telegram/SourceFiles/media/media_clip_ffmpeg.cpp +++ b/Telegram/SourceFiles/media/media_clip_ffmpeg.cpp @@ -47,7 +47,7 @@ QImage createAlignedImage(QSize size) { auto buffer = new uchar[bytesperline * height + kAlignImageBy]; auto cleanupdata = static_cast(buffer); auto bufferval = reinterpret_cast(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); } diff --git a/Telegram/build/version b/Telegram/build/version index e6dd3face..23e834dce 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -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