mirror of
https://github.com/tesseract-ocr/tesseract.git
synced 2025-01-23 02:24:09 +08:00
Merge pull request #1726 from stweil/rand
Remove unused function long_rand
This commit is contained in:
commit
2227474331
@ -1,5 +1,5 @@
|
|||||||
/* -*-C-*-
|
/* -*-C-*-
|
||||||
********************************************************************************
|
******************************************************************************
|
||||||
*
|
*
|
||||||
* File: cutil.cpp
|
* File: cutil.cpp
|
||||||
* Description: General utility functions
|
* Description: General utility functions
|
||||||
@ -21,21 +21,7 @@
|
|||||||
** See the License for the specific language governing permissions and
|
** See the License for the specific language governing permissions and
|
||||||
** limitations under the License.
|
** limitations under the License.
|
||||||
*
|
*
|
||||||
********************************************************************************
|
******************************************************************************
|
||||||
Revision 1.1 2007/02/02 23:39:07 theraysmith
|
|
||||||
Fixed portability issues
|
|
||||||
|
|
||||||
Revision 1.1.1.1 2004/02/20 19:39:06 slumos
|
|
||||||
Import original HP distribution
|
|
||||||
|
|
||||||
* Revision 1.3 90/03/06 15:39:10 15:39:10 marks (Mark Seaman)
|
|
||||||
* Look for correct file of <malloc.h> or <stdlib.h>
|
|
||||||
*
|
|
||||||
* Revision 1.2 90/01/15 13:02:13 13:02:13 marks (Mark Seaman)
|
|
||||||
* Added memory allocator (*allocate) and (*deallocate)
|
|
||||||
*
|
|
||||||
* Revision 1.1 89/10/09 14:58:29 14:58:29 marks (Mark Seaman)
|
|
||||||
* Initial revision
|
|
||||||
**/
|
**/
|
||||||
|
|
||||||
#include "cutil.h"
|
#include "cutil.h"
|
||||||
@ -46,32 +32,6 @@ Import original HP distribution
|
|||||||
|
|
||||||
#define RESET_COUNT 2000
|
#define RESET_COUNT 2000
|
||||||
|
|
||||||
/**********************************************************************
|
|
||||||
* long_rand
|
|
||||||
*
|
|
||||||
* Return a long random number whose value is less than limit. Do this
|
|
||||||
* by calling the standard cheepo random number generator and resetting
|
|
||||||
* it pretty often.
|
|
||||||
**********************************************************************/
|
|
||||||
long long_rand(long limit) {
|
|
||||||
#if RAND_MAX < 0x1000000
|
|
||||||
static long seed;
|
|
||||||
|
|
||||||
long num;
|
|
||||||
num = (long) rand () << 16;
|
|
||||||
num |= rand () & 0xffff;
|
|
||||||
seed ^= num;
|
|
||||||
long result = num % limit;
|
|
||||||
while (result < 0) {
|
|
||||||
result += limit;
|
|
||||||
}
|
|
||||||
return result;
|
|
||||||
#else
|
|
||||||
return (long)((double)limit * rand()/(RAND_MAX + 1.0));
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**********************************************************************
|
/**********************************************************************
|
||||||
* open_file
|
* open_file
|
||||||
*
|
*
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/* -*-C-*-
|
/* -*-C-*-
|
||||||
********************************************************************************
|
******************************************************************************
|
||||||
*
|
*
|
||||||
* File: cutil.h
|
* File: cutil.h
|
||||||
* Description: General utility functions
|
* Description: General utility functions
|
||||||
@ -21,14 +21,8 @@
|
|||||||
** See the License for the specific language governing permissions and
|
** See the License for the specific language governing permissions and
|
||||||
** limitations under the License.
|
** limitations under the License.
|
||||||
*
|
*
|
||||||
********************************************************************************
|
******************************************************************************
|
||||||
Revision 1.1 2007/02/02 23:39:07 theraysmith
|
*/
|
||||||
Fixed portability issues
|
|
||||||
|
|
||||||
Revision 1.1.1.1 2004/02/20 19:39:06 slumos
|
|
||||||
Import original HP distribution
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef CUTILH
|
#ifndef CUTILH
|
||||||
#define CUTILH
|
#define CUTILH
|
||||||
@ -62,7 +56,6 @@ Import original HP distribution
|
|||||||
# define _ARGS(s) ()
|
# define _ARGS(s) ()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//typedef int (*int_proc) (void);
|
|
||||||
typedef void (*void_proc) (...);
|
typedef void (*void_proc) (...);
|
||||||
typedef void *(*void_star_proc) _ARGS ((...));
|
typedef void *(*void_star_proc) _ARGS ((...));
|
||||||
|
|
||||||
@ -95,21 +88,10 @@ typedef void (*void_dest) (void *);
|
|||||||
/*----------------------------------------------------------------------
|
/*----------------------------------------------------------------------
|
||||||
F u n c t i o n s
|
F u n c t i o n s
|
||||||
----------------------------------------------------------------------*/
|
----------------------------------------------------------------------*/
|
||||||
long long_rand(long limit);
|
|
||||||
|
|
||||||
FILE *open_file(const char *filename, const char *mode);
|
FILE *open_file(const char *filename, const char *mode);
|
||||||
|
|
||||||
bool exists_file(const char *filename);
|
bool exists_file(const char *filename);
|
||||||
|
|
||||||
/* util.c
|
|
||||||
long long_rand
|
|
||||||
_ARGS ((long limit));
|
|
||||||
|
|
||||||
FILE *open_file
|
|
||||||
_ARGS((char *filename,
|
|
||||||
char *mode));
|
|
||||||
|
|
||||||
#undef _ARGS
|
|
||||||
*/
|
|
||||||
#include "cutil_class.h"
|
#include "cutil_class.h"
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user