diff options
| author | Tsuda Kageyu <tsuda.kageyu@gmail.com> | 2015-12-03 01:50:44 +0900 |
|---|---|---|
| committer | Tsuda Kageyu <tsuda.kageyu@gmail.com> | 2015-12-03 02:15:41 +0900 |
| commit | a0b86836568e294a6f6e83697ee6f9b1b8efb5cf (patch) | |
| tree | dcb5d462e379d7bdeb15cce0df115137ac7476f8 /taglib/mpeg/id3v2/id3v2framefactory.cpp | |
| parent | 085a0ef2987496937292134adff6869b65a5be71 (diff) | |
Use a standard type rather than TagLib::uint.
This won't break the ABI compatibility.
Diffstat (limited to 'taglib/mpeg/id3v2/id3v2framefactory.cpp')
| -rw-r--r-- | taglib/mpeg/id3v2/id3v2framefactory.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/taglib/mpeg/id3v2/id3v2framefactory.cpp b/taglib/mpeg/id3v2/id3v2framefactory.cpp index a462e21b..cfa6be23 100644 --- a/taglib/mpeg/id3v2/id3v2framefactory.cpp +++ b/taglib/mpeg/id3v2/id3v2framefactory.cpp @@ -117,10 +117,10 @@ FrameFactory *FrameFactory::instance() Frame *FrameFactory::createFrame(const ByteVector &data, bool synchSafeInts) const { - return createFrame(data, uint(synchSafeInts ? 4 : 3)); + return createFrame(data, static_cast<unsigned int>(synchSafeInts ? 4 : 3)); } -Frame *FrameFactory::createFrame(const ByteVector &data, uint version) const +Frame *FrameFactory::createFrame(const ByteVector &data, unsigned int version) const { Header tagHeader; tagHeader.setMajorVersion(version); @@ -130,7 +130,7 @@ Frame *FrameFactory::createFrame(const ByteVector &data, uint version) const Frame *FrameFactory::createFrame(const ByteVector &origData, Header *tagHeader) const { ByteVector data = origData; - uint version = tagHeader->majorVersion(); + unsigned int version = tagHeader->majorVersion(); Frame::Header *header = new Frame::Header(data, version); ByteVector frameID = header->frameID(); @@ -138,7 +138,7 @@ Frame *FrameFactory::createFrame(const ByteVector &origData, Header *tagHeader) // characters. Also make sure that there is data in the frame. if(frameID.size() != (version < 3 ? 3 : 4) || - header->frameSize() <= uint(header->dataLengthIndicator() ? 4 : 0) || + header->frameSize() <= static_cast<unsigned int>(header->dataLengthIndicator() ? 4 : 0) || header->frameSize() > data.size()) { delete header; |