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

Merge pull request #2542 from stweil/tiff

Browse Source 
Fix handling of single pages from multipage TIFF files (issue #2537)
This commit is contained in:
Egor Pugin 2019-07-04 20:41:27 +03:00 committed by GitHub
commit 67ad54ea20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/api/baseapi.cpp
View File

@ -1036,20 +1036,13 @@ bool TessBaseAPI::ProcessPagesMultipageTiff(const l_uint8 *data,
for (; ; ++page) { for (; ; ++page) {
if (tessedit_page_number >= 0) { if (tessedit_page_number >= 0) {
page = tessedit_page_number; page = tessedit_page_number;
int pages_read = 0; pix = (data) ? pixReadMemTiff(data, size, page)
do { : pixReadTiff(filename, page);
pix = (data) ? pixReadMemFromMultipageTiff(data, size, &offset) } else {
: pixReadFromMultipageTiff(filename, &offset);
pages_read++;
} while (pix != nullptr && pages_read < (page + 1));
}
else {
pix = (data) ? pixReadMemFromMultipageTiff(data, size, &offset) pix = (data) ? pixReadMemFromMultipageTiff(data, size, &offset)
: pixReadFromMultipageTiff(filename, &offset); : pixReadFromMultipageTiff(filename, &offset);
} }
if (pix == nullptr) { if (pix == nullptr) break;
break;
}
tprintf("Page %d\n", page + 1); tprintf("Page %d\n", page + 1);
char page_str[kMaxIntSize]; char page_str[kMaxIntSize];
snprintf(page_str, kMaxIntSize - 1, "%d", page); snprintf(page_str, kMaxIntSize - 1, "%d", page);