Silence GCC warnings about uninitialized variables.

This commit is contained in:
Tsuda Kageyu 2015-11-23 23:24:17 +09:00
parent faca7ac8f4
commit 7baa7e70fe
4 changed files with 21 additions and 21 deletions

View File

@ -122,9 +122,6 @@ PictureMap ASF::Tag::pictures() const
ASF::Picture asfPicture = (*it).toPicture();
TagLib::Picture::Type type;
switch(asfPicture.type()) {
case ASF::Picture::Other:
type = TagLib::Picture::Other;
break;
case ASF::Picture::FileIcon:
type = TagLib::Picture::FileIcon;
break;
@ -185,6 +182,9 @@ PictureMap ASF::Tag::pictures() const
case ASF::Picture::PublisherLogo:
type = TagLib::Picture::PublisherLogo;
break;
default:
type = TagLib::Picture::Other;
break;
}
TagLib::Picture picture(asfPicture.picture(),
type,

View File

@ -246,9 +246,6 @@ TagLib::PictureMap ID3v2::Tag::pictures() const
const AttachedPictureFrame *frame = static_cast<AttachedPictureFrame *>(*it);
Picture::Type type;
switch(frame->type()) {
case AttachedPictureFrame::Other:
type = Picture::Other;
break;
case AttachedPictureFrame::FileIcon:
type = Picture::FileIcon;
break;
@ -309,6 +306,9 @@ TagLib::PictureMap ID3v2::Tag::pictures() const
case AttachedPictureFrame::PublisherLogo:
type = Picture::PublisherLogo;
break;
default:
type = Picture::Other;
break;
}
Picture picture(frame->picture(),
type,

View File

@ -30,9 +30,8 @@ using namespace TagLib;
class Picture::PicturePrivate : public RefCounter
{
public:
PicturePrivate() : RefCounter()
{
}
PicturePrivate() :
RefCounter() {}
String description;
String mime;
@ -40,16 +39,16 @@ public:
ByteVector data;
};
Picture::Picture()
: d(new PicturePrivate())
Picture::Picture() :
d(new PicturePrivate())
{
}
Picture::Picture(const ByteVector &data,
Type type,
const String &mime,
const String &description)
: d(new PicturePrivate())
const String &description) :
d(new PicturePrivate())
{
d->mime = mime;
d->description = description;
@ -108,9 +107,6 @@ std::ostream &operator<<(std::ostream &s, const Picture &p)
{
String type;
switch(p.type()) {
case Picture::Other:
type = "Other";
break;
case Picture::FileIcon:
type = "FileIcon";
break;
@ -171,6 +167,9 @@ std::ostream &operator<<(std::ostream &s, const Picture &p)
case Picture::PublisherLogo:
type = "PublisherLogo";
break;
default:
type = "Other";
break;
}
ByteVector displayableData = p.data().mid(0, 20).toHex();

View File

@ -27,18 +27,19 @@
using namespace TagLib;
PictureMap::PictureMap() : Map< Picture::Type, PictureList >()
PictureMap::PictureMap() :
Map< Picture::Type, PictureList >()
{
}
PictureMap::PictureMap(const PictureList &l)
: Map< Picture::Type, PictureList >()
PictureMap::PictureMap(const PictureList &l) :
Map< Picture::Type, PictureList >()
{
insert(l);
}
PictureMap::PictureMap(const Picture &p)
: Map< Picture::Type, PictureList >()
PictureMap::PictureMap(const Picture &p) :
Map< Picture::Type, PictureList >()
{
insert(p);
}