From e98137e059d7de53cdc696c2fcb191dcfbcbfe09 Mon Sep 17 00:00:00 2001 From: Nils Date: Wed, 12 Feb 2020 23:01:15 +0000 Subject: [PATCH] [FIX] Fix tags displaying incorrectly (#1229) This was caused by 19241744d71adeda0f29c553b966236e88312c94, moving from `unsigned char` to `enums` for colors and fonts. The problem with this is that each colour isn't one byte next to each other so memcpy and memset didn't work anymore. The problem: ```patch 6812,6813c6812,6813 < EDITION OF AMERICA'S NEXT TOP < MODEL ON WEDNESDAYS. --- > EDITION OF AMERICA'S NEXT TOP > MODEL ON WEDNESDAYS. 6817c6817 < EDITION OF AMERICA'S NEXT TOP --- > EDITION OF AMERICA'S NEXT TOP 6819c6819 < >> THE VAMPIRE DIARIES --- > >> THE VAMPIRE DIARIES 6824,6825c6824,6825 < >> THE VAMPIRE DIARIES < AND THE SECRET CIRCLE --- > >> THE VAMPIRE DIARIES > AND THE SECRET CIRCLE 6829,6831c6829,6831 < >> THE VAMPIRE DIARIES < AND THE SECRET CIRCLE < ON THURSDAYS. --- > >> THE VAMPIRE DIARIES > AND THE SECRET CIRCLE > ON THURSDAYS. 6835c6835 < AND THE SECRET CIRCLE --- > AND THE SECRET CIRCLE ``` --- src/lib_ccx/ccx_decoders_608.c | 41 +++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/src/lib_ccx/ccx_decoders_608.c b/src/lib_ccx/ccx_decoders_608.c index 23a87346..254b1bb4 100644 --- a/src/lib_ccx/ccx_decoders_608.c +++ b/src/lib_ccx/ccx_decoders_608.c @@ -109,7 +109,7 @@ void clear_eia608_cc_buffer(ccx_decoder_608_context *context, struct eia608_scre memset(data->characters[i], ' ', CCX_DECODER_608_SCREEN_WIDTH); data->characters[i][CCX_DECODER_608_SCREEN_WIDTH] = 0; - for (int j = 0; j < CCX_DECODER_608_SCREEN_WIDTH + 1; j++) + for (int j = 0; j < CCX_DECODER_608_SCREEN_WIDTH + 1; ++j) { data->colors[i][j] = context->settings->default_color; data->fonts[i][j] = FONT_REGULAR; @@ -526,24 +526,39 @@ int roll_up(ccx_decoder_608_context *context) if (j >= 0) { memcpy(use_buffer->characters[j], use_buffer->characters[j + 1], CCX_DECODER_608_SCREEN_WIDTH + 1); - memcpy(use_buffer->colors[j], use_buffer->colors[j + 1], CCX_DECODER_608_SCREEN_WIDTH + 1); - memcpy(use_buffer->fonts[j], use_buffer->fonts[j + 1], CCX_DECODER_608_SCREEN_WIDTH + 1); - use_buffer->row_used[j] = use_buffer->row_used[j + 1]; + + for (int i = 0; i < CCX_DECODER_608_SCREEN_WIDTH + 1; ++i) + { + use_buffer->colors[j][i] = use_buffer->colors[j + 1][i]; + use_buffer->fonts[j][i] = use_buffer->fonts[j + 1][i]; + } + + use_buffer->row_used[j]=use_buffer->row_used[j+1]; } } for (int j = 0; j < (1 + context->cursor_row - keep_lines); j++) { memset(use_buffer->characters[j], ' ', CCX_DECODER_608_SCREEN_WIDTH); - memset(use_buffer->colors[j], context->settings->default_color, CCX_DECODER_608_SCREEN_WIDTH); - memset(use_buffer->fonts[j], FONT_REGULAR, CCX_DECODER_608_SCREEN_WIDTH); use_buffer->characters[j][CCX_DECODER_608_SCREEN_WIDTH] = 0; + + for (int i = 0; i < CCX_DECODER_608_SCREEN_WIDTH; ++i) + { + use_buffer->colors[j][i] = context->settings->default_color; + use_buffer->fonts[j][i] = FONT_REGULAR; + } + use_buffer->row_used[j] = 0; } - memset(use_buffer->characters[lastrow], ' ', CCX_DECODER_608_SCREEN_WIDTH); - memset(use_buffer->colors[lastrow], context->settings->default_color, CCX_DECODER_608_SCREEN_WIDTH); - memset(use_buffer->fonts[lastrow], FONT_REGULAR, CCX_DECODER_608_SCREEN_WIDTH); + memset(use_buffer->characters[lastrow], ' ', CCX_DECODER_608_SCREEN_WIDTH); use_buffer->characters[lastrow][CCX_DECODER_608_SCREEN_WIDTH] = 0; + + for (int i = 0; i < CCX_DECODER_608_SCREEN_WIDTH; ++i) + { + use_buffer->colors[lastrow][i] = context->settings->default_color; + use_buffer->fonts[lastrow][i] = FONT_REGULAR; + } + use_buffer->row_used[lastrow] = 0; // Sanity check @@ -949,9 +964,13 @@ void handle_pac(unsigned char c1, unsigned char c2, ccx_decoder_608_context *con if (use_buffer->row_used[j]) { memset(use_buffer->characters[j], ' ', CCX_DECODER_608_SCREEN_WIDTH); - memset(use_buffer->colors[j], context->settings->default_color, CCX_DECODER_608_SCREEN_WIDTH); - memset(use_buffer->fonts[j], FONT_REGULAR, CCX_DECODER_608_SCREEN_WIDTH); use_buffer->characters[j][CCX_DECODER_608_SCREEN_WIDTH] = 0; + + for (int i = 0; i < CCX_DECODER_608_SCREEN_WIDTH; ++i) + { + use_buffer->colors[j][i] = context->settings->default_color; + use_buffer->fonts[j][i] = FONT_REGULAR; + } use_buffer->row_used[j] = 0; } }