Commit 3e219679 for tesseract
commit 3e21967944fa6e537b4ffb72e60d1ba614ad0f33
Author: Stefan Weil <sw@weilnetz.de>
Date: Thu Jun 4 21:40:56 2026 +0200
Use more `constexpr`
Assisted-by: OpenCode / BigPickle
Signed-off-by: Stefan Weil <sw@weilnetz.de>
diff --git a/src/classify/adaptmatch.cpp b/src/classify/adaptmatch.cpp
index 29eebc7b..f71d86d8 100644
--- a/src/classify/adaptmatch.cpp
+++ b/src/classify/adaptmatch.cpp
@@ -75,20 +75,20 @@ namespace tesseract {
// TODO: The parameter classify_enable_adaptive_matcher can cause
// a segmentation fault if it is set to false (issue #256),
// so override it here.
-#define CLASSIFY_ENABLE_ADAPTIVE_MATCHER_OVERRIDE true
+constexpr bool CLASSIFY_ENABLE_ADAPTIVE_MATCHER_OVERRIDE = true;
-#define ADAPT_TEMPLATE_SUFFIX ".a"
+constexpr const char *ADAPT_TEMPLATE_SUFFIX = ".a";
-#define MAX_MATCHES 10
-#define UNLIKELY_NUM_FEAT 200
-#define NO_DEBUG 0
-#define MAX_ADAPTABLE_WERD_SIZE 40
+constexpr int MAX_MATCHES = 10;
+constexpr int UNLIKELY_NUM_FEAT = 200;
+constexpr int NO_DEBUG = 0;
+constexpr int MAX_ADAPTABLE_WERD_SIZE = 40;
-#define ADAPTABLE_WERD_ADJUSTMENT (0.05)
+constexpr double ADAPTABLE_WERD_ADJUSTMENT = 0.05;
-#define Y_DIM_OFFSET (Y_SHIFT - BASELINE_Y_SHIFT)
+constexpr double Y_DIM_OFFSET = Y_SHIFT - BASELINE_Y_SHIFT;
-#define WORST_POSSIBLE_RATING (0.0f)
+constexpr float WORST_POSSIBLE_RATING = 0.0f;
struct ADAPT_RESULTS {
int32_t BlobLength;
diff --git a/src/classify/featdefs.cpp b/src/classify/featdefs.cpp
index cc91c8b6..d051faf4 100644
--- a/src/classify/featdefs.cpp
+++ b/src/classify/featdefs.cpp
@@ -25,7 +25,7 @@
namespace tesseract {
-#define PICO_FEATURE_LENGTH 0.05
+constexpr double PICO_FEATURE_LENGTH = 0.05;
/*-----------------------------------------------------------------------------
Global Data Definitions and Declarations
diff --git a/src/classify/featdefs.h b/src/classify/featdefs.h
index a6c41efc..fdfbd08e 100644
--- a/src/classify/featdefs.h
+++ b/src/classify/featdefs.h
@@ -26,7 +26,7 @@
namespace tesseract {
/* Enumerate the different types of features currently defined. */
-#define NUM_FEATURE_TYPES 4
+constexpr int NUM_FEATURE_TYPES = 4;
extern TESS_API const char *const kMicroFeatureType;
extern TESS_API const char *const kCNFeatureType;
extern TESS_API const char *const kIntFeatureType;