mirror of
https://github.com/tesseract-ocr/tesseract.git
synced 2024-11-24 02:59:07 +08:00
Fixed name collision with jpeg library
git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@161 d0cd1f9f-072b-0410-8dd7-cf729c803f20
This commit is contained in:
parent
f734888453
commit
e3b507b15e
@ -25,13 +25,8 @@
|
||||
#include "leptonica_pageseg.h"
|
||||
|
||||
#ifdef HAVE_LIBLEPT
|
||||
// The jpeg library still has INT32 as long, which is no good for 64 bit.
|
||||
#define INT32 WRONGINT32
|
||||
#define BOX LEPT_BOX
|
||||
// Include leptonica library only if autoconf (or makefile etc) tell us to.
|
||||
#include "allheaders.h"
|
||||
#undef BOX
|
||||
#undef INT32
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LIBLEPT
|
||||
|
@ -28,13 +28,8 @@
|
||||
#include "imgs.h"
|
||||
|
||||
#ifdef HAVE_LIBLEPT
|
||||
// The jpeg library still has INT32 as long, which is no good for 64 bit.
|
||||
#define INT32 WRONGINT32
|
||||
#define BOX LEPT_BOX
|
||||
// Include leptonica library only if autoconf (or makefile etc) tell us to.
|
||||
#include "allheaders.h"
|
||||
#undef BOX
|
||||
#undef INT32
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LIBLEPT
|
||||
|
@ -119,8 +119,8 @@ void outlines_to_blocks(OUTLINE_LIST* outlines, BLOCK_LIST* blocks) {
|
||||
for (polypt_it.mark_cycle_pt();
|
||||
!polypt_it.cycled_list();
|
||||
polypt_it.forward()) {
|
||||
ICOORD current_icoord = ICOORD((INT16) polypt_it.data()->pos.x(),
|
||||
(INT16) polypt_it.data()->pos.y());
|
||||
ICOORD current_icoord = ICOORD((inT16) polypt_it.data()->pos.x(),
|
||||
(inT16) polypt_it.data()->pos.y());
|
||||
icoordelt_it.add_after_then_move(new ICOORDELT(current_icoord));
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user