Skip to content

Simplify code for osdetect #4436

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stweil merged 1 commit into from
Jul 6, 2025
Merged

Simplify code for osdetect #4436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions include/tesseract/osdetect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,6 @@ class ScriptDetector {

private:
OSResults *osr_;
static const char *korean_script_;
static const char *japanese_script_;
static const char *fraktur_script_;
int korean_id_;
int japanese_id_;
int katakana_id_;
Expand Down
30 changes: 10 additions & 20 deletions src/ccmain/osdetect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,6 @@ const float kHanRatioInJapanese = 0.3;

const float kNonAmbiguousMargin = 1.0;

// General scripts
static const char *han_script = "Han";
static const char *latin_script = "Latin";
static const char *katakana_script = "Katakana";
static const char *hiragana_script = "Hiragana";
static const char *hangul_script = "Hangul";

// Pseudo-scripts Name
const char *ScriptDetector::korean_script_ = "Korean";
const char *ScriptDetector::japanese_script_ = "Japanese";
const char *ScriptDetector::fraktur_script_ = "Fraktur";

void OSResults::update_best_orientation() {
float first = orientations[0];
float second = orientations[1];
Expand Down Expand Up @@ -450,14 +438,16 @@ ScriptDetector::ScriptDetector(const std::vector<int> *allowed_scripts, OSResult
osr_ = osr;
tess_ = tess;
allowed_scripts_ = allowed_scripts;
katakana_id_ = tess_->unicharset.add_script(katakana_script);
hiragana_id_ = tess_->unicharset.add_script(hiragana_script);
han_id_ = tess_->unicharset.add_script(han_script);
hangul_id_ = tess_->unicharset.add_script(hangul_script);
japanese_id_ = tess_->unicharset.add_script(japanese_script_);
korean_id_ = tess_->unicharset.add_script(korean_script_);
latin_id_ = tess_->unicharset.add_script(latin_script);
fraktur_id_ = tess_->unicharset.add_script(fraktur_script_);
// General scripts
katakana_id_ = tess_->unicharset.add_script("Katakana");
hiragana_id_ = tess_->unicharset.add_script("Hiragana");
han_id_ = tess_->unicharset.add_script("Han");
hangul_id_ = tess_->unicharset.add_script("Hangul");
latin_id_ = tess_->unicharset.add_script("Latin");
// Pseudo-scripts
fraktur_id_ = tess_->unicharset.add_script("Fraktur");
japanese_id_ = tess_->unicharset.add_script("Japanese");
korean_id_ = tess_->unicharset.add_script("Korean");
}

// Score the given blob and return true if it is now sure of the script after
Expand Down
Loading