mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-06-03 17:18:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Avoid the risk of subtracting between signed and unsigned types.

Browse Source
This commit is contained in:
Tsuda Kageyu 2015-12-21 11:44:25 +09:00
parent cf5d431d77
commit d0238ba82f
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
taglib/ape/apefile.cpp
View File

@ -70,13 +70,13 @@ public:
}
long APELocation;
unsigned int APESize;
long APESize;
long ID3v1Location;
ID3v2::Header *ID3v2Header;
long ID3v2Location;
unsigned int ID3v2Size;
long ID3v2Size;
TagUnion tag;
@ -186,7 +186,7 @@ bool APE::File::save()
insert(data, d->APELocation, d->APESize);
if(d->ID3v1Location >= 0)
d->ID3v1Location += (data.size() - d->APESize);
d->ID3v1Location += (static_cast<long>(data.size()) - d->APESize);
d->APESize = data.size();
}

12
taglib/flac/flacfile.cpp
View File

@ -80,7 +80,7 @@ public:
const ID3v2::FrameFactory *ID3v2FrameFactory;
long ID3v2Location;
unsigned int ID3v2OriginalSize;
long ID3v2OriginalSize;
long ID3v1Location;
@ -226,10 +226,10 @@ bool FLAC::File::save()
insert(data, d->flacStart, originalLength);
d->streamStart += (data.size() - originalLength);
d->streamStart += (static_cast<long>(data.size()) - originalLength);
if(d->ID3v1Location >= 0)
d->ID3v1Location += (data.size() - originalLength);
d->ID3v1Location += (static_cast<long>(data.size()) - originalLength);
// Update ID3 tags
@ -243,11 +243,11 @@ bool FLAC::File::save()
data = ID3v2Tag()->render();
insert(data, d->ID3v2Location, d->ID3v2OriginalSize);
d->flacStart += (data.size() - d->ID3v2OriginalSize);
d->streamStart += (data.size() - d->ID3v2OriginalSize);
d->flacStart += (static_cast<long>(data.size()) - d->ID3v2OriginalSize);
d->streamStart += (static_cast<long>(data.size()) - d->ID3v2OriginalSize);
if(d->ID3v1Location >= 0)
d->ID3v1Location += (data.size() - d->ID3v2OriginalSize);
d->ID3v1Location += (static_cast<long>(data.size()) - d->ID3v2OriginalSize);
d->ID3v2OriginalSize = data.size();
}

6
taglib/mpc/mpcfile.cpp
View File

@ -62,13 +62,13 @@ public:
}
long APELocation;
unsigned int APESize;
long APESize;
long ID3v1Location;
ID3v2::Header *ID3v2Header;
long ID3v2Location;
unsigned int ID3v2Size;
long ID3v2Size;
TagUnion tag;
@ -193,7 +193,7 @@ bool MPC::File::save()
insert(data, d->APELocation, d->APESize);
if(d->ID3v1Location >= 0)
d->ID3v1Location += (data.size() - d->APESize);
d->ID3v1Location += (static_cast<long>(data.size()) - d->APESize);
d->APESize = data.size();
}

6
taglib/mpeg/mpegfile.cpp
View File

@ -82,10 +82,10 @@ public:
const ID3v2::FrameFactory *ID3v2FrameFactory;
long ID3v2Location;
unsigned int ID3v2OriginalSize;
long ID3v2OriginalSize;
long APELocation;
unsigned int APEOriginalSize;
long APEOriginalSize;
long ID3v1Location;
@ -274,7 +274,7 @@ bool MPEG::File::save(int tags, bool stripOthers, int id3v2Version, bool duplica
insert(data, d->APELocation, d->APEOriginalSize);
if(d->ID3v1Location >= 0)
d->ID3v1Location += (data.size() - d->APEOriginalSize);
d->ID3v1Location += (static_cast<long>(data.size()) - d->APEOriginalSize);
d->APEOriginalSize = data.size();
}

4
taglib/trueaudio/trueaudiofile.cpp
View File

@ -64,7 +64,7 @@ public:
const ID3v2::FrameFactory *ID3v2FrameFactory;
long ID3v2Location;
unsigned int ID3v2OriginalSize;
long ID3v2OriginalSize;
long ID3v1Location;
@ -169,7 +169,7 @@ bool TrueAudio::File::save()
insert(data, d->ID3v2Location, d->ID3v2OriginalSize);
if(d->ID3v1Location >= 0)
d->ID3v1Location += (data.size() - d->ID3v2OriginalSize);
d->ID3v1Location += (static_cast<long>(data.size()) - d->ID3v2OriginalSize);
d->ID3v2OriginalSize = data.size();
}

4
taglib/wavpack/wavpackfile.cpp
View File

@ -62,7 +62,7 @@ public:
}
long APELocation;
unsigned int APESize;
long APESize;
long ID3v1Location;
@ -174,7 +174,7 @@ bool WavPack::File::save()
insert(data, d->APELocation, d->APESize);
if(d->ID3v1Location >= 0)
d->ID3v1Location += (data.size() - d->APESize);
d->ID3v1Location += (static_cast<long>(data.size()) - d->APESize);
d->APESize = data.size();
}