Skip to content

Commit

Permalink
What the...? Git's merge failed hard.
Browse files Browse the repository at this point in the history
  • Loading branch information
jimregan committed Jul 20, 2015
1 parent 301eaec commit 953523b
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions classify/mf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,12 @@
* the features into the new format. Then deallocate the
* old micro-features.
* @param Blob blob to extract micro-features from
* @param bl_denorm currently unused
* @param cn_denorm control parameter to feature extractor.
* @param fx_info currently unused
* @return Micro-features for Blob.
* @note Exceptions: none
* @note History: Wed May 23 18:06:38 1990, DSJ, Created.
*/
FEATURE_SET ExtractMicros(TBLOB *Blob, const DENORM& bl_denorm,
const DENORM& cn_denorm,
const INT_FX_RESULT_STRUCT& fx_info) {
FEATURE_SET ExtractMicros(TBLOB* Blob, const DENORM& cn_denorm) {
int NumFeatures;
MICROFEATURES Features, OldFeatures;
FEATURE_SET FeatureSet;
Expand Down

0 comments on commit 953523b

Please sign in to comment.