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

What the...? Git's merge failed hard.

Browse Source
This commit is contained in:
Jim Regan 2015-07-20 22:42:58 +01:00
parent 301eaeca5f
commit 953523bbe2
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
classify/mf.cpp
View File

@ -37,16 +37,12 @@
* the features into the new format. Then deallocate the * the features into the new format. Then deallocate the
* old micro-features. * old micro-features.
* @param Blob blob to extract micro-features from * @param Blob blob to extract micro-features from
* @param bl_denorm currently unused
* @param cn_denorm control parameter to feature extractor. * @param cn_denorm control parameter to feature extractor.
* @param fx_info currently unused
* @return Micro-features for Blob. * @return Micro-features for Blob.
* @note Exceptions: none * @note Exceptions: none
* @note History: Wed May 23 18:06:38 1990, DSJ, Created. * @note History: Wed May 23 18:06:38 1990, DSJ, Created.
*/ */
FEATURE_SET ExtractMicros(TBLOB *Blob, const DENORM& bl_denorm, FEATURE_SET ExtractMicros(TBLOB* Blob, const DENORM& cn_denorm) {
const DENORM& cn_denorm,
const INT_FX_RESULT_STRUCT& fx_info) {
int NumFeatures; int NumFeatures;
MICROFEATURES Features, OldFeatures; MICROFEATURES Features, OldFeatures;
FEATURE_SET FeatureSet; FEATURE_SET FeatureSet;