[easytag] Emit a critical warning for invalid FLAC artwork
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [easytag] Emit a critical warning for invalid FLAC artwork
- Date: Thu, 6 Nov 2014 16:26:23 +0000 (UTC)
commit b83f270dca352a67c299a23f320fda6823f710da
Author: David King <amigadave amigadave com>
Date: Thu Nov 6 16:23:40 2014 +0000
Emit a critical warning for invalid FLAC artwork
This should only happen if gdk-pixbuf supplies bogus data, so it should
not use Log_Print() to log a massage to the UI.
src/tags/flac_tag.c | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/src/tags/flac_tag.c b/src/tags/flac_tag.c
index be75f1a..16d71d8 100644
--- a/src/tags/flac_tag.c
+++ b/src/tags/flac_tag.c
@@ -1088,15 +1088,19 @@ flac_tag_write_file_tag (const ET_File *ETFile,
picture_block->data.picture.height = pic->height;
picture_block->data.picture.depth = 0;
- // Picture data
- FLAC__metadata_object_picture_set_data(picture_block, (FLAC__byte *)pic->data,
(FLAC__uint32) pic->size, TRUE);
+ /* Picture data. */
+ FLAC__metadata_object_picture_set_data (picture_block,
+ (FLAC__byte *)pic->data, (FLAC__uint32) pic->size,
+ TRUE);
- if (!FLAC__metadata_object_picture_is_legal(picture_block, &violation))
+ if (!FLAC__metadata_object_picture_is_legal (picture_block,
+ &violation))
{
- Log_Print (LOG_ERROR, _("Picture block is invalid ā%sā"),
- violation);
- FLAC__metadata_object_delete(picture_block);
- }else
+ g_critical ("Created an invalid picture block: ā%sā",
+ violation);
+ FLAC__metadata_object_delete (picture_block);
+ }
+ else
{
// Add the block to the the chain (so we don't need to free the block)
FLAC__metadata_iterator_insert_block_after(iter, picture_block);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]