Alpha version 0.10.25: crash fix in aligned image creation.

newworkerr · Jan 5, 2017 · 0edca8c · 0edca8c
1 parent 019939a
commit 0edca8c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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);
 }
 

diff --git 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