mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2025-01-18 06:30:14 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Merge pull request #861 from stweil/malloc

Browse Source 
Remove freelist,c and freelist.h
This commit is contained in:
zdenop 2017-05-02 08:37:00 +02:00 committed by GitHub
commit b8137d810f
12 changed files with 35 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
classify/adaptive.cpp
View File

@ -21,7 +21,6 @@
----------------------------------------------------------------------------*/
#include "adaptive.h"
#include "emalloc.h"
#include "freelist.h"
#include "globals.h"
#include "classify.h"
@ -81,11 +80,8 @@ void AddAdaptedClass(ADAPT_TEMPLATES Templates,
*/
void FreeTempConfig(TEMP_CONFIG Config) {
assert (Config != NULL);
destroy_nodes (Config->ContextsSeen, memfree);
FreeBitVector (Config->Protos);
free(Config);
} /* FreeTempConfig */
/*---------------------------------------------------------------------------*/
@ -231,7 +227,6 @@ TEMP_CONFIG NewTempConfig(int MaxProtoId, int FontinfoId) {
Config->NumTimesSeen = 1;
Config->MaxProtoId = MaxProtoId;
Config->ProtoVectorSize = WordsInVectorOfSize (NumProtos);
Config->ContextsSeen = NIL_LIST;
zero_all_bits (Config->Protos, Config->ProtoVectorSize);
Config->FontinfoId = FontinfoId;
@ -547,8 +542,6 @@ void WritePermConfig(FILE *File, PERM_CONFIG Config) {
*/
void WriteTempConfig(FILE *File, TEMP_CONFIG Config) {
assert (Config != NULL);
/* contexts not yet implemented */
assert (Config->ContextsSeen == NULL);
fwrite ((char *) Config, sizeof (TEMP_CONFIG_STRUCT), 1, File);
fwrite ((char *) Config->Protos, sizeof (uinT32),

1
classify/adaptive.h
View File

@ -41,7 +41,6 @@ typedef struct
uinT8 NumTimesSeen;
uinT8 ProtoVectorSize;
PROTO_ID MaxProtoId;
LIST ContextsSeen;
BIT_VECTOR Protos;
int FontinfoId; // font information inferred from pre-trained templates
} TEMP_CONFIG_STRUCT;

45
classify/cluster.cpp
View File

@ -24,7 +24,6 @@
#include "matrix.h"
#include "tprintf.h"
#include "danerror.h"
#include "freelist.h"
#include <math.h>
#define HOTELLING 1 // If true use Hotelling's test to decide where to split.
@ -546,7 +545,7 @@ LIST ClusterSamples(CLUSTERER *Clusterer, CLUSTERCONFIG *Config) {
*/
void FreeClusterer(CLUSTERER *Clusterer) {
if (Clusterer != NULL) {
memfree (Clusterer->ParamDesc);
free(Clusterer->ParamDesc);
if (Clusterer->KDTree != NULL)
FreeKDTree (Clusterer->KDTree);
if (Clusterer->Root != NULL)
@ -558,7 +557,7 @@ void FreeClusterer(CLUSTERER *Clusterer) {
FreeBuckets(Clusterer->bucket_cache[d][c]);
}
memfree(Clusterer);
free(Clusterer);
}
} // FreeClusterer
@ -593,19 +592,14 @@ void FreePrototype(void *arg) { //PROTOTYPE *Prototype)
Prototype->Cluster->Prototype = FALSE;
// deallocate the prototype statistics and then the prototype itself
if (Prototype->Distrib != NULL)
memfree (Prototype->Distrib);
if (Prototype->Mean != NULL)
memfree (Prototype->Mean);
free (Prototype->Distrib);
free (Prototype->Mean);
if (Prototype->Style != spherical) {
if (Prototype->Variance.Elliptical != NULL)
memfree (Prototype->Variance.Elliptical);
if (Prototype->Magnitude.Elliptical != NULL)
memfree (Prototype->Magnitude.Elliptical);
if (Prototype->Weight.Elliptical != NULL)
memfree (Prototype->Weight.Elliptical);
free (Prototype->Variance.Elliptical);
free (Prototype->Magnitude.Elliptical);
free (Prototype->Weight.Elliptical);
}
memfree(Prototype);
free(Prototype);
} // FreePrototype
/**
@ -756,7 +750,7 @@ void CreateClusterTree(CLUSTERER *Clusterer) {
FreeKDTree(context.tree);
Clusterer->KDTree = NULL;
delete context.heap;
memfree(context.candidates);
free(context.candidates);
} // CreateClusterTree
/**
@ -1173,9 +1167,9 @@ PROTOTYPE *TestEllipticalProto(CLUSTERER *Clusterer,
}
Tsq += Delta[x] * temp;
}
memfree(Covariance);
memfree(Inverse);
memfree(Delta);
free(Covariance);
free(Inverse);
free(Delta);
// Changed this function to match the formula in
// Statistical Methods in Medical Research p 473
// By Peter Armitage, Geoffrey Berry, J. N. S. Matthews.
@ -1485,7 +1479,7 @@ ComputeStatistics (inT16 N, PARAM_DESC ParamDesc[], CLUSTER * Cluster) {
1.0 / N);
// release temporary memory and return
memfree(Distance);
free(Distance);
return (Statistics);
} // ComputeStatistics
@ -2157,10 +2151,10 @@ BOOL8 DistributionOK(BUCKETS *Buckets) {
* @note History: 6/5/89, DSJ, Created.
*/
void FreeStatistics(STATISTICS *Statistics) {
memfree (Statistics->CoVariance);
memfree (Statistics->Min);
memfree (Statistics->Max);
memfree(Statistics);
free(Statistics->CoVariance);
free(Statistics->Min);
free(Statistics->Max);
free(Statistics);
} // FreeStatistics
/**
@ -2190,7 +2184,7 @@ void FreeCluster(CLUSTER *Cluster) {
if (Cluster != NULL) {
FreeCluster (Cluster->Left);
FreeCluster (Cluster->Right);
memfree(Cluster);
free(Cluster);
}
} // FreeCluster
@ -2487,8 +2481,7 @@ CLUSTER * Cluster, FLOAT32 MaxIllegal)
NumIllegalInCluster = 0;
if (Clusterer->NumChar > NumFlags) {
if (CharFlags != NULL)
memfree(CharFlags);
free(CharFlags);
NumFlags = Clusterer->NumChar;
CharFlags = (BOOL8 *) Emalloc (NumFlags * sizeof (BOOL8));
}

7
classify/kdtree.cpp
View File

@ -24,7 +24,6 @@
#include "kdtree.h"
#include "const.h"
#include "emalloc.h"
#include "freelist.h"
#include <stdio.h>
#include <math.h>
@ -349,7 +348,7 @@ void KDWalk(KDTREE *Tree, void_proc action, void *context) {
*/
void FreeKDTree(KDTREE *Tree) {
FreeSubTree(Tree->Root.Left);
memfree(Tree);
free(Tree);
} /* FreeKDTree */
@ -389,7 +388,7 @@ KDNODE *MakeKDNode(KDTREE *tree, FLOAT32 Key[], void *Data, int Index) {
/*---------------------------------------------------------------------------*/
void FreeKDNode(KDNODE *Node) {
memfree ((char *)Node);
free(Node);
}
@ -555,6 +554,6 @@ void FreeSubTree(KDNODE *sub_tree) {
if (sub_tree != NULL) {
FreeSubTree(sub_tree->Left);
FreeSubTree(sub_tree->Right);
memfree(sub_tree);
free(sub_tree);
}
}

3
classify/ocrfeatures.cpp
View File

@ -22,7 +22,6 @@
#include "emalloc.h"
#include "callcpp.h"
#include "danerror.h"
#include "freelist.h"
#include "scanutils.h"
#include <assert.h>
@ -75,7 +74,7 @@ void FreeFeatureSet(FEATURE_SET FeatureSet) {
if (FeatureSet) {
for (i = 0; i < FeatureSet->NumFeatures; i++)
FreeFeature(FeatureSet->Features[i]);
memfree(FeatureSet);
free(FeatureSet);
}
} /* FreeFeatureSet */

5
classify/protos.cpp
View File

@ -28,7 +28,6 @@
#include "protos.h"
#include "const.h"
#include "emalloc.h"
#include "freelist.h"
#include "callcpp.h"
#include "tprintf.h"
#include "scanutils.h"
@ -230,11 +229,11 @@ void FreeClassFields(CLASS_TYPE Class) {
if (Class) {
if (Class->MaxNumProtos > 0)
memfree (Class->Prototypes);
free(Class->Prototypes);
if (Class->MaxNumConfigs > 0) {
for (i = 0; i < Class->NumConfigs; i++)
FreeBitVector (Class->Configurations[i]);
memfree (Class->Configurations);
free(Class->Configurations);
}
}
}

6
cutil/Makefile.am
View File

@ -7,7 +7,7 @@ endif
noinst_HEADERS = \
bitvec.h callcpp.h const.h cutil.h cutil_class.h danerror.h efio.h \
emalloc.h freelist.h globals.h \
emalloc.h globals.h \
oldlist.h structures.h
if !USING_MULTIPLELIBS
@ -22,7 +22,5 @@ endif
libtesseract_cutil_la_SOURCES = \
bitvec.cpp callcpp.cpp cutil.cpp cutil_class.cpp danerror.cpp efio.cpp \
emalloc.cpp freelist.cpp \
emalloc.cpp \
oldlist.cpp structures.cpp

2
cutil/cutil.h
View File

@ -56,7 +56,7 @@ Import original HP distribution
#define CHARS_PER_LINE 500
#if defined(__STDC__) || defined(__cplusplus) || MAC_OR_DOS
#if defined(__STDC__) || defined(__cplusplus)
# define _ARGS(s) s
#else
# define _ARGS(s) ()

18
cutil/freelist.cpp
View File

@ -1,18 +0,0 @@
/**************************************************************************
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
** http://www.apache.org/licenses/LICENSE-2.0
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
**************************************************************************/
#include "freelist.h"
#include <stdlib.h>
void memfree(void *element) {
free(element);
}

31
cutil/freelist.h
View File

@ -1,31 +0,0 @@
/* -*-C-*-
********************************************************************************
*
* File: freelist.h (Formerly freelist.h)
* Description: Memory allocator
* Author: Mark Seaman, OCR Technology
* Created: Wed May 30 13:50:28 1990
* Modified: Mon Dec 10 15:15:25 1990 (Mark Seaman) marks@hpgrlt
* Language: C
* Package: N/A
* Status: Experimental (Do Not Distribute)
*
* (c) Copyright 1990, Hewlett-Packard Company.
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
** http://www.apache.org/licenses/LICENSE-2.0
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*
*********************************************************************************/
#ifndef FREELIST_H
#define FREELIST_H
void memfree(void *element);
#endif

8
cutil/oldlist.cpp
View File

@ -85,11 +85,6 @@
#include "oldlist.h"
#include "structures.h"
#include <stdio.h>
#if MAC_OR_DOS
#include <stdlib.h>
#else
#include "freelist.h"
#endif
/*----------------------------------------------------------------------
M a c r o s
@ -202,8 +197,7 @@ LIST destroy(LIST list) {
* Return the space taken by the LISTs of a list to the heap.
**********************************************************************/
void destroy_nodes(LIST list, void_dest destructor) {
if (destructor == NULL)
destructor = memfree;
ASSERT_HOST(destructor != NULL);
while (list != NIL_LIST) {
if (first_node(list) != NULL) (*destructor)(first_node(list));

13
training/commontraining.cpp
View File

@ -22,7 +22,6 @@
#include "emalloc.h"
#include "featdefs.h"
#include "fontinfo.h"
#include "freelist.h"
#include "globals.h"
#include "intfeaturespace.h"
#include "mastertrainer.h"
@ -579,19 +578,13 @@ void CleanUpUnusedData(
iterate(ProtoList)
{
Prototype = (PROTOTYPE *) first_node (ProtoList);
if (Prototype->Variance.Elliptical != nullptr) {
memfree(Prototype->Variance.Elliptical);
free(Prototype->Variance.Elliptical);
Prototype->Variance.Elliptical = nullptr;
}
if (Prototype->Magnitude.Elliptical != nullptr) {
memfree(Prototype->Magnitude.Elliptical);
free(Prototype->Magnitude.Elliptical);
Prototype->Magnitude.Elliptical = nullptr;
}
if (Prototype->Weight.Elliptical != nullptr) {
memfree(Prototype->Weight.Elliptical);
free(Prototype->Weight.Elliptical);
Prototype->Weight.Elliptical = nullptr;
}
}
}
/*------------------------------------------------------------------------*/