mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-12-05 02:47:00 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #2448 from stweil/pi

Browse Source 
Remove local definition of M_PI
This commit is contained in:
zdenop 2019-05-21 11:47:51 +02:00 committed by GitHub
commit b96df3a33a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 55 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/baseapi.cpp
View File

@ -16,6 +16,8 @@
*
**********************************************************************/
#define _USE_MATH_DEFINES // for M_PI
// Include automatically generated configuration file if running autoconf.
#ifdef HAVE_CONFIG_H
#include "config_auto.h"

6
src/ccstruct/points.cpp
View File

@ -2,7 +2,6 @@
* File: points.cpp (Formerly coords.c)
* Description: Member functions for coordinate classes.
* Author: Ray Smith
* Created: Fri Mar 15 08:58:17 GMT 1991
*
* (C) Copyright 1991, Hewlett-Packard Ltd.
** Licensed under the Apache License, Version 2.0 (the "License");
@ -17,11 +16,10 @@
*
**********************************************************************/
#ifdef _MSC_VER
#define _USE_MATH_DEFINES
#endif // _MSC_VER
#define _USE_MATH_DEFINES // for M_PI
#include <algorithm>
#include <cmath> // for M_PI
#include <cstdlib>
#include "helpers.h"
#include "serialis.h"

6
src/ccutil/platform.h
View File

@ -32,12 +32,6 @@
# endif
#endif
#if defined(_WIN32) || defined(__CYGWIN__)
# ifndef M_PI
# define M_PI 3.14159265358979323846
# endif
#endif
#if defined(_WIN32) || defined(__CYGWIN__)
# if defined(TESS_EXPORTS)
# define TESS_API __declspec(dllexport)

3
src/classify/cluster.cpp
View File

@ -15,8 +15,9 @@
** limitations under the License.
*****************************************************************************/
#define _USE_MATH_DEFINES // for M_PI
#include <cfloat> // for FLT_MAX
#include <cmath>
#include <cmath> // for M_PI
#include <vector> // for std::vector
#include "cluster.h"

3
src/classify/clusttool.cpp
View File

@ -16,8 +16,9 @@
*****************************************************************************/
//--------------------------Include Files----------------------------------
#define _USE_MATH_DEFINES // for M_PI
#include "clusttool.h"
#include <cmath> // for std::isnan
#include <cmath> // for M_PI, std::isnan
#include <locale> // for std::locale::classic
#include <sstream> // for std::stringstream
#include "emalloc.h"

4
src/classify/fpoint.cpp
View File

@ -17,10 +17,10 @@
/*----------------------------------------------------------------------------
Include Files and Type Defines
----------------------------------------------------------------------------*/
#define _USE_MATH_DEFINES // for M_PI
#include "fpoint.h"
#include <cstdio>
#include <cmath>
#include "platform.h" // M_PI
#include <cmath> // for M_PI
/*----------------------------------------------------------------------------
Public Code

3
src/classify/intfeaturespace.cpp
View File

@ -3,7 +3,6 @@
///////////////////////////////////////////////////////////////////////
// File: intfeaturespace.cpp
// Description: Indexed feature space based on INT_FEATURE_STRUCT.
// Created: Wed Mar 24 11:21:27 PDT 2010
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -17,7 +16,9 @@
//
///////////////////////////////////////////////////////////////////////
#define _USE_MATH_DEFINES // for M_PI
#include "intfeaturespace.h"
#include <cmath> // for M_PI
#include "intfx.h"
namespace tesseract {

17
src/classify/intfx.cpp
View File

@ -1,13 +1,9 @@
/******************************************************************************
** Filename: intfx.c
** Purpose: Integer character normalization & feature extraction
** Author: Robert Moss, rays@google.com (Ray Smith)
** History: Tue May 21 15:51:57 MDT 1991, RWM, Created.
** Tue Feb 28 10:42:00 PST 2012, vastly rewritten to allow
greyscale fx and non-linear
normalization.
** Filename: intfx.c
** Purpose: Integer character normalization & feature extraction
** Author: Robert Moss, rays@google.com (Ray Smith)
**
** (c) Copyright Hewlett-Packard Company, 1988.
** (c) Copyright Hewlett-Packard Company, 1988.
** 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
@ -21,7 +17,10 @@
/**----------------------------------------------------------------------------
Include Files and Type Defines
----------------------------------------------------------------------------**/
#define _USE_MATH_DEFINES // for M_PI
#include "intfx.h"
#include <cmath> // for M_PI
#include "allheaders.h"
#include "ccutil.h"
#include "classify.h"
@ -49,7 +48,7 @@ tesseract::CCUtilMutex atan_table_mutex;
/**----------------------------------------------------------------------------
Public Code
----------------------------------------------------------------------------**/
/*---------------------------------------------------------------------------*/
void InitIntegerFX() {
static bool atan_table_init = false;
atan_table_mutex.Lock();

3
src/classify/intproto.cpp
View File

@ -18,8 +18,9 @@
Include Files and Type Defines
-----------------------------------------------------------------------------*/
#define _USE_MATH_DEFINES // for M_PI
#include <algorithm>
#include <cmath> // for std::floor
#include <cmath> // for M_PI, std::floor
#include <cstdio>
#include <cassert>

15
src/classify/mfx.cpp
View File

@ -1,9 +1,9 @@
/******************************************************************************
** Filename: mfx.c
** Purpose: Micro feature extraction routines
** Author: Dan Johnson
** Filename: mfx.c
** Purpose: Micro feature extraction routines
** Author: Dan Johnson
**
** (c) Copyright Hewlett-Packard Company, 1988.
** (c) Copyright Hewlett-Packard Company, 1988.
** 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
@ -17,16 +17,17 @@
/*----------------------------------------------------------------------------
Include Files and Type Defines
----------------------------------------------------------------------------*/
#define _USE_MATH_DEFINES // for M_PI
#include "mfx.h"
#include <cmath> // for M_PI
#include "mfdefs.h"
#include "mfoutline.h"
#include "clusttool.h" //NEEDED
#include "clusttool.h" //NEEDED
#include "intfx.h"
#include "normalis.h"
#include "params.h"
#include <cmath>
/*----------------------------------------------------------------------------
Variables
----------------------------------------------------------------------------*/

6
src/classify/protos.cpp
View File

@ -19,7 +19,10 @@
/*----------------------------------------------------------------------
I n c l u d e s
----------------------------------------------------------------------*/
#define _USE_MATH_DEFINES // for M_PI
#include "protos.h"
#include <cmath> // for M_PI
#include <cstdio>
#include "emalloc.h"
#include "callcpp.h"
#include "tprintf.h"
@ -27,9 +30,6 @@
#include "params.h"
#include "intproto.h"
#include <cstdio>
#include <cmath>
#define PROTO_INCREMENT 32
#define CONFIG_INCREMENT 16

3
src/classify/trainingsample.cpp
View File

@ -13,6 +13,7 @@
//
///////////////////////////////////////////////////////////////////////
#define _USE_MATH_DEFINES // for M_PI
// Include automatically generated configuration file if running autoconf.
#ifdef HAVE_CONFIG_H
#include "config_auto.h"
@ -20,7 +21,7 @@
#include "trainingsample.h"
#include <cmath>
#include <cmath> // for M_PI
#include "allheaders.h"
#include "helpers.h"
#include "intfeaturemap.h"

9
src/textord/baselinedetect.cpp
View File

@ -3,7 +3,6 @@
// Description: Initial Baseline Determination.
// Copyright 2012 Google Inc. All Rights Reserved.
// Author: rays@google.com (Ray Smith)
// Created: Mon Apr 30 10:15:31 PDT 2012
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@ -17,9 +16,7 @@
//
///////////////////////////////////////////////////////////////////////
#ifdef _MSC_VER
#define _USE_MATH_DEFINES
#endif // _MSC_VER
#define _USE_MATH_DEFINES // for M_PI
#ifdef HAVE_CONFIG_H
#include "config_auto.h"
@ -28,8 +25,8 @@
#include "baselinedetect.h"
#include <algorithm>
#include <cfloat> // for FLT_MAX
#include <cmath>
#include <cfloat> // for FLT_MAX
#include <cmath> // for M_PI
#include "allheaders.h"
#include "blobbox.h"
#include "detlinefit.h"

2
src/textord/tordmain.cpp
View File

@ -2,7 +2,6 @@
* File: tordmain.cpp (Formerly textordp.c)
* Description: C++ top level textord code.
* Author: Ray Smith
* Created: Tue Jul 28 17:12:33 BST 1992
*
* (C) Copyright 1992, Hewlett-Packard Ltd.
** Licensed under the Apache License, Version 2.0 (the "License");
@ -17,6 +16,7 @@
*
**********************************************************************/
#define _USE_MATH_DEFINES // for M_PI
#ifdef HAVE_CONFIG_H
#include "config_auto.h"
#endif

11
src/training/commontraining.cpp
View File

@ -11,18 +11,17 @@
// See the License for the specific language governing permissions and
// limitations under the License.
#define _USE_MATH_DEFINES // for M_PI
#include "commontraining.h"
#include <algorithm>
#include <cmath> // for M_PI
#ifdef DISABLED_LEGACY_ENGINE
#include <algorithm>
#include <cmath>
#include "params.h"
#include "tessopt.h"
#include "tprintf.h"
INT_PARAM_FLAG(debug_level, 0, "Level of Trainer debugging");
INT_PARAM_FLAG(load_images, 0, "Load images with tr files");
STRING_PARAM_FLAG(configfile, "", "File to load more configs from");
@ -34,7 +33,6 @@ STRING_PARAM_FLAG(O, "", "File to write unicharset to");
STRING_PARAM_FLAG(output_trainer, "", "File to write trainer to");
STRING_PARAM_FLAG(test_ch, "", "UTF8 test character string");
/**
* This routine parses the command line arguments that were
* passed to the program and uses them to set relevant
@ -59,9 +57,6 @@ void ParseArguments(int* argc, char ***argv) {
#else
#include <algorithm>
#include <cmath>
#include "allheaders.h"
#include "ccutil.h"
#include "classify.h"

13
src/training/mergenf.cpp
View File

@ -14,6 +14,14 @@
** See the License for the specific language governing permissions and
** limitations under the License.
******************************************************************************/
#define _USE_MATH_DEFINES // for M_PI
#include <algorithm>
#include <cfloat> // for FLT_MAX
#include <cmath> // for M_PI
#include <cstdio>
#include <cstring>
#include "mergenf.h"
#include "clusttool.h"
#include "cluster.h"
@ -24,11 +32,6 @@
#include "intproto.h"
#include "params.h"
#include <algorithm>
#include <cstdio>
#include <cstring>
#include <cmath>
/*-------------------once in subfeat---------------------------------*/
double_VAR(training_angle_match_scale, 1.0, "Angle Match Scale ...");

5
src/training/mftraining.cpp
View File

@ -20,14 +20,15 @@
/*----------------------------------------------------------------------------
Include Files and Type Defines
----------------------------------------------------------------------------*/
#define _USE_MATH_DEFINES // for M_PI
#ifdef HAVE_CONFIG_H
#include "config_auto.h"
#endif
#include <cmath> // for M_PI
#include <cstring>
#include <cstdio>
#define _USE_MATH_DEFINES
#include <cmath>
#include "classify.h"
#include "cluster.h"

4
src/wordrec/chop.cpp
View File

@ -21,14 +21,14 @@
I n c l u d e s
----------------------------------------------------------------------*/
#define _USE_MATH_DEFINES // for M_PI
#include <cmath> // for M_PI
#include "chop.h"
#include "outlines.h"
#include "callcpp.h"
#include "plotedges.h"
#include "wordrec.h"
#include <cmath>
// Include automatically generated configuration file if running autoconf.
#ifdef HAVE_CONFIG_H
#include "config_auto.h"