Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build failure on 32-bit with taglib 2 #7376

Merged
merged 1 commit into from
Jan 13, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ext/libclementine-tagreader/cloudstream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ TagLib::ByteVector CloudStream::readBlock(size_t length) {
TagLib::ByteVector CloudStream::readBlock(ulong length) {
#endif
const uint start = cursor_;
const uint end = qMin(cursor_ + length - 1, length_ - 1);
const uint end = qMin((size_t)(cursor_ + length - 1), (size_t)(length_ - 1));

if (end < start) {
return TagLib::ByteVector();
Expand Down Expand Up @@ -187,7 +187,7 @@ void CloudStream::seek(long offset, TagLib::IOStream::Position p) {

case TagLib::IOStream::End:
// This should really not have qAbs(), but OGG reading needs it.
cursor_ = qMax(0UL, length_ - qAbs(offset));
cursor_ = qMax(0UL, (unsigned long)(length_ - qAbs(offset)));
break;
}
}
Expand Down