Fix more compiler warnings.
[platform/upstream/flac.git] / src / test_libFLAC++ / metadata_object.cpp
index 278663e..b5debd3 100644 (file)
@@ -1,5 +1,5 @@
 /* test_libFLAC++ - Unit tester for libFLAC++
- * Copyright (C) 2002  Josh Coalson
+ * Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -22,7 +22,7 @@
 #include <stdlib.h> /* for malloc() */
 #include <string.h> /* for memcmp() */
 
-static ::FLAC__StreamMetadata streaminfo_, padding_, seektable_, application_, vorbiscomment_, cuesheet_;
+static ::FLAC__StreamMetadata streaminfo_, padding_, seektable_, application_, vorbiscomment_, cuesheet_, picture_;
 
 static bool die_(const char *msg)
 {
@@ -40,6 +40,16 @@ static void *malloc_or_die_(size_t size)
        return x;
 }
 
+static char *strdup_or_die_(const char *s)
+{
+       char *x = strdup(s);
+       if(0 == x) {
+               fprintf(stderr, "ERROR: out of memory copying string \"%s\"\n", s);
+               exit(1);
+       }
+       return x;
+}
+
 static bool index_is_equal_(const ::FLAC__StreamMetadata_CueSheet_Index &index, const ::FLAC__StreamMetadata_CueSheet_Index &indexcopy)
 {
        if(indexcopy.offset != index.offset)
@@ -120,18 +130,18 @@ static void init_metadata_blocks_()
        vorbiscomment_.type = ::FLAC__METADATA_TYPE_VORBIS_COMMENT;
        vorbiscomment_.length = (4 + 5) + 4 + (4 + 12) + (4 + 12);
        vorbiscomment_.data.vorbis_comment.vendor_string.length = 5;
-       vorbiscomment_.data.vorbis_comment.vendor_string.entry = (FLAC__byte*)malloc_or_die_(5);
-       memcpy(vorbiscomment_.data.vorbis_comment.vendor_string.entry, "name0", 5);
+       vorbiscomment_.data.vorbis_comment.vendor_string.entry = (FLAC__byte*)malloc_or_die_(5+1);
+       memcpy(vorbiscomment_.data.vorbis_comment.vendor_string.entry, "name0", 5+1);
        vorbiscomment_.data.vorbis_comment.num_comments = 2;
        vorbiscomment_.data.vorbis_comment.comments = (::FLAC__StreamMetadata_VorbisComment_Entry*)malloc_or_die_(vorbiscomment_.data.vorbis_comment.num_comments * sizeof(::FLAC__StreamMetadata_VorbisComment_Entry));
        vorbiscomment_.data.vorbis_comment.comments[0].length = 12;
-       vorbiscomment_.data.vorbis_comment.comments[0].entry = (FLAC__byte*)malloc_or_die_(12);
-       memcpy(vorbiscomment_.data.vorbis_comment.comments[0].entry, "name2=value2", 12);
+       vorbiscomment_.data.vorbis_comment.comments[0].entry = (FLAC__byte*)malloc_or_die_(12+1);
+       memcpy(vorbiscomment_.data.vorbis_comment.comments[0].entry, "name2=value2", 12+1);
        vorbiscomment_.data.vorbis_comment.comments[1].length = 12;
-       vorbiscomment_.data.vorbis_comment.comments[1].entry = (FLAC__byte*)malloc_or_die_(12);
-       memcpy(vorbiscomment_.data.vorbis_comment.comments[1].entry, "name3=value3", 12);
+       vorbiscomment_.data.vorbis_comment.comments[1].entry = (FLAC__byte*)malloc_or_die_(12+1);
+       memcpy(vorbiscomment_.data.vorbis_comment.comments[1].entry, "name3=value3", 12+1);
 
-       cuesheet_.is_last = true;
+       cuesheet_.is_last = false;
        cuesheet_.type = ::FLAC__METADATA_TYPE_CUESHEET;
        cuesheet_.length =
                /* cuesheet guts */
@@ -186,6 +196,33 @@ static void init_metadata_blocks_()
        cuesheet_.data.cue_sheet.tracks[1].indices = (FLAC__StreamMetadata_CueSheet_Index*)malloc_or_die_(cuesheet_.data.cue_sheet.tracks[1].num_indices * sizeof(FLAC__StreamMetadata_CueSheet_Index));
        cuesheet_.data.cue_sheet.tracks[1].indices[0].offset = 0;
        cuesheet_.data.cue_sheet.tracks[1].indices[0].number = 1;
+
+       picture_.is_last = true;
+       picture_.type = FLAC__METADATA_TYPE_PICTURE;
+       picture_.length =
+               (
+                       FLAC__STREAM_METADATA_PICTURE_TYPE_LEN +
+                       FLAC__STREAM_METADATA_PICTURE_MIME_TYPE_LENGTH_LEN + /* will add the length for the string later */
+                       FLAC__STREAM_METADATA_PICTURE_DESCRIPTION_LENGTH_LEN + /* will add the length for the string later */
+                       FLAC__STREAM_METADATA_PICTURE_WIDTH_LEN +
+                       FLAC__STREAM_METADATA_PICTURE_HEIGHT_LEN +
+                       FLAC__STREAM_METADATA_PICTURE_DEPTH_LEN +
+                       FLAC__STREAM_METADATA_PICTURE_COLORS_LEN +
+                       FLAC__STREAM_METADATA_PICTURE_DATA_LENGTH_LEN /* will add the length for the data later */
+               ) / 8
+       ;
+       picture_.data.picture.type = FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER;
+       picture_.data.picture.mime_type = strdup_or_die_("image/jpeg");
+       picture_.length += strlen(picture_.data.picture.mime_type);
+       picture_.data.picture.description = (FLAC__byte*)strdup_or_die_("desc");
+       picture_.length += strlen((const char *)picture_.data.picture.description);
+       picture_.data.picture.width = 300;
+       picture_.data.picture.height = 300;
+       picture_.data.picture.depth = 24;
+       picture_.data.picture.colors = 0;
+       picture_.data.picture.data = (FLAC__byte*)strdup_or_die_("SOMEJPEGDATA");
+       picture_.data.picture.data_length = strlen((const char *)picture_.data.picture.data);
+       picture_.length += picture_.data.picture.data_length;
 }
 
 static void free_metadata_blocks_()
@@ -194,10 +231,14 @@ static void free_metadata_blocks_()
        free(application_.data.application.data);
        free(vorbiscomment_.data.vorbis_comment.vendor_string.entry);
        free(vorbiscomment_.data.vorbis_comment.comments[0].entry);
+       free(vorbiscomment_.data.vorbis_comment.comments[1].entry);
        free(vorbiscomment_.data.vorbis_comment.comments);
        free(cuesheet_.data.cue_sheet.tracks[0].indices);
        free(cuesheet_.data.cue_sheet.tracks[1].indices);
        free(cuesheet_.data.cue_sheet.tracks);
+       free(picture_.data.picture.mime_type);
+       free(picture_.data.picture.description);
+       free(picture_.data.picture.data);
 }
 
 bool test_metadata_object_streaminfo()
@@ -222,7 +263,7 @@ bool test_metadata_object_streaminfo()
        {
                FLAC::Metadata::StreamInfo blockcopy(block);
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(blockcopy != block)
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -236,7 +277,7 @@ bool test_metadata_object_streaminfo()
        {
                FLAC::Metadata::StreamInfo blockcopy(streaminfo_);
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(blockcopy != streaminfo_)
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -247,7 +288,55 @@ bool test_metadata_object_streaminfo()
        {
                FLAC::Metadata::StreamInfo blockcopy(&streaminfo_);
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != streaminfo_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing StreamInfo::StreamInfo(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+       printf("        StreamInfo::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               FLAC::Metadata::StreamInfo blockcopy(&streaminfo_, /*copy=*/true);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != streaminfo_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing StreamInfo::StreamInfo(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+       printf("        StreamInfo::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&streaminfo_);
+               FLAC::Metadata::StreamInfo blockcopy(copy, /*copy=*/false);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != streaminfo_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing StreamInfo::assign(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+       printf("        StreamInfo::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               FLAC::Metadata::StreamInfo blockcopy;
+               blockcopy.assign(&streaminfo_, /*copy=*/true);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != streaminfo_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing StreamInfo::assign(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+       printf("        StreamInfo::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&streaminfo_);
+               FLAC::Metadata::StreamInfo blockcopy;
+               blockcopy.assign(copy, /*copy=*/false);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
                if(blockcopy != streaminfo_)
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -258,7 +347,7 @@ bool test_metadata_object_streaminfo()
        {
                FLAC::Metadata::StreamInfo blockcopy = block;
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(!(blockcopy == block))
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -269,7 +358,7 @@ bool test_metadata_object_streaminfo()
        {
                FLAC::Metadata::StreamInfo blockcopy = streaminfo_;
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(!(blockcopy == streaminfo_))
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -280,7 +369,7 @@ bool test_metadata_object_streaminfo()
        {
                FLAC::Metadata::StreamInfo blockcopy = &streaminfo_;
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(!(blockcopy == streaminfo_))
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -376,6 +465,9 @@ bool test_metadata_object_streaminfo()
        if(*dynamic_cast<FLAC::Metadata::StreamInfo *>(clone_) != block)
                return die_("clone is not identical");
        printf("OK\n");
+       printf("testing StreamInfo::~StreamInfo()... ");
+       delete clone_;
+       printf("OK\n");
 
 
        printf("PASSED\n\n");
@@ -404,7 +496,7 @@ bool test_metadata_object_padding()
        {
                FLAC::Metadata::Padding blockcopy(block);
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(blockcopy != block)
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -418,7 +510,7 @@ bool test_metadata_object_padding()
        {
                FLAC::Metadata::Padding blockcopy(padding_);
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(blockcopy != padding_)
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -429,7 +521,55 @@ bool test_metadata_object_padding()
        {
                FLAC::Metadata::Padding blockcopy(&padding_);
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != padding_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing Padding::Padding(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+       printf("        Padding::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               FLAC::Metadata::Padding blockcopy(&padding_, /*copy=*/true);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != padding_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing Padding::Padding(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+       printf("        Padding::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&padding_);
+               FLAC::Metadata::Padding blockcopy(copy, /*copy=*/false);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != padding_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing Padding::assign(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+       printf("        Padding::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               FLAC::Metadata::Padding blockcopy;
+               blockcopy.assign(&padding_, /*copy=*/true);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != padding_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing Padding::assign(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+       printf("        Padding::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&padding_);
+               FLAC::Metadata::Padding blockcopy;
+               blockcopy.assign(copy, /*copy=*/false);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
                if(blockcopy != padding_)
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -440,7 +580,7 @@ bool test_metadata_object_padding()
        {
                FLAC::Metadata::Padding blockcopy = block;
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(!(blockcopy == block))
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -451,7 +591,7 @@ bool test_metadata_object_padding()
        {
                FLAC::Metadata::Padding blockcopy = padding_;
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(!(blockcopy == padding_))
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -462,7 +602,7 @@ bool test_metadata_object_padding()
        {
                FLAC::Metadata::Padding blockcopy = &padding_;
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(!(blockcopy == padding_))
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -486,6 +626,9 @@ bool test_metadata_object_padding()
        if(*dynamic_cast<FLAC::Metadata::Padding *>(clone_) != block)
                return die_("clone is not identical");
        printf("OK\n");
+       printf("testing Padding::~Padding()... ");
+       delete clone_;
+       printf("OK\n");
 
 
        printf("PASSED\n\n");
@@ -514,7 +657,7 @@ bool test_metadata_object_application()
        {
                FLAC::Metadata::Application blockcopy(block);
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(blockcopy != block)
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -528,7 +671,7 @@ bool test_metadata_object_application()
        {
                FLAC::Metadata::Application blockcopy(application_);
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(blockcopy != application_)
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -539,7 +682,55 @@ bool test_metadata_object_application()
        {
                FLAC::Metadata::Application blockcopy(&application_);
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != application_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing Application::Application(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+       printf("        Application::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               FLAC::Metadata::Application blockcopy(&application_, /*copy=*/true);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != application_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing Application::Application(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+       printf("        Application::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&application_);
+               FLAC::Metadata::Application blockcopy(copy, /*copy=*/false);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != application_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing Application::assign(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+       printf("        Application::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               FLAC::Metadata::Application blockcopy;
+               blockcopy.assign(&application_, /*copy=*/true);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != application_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing Application::assign(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+       printf("        Application::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&application_);
+               FLAC::Metadata::Application blockcopy;
+               blockcopy.assign(copy, /*copy=*/false);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
                if(blockcopy != application_)
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -550,7 +741,7 @@ bool test_metadata_object_application()
        {
                FLAC::Metadata::Application blockcopy = block;
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(!(blockcopy == block))
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -561,7 +752,7 @@ bool test_metadata_object_application()
        {
                FLAC::Metadata::Application blockcopy = application_;
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(!(blockcopy == application_))
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -572,7 +763,7 @@ bool test_metadata_object_application()
        {
                FLAC::Metadata::Application blockcopy = &application_;
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(!(blockcopy == application_))
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -605,6 +796,9 @@ bool test_metadata_object_application()
        if(*dynamic_cast<FLAC::Metadata::Application *>(clone_) != block)
                return die_("clone is not identical");
        printf("OK\n");
+       printf("testing Application::~Application()... ");
+       delete clone_;
+       printf("OK\n");
 
 
        printf("PASSED\n\n");
@@ -633,7 +827,7 @@ bool test_metadata_object_seektable()
        {
                FLAC::Metadata::SeekTable blockcopy(block);
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(blockcopy != block)
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -647,7 +841,7 @@ bool test_metadata_object_seektable()
        {
                FLAC::Metadata::SeekTable blockcopy(seektable_);
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(blockcopy != seektable_)
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -658,7 +852,55 @@ bool test_metadata_object_seektable()
        {
                FLAC::Metadata::SeekTable blockcopy(&seektable_);
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != seektable_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing SeekTable::SeekTable(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+       printf("        SeekTable::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               FLAC::Metadata::SeekTable blockcopy(&seektable_, /*copy=*/true);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != seektable_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing SeekTable::SeekTable(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+       printf("        SeekTable::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&seektable_);
+               FLAC::Metadata::SeekTable blockcopy(copy, /*copy=*/false);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != seektable_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing SeekTable::assign(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+       printf("        SeekTable::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               FLAC::Metadata::SeekTable blockcopy;
+               blockcopy.assign(&seektable_, /*copy=*/true);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != seektable_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing SeekTable::assign(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+       printf("        SeekTable::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&seektable_);
+               FLAC::Metadata::SeekTable blockcopy;
+               blockcopy.assign(copy, /*copy=*/false);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
                if(blockcopy != seektable_)
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -669,7 +911,7 @@ bool test_metadata_object_seektable()
        {
                FLAC::Metadata::SeekTable blockcopy = block;
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(!(blockcopy == block))
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -680,7 +922,7 @@ bool test_metadata_object_seektable()
        {
                FLAC::Metadata::SeekTable blockcopy = seektable_;
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(!(blockcopy == seektable_))
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -691,7 +933,7 @@ bool test_metadata_object_seektable()
        {
                FLAC::Metadata::SeekTable blockcopy = &seektable_;
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(!(blockcopy == seektable_))
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -753,6 +995,9 @@ bool test_metadata_object_seektable()
        if(*dynamic_cast<FLAC::Metadata::SeekTable *>(clone_) != block)
                return die_("clone is not identical");
        printf("OK\n");
+       printf("testing SeekTable::~SeekTable()... ");
+       delete clone_;
+       printf("OK\n");
 
 
        printf("PASSED\n\n");
@@ -782,12 +1027,32 @@ bool test_metadata_object_vorbiscomment()
                return die_("!is_valid()");
        printf("OK\n");
 
+       {
+               printf("testing Entry::Entry(const char *field)... ");
+               FLAC::Metadata::VorbisComment::Entry entry2z("name2=value2");
+               if(!entry2z.is_valid())
+                       return die_("!is_valid()");
+               if(strcmp(entry2.get_field(), entry2z.get_field()))
+                       return die_("bad value");
+               printf("OK\n");
+       }
+
        printf("testing Entry::Entry(const char *field_name, const char *field_value, unsigned field_value_length)... ");
        FLAC::Metadata::VorbisComment::Entry entry3("name3", "value3", strlen("value3"));
        if(!entry3.is_valid())
                return die_("!is_valid()");
        printf("OK\n");
 
+       {
+               printf("testing Entry::Entry(const char *field_name, const char *field_value)... ");
+               FLAC::Metadata::VorbisComment::Entry entry3z("name3", "value3");
+               if(!entry3z.is_valid())
+                       return die_("!is_valid()");
+               if(strcmp(entry3.get_field(), entry3z.get_field()))
+                       return die_("bad value");
+               printf("OK\n");
+       }
+
        printf("testing Entry::Entry(const Entry &entry)... ");
        {
                FLAC::Metadata::VorbisComment::Entry entry2copy(entry2);
@@ -854,7 +1119,7 @@ bool test_metadata_object_vorbiscomment()
                return die_("entry mismatch");
        printf("OK\n");
 
-       printf("testing Entry::set_field_value()... ");
+       printf("testing Entry::set_field_value(const char *field_value, unsigned field_value_length)... ");
        if(!entry1.set_field_value("value1", strlen("value1")))
                return die_("returned false");
        if(0 != memcmp(entry1.get_field_value(), "value1", strlen("value1")))
@@ -863,7 +1128,16 @@ bool test_metadata_object_vorbiscomment()
                return die_("entry mismatch");
        printf("OK\n");
 
-       printf("testing Entry::set_field()... ");
+       printf("testing Entry::set_field_value(const char *field_value)... ");
+       if(!entry1.set_field_value("value1"))
+               return die_("returned false");
+       if(0 != memcmp(entry1.get_field_value(), "value1", strlen("value1")))
+               return die_("value mismatch");
+       if(0 != memcmp(entry1.get_field(), "name1=value1", strlen("name1=value1")))
+               return die_("entry mismatch");
+       printf("OK\n");
+
+       printf("testing Entry::set_field(const char *field, unsigned field_length)... ");
        if(!entry1.set_field("name0=value0", strlen("name0=value0")))
                return die_("returned false");
        if(0 != memcmp(entry1.get_field_name(), "name0", strlen("name0")))
@@ -874,6 +1148,17 @@ bool test_metadata_object_vorbiscomment()
                return die_("entry mismatch");
        printf("OK\n");
 
+       printf("testing Entry::set_field(const char *field)... ");
+       if(!entry1.set_field("name0=value0"))
+               return die_("returned false");
+       if(0 != memcmp(entry1.get_field_name(), "name0", strlen("name0")))
+               return die_("value mismatch");
+       if(0 != memcmp(entry1.get_field_value(), "value0", strlen("value0")))
+               return die_("value mismatch");
+       if(0 != memcmp(entry1.get_field(), "name0=value0", strlen("name0=value0")))
+               return die_("entry mismatch");
+       printf("OK\n");
+
        printf("PASSED\n\n");
 
 
@@ -895,7 +1180,7 @@ bool test_metadata_object_vorbiscomment()
        {
                FLAC::Metadata::VorbisComment blockcopy(block);
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(blockcopy != block)
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -909,7 +1194,7 @@ bool test_metadata_object_vorbiscomment()
        {
                FLAC::Metadata::VorbisComment blockcopy(vorbiscomment_);
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(blockcopy != vorbiscomment_)
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -920,7 +1205,55 @@ bool test_metadata_object_vorbiscomment()
        {
                FLAC::Metadata::VorbisComment blockcopy(&vorbiscomment_);
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != vorbiscomment_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing VorbisComment::VorbisComment(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+       printf("        VorbisComment::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               FLAC::Metadata::VorbisComment blockcopy(&vorbiscomment_, /*copy=*/true);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != vorbiscomment_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing VorbisComment::VorbisComment(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+       printf("        VorbisComment::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&vorbiscomment_);
+               FLAC::Metadata::VorbisComment blockcopy(copy, /*copy=*/false);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != vorbiscomment_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing VorbisComment::assign(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+       printf("        VorbisComment::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               FLAC::Metadata::VorbisComment blockcopy;
+               blockcopy.assign(&vorbiscomment_, /*copy=*/true);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != vorbiscomment_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing VorbisComment::assign(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+       printf("        VorbisComment::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&vorbiscomment_);
+               FLAC::Metadata::VorbisComment blockcopy;
+               blockcopy.assign(copy, /*copy=*/false);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
                if(blockcopy != vorbiscomment_)
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -931,7 +1264,7 @@ bool test_metadata_object_vorbiscomment()
        {
                FLAC::Metadata::VorbisComment blockcopy = block;
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(!(blockcopy == block))
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -942,7 +1275,7 @@ bool test_metadata_object_vorbiscomment()
        {
                FLAC::Metadata::VorbisComment blockcopy = vorbiscomment_;
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(!(blockcopy == vorbiscomment_))
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -953,7 +1286,7 @@ bool test_metadata_object_vorbiscomment()
        {
                FLAC::Metadata::VorbisComment blockcopy = &vorbiscomment_;
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(!(blockcopy == vorbiscomment_))
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -965,17 +1298,56 @@ bool test_metadata_object_vorbiscomment()
        printf("OK\n");
 
        printf("testing VorbisComment::set_vendor_string()... ");
-       if(!block.set_vendor_string(entry1))
+       if(!block.set_vendor_string((const FLAC__byte *)"mame0"))
                return die_("returned false");
        printf("OK\n");
+       vorbiscomment_.data.vorbis_comment.vendor_string.entry[0] = 'm';
 
        printf("testing VorbisComment::get_vendor_string()... ");
-       if(block.get_vendor_string().get_field_name_length() != vorbiscomment_.data.vorbis_comment.vendor_string.length)
+       if(strlen((const char *)block.get_vendor_string()) != vorbiscomment_.data.vorbis_comment.vendor_string.length)
                return die_("length mismatch");
-       if(0 != memcmp(block.get_vendor_string().get_field_name(), vorbiscomment_.data.vorbis_comment.vendor_string.entry, vorbiscomment_.data.vorbis_comment.vendor_string.length))
+       if(0 != memcmp(block.get_vendor_string(), vorbiscomment_.data.vorbis_comment.vendor_string.entry, vorbiscomment_.data.vorbis_comment.vendor_string.length))
                return die_("value mismatch");
        printf("OK\n");
 
+       printf("testing VorbisComment::append_comment()... +\n");
+       printf("        VorbisComment::get_comment()... ");
+       if(!block.append_comment(entry3))
+               return die_("returned false");
+       if(block.get_comment(0).get_field_length() != vorbiscomment_.data.vorbis_comment.comments[1].length)
+               return die_("length mismatch");
+       if(0 != memcmp(block.get_comment(0).get_field(), vorbiscomment_.data.vorbis_comment.comments[1].entry, vorbiscomment_.data.vorbis_comment.comments[1].length))
+               return die_("value mismatch");
+       printf("OK\n");
+
+       printf("testing VorbisComment::append_comment()... +\n");
+       printf("        VorbisComment::get_comment()... ");
+       if(!block.append_comment(entry2))
+               return die_("returned false");
+       if(block.get_comment(1).get_field_length() != vorbiscomment_.data.vorbis_comment.comments[0].length)
+               return die_("length mismatch");
+       if(0 != memcmp(block.get_comment(1).get_field(), vorbiscomment_.data.vorbis_comment.comments[0].entry, vorbiscomment_.data.vorbis_comment.comments[0].length))
+               return die_("value mismatch");
+       printf("OK\n");
+
+       printf("testing VorbisComment::delete_comment()... +\n");
+       printf("        VorbisComment::get_comment()... ");
+       if(!block.delete_comment(0))
+               return die_("returned false");
+       if(block.get_comment(0).get_field_length() != vorbiscomment_.data.vorbis_comment.comments[0].length)
+               return die_("length[0] mismatch");
+       if(0 != memcmp(block.get_comment(0).get_field(), vorbiscomment_.data.vorbis_comment.comments[0].entry, vorbiscomment_.data.vorbis_comment.comments[0].length))
+               return die_("value[0] mismatch");
+       printf("OK\n");
+
+       printf("testing VorbisComment::delete_comment()... +\n");
+       printf("        VorbisComment::get_comment()... ");
+       if(!block.delete_comment(0))
+               return die_("returned false");
+       if(block.get_num_comments() != 0)
+               return die_("block mismatch, expected num_comments = 0");
+       printf("OK\n");
+
        printf("testing VorbisComment::insert_comment()... +\n");
        printf("        VorbisComment::get_comment()... ");
        if(!block.insert_comment(0, entry3))
@@ -1039,6 +1411,9 @@ bool test_metadata_object_vorbiscomment()
        if(*dynamic_cast<FLAC::Metadata::VorbisComment *>(clone_) != block)
                return die_("clone is not identical");
        printf("OK\n");
+       printf("testing VorbisComment::~VorbisComment()... ");
+       delete clone_;
+       printf("OK\n");
 
 
        printf("PASSED\n\n");
@@ -1183,7 +1558,7 @@ bool test_metadata_object_cuesheet()
        {
                FLAC::Metadata::CueSheet blockcopy(block);
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(blockcopy != block)
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -1197,7 +1572,7 @@ bool test_metadata_object_cuesheet()
        {
                FLAC::Metadata::CueSheet blockcopy(cuesheet_);
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(blockcopy != cuesheet_)
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -1208,7 +1583,55 @@ bool test_metadata_object_cuesheet()
        {
                FLAC::Metadata::CueSheet blockcopy(&cuesheet_);
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != cuesheet_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing CueSheet::CueSheet(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+       printf("        CueSheet::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               FLAC::Metadata::CueSheet blockcopy(&cuesheet_, /*copy=*/true);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != cuesheet_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing CueSheet::CueSheet(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+       printf("        CueSheet::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&cuesheet_);
+               FLAC::Metadata::CueSheet blockcopy(copy, /*copy=*/false);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != cuesheet_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing CueSheet::assign(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+       printf("        CueSheet::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               FLAC::Metadata::CueSheet blockcopy;
+               blockcopy.assign(&cuesheet_, /*copy=*/true);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != cuesheet_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing CueSheet::assign(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+       printf("        CueSheet::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&cuesheet_);
+               FLAC::Metadata::CueSheet blockcopy;
+               blockcopy.assign(copy, /*copy=*/false);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
                if(blockcopy != cuesheet_)
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -1219,7 +1642,7 @@ bool test_metadata_object_cuesheet()
        {
                FLAC::Metadata::CueSheet blockcopy = block;
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(!(blockcopy == block))
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -1230,7 +1653,7 @@ bool test_metadata_object_cuesheet()
        {
                FLAC::Metadata::CueSheet blockcopy = cuesheet_;
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(!(blockcopy == cuesheet_))
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -1241,7 +1664,7 @@ bool test_metadata_object_cuesheet()
        {
                FLAC::Metadata::CueSheet blockcopy = &cuesheet_;
                if(!blockcopy.is_valid())
-                       return die_("!block.is_valid()");
+                       return die_("!blockcopy.is_valid()");
                if(!(blockcopy == cuesheet_))
                        return die_("copy is not identical to original");
                printf("OK\n");
@@ -1368,6 +1791,269 @@ bool test_metadata_object_cuesheet()
        if(*dynamic_cast<FLAC::Metadata::CueSheet *>(clone_) != block)
                return die_("clone is not identical");
        printf("OK\n");
+       printf("testing CueSheet::~CueSheet()... ");
+       delete clone_;
+       printf("OK\n");
+
+       printf("PASSED\n\n");
+       return true;
+}
+
+bool test_metadata_object_picture()
+{
+       unsigned expected_length;
+
+       printf("testing class FLAC::Metadata::Picture\n");
+
+       printf("testing Picture::Picture()... ");
+       FLAC::Metadata::Picture block;
+       if(!block.is_valid())
+               return die_("!block.is_valid()");
+       expected_length = (
+               FLAC__STREAM_METADATA_PICTURE_TYPE_LEN +
+               FLAC__STREAM_METADATA_PICTURE_MIME_TYPE_LENGTH_LEN +
+               FLAC__STREAM_METADATA_PICTURE_DESCRIPTION_LENGTH_LEN +
+               FLAC__STREAM_METADATA_PICTURE_WIDTH_LEN +
+               FLAC__STREAM_METADATA_PICTURE_HEIGHT_LEN +
+               FLAC__STREAM_METADATA_PICTURE_DEPTH_LEN +
+               FLAC__STREAM_METADATA_PICTURE_COLORS_LEN +
+               FLAC__STREAM_METADATA_PICTURE_DATA_LENGTH_LEN
+       ) / 8;
+       if(block.get_length() != expected_length) {
+               printf("FAILED, bad length, expected %u, got %u\n", expected_length, block.get_length());
+               return false;
+       }
+       printf("OK\n");
+
+       printf("testing Picture::Picture(const Picture &)... +\n");
+       printf("        Picture::operator!=(const Picture &)... ");
+       {
+               FLAC::Metadata::Picture blockcopy(block);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != block)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+
+               printf("testing Picture::~Picture()... ");
+       }
+       printf("OK\n");
+
+       printf("testing Picture::Picture(const ::FLAC__StreamMetadata &)... +\n");
+       printf("        Picture::operator!=(const ::FLAC__StreamMetadata &)... ");
+       {
+               FLAC::Metadata::Picture blockcopy(picture_);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != picture_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing Picture::Picture(const ::FLAC__StreamMetadata *)... +\n");
+       printf("        Picture::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               FLAC::Metadata::Picture blockcopy(&picture_);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != picture_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing Picture::Picture(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+       printf("        Picture::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               FLAC::Metadata::Picture blockcopy(&picture_, /*copy=*/true);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != picture_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing Picture::Picture(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+       printf("        Picture::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&picture_);
+               FLAC::Metadata::Picture blockcopy(copy, /*copy=*/false);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != picture_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing Picture::assign(const ::FLAC__StreamMetadata *, copy=true)... +\n");
+       printf("        Picture::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               FLAC::Metadata::Picture blockcopy;
+               blockcopy.assign(&picture_, /*copy=*/true);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != picture_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing Picture::assign(const ::FLAC__StreamMetadata *, copy=false)... +\n");
+       printf("        Picture::operator!=(const ::FLAC__StreamMetadata *)... ");
+       {
+               ::FLAC__StreamMetadata *copy = ::FLAC__metadata_object_clone(&picture_);
+               FLAC::Metadata::Picture blockcopy;
+               blockcopy.assign(copy, /*copy=*/false);
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(blockcopy != picture_)
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing Picture::operator=(const Picture &)... +\n");
+       printf("        Picture::operator==(const Picture &)... ");
+       {
+               FLAC::Metadata::Picture blockcopy = block;
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(!(blockcopy == block))
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing Picture::operator=(const ::FLAC__StreamMetadata &)... +\n");
+       printf("        Picture::operator==(const ::FLAC__StreamMetadata &)... ");
+       {
+               FLAC::Metadata::Picture blockcopy = picture_;
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(!(blockcopy == picture_))
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing Picture::operator=(const ::FLAC__StreamMetadata *)... +\n");
+       printf("        Picture::operator==(const ::FLAC__StreamMetadata *)... ");
+       {
+               FLAC::Metadata::Picture blockcopy = &picture_;
+               if(!blockcopy.is_valid())
+                       return die_("!blockcopy.is_valid()");
+               if(!(blockcopy == picture_))
+                       return die_("copy is not identical to original");
+               printf("OK\n");
+       }
+
+       printf("testing Picture::get_type()... ");
+       if(block.get_type() != ::FLAC__STREAM_METADATA_PICTURE_TYPE_OTHER)
+               return die_("value mismatch, expected ::FLAC__STREAM_METADATA_PICTURE_TYPE_OTHER");
+       printf("OK\n");
+
+       printf("testing Picture::set_type()... +\n");
+       printf("        Picture::get_type()... ");
+       block.set_type(::FLAC__STREAM_METADATA_PICTURE_TYPE_MEDIA);
+       if(block.get_type() != ::FLAC__STREAM_METADATA_PICTURE_TYPE_MEDIA)
+               return die_("value mismatch, expected ::FLAC__STREAM_METADATA_PICTURE_TYPE_MEDIA");
+       printf("OK\n");
+
+       printf("testing Picture::set_mime_type()... ");
+       if(!block.set_mime_type("qmage/jpeg"))
+               return die_("returned false");
+       printf("OK\n");
+       picture_.data.picture.mime_type[0] = 'q';
+
+       printf("testing Picture::get_mime_type()... ");
+       if(0 != strcmp(block.get_mime_type(), picture_.data.picture.mime_type))
+               return die_("value mismatch");
+       printf("OK\n");
+
+       printf("testing Picture::set_description()... ");
+       if(!block.set_description((const FLAC__byte*)"qesc"))
+               return die_("returned false");
+       printf("OK\n");
+       picture_.data.picture.description[0] = 'q';
+
+       printf("testing Picture::get_description()... ");
+       if(0 != strcmp((const char *)block.get_description(), (const char *)picture_.data.picture.description))
+               return die_("value mismatch");
+       printf("OK\n");
+
+       printf("testing Picture::get_width()... ");
+       if(block.get_width() != 0)
+               return die_("value mismatch, expected 0");
+       printf("OK\n");
+
+       printf("testing Picture::set_width()... +\n");
+       printf("        Picture::get_width()... ");
+       block.set_width(400);
+       if(block.get_width() != 400)
+               return die_("value mismatch, expected 400");
+       printf("OK\n");
+
+       printf("testing Picture::get_height()... ");
+       if(block.get_height() != 0)
+               return die_("value mismatch, expected 0");
+       printf("OK\n");
+
+       printf("testing Picture::set_height()... +\n");
+       printf("        Picture::get_height()... ");
+       block.set_height(200);
+       if(block.get_height() != 200)
+               return die_("value mismatch, expected 200");
+       printf("OK\n");
+
+       printf("testing Picture::get_depth()... ");
+       if(block.get_depth() != 0)
+               return die_("value mismatch, expected 0");
+       printf("OK\n");
+
+       printf("testing Picture::set_depth()... +\n");
+       printf("        Picture::get_depth()... ");
+       block.set_depth(16);
+       if(block.get_depth() != 16)
+               return die_("value mismatch, expected 16");
+       printf("OK\n");
+
+       printf("testing Picture::get_colors()... ");
+       if(block.get_colors() != 0)
+               return die_("value mismatch, expected 0");
+       printf("OK\n");
+
+       printf("testing Picture::set_colors()... +\n");
+       printf("        Picture::get_colors()... ");
+       block.set_colors(1u>16);
+       if(block.get_colors() != (1u>16))
+               return die_("value mismatch, expected 2^16");
+       printf("OK\n");
+
+       printf("testing Picture::get_data_length()... ");
+       if(block.get_data_length() != 0)
+               return die_("value mismatch, expected 0");
+       printf("OK\n");
+
+       printf("testing Picture::set_data()... ");
+       if(!block.set_data((const FLAC__byte*)"qOMEJPEGDATA", strlen("qOMEJPEGDATA")))
+               return die_("returned false");
+       printf("OK\n");
+       picture_.data.picture.data[0] = 'q';
+
+       printf("testing Picture::get_data()... ");
+       if(block.get_data_length() != picture_.data.picture.data_length)
+               return die_("length mismatch");
+       if(0 != memcmp(block.get_data(), picture_.data.picture.data, picture_.data.picture.data_length))
+               return die_("value mismatch");
+       printf("OK\n");
+
+       printf("testing FLAC::Metadata::clone(const FLAC::Metadata::Prototype *)... ");
+       FLAC::Metadata::Prototype *clone_ = FLAC::Metadata::clone(&block);
+       if(0 == clone_)
+               return die_("returned NULL");
+       if(0 == dynamic_cast<FLAC::Metadata::Picture *>(clone_))
+               return die_("downcast is NULL");
+       if(*dynamic_cast<FLAC::Metadata::Picture *>(clone_) != block)
+               return die_("clone is not identical");
+       printf("OK\n");
+       printf("testing Picture::~Picture()... ");
+       delete clone_;
+       printf("OK\n");
 
 
        printf("PASSED\n\n");
@@ -1398,6 +2084,9 @@ bool test_metadata_object()
        if(!test_metadata_object_cuesheet())
                return false;
 
+       if(!test_metadata_object_picture())
+               return false;
+
        free_metadata_blocks_();
 
        return true;