diff options
| author | Josh Coalson <jcoalson@users.sourceforce.net> | 2006-09-23 23:15:05 +0000 |
|---|---|---|
| committer | Josh Coalson <jcoalson@users.sourceforce.net> | 2006-09-23 23:15:05 +0000 |
| commit | 74ed294764174ab4abe2bb5d4081c63d87747b97 (patch) | |
| tree | 8c37139701b30b21d334fa8b4d23fa687defc7de /src/libFLAC/metadata_object.c | |
| parent | e343ab2b87dbea605bbaebb1d1af786838510c92 (diff) | |
| download | flac-74ed294764174ab4abe2bb5d4081c63d87747b97.tar.gz | |
add number-of-colors field to PICTURE metadata block
Diffstat (limited to 'src/libFLAC/metadata_object.c')
| -rw-r--r-- | src/libFLAC/metadata_object.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libFLAC/metadata_object.c b/src/libFLAC/metadata_object.c index 7efa2cf1..55b00de2 100644 --- a/src/libFLAC/metadata_object.c +++ b/src/libFLAC/metadata_object.c @@ -481,6 +481,7 @@ FLAC_API FLAC__StreamMetadata *FLAC__metadata_object_new(FLAC__MetadataType type 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 + 0 /* no data */ ) / 8; @@ -491,6 +492,7 @@ FLAC_API FLAC__StreamMetadata *FLAC__metadata_object_new(FLAC__MetadataType type object->data.picture.width = 0; object->data.picture.height = 0; object->data.picture.depth = 0; + object->data.picture.colors = 0; object->data.picture.data_length = 0; object->data.picture.data = 0; */ @@ -598,6 +600,7 @@ FLAC_API FLAC__StreamMetadata *FLAC__metadata_object_clone(const FLAC__StreamMet to->data.picture.width = object->data.picture.width; to->data.picture.height = object->data.picture.height; to->data.picture.depth = object->data.picture.depth; + to->data.picture.colors = object->data.picture.colors; to->data.picture.data_length = object->data.picture.data_length; if(!copy_bytes_((&to->data.picture.data), object->data.picture.data, object->data.picture.data_length)) { FLAC__metadata_object_delete(to); @@ -834,6 +837,8 @@ static FLAC__bool compare_block_data_picture_(const FLAC__StreamMetadata_Picture return false; if(block1->depth != block2->depth) return false; + if(block1->colors != block2->colors) + return false; if(block1->data_length != block2->data_length) return false; if(block1->data != block2->data && (0 == block1->data || 0 == block2->data || memcmp(block1->data, block2->data, block1->data_length))) |