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

Fix some mistakes on merging.

Browse Source
This commit is contained in:
Tsuda Kageyu 2015-12-02 09:37:18 +09:00
parent d36550f96d
commit afa137e1c1
6 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
taglib/mpeg/id3v1/id3v1tag.cpp
View File

@ -220,7 +220,7 @@ void ID3v1::Tag::setStringHandler(const TagLib::StringHandler *handler)
// protected methods
////////////////////////////////////////////////////////////////////////////////
void ID3v1::Tag::read(File *file, long tagOffset)
void ID3v1::Tag::read(File *file, long long tagOffset)
{
if(file && file->isValid()) {
file->seek(tagOffset);

2
taglib/mpeg/id3v1/id3v1tag.h
View File

@ -140,7 +140,7 @@ namespace TagLib {
/*!
* Reads from the file specified in the constructor.
*/
void read(File *file, long tagOffset);
void read(File *file, long long tagOffset);
/*!
* Pareses the body of the tag in \a data.
*/

2
taglib/mpeg/id3v2/id3v2tag.cpp
View File

@ -840,7 +840,7 @@ void ID3v2::Tag::setLatin1StringHandler(const TagLib::StringHandler *handler)
// protected members
////////////////////////////////////////////////////////////////////////////////
void ID3v2::Tag::read(TagLib::File *file, long offset)
void ID3v2::Tag::read(TagLib::File *file, long long offset)
{
if(!file)
return;

2
taglib/mpeg/id3v2/id3v2tag.h
View File

@ -356,7 +356,7 @@ namespace TagLib {
* the Header, the body of the tag (which contains the ExtendedHeader and
* frames) and Footer.
*/
void read(TagLib::File *file, long offset);
void read(TagLib::File *file, long long offset);
/*!
* This is called by read to parse the body of the tag. It determines if an

14
taglib/riff/rifffile.cpp
View File

@ -70,20 +70,6 @@ RIFF::File::~File()
delete d;
}
bool RIFF::File::isValidChunkName(const ByteVector &name) // static
{
if(name.size() != 4)
return false;
for(ByteVector::ConstIterator it = name.begin(); it != name.end(); ++it) {
const uchar c = static_cast<uchar>(*it);
if(c < 32 || 127 < c)
return false;
}
return true;
}
////////////////////////////////////////////////////////////////////////////////
// protected members
////////////////////////////////////////////////////////////////////////////////

6
taglib/riff/rifffile.h
View File

@ -51,13 +51,7 @@ namespace TagLib {
*/
virtual ~File();
/*!
* Returns whether or not \a name is valid as a chunk name.
*/
static bool isValidChunkName(const ByteVector &name);
protected:
File(FileName file, ByteOrder endianness);
File(IOStream *stream, ByteOrder endianness);