mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2026-04-05 21:52:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove the definition of offset_t.

Browse Source 
The definition of offset_t has changed over time, and it's just equivalent to long long now.
We no longer have a good reason to keep it.
This commit is contained in:
Tsuda Kageyu
2015-12-01 22:02:05 +09:00
parent 2f29f0e1d0
commit 6f5874a035
63 changed files with 340 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/test_aiff.cpp
View File

@ -87,8 +87,8 @@ public:
CPPUNIT_ASSERT_EQUAL(String("Title1"), f.tag()->title());
f.save();
CPPUNIT_ASSERT_EQUAL((offset_t)7030, f.length());
CPPUNIT_ASSERT_EQUAL((offset_t)-1, f.find("Title2"));
CPPUNIT_ASSERT_EQUAL(7030LL, f.length());
CPPUNIT_ASSERT_EQUAL(-1LL, f.find("Title2"));
}
void testFuzzedFile1()

4
tests/test_asf.cpp
View File

@ -287,10 +287,10 @@ public:
ASF::File f(copy.fileName().c_str());
f.tag()->setTitle(std::string(128 * 1024, 'X').c_str());
f.save();
CPPUNIT_ASSERT_EQUAL((offset_t)297578, f.length());
CPPUNIT_ASSERT_EQUAL(297578LL, f.length());
f.tag()->setTitle(std::string(16 * 1024, 'X').c_str());
f.save();
CPPUNIT_ASSERT_EQUAL((offset_t)68202, f.length());
CPPUNIT_ASSERT_EQUAL(68202LL, f.length());
}
}

44
tests/test_file.cpp
View File

@ -57,19 +57,19 @@ public:
}
{
PlainFile file(name.c_str());
CPPUNIT_ASSERT_EQUAL((offset_t)10, file.length());
CPPUNIT_ASSERT_EQUAL(10LL, file.length());
CPPUNIT_ASSERT_EQUAL((offset_t)2, file.find(ByteVector("23", 2)));
CPPUNIT_ASSERT_EQUAL((offset_t)2, file.find(ByteVector("23", 2), 2));
CPPUNIT_ASSERT_EQUAL((offset_t)7, file.find(ByteVector("23", 2), 3));
CPPUNIT_ASSERT_EQUAL(2LL, file.find(ByteVector("23", 2)));
CPPUNIT_ASSERT_EQUAL(2LL, file.find(ByteVector("23", 2), 2));
CPPUNIT_ASSERT_EQUAL(7LL, file.find(ByteVector("23", 2), 3));
file.seek(0);
const ByteVector v = file.readBlock(static_cast<size_t>(file.length()));
CPPUNIT_ASSERT_EQUAL((size_t)10, v.size());
CPPUNIT_ASSERT_EQUAL((offset_t)v.find("23"), file.find("23"));
CPPUNIT_ASSERT_EQUAL((offset_t)v.find("23", 2), file.find("23", 2));
CPPUNIT_ASSERT_EQUAL((offset_t)v.find("23", 3), file.find("23", 3));
CPPUNIT_ASSERT_EQUAL((long long)v.find("23"), file.find("23"));
CPPUNIT_ASSERT_EQUAL((long long)v.find("23", 2), file.find("23", 2));
CPPUNIT_ASSERT_EQUAL((long long)v.find("23", 3), file.find("23", 3));
}
}
@ -85,19 +85,19 @@ public:
}
{
PlainFile file(name.c_str());
CPPUNIT_ASSERT_EQUAL((offset_t)10, file.length());
CPPUNIT_ASSERT_EQUAL(10LL, file.length());
CPPUNIT_ASSERT_EQUAL((offset_t)7, file.rfind(ByteVector("23", 2)));
CPPUNIT_ASSERT_EQUAL((offset_t)7, file.rfind(ByteVector("23", 2), 7));
CPPUNIT_ASSERT_EQUAL((offset_t)2, file.rfind(ByteVector("23", 2), 6));
CPPUNIT_ASSERT_EQUAL(7LL, file.rfind(ByteVector("23", 2)));
CPPUNIT_ASSERT_EQUAL(7LL, file.rfind(ByteVector("23", 2), 7));
CPPUNIT_ASSERT_EQUAL(2LL, file.rfind(ByteVector("23", 2), 6));
file.seek(0);
const ByteVector v = file.readBlock(static_cast<size_t>(file.length()));
CPPUNIT_ASSERT_EQUAL((size_t)10, v.size());
CPPUNIT_ASSERT_EQUAL((offset_t)v.rfind("23"), file.rfind("23"));
CPPUNIT_ASSERT_EQUAL((offset_t)v.rfind("23", 7), file.rfind("23", 7));
CPPUNIT_ASSERT_EQUAL((offset_t)v.rfind("23", 6), file.rfind("23", 6));
CPPUNIT_ASSERT_EQUAL((long long)v.rfind("23"), file.rfind("23"));
CPPUNIT_ASSERT_EQUAL((long long)v.rfind("23", 7), file.rfind("23", 7));
CPPUNIT_ASSERT_EQUAL((long long)v.rfind("23", 6), file.rfind("23", 6));
}
}
@ -107,22 +107,22 @@ public:
std::string name = copy.fileName();
PlainFile f(name.c_str());
CPPUNIT_ASSERT_EQUAL((offset_t)0, f.tell());
CPPUNIT_ASSERT_EQUAL((offset_t)4328, f.length());
CPPUNIT_ASSERT_EQUAL(0LL, f.tell());
CPPUNIT_ASSERT_EQUAL(4328LL, f.length());
f.seek(100, File::Beginning);
CPPUNIT_ASSERT_EQUAL((offset_t)100, f.tell());
CPPUNIT_ASSERT_EQUAL(100LL, f.tell());
f.seek(100, File::Current);
CPPUNIT_ASSERT_EQUAL((offset_t)200, f.tell());
CPPUNIT_ASSERT_EQUAL(200LL, f.tell());
f.seek(-300, File::Current);
CPPUNIT_ASSERT_EQUAL((offset_t)200, f.tell());
CPPUNIT_ASSERT_EQUAL(200LL, f.tell());
f.seek(-100, File::End);
CPPUNIT_ASSERT_EQUAL((offset_t)4228, f.tell());
CPPUNIT_ASSERT_EQUAL(4228LL, f.tell());
f.seek(-100, File::Current);
CPPUNIT_ASSERT_EQUAL((offset_t)4128, f.tell());
CPPUNIT_ASSERT_EQUAL(4128LL, f.tell());
f.seek(300, File::Current);
CPPUNIT_ASSERT_EQUAL((offset_t)4428, f.tell());
CPPUNIT_ASSERT_EQUAL(4428LL, f.tell());
}
};

4
tests/test_flac.cpp
View File

@ -293,7 +293,7 @@ public:
{
FLAC::File f(copy.fileName().c_str());
CPPUNIT_ASSERT(!f.hasID3v1Tag());
CPPUNIT_ASSERT_EQUAL((offset_t)4692, f.length());
CPPUNIT_ASSERT_EQUAL(4692LL, f.length());
f.seek(0x0100);
audioStream = f.readBlock(4436);
@ -301,7 +301,7 @@ public:
f.ID3v1Tag(true)->setTitle("01234 56789 ABCDE FGHIJ");
f.save();
CPPUNIT_ASSERT(f.hasID3v1Tag());
CPPUNIT_ASSERT_EQUAL((offset_t)4820, f.length());
CPPUNIT_ASSERT_EQUAL(4820LL, f.length());
f.seek(0x0100);
CPPUNIT_ASSERT_EQUAL(audioStream, f.readBlock(4436));

2
tests/test_id3v2.cpp
View File

@ -1153,7 +1153,7 @@ public:
{
MPEG::File f(copy.fileName().c_str());
CPPUNIT_ASSERT(f.hasID3v2Tag());
CPPUNIT_ASSERT_EQUAL((offset_t)3594, f.length());
CPPUNIT_ASSERT_EQUAL(3594LL, f.length());
CPPUNIT_ASSERT_EQUAL((TagLib::uint)1505, f.ID3v2Tag()->header()->completeTagSize());
CPPUNIT_ASSERT_EQUAL(String("Artist A"), f.ID3v2Tag()->artist());
CPPUNIT_ASSERT_EQUAL(44100, f.audioProperties()->sampleRate());

4
tests/test_mp4.cpp
View File

@ -205,7 +205,7 @@ public:
MP4::Atoms atoms(&f);
MP4::Atom *moov = atoms.atoms[0];
CPPUNIT_ASSERT_EQUAL(offset_t(77), moov->length);
CPPUNIT_ASSERT_EQUAL(77LL, moov->length);
f.tag()->setItem("pgap", true);
f.save();
@ -218,7 +218,7 @@ public:
MP4::Atoms atoms(&f);
MP4::Atom *moov = atoms.atoms[0];
// original size + 'pgap' size + padding
CPPUNIT_ASSERT_EQUAL(offset_t(77 + 25 + 974), moov->length);
CPPUNIT_ASSERT_EQUAL(77 + 25 + 974LL, moov->length);
}
}

16
tests/test_mpeg.cpp
View File

@ -85,7 +85,7 @@ public:
CPPUNIT_ASSERT_EQUAL(44100, f.audioProperties()->sampleRate());
CPPUNIT_ASSERT(!f.audioProperties()->xingHeader());
offset_t last = f.lastFrameOffset();
long long last = f.lastFrameOffset();
f.seek(last);
MPEG::Header lastHeader(f.readBlock(4));
@ -98,7 +98,7 @@ public:
lastHeader = MPEG::Header(f.readBlock(4));
}
CPPUNIT_ASSERT_EQUAL((offset_t)28213, last);
CPPUNIT_ASSERT_EQUAL(28213LL, last);
CPPUNIT_ASSERT_EQUAL(209, lastHeader.frameLength());
}
@ -199,20 +199,20 @@ public:
{
MPEG::File f(TEST_FILE_PATH_C("ape.mp3"));
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL((offset_t)0x0000, f.firstFrameOffset());
CPPUNIT_ASSERT_EQUAL((offset_t)0x1FD6, f.lastFrameOffset());
CPPUNIT_ASSERT_EQUAL(0x0000LL, f.firstFrameOffset());
CPPUNIT_ASSERT_EQUAL(0x1FD6LL, f.lastFrameOffset());
}
{
MPEG::File f(TEST_FILE_PATH_C("ape-id3v1.mp3"));
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL((offset_t)0x0000, f.firstFrameOffset());
CPPUNIT_ASSERT_EQUAL((offset_t)0x1FD6, f.lastFrameOffset());
CPPUNIT_ASSERT_EQUAL(0x0000LL, f.firstFrameOffset());
CPPUNIT_ASSERT_EQUAL(0x1FD6LL, f.lastFrameOffset());
}
{
MPEG::File f(TEST_FILE_PATH_C("ape-id3v2.mp3"));
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL((offset_t)0x041A, f.firstFrameOffset());
CPPUNIT_ASSERT_EQUAL((offset_t)0x23F0, f.lastFrameOffset());
CPPUNIT_ASSERT_EQUAL(0x041ALL, f.firstFrameOffset());
CPPUNIT_ASSERT_EQUAL(0x23F0LL, f.lastFrameOffset());
}
}

4
tests/test_ogg.cpp
View File

@ -59,7 +59,7 @@ public:
{
Ogg::Vorbis::File f(newname.c_str());
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL((offset_t)136383, f.length());
CPPUNIT_ASSERT_EQUAL(136383LL, f.length());
CPPUNIT_ASSERT_EQUAL(19, f.lastPageHeader()->pageSequenceNumber());
CPPUNIT_ASSERT_EQUAL((size_t)30, f.packet(0).size());
CPPUNIT_ASSERT_EQUAL((size_t)131127, f.packet(1).size());
@ -75,7 +75,7 @@ public:
{
Ogg::Vorbis::File f(newname.c_str());
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL((offset_t)4370, f.length());
CPPUNIT_ASSERT_EQUAL(4370LL, f.length());
CPPUNIT_ASSERT_EQUAL(3, f.lastPageHeader()->pageSequenceNumber());
CPPUNIT_ASSERT_EQUAL((size_t)30, f.packet(0).size());
CPPUNIT_ASSERT_EQUAL((size_t)60, f.packet(1).size());

6
tests/test_oggflac.cpp
View File

@ -37,7 +37,7 @@ public:
CPPUNIT_ASSERT_EQUAL(String("The Artist"), f.tag()->artist());
f.seek(0, File::End);
CPPUNIT_ASSERT_EQUAL((offset_t)9134, f.tell());
CPPUNIT_ASSERT_EQUAL(9134LL, f.tell());
}
}
@ -64,7 +64,7 @@ public:
{
Ogg::FLAC::File f(newname.c_str());
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL((offset_t)141141, f.length());
CPPUNIT_ASSERT_EQUAL(141141LL, f.length());
CPPUNIT_ASSERT_EQUAL(21, f.lastPageHeader()->pageSequenceNumber());
CPPUNIT_ASSERT_EQUAL((size_t)51, f.packet(0).size());
CPPUNIT_ASSERT_EQUAL((size_t)131126, f.packet(1).size());
@ -81,7 +81,7 @@ public:
{
Ogg::FLAC::File f(newname.c_str());
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL((offset_t)9128, f.length());
CPPUNIT_ASSERT_EQUAL(9128LL, f.length());
CPPUNIT_ASSERT_EQUAL(5, f.lastPageHeader()->pageSequenceNumber());
CPPUNIT_ASSERT_EQUAL((size_t)51, f.packet(0).size());
CPPUNIT_ASSERT_EQUAL((size_t)59, f.packet(1).size());

4
tests/test_opus.cpp
View File

@ -80,7 +80,7 @@ public:
{
Ogg::Opus::File f(newname.c_str());
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL((offset_t)167534, f.length());
CPPUNIT_ASSERT_EQUAL(167534LL, f.length());
CPPUNIT_ASSERT_EQUAL(27, f.lastPageHeader()->pageSequenceNumber());
CPPUNIT_ASSERT_EQUAL((size_t)19, f.packet(0).size());
CPPUNIT_ASSERT_EQUAL((size_t)131380, f.packet(1).size());
@ -97,7 +97,7 @@ public:
{
Ogg::Opus::File f(newname.c_str());
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL((offset_t)35521, f.length());
CPPUNIT_ASSERT_EQUAL(35521LL, f.length());
CPPUNIT_ASSERT_EQUAL(11, f.lastPageHeader()->pageSequenceNumber());
CPPUNIT_ASSERT_EQUAL((size_t)19, f.packet(0).size());
CPPUNIT_ASSERT_EQUAL((size_t)313, f.packet(1).size());

72
tests/test_riff.cpp
View File

@ -15,7 +15,7 @@ public:
PublicRIFF(FileName file) : RIFF::File(file, BigEndian) {};
TagLib::uint riffSize() { return RIFF::File::riffSize(); };
TagLib::uint chunkCount() { return RIFF::File::chunkCount(); };
offset_t chunkOffset(TagLib::uint i) { return RIFF::File::chunkOffset(i); };
long long chunkOffset(TagLib::uint i) { return RIFF::File::chunkOffset(i); };
TagLib::uint chunkPadding(TagLib::uint i) { return RIFF::File::chunkPadding(i); };
TagLib::uint chunkDataSize(TagLib::uint i) { return RIFF::File::chunkDataSize(i); };
ByteVector chunkName(TagLib::uint i) { return RIFF::File::chunkName(i); };
@ -53,7 +53,7 @@ public:
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(offset_t(0x1728 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(0x1728 + 8LL, f.chunkOffset(2));
f.setChunkData("TEST", "foo");
}
@ -62,7 +62,7 @@ public:
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("foo"), f.chunkData(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(3), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(offset_t(0x1728 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(0x1728 + 8LL, f.chunkOffset(2));
f.setChunkData("SSND", "abcd");
@ -95,18 +95,18 @@ public:
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(offset_t(0xff0 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(0xff0 + 8LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL(offset_t(4400), f.length());
CPPUNIT_ASSERT_EQUAL(4400LL, f.length());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4399 - 8), f.riffSize());
f.setChunkData("TEST", "abcd");
CPPUNIT_ASSERT_EQUAL(offset_t(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(4088LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL(offset_t(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(4408LL, f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0), f.chunkPadding(3));
@ -114,15 +114,15 @@ public:
}
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(offset_t(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(4088LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL(offset_t(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(4408LL, f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0), f.chunkPadding(3));
CPPUNIT_ASSERT_EQUAL(offset_t(4412), f.length());
CPPUNIT_ASSERT_EQUAL(4412LL, f.length());
}
}
@ -133,18 +133,18 @@ public:
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(offset_t(0xff0 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(0xff0 + 8LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL(offset_t(4399), f.length());
CPPUNIT_ASSERT_EQUAL(4399LL, f.length());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4399 - 8), f.riffSize());
f.setChunkData("TEST", "abcd");
CPPUNIT_ASSERT_EQUAL(offset_t(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(4088LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL(offset_t(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(4408LL, f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0), f.chunkPadding(3));
@ -152,15 +152,15 @@ public:
}
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(offset_t(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(4088LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL(offset_t(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(4408LL, f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0), f.chunkPadding(3));
CPPUNIT_ASSERT_EQUAL(offset_t(4412), f.length());
CPPUNIT_ASSERT_EQUAL(4412LL, f.length());
}
}
@ -171,18 +171,18 @@ public:
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(offset_t(0xff0 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(0xff0 + 8LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(0), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL(offset_t(4399), f.length());
CPPUNIT_ASSERT_EQUAL(4399LL, f.length());
CPPUNIT_ASSERT_EQUAL(TagLib::uint(4399 - 8), f.riffSize());
f.setChunkData("TEST", "abc");
CPPUNIT_ASSERT_EQUAL(offset_t(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(4088LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL(offset_t(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(4408LL, f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(3), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), f.chunkPadding(3));
@ -190,15 +190,15 @@ public:
}
{
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(offset_t(4088), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(4088LL, f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(311), f.chunkDataSize(2));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), f.chunkPadding(2));
CPPUNIT_ASSERT_EQUAL(offset_t(4408), f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(4408LL, f.chunkOffset(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(3), f.chunkDataSize(3));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(3));
CPPUNIT_ASSERT_EQUAL(TagLib::uint(1), f.chunkPadding(3));
CPPUNIT_ASSERT_EQUAL(offset_t(4412), f.length());
CPPUNIT_ASSERT_EQUAL(4412LL, f.length());
}
}
@ -210,17 +210,17 @@ public:
PublicRIFF f(filename.c_str());
CPPUNIT_ASSERT_EQUAL(ByteVector("COMM"), f.chunkName(0));
CPPUNIT_ASSERT_EQUAL(offset_t(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(0x000C + 8LL, f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(ByteVector("SSND"), f.chunkName(1));
CPPUNIT_ASSERT_EQUAL(offset_t(0x0026 + 8), f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL(0x0026 + 8LL, f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.chunkName(2));
CPPUNIT_ASSERT_EQUAL(offset_t(0x1728 + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(0x1728 + 8LL, f.chunkOffset(2));
const ByteVector data(0x400, ' ');
f.setChunkData("SSND", data);
CPPUNIT_ASSERT_EQUAL(offset_t(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(offset_t(0x0026 + 8), f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL(offset_t(0x042E + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(0x000C + 8LL, f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(0x0026 + 8LL, f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL(0x042E + 8LL, f.chunkOffset(2));
f.seek(f.chunkOffset(0) - 8);
CPPUNIT_ASSERT_EQUAL(ByteVector("COMM"), f.readBlock(4));
@ -230,9 +230,9 @@ public:
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.readBlock(4));
f.setChunkData(0, data);
CPPUNIT_ASSERT_EQUAL(offset_t(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(offset_t(0x0414 + 8), f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL(offset_t(0x081C + 8), f.chunkOffset(2));
CPPUNIT_ASSERT_EQUAL(0x000C + 8LL, f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(0x0414 + 8LL, f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL(0x081C + 8LL, f.chunkOffset(2));
f.seek(f.chunkOffset(0) - 8);
CPPUNIT_ASSERT_EQUAL(ByteVector("COMM"), f.readBlock(4));
@ -242,8 +242,8 @@ public:
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.readBlock(4));
f.removeChunk("SSND");
CPPUNIT_ASSERT_EQUAL(offset_t(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(offset_t(0x0414 + 8), f.chunkOffset(1));
CPPUNIT_ASSERT_EQUAL(0x000C + 8LL, f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(0x0414 + 8LL, f.chunkOffset(1));
f.seek(f.chunkOffset(0) - 8);
CPPUNIT_ASSERT_EQUAL(ByteVector("COMM"), f.readBlock(4));
@ -251,7 +251,7 @@ public:
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.readBlock(4));
f.removeChunk(0);
CPPUNIT_ASSERT_EQUAL(offset_t(0x000C + 8), f.chunkOffset(0));
CPPUNIT_ASSERT_EQUAL(0x000C + 8LL, f.chunkOffset(0));
f.seek(f.chunkOffset(0) - 8);
CPPUNIT_ASSERT_EQUAL(ByteVector("TEST"), f.readBlock(4));

4
tests/test_speex.cpp
View File

@ -45,7 +45,7 @@ public:
{
Ogg::Speex::File f(newname.c_str());
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL((offset_t)156330, f.length());
CPPUNIT_ASSERT_EQUAL(156330LL, f.length());
CPPUNIT_ASSERT_EQUAL(23, f.lastPageHeader()->pageSequenceNumber());
CPPUNIT_ASSERT_EQUAL((size_t)80, f.packet(0).size());
CPPUNIT_ASSERT_EQUAL((size_t)131116, f.packet(1).size());
@ -62,7 +62,7 @@ public:
{
Ogg::Speex::File f(newname.c_str());
CPPUNIT_ASSERT(f.isValid());
CPPUNIT_ASSERT_EQUAL((offset_t)24317, f.length());
CPPUNIT_ASSERT_EQUAL(24317LL, f.length());
CPPUNIT_ASSERT_EQUAL(7, f.lastPageHeader()->pageSequenceNumber());
CPPUNIT_ASSERT_EQUAL((size_t)80, f.packet(0).size());
CPPUNIT_ASSERT_EQUAL((size_t)49, f.packet(1).size());

6
tests/test_wav.cpp
View File

@ -192,7 +192,7 @@ public:
ScopedFileCopy copy("duplicate_tags", ".wav");
RIFF::WAV::File f(copy.fileName().c_str());
CPPUNIT_ASSERT_EQUAL((offset_t)17052, f.length());
CPPUNIT_ASSERT_EQUAL(17052LL, f.length());
// duplicate_tags.wav has duplicate ID3v2/INFO tags.
// title() returns "Title2" if can't skip the second tag.
@ -204,8 +204,8 @@ public:
CPPUNIT_ASSERT_EQUAL(String("Title1"), f.InfoTag()->title());
f.save();
CPPUNIT_ASSERT_EQUAL((offset_t)15898, f.length());
CPPUNIT_ASSERT_EQUAL((offset_t)-1, f.find("Title2"));
CPPUNIT_ASSERT_EQUAL(15898LL, f.length());
CPPUNIT_ASSERT_EQUAL(-1LL, f.find("Title2"));
}
void testFuzzedFile1()