procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed 9015003 build for os x

This commit is contained in:
John Preston 2015-12-28 01:49:08 +03:00
parent 0b8a05e435
commit 3aa2e592e0
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/application.cpp
View File

@ -897,7 +897,9 @@ Application::~Application() {
updateThread = 0; updateThread = 0;
#endif #endif
delete window; Window *w = window;
window = 0;
delete w;
delete cChatBackground(); delete cChatBackground();
cSetChatBackground(0); cSetChatBackground(0);

2
Telegram/SourceFiles/gui/animation.cpp
View File

@ -300,6 +300,8 @@ QPixmap ClipReader::current(int32 framew, int32 frameh, int32 outerw, int32 oute
_request.outerh = outerh * factor; _request.outerh = outerh * factor;
QImage current(_currentOriginal); QImage current(_currentOriginal);
current.setDevicePixelRatio(cRetinaFactor());
result = _current = QPixmap(); result = _current = QPixmap();
result = _current = _prepareFrame(_request, current, _cacheForResize, true); result = _current = _prepareFrame(_request, current, _cacheForResize, true);

2
Telegram/SourceFiles/gui/animation.h
View File

@ -366,7 +366,7 @@ public:
} }
typename AnimType::Type current() { typename AnimType::Type current() {
return _data ? _data->a.current() : AnimType::Type(); return _data ? _data->a.current() : typename AnimType::Type();
} }
typename AnimType::Type current(uint64 ms, const typename AnimType::Type &def) { typename AnimType::Type current(uint64 ms, const typename AnimType::Type &def) {

3
Telegram/SourceFiles/logs.h
View File

@ -82,10 +82,11 @@ void logWrite(const QString &v);
#define LOG(msg) (logWrite(QString msg)) #define LOG(msg) (logWrite(QString msg))
//usage LOG(("log: %1 %2").arg(1).arg(2)) //usage LOG(("log: %1 %2").arg(1).arg(2))
static volatile int *t_assert_nullptr = 0;
inline void t_noop() {} inline void t_noop() {}
inline void t_assert_fail(const char *condition, const char *file, int32 line) { inline void t_assert_fail(const char *condition, const char *file, int32 line) {
LOG(("Assertion Failed! \"%1\" %2:%3").arg(condition).arg(file).arg(line)); LOG(("Assertion Failed! \"%1\" %2:%3").arg(condition).arg(file).arg(line));
*(int*)0 = 0; *t_assert_nullptr = 0;
} }
#define t_assert(cond) ((!(cond)) ? t_assert_fail(#cond, __FILE__, __LINE__) : t_noop()) #define t_assert(cond) ((!(cond)) ? t_assert_fail(#cond, __FILE__, __LINE__) : t_noop())

2
Telegram/SourceFiles/types.h
View File

@ -502,7 +502,7 @@ private:
}; };
template <typename Object, typename ReturnType> template <typename Object, typename ReturnType>
Function<ReturnType> *func(Object *obj, typename ReturnType (Object::*method)()) { Function<ReturnType> *func(Object *obj, ReturnType (Object::*method)()) {
return new ObjectFunction<Object, ReturnType>(obj, method); return new ObjectFunction<Object, ReturnType>(obj, method);
} }