hiro/tdesktop
1
0
Fork 0
mirror of https://github.com/vale981/tdesktop synced 2025-03-06 10:11:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed errors for 0.9.22 dev version

Browse source
This commit is contained in:
John Preston 2016-02-14 22:46:01 +03:00
parent f83644cec0
commit 0154be5138
6 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Telegram/SourceFiles/audio.cpp
View file

@ -1867,10 +1867,10 @@ struct AudioCapturePrivate {
, swrContext(0)
, lastUpdate(0)
, levelMax(0)
, dataPos(0)
, waveformMod(0)
, waveformEach(AudioVoiceMsgFrequency / 100)
, waveformPeak(0)
, dataPos(0) {
, waveformPeak(0) {
}
ALCdevice *device;
AVOutputFormat *fmt;
@ -2548,7 +2548,7 @@ public:
const char *data = buffer.data();
if (fmt == AL_FORMAT_MONO8 || fmt == AL_FORMAT_STEREO8) {
for (int32 i = 0, l = buffer.size(); i + sizeof(uchar) <= l;) {
for (int32 i = 0, l = buffer.size(); i + int32(sizeof(uchar)) <= l;) {
uint16 sample = qAbs((int32(*(uchar*)(data + i)) - 128) * 256);
if (peak < sample) {
peak = sample;
@ -2563,7 +2563,7 @@ public:
}
}
} else if (fmt == AL_FORMAT_MONO16 || fmt == AL_FORMAT_STEREO16) {
for (int32 i = 0, l = buffer.size(); i + sizeof(uint16) <= l;) {
for (int32 i = 0, l = buffer.size(); i + int32(sizeof(uint16)) <= l;) {
uint16 sample = qAbs(int32(*(int16*)(data + i)));
if (peak < sample) {
peak = sample;

2
Telegram/SourceFiles/history.cpp
View file

@ -4069,7 +4069,7 @@ void HistoryDocument::draw(Painter &p, const HistoryItem *parent, const QRect &r
uchar max_value = 0;
int32 max_delta = st::msgWaveformMax - st::msgWaveformMin, bottom = st::msgFilePadding.top() + st::msgWaveformMax;
p.setPen(Qt::NoPen);
for (uint32 i = 0, bar_x = 0, sum_i = 0; i < wf_size; ++i) {
for (int32 i = 0, bar_x = 0, sum_i = 0; i < wf_size; ++i) {
uchar value = wf ? wf->at(i) : 0;
if (sum_i + bar_count >= wf_size) { // draw bar
sum_i = sum_i + bar_count - wf_size;

2
Telegram/SourceFiles/historywidget.cpp
View file

@ -866,7 +866,7 @@ void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
PhotoLink *lnkPhoto = dynamic_cast<PhotoLink*>(_contextMenuLnk.data());
DocumentLink *lnkDocument = dynamic_cast<DocumentLink*>(_contextMenuLnk.data());
bool lnkIsVideo = lnkDocument ? lnkDocument->document()->isVideo() : false;
bool lnkIsAudio = lnkDocument ? lnkDocument->document()->voice() : false;
bool lnkIsAudio = lnkDocument ? (lnkDocument->document()->voice() != 0) : false;
if (lnkPhoto || lnkDocument) {
if (isUponSelected > 0) {
_menu->addAction(lang(lng_context_copy_selected), this, SLOT(copySelectedText()))->setEnabled(true);

13
Telegram/SourceFiles/mtproto/mtpConnection.cpp
View file

@ -431,18 +431,19 @@ namespace {
TCP_LOG(("TCP Error: bad packet header, packet: %1").arg(Logs::mb(packet, length).str()));
return mtpBuffer(1, -500);
}
const mtpPrime *packetdata = reinterpret_cast<const mtpPrime*>(packet + (length - len));
TCP_LOG(("TCP Info: packet received, size = %1").arg(size * sizeof(mtpPrime)));
if (size == 1) {
if (packet[0] == -429) {
if (*packetdata == -429) {
LOG(("Protocol Error: -429 flood code returned!"));
} else {
LOG(("TCP Error: error packet received, code = %1").arg(packet[0]));
LOG(("TCP Error: error packet received, code = %1").arg(*packetdata));
}
return mtpBuffer(1, packet[0]);
return mtpBuffer(1, *packetdata);
}
mtpBuffer data(size);
memcpy(data.data(), packet + (length - len), size * sizeof(mtpPrime));
memcpy(data.data(), packetdata, size * sizeof(mtpPrime));
return data;
}
@ -729,7 +730,7 @@ void MTPautoConnection::tcpSend(mtpBuffer &buffer) {
uint32 second1 = 0;
do {
memset_rand(nonce, sizeof(nonce));
} while (*first == first1 || *first == first2 || *first == first3 || *first == first4 || *first == first5 || *second == second1 || nonce[0] == 0xef);
} while (*first == first1 || *first == first2 || *first == first3 || *first == first4 || *first == first5 || *second == second1 || *reinterpret_cast<uchar*>(nonce) == 0xef);
sock.write(nonce, sizeof(nonce));
}
++packetNum;
@ -1029,7 +1030,7 @@ void MTPtcpConnection::sendData(mtpBuffer &buffer) {
uint32 second1 = 0;
do {
memset_rand(nonce, sizeof(nonce));
} while (*first == first1 || *first == first2 || *first == first3 || *first == first4 || *first == first5 || *second == second1 || nonce[0] == 0xef);
} while (*first == first1 || *first == first2 || *first == first3 || *first == first4 || *first == first5 || *second == second1 || *reinterpret_cast<uchar*>(nonce) == 0xef);
sock.write(nonce, sizeof(nonce));
}
++packetNum;

2
Telegram/SourceFiles/overviewwidget.cpp
View file

@ -1262,7 +1262,7 @@ void OverviewInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
_contextMenuLnk = textlnkOver();
PhotoLink *lnkPhoto = dynamic_cast<PhotoLink*>(_contextMenuLnk.data());
DocumentLink *lnkDocument = dynamic_cast<DocumentLink*>(_contextMenuLnk.data());
bool lnkIsAudio = lnkDocument ? lnkDocument->document()->voice() : false;
bool lnkIsAudio = lnkDocument ? (lnkDocument->document()->voice() != 0) : false;
bool lnkIsVideo = lnkDocument ? lnkDocument->document()->isVideo() : false;
if (lnkPhoto || lnkDocument) {
_menu = new PopupMenu();

2
Telegram/SourceFiles/structs.cpp
View file

@ -977,7 +977,7 @@ void DocumentCancelLink::onClick(Qt::MouseButton button) const {
}
VoiceData::~VoiceData() {
if (!waveform.isEmpty() && waveform.at(0) == -1 && waveform.size() > sizeof(TaskId)) {
if (!waveform.isEmpty() && waveform.at(0) == -1 && waveform.size() > int32(sizeof(TaskId))) {
TaskId taskId = 0;
memcpy(&taskId, waveform.constData() + 1, sizeof(taskId));
Local::cancelTask(taskId);