claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

add number-of-colors field to PICTURE metadata block

Browse Source
This commit is contained in:
Josh Coalson
2006-09-23 23:15:05 +00:00
parent e343ab2b87
commit 74ed294764
15 changed files with 87 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libFLAC/metadata_object.c
View File

@@ -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)))