mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-11-24 11:09:06 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Replace strdup / free by std::string for StringRenderer::features_

Browse Source 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2021-03-29 10:58:23 +02:00
parent 201686feb8
commit 7c1bea505a
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/training/pango/stringrenderer.cpp
View File

@ -3,7 +3,6 @@
* Description: Class for rendering UTF-8 text to an image, and retrieving
* bounding boxes around each grapheme cluster.
* Author: Ranjith Unnikrishnan
* Created: Mon Nov 18 2013
*
* (C) Copyright 2013, Google Inc.
* Licensed under the Apache License, Version 2.0 (the "License");
@ -108,7 +107,6 @@ StringRenderer::StringRenderer(const std::string &font_desc, int page_width, int
, underline_start_prob_(0)
, underline_continuation_prob_(0)
, underline_style_(PANGO_UNDERLINE_SINGLE)
, features_(nullptr)
, drop_uncovered_chars_(true)
, strip_unrenderable_words_(false)
, add_ligatures_(false)
@ -147,7 +145,6 @@ void StringRenderer::set_underline_continuation_prob(const double frac) {
}
StringRenderer::~StringRenderer() {
free(features_);
ClearBoxes();
FreePangoCairo();
}
@ -204,7 +201,7 @@ void StringRenderer::SetLayoutProperties() {
#if (PANGO_VERSION_MAJOR == 1 && PANGO_VERSION_MINOR >= 38)
if (add_ligatures_) {
set_features("liga, clig, dlig, hlig");
PangoAttribute *feature_attr = pango_attr_font_features_new(features_);
PangoAttribute *feature_attr = pango_attr_font_features_new(features_.c_str());
pango_attr_list_change(attr_list, feature_attr);
}
#endif

9
src/training/pango/stringrenderer.h
View File

@ -41,10 +41,6 @@
struct Boxa;
struct Pix;
#ifdef _MSC_VER
# define strdup(s) _strdup(s)
#endif
namespace tesseract {
class BoxChar;
@ -95,8 +91,7 @@ public:
underline_style_ = style;
}
void set_features(const char *features) {
free(features_);
features_ = strdup(features);
features_ = features;
}
void set_page(int page) {
page_ = page;
@ -196,7 +191,7 @@ protected:
double underline_start_prob_;
double underline_continuation_prob_;
PangoUnderline underline_style_;
char *features_;
std::string features_;
// Text filtering options
bool drop_uncovered_chars_;
bool strip_unrenderable_words_;