Remove empty DLLSYM macro.

This commit is contained in:
Egor Pugin 2020-12-31 02:10:46 +03:00
parent 8bd1227c3e
commit 89273c915d
13 changed files with 35 additions and 36 deletions

View File

@ -18,7 +18,6 @@
#ifndef TESSERACT_CCUTIL_PLATFORM_H_
#define TESSERACT_CCUTIL_PLATFORM_H_
#define DLLSYM
#ifndef _WIN32
# ifdef __cplusplus
# include <climits>

View File

@ -71,10 +71,10 @@ struct EdgeOffset {
uint8_t direction;
};
class DLLSYM C_OUTLINE; //forward declaration
class C_OUTLINE; //forward declaration
ELISTIZEH (C_OUTLINE)
class DLLSYM C_OUTLINE:public ELIST_LINK {
class C_OUTLINE:public ELIST_LINK {
public:
C_OUTLINE() {
stepcount = 0;

View File

@ -28,7 +28,7 @@ namespace tesseract {
#define DIRBITS 7 //no of bits used
#define DIRSCALE 1000 //length of vector
class DLLSYM DIR128
class DIR128
{
public:
DIR128() = default;

View File

@ -103,7 +103,7 @@ class PDBLK {
int index_; ///< Serial number of this block.
};
class DLLSYM BLOCK_RECT_IT //rectangle iterator
class BLOCK_RECT_IT //rectangle iterator
{
public:
///constructor
@ -145,7 +145,7 @@ class DLLSYM BLOCK_RECT_IT //rectangle iterator
};
///rectangle iterator
class DLLSYM BLOCK_LINE_IT
class BLOCK_LINE_IT
{
public:
///constructor

View File

@ -162,7 +162,7 @@ class ICOORD
int16_t ycoord; ///< y value
};
class DLLSYM ICOORDELT : public ELIST_LINK, public ICOORD
class ICOORDELT : public ELIST_LINK, public ICOORD
//embedded coord list
{
public:
@ -189,7 +189,7 @@ class DLLSYM ICOORDELT : public ELIST_LINK, public ICOORD
};
ELISTIZEH (ICOORDELT)
class DLLSYM FCOORD
class FCOORD
{
public:
///empty constructor

View File

@ -27,7 +27,7 @@
namespace tesseract {
class DLLSYM POLY_BLOCK {
class POLY_BLOCK {
public:
POLY_BLOCK() = default;
// Initialize from box coordinates.
@ -91,7 +91,7 @@ class DLLSYM POLY_BLOCK {
};
// Class to iterate the scanlines of a polygon.
class DLLSYM PB_LINE_IT {
class PB_LINE_IT {
public:
PB_LINE_IT(POLY_BLOCK *blkptr) {
block = blkptr;

View File

@ -193,7 +193,7 @@ bool TBOX::DeSerialize(bool swap, FILE* fp) {
* Extend one box to include the other (In place union)
**********************************************************************/
DLLSYM TBOX &
TBOX &
operator+= ( //bounding bounding bx
TBOX & op1, //operands
const TBOX & op2) {

View File

@ -35,7 +35,7 @@ namespace tesseract {
class STRING;
class DLLSYM TBOX { // bounding box
class TBOX { // bounding box
public:
TBOX (): // empty constructor making a null box
bot_left (INT16_MAX, INT16_MAX), top_right (-INT16_MAX, -INT16_MAX) {

View File

@ -22,7 +22,7 @@
#include <cstdint> // for uint8_t, ...
#include <tesseract/platform.h> // for DLLSYM
class DLLSYM BITS16 {
class BITS16 {
public:
uint16_t val = 0;

View File

@ -39,7 +39,7 @@ class CLIST_ITERATOR;
* walks the list.
**********************************************************************/
class DLLSYM CLIST_LINK
class CLIST_LINK
{
friend class CLIST_ITERATOR;
friend class CLIST;
@ -69,7 +69,7 @@ class DLLSYM CLIST_LINK
* Generic list class for singly linked CONS cell lists
**********************************************************************/
class DLLSYM CLIST
class CLIST
{
friend class CLIST_ITERATOR;
@ -144,7 +144,7 @@ class DLLSYM CLIST
*links
**********************************************************************/
class DLLSYM CLIST_ITERATOR
class CLIST_ITERATOR
{
friend void CLIST::assign_to_sublist(CLIST_ITERATOR *, CLIST_ITERATOR *);
@ -816,10 +816,10 @@ CLISTIZEH_C.
#define CLISTIZEH_A(CLASSNAME) \
\
extern DLLSYM void CLASSNAME##_c1_zapper( /*delete a link*/ \
extern void CLASSNAME##_c1_zapper( /*delete a link*/ \
void *link); /*link to delete*/ \
\
extern DLLSYM void \
extern void \
*CLASSNAME##_c1_copier( /*deep copy a link*/ \
void *old_element); /*source link */
@ -834,7 +834,7 @@ CLISTIZEH_C.
* \
**********************************************************************/ \
\
class DLLSYM CLASSNAME##_CLIST : public CLIST { \
class CLASSNAME##_CLIST : public CLIST { \
public: \
CLASSNAME##_CLIST() : CLIST() {} \
/* constructor */ \
@ -871,7 +871,7 @@ CLISTIZEH_C.
* class of that class") \
**********************************************************************/ \
\
class DLLSYM CLASSNAME##_C_IT : public CLIST_ITERATOR { \
class CLASSNAME##_C_IT : public CLIST_ITERATOR { \
public: \
CLASSNAME##_C_IT() : CLIST_ITERATOR() {} \
\
@ -926,7 +926,7 @@ CLISTIZEH_C.
* though we don't use a virtual destructor function. \
**********************************************************************/ \
\
DLLSYM void CLASSNAME##_c1_zapper( /*delete a link*/ \
void CLASSNAME##_c1_zapper( /*delete a link*/ \
void *link) /*link to delete*/ \
{ \
delete static_cast<CLASSNAME*>(link); \

View File

@ -78,7 +78,7 @@ lists.
* walks the list.
**********************************************************************/
class DLLSYM ELIST_LINK
class ELIST_LINK
{
friend class ELIST_ITERATOR;
friend class ELIST;
@ -107,7 +107,7 @@ class DLLSYM ELIST_LINK
* Generic list class for singly linked lists with embedded links
**********************************************************************/
class DLLSYM ELIST
class ELIST
{
friend class ELIST_ITERATOR;
@ -181,7 +181,7 @@ class DLLSYM ELIST
* Generic iterator class for singly linked lists with embedded links
**********************************************************************/
class DLLSYM ELIST_ITERATOR
class ELIST_ITERATOR
{
friend void ELIST::assign_to_sublist(ELIST_ITERATOR *, ELIST_ITERATOR *);
@ -849,7 +849,7 @@ ELISTIZEH_C.
#define ELISTIZEH_A(CLASSNAME) \
\
extern DLLSYM void CLASSNAME##_zapper(ELIST_LINK* link);
extern void CLASSNAME##_zapper(ELIST_LINK* link);
#define ELISTIZEH_B(CLASSNAME) \
\
@ -860,7 +860,7 @@ extern DLLSYM void CLASSNAME##_zapper(ELIST_LINK* link);
* \
**********************************************************************/ \
\
class DLLSYM CLASSNAME##_LIST : public ELIST { \
class CLASSNAME##_LIST : public ELIST { \
public: \
CLASSNAME##_LIST():ELIST() {} \
\
@ -901,7 +901,7 @@ private: \
* class of that class") \
**********************************************************************/ \
\
class DLLSYM CLASSNAME##_IT : public ELIST_ITERATOR { \
class CLASSNAME##_IT : public ELIST_ITERATOR { \
public: \
CLASSNAME##_IT():ELIST_ITERATOR(){} \
\
@ -958,7 +958,7 @@ ELISTIZEH_C(CLASSNAME)
* though we don't use a virtual destructor function. \
**********************************************************************/ \
\
DLLSYM void CLASSNAME##_zapper(ELIST_LINK *link) { \
void CLASSNAME##_zapper(ELIST_LINK *link) { \
delete reinterpret_cast<CLASSNAME *>(link); \
} \
\

View File

@ -58,7 +58,7 @@ i) The duplication in source does not affect the run time code size - the
* walks the list.
**********************************************************************/
class DLLSYM ELIST2_LINK
class ELIST2_LINK
{
friend class ELIST2_ITERATOR;
friend class ELIST2;
@ -88,7 +88,7 @@ class DLLSYM ELIST2_LINK
* Generic list class for doubly linked lists with embedded links
**********************************************************************/
class DLLSYM ELIST2
class ELIST2
{
friend class ELIST2_ITERATOR;
@ -151,7 +151,7 @@ class DLLSYM ELIST2
*links
**********************************************************************/
class DLLSYM ELIST2_ITERATOR
class ELIST2_ITERATOR
{
friend void ELIST2::assign_to_sublist(ELIST2_ITERATOR *, ELIST2_ITERATOR *);
@ -858,7 +858,7 @@ ELIST2IZEH_C.
#define ELIST2IZEH_A(CLASSNAME) \
\
extern DLLSYM void CLASSNAME##_zapper( /*delete a link*/ \
extern void CLASSNAME##_zapper( /*delete a link*/ \
ELIST2_LINK *link); /*link to delete*/
#define ELIST2IZEH_B(CLASSNAME) \
@ -872,7 +872,7 @@ ELIST2IZEH_C.
* \
**********************************************************************/ \
\
class DLLSYM CLASSNAME##_LIST : public ELIST2 { \
class CLASSNAME##_LIST : public ELIST2 { \
public: \
CLASSNAME##_LIST() : ELIST2() {} \
/* constructor */ \
@ -918,7 +918,7 @@ ELIST2IZEH_C.
* class of that class") \
**********************************************************************/ \
\
class DLLSYM CLASSNAME##_IT : public ELIST2_ITERATOR { \
class CLASSNAME##_IT : public ELIST2_ITERATOR { \
public: \
CLASSNAME##_IT(CLASSNAME##_LIST *list) : ELIST2_ITERATOR(list) {} \
\
@ -976,7 +976,7 @@ ELIST2IZEH_C.
* though we don't use a virtual destructor function. \
**********************************************************************/ \
\
DLLSYM void CLASSNAME##_zapper( /*delete a link*/ \
void CLASSNAME##_zapper( /*delete a link*/ \
ELIST2_LINK *link) /*link to delete*/ \
{ \
delete reinterpret_cast<CLASSNAME*>(link); \

View File

@ -37,7 +37,7 @@ namespace tesseract {
static STRING_VAR(debug_file, "", "File to send tprintf output to");
// Trace printf
DLLSYM void tprintf(const char *format, ...)
void tprintf(const char *format, ...)
{
const char* debug_file_name = debug_file.c_str();
static FILE *debugfp = nullptr; // debug file