Merge branch 'master' into taglib2

.travis.yml

@@ -3,5 +3,5 @@ compiler:
   - gcc
   - clang
 install: sudo apt-get install libcppunit-dev zlib1g-dev
-script: cmake -DBUILD_TESTS=ON . && make && make check
+script: cmake -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON . && make && make check
 

NEWS

@@ -10,6 +10,7 @@ TagLib 1.9 (In Development)
  * Better parsing of corrupted FLAC files.
  * Fixed saving of PropertyMap comments without description into ID3v2 tags.
  * Fixed crash when parsing certain XM files.
+ * Fixed compilation of unit test with clang.
 
 TagLib 1.8 (Sep 6, 2012)
 ========================

taglib/mp4/mp4coverart.h

@@ -42,10 +42,11 @@ namespace TagLib {
        * This describes the image type.
        */
       enum Format {
-        JPEG = TypeJPEG,
-        PNG  = TypePNG,
-        BMP  = TypeBMP,
-        GIF  = TypeGIF
+        JPEG    = TypeJPEG,
+        PNG     = TypePNG,
+        BMP     = TypeBMP,
+        GIF     = TypeGIF,
+        Unknown = TypeImplicit,
       };
 
       CoverArt(Format format, const ByteVector &data);

taglib/mp4/mp4tag.cpp

@@ -283,10 +283,13 @@ MP4::Tag::parseCovr(MP4::Atom *atom, TagLib::File *file)
       debug("MP4: Unexpected atom \"" + name + "\", expecting \"data\"");
       break;
     }
-    if(flags == TypeJPEG || flags == TypePNG || flags == TypeBMP || flags == TypeGIF) {
+    if(flags == TypeJPEG || flags == TypePNG || flags == TypeBMP || flags == TypeGIF || flags == TypeImplicit) {
       value.append(MP4::CoverArt(MP4::CoverArt::Format(flags),
                                  data.mid(pos + 16, length - 16)));
     }
+    else {
+      debug("MP4: Unknown covr format " + String::number(flags));
+    }
     pos += length;
   }
   if(value.size() > 0)