From 983842049597d8e320ec511df3dd4e09e598c63f Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Mon, 20 May 2024 08:08:24 +0200 Subject: [PATCH 1/2] Fix compiler warnings [-Wmaybe-uninitialized] Signed-off-by: Stefan Weil --- src/api/pagerenderer.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/api/pagerenderer.cpp b/src/api/pagerenderer.cpp index a6541ba91d..597f86fc01 100644 --- a/src/api/pagerenderer.cpp +++ b/src/api/pagerenderer.cpp @@ -744,7 +744,7 @@ char *TessBaseAPI::GetPAGEText(ETEXT_DESC *monitor, int page_number) { std::stringstream word_str; std::stringstream page_str; - float x1, y1, x2, y2, word_conf, line_conf, block_conf; + float x1, y1, x2, y2; tesseract::Orientation orientation_block = ORIENTATION_PAGE_UP; tesseract::WritingDirection writing_direction_block = @@ -824,6 +824,7 @@ char *TessBaseAPI::GetPAGEText(ETEXT_DESC *monitor, int page_number) { break; } + float block_conf = 0; if (res_it->IsAtBeginningOf(RIL_BLOCK)) { // Add Block to reading order reading_order_str << "\t\t\t\tIsAtBeginningOf(RIL_TEXTLINE)) { // writing_direction_before = writing_direction; line_conf = ((res_it->Confidence(RIL_TEXTLINE)) / 100.); @@ -900,7 +902,7 @@ char *TessBaseAPI::GetPAGEText(ETEXT_DESC *monitor, int page_number) { bool last_word_in_line = res_it->IsAtFinalElement(RIL_TEXTLINE, RIL_WORD); bool last_word_in_cblock = res_it->IsAtFinalElement(RIL_BLOCK, RIL_WORD); - word_conf = ((res_it->Confidence(RIL_WORD)) / 100.); + float word_conf = ((res_it->Confidence(RIL_WORD)) / 100.); // Create word stream if word level output is active if (LEVELFLAG > 0) { From 0b180be7f0286b24927c3f4cec63feea538fba51 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Mon, 20 May 2024 08:40:01 +0200 Subject: [PATCH 2/2] Fix compiler warnings [-Wdeprecated-declarations] Signed-off-by: Stefan Weil --- src/training/pango/pango_font_info.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/training/pango/pango_font_info.cpp b/src/training/pango/pango_font_info.cpp index 1ebe43a7c2..5adbb26f9e 100644 --- a/src/training/pango/pango_font_info.cpp +++ b/src/training/pango/pango_font_info.cpp @@ -230,12 +230,20 @@ bool PangoFontInfo::CoversUTF8Text(const char *utf8_text, int byte_length) const int len = it.get_utf8(tmp); tmp[len] = '\0'; tlog(2, "'%s' (U+%x) not covered by font\n", tmp, *it); +#if PANGO_VERSION_CHECK(1, 52, 0) + g_object_unref(coverage); +#else pango_coverage_unref(coverage); +#endif g_object_unref(font); return false; } } +#if PANGO_VERSION_CHECK(1, 52, 0) + g_object_unref(coverage); +#else pango_coverage_unref(coverage); +#endif g_object_unref(font); return true; } @@ -303,7 +311,11 @@ int PangoFontInfo::DropUncoveredChars(std::string *utf8_text) const { my_strnmove(out, utf8_char, utf8_len); out += utf8_len; } +#if PANGO_VERSION_CHECK(1, 52, 0) + g_object_unref(coverage); +#else pango_coverage_unref(coverage); +#endif g_object_unref(font); utf8_text->resize(out - utf8_text->c_str()); return num_dropped_chars; @@ -603,7 +615,11 @@ int FontUtils::FontScore(const std::unordered_map &ch_map, ch_flags->push_back(covered); } } +#if PANGO_VERSION_CHECK(1, 52, 0) + g_object_unref(coverage); +#else pango_coverage_unref(coverage); +#endif g_object_unref(font); return ok_chars; }