mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-06-04 01:28:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

ByteVector::size is a size_t in taglib2

Browse Source
This commit is contained in:
Scott Wheeler 2014-09-25 16:52:16 +02:00
parent bdfd7dc003
commit d52baafa24
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
taglib/mpeg/id3v2/frames/chapterframe.cpp
View File

@ -208,14 +208,15 @@ ChapterFrame *ChapterFrame::findByElementID(const ID3v2::Tag *tag, const ByteVec
void ChapterFrame::parseFields(const ByteVector &data)
{
uint size = data.size();
size_t size = data.size();
if(size < 18) {
debug("A CHAP frame must contain at least 18 bytes (1 byte element ID "
"terminated by null and 4x4 bytes for start and end time and offset).");
return;
}
size_t pos = 0, embPos = 0;
size_t pos = 0;
size_t embPos = 0;
d->elementID = readStringField(data, String::Latin1, pos).data(String::Latin1);
d->elementID.append(char(0));
d->startTime = data.toUInt32BE(pos);
@ -227,7 +228,7 @@ void ChapterFrame::parseFields(const ByteVector &data)
d->endOffset = data.toUInt32BE(pos);
pos += 4;
size -= pos;
while((uint)embPos < size - Frame::headerSize(4))
while(embPos < size - Frame::headerSize(4))
{
Frame *frame = FrameFactory::instance()->createFrame(data.mid(pos + embPos));

6
taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
View File

@ -234,14 +234,14 @@ void TableOfContentsFrame::parseFields(const ByteVector &data)
return;
}
size_t pos = 0, embPos = 0;
size_t pos = 0;
size_t embPos = 0;
d->elementID = readStringField(data, String::Latin1, pos).data(String::Latin1);
d->elementID.append(char(0));
d->isTopLevel = (data.at(pos) & 2) > 0;
d->isOrdered = (data.at(pos++) & 1) > 0;
uint entryCount = data.at(pos++);
for(uint i = 0; i < entryCount; i++)
{
for(uint i = 0; i < entryCount; i++) {
ByteVector childElementID = readStringField(data, String::Latin1, pos).data(String::Latin1);
childElementID.append(char(0));
d->childElements.append(childElementID);