Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

3.05: Backports from master branch #835

Merged
merged 9 commits into from
Apr 23, 2017
Merged

3.05: Backports from master branch #835

merged 9 commits into from
Apr 23, 2017

Conversation

stweil
Copy link
Member

@stweil stweil commented Apr 22, 2017

No description provided.

stweil and others added 9 commits April 22, 2017 17:38
@stweil
Update required Leptonica version
c208540 
Tesseract uses the function pixReadFromMultipageTiff since commit
245eebd.

That function requires Leptonica 1.74.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
@stweil
Synchronize Travis configuration with master branch
720e8a6 
* Enable Travis CI for branch 3.05 (Linux and macOS)

Signed-off-by: Stefan Weil <sw@weilnetz.de>
@stweil
Update Leptonica configuration
f52d445 
This synchronizes the code with the master branch.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
@stweil
Remove unneeded code for old Leptonica versions
2ac2417 
Tesseract requires Leptonica 1.74 or newer,
so that code is no longer needed.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
@stweil
Synchronize COPYING with master branch
5a3ccf0 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
@stweil
Fix ChangeLog for Leptonica 1.74
37478e7 
Since commit 245eebd, Tesseract 3.05
requires Leptonica 1.74.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
@theraysmith @stweil
Removed dead TODO
9283b07
@stweil
opencl: Backport changes from master branch
aec39d6 
The code for 3.05 still uses NULL instead of nullptr.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
@stweil
Use pkg-config for icu compiler and linker flags
b66ff1f 
The old settings are used as fallback if there is no configuration.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
@stweil stweil mentioned this pull request Apr 22, 2017
Closed
@stweil
Copy link
Member Author

stweil commented Apr 23, 2017

Tesseract 3.05 still includes vs2010 (which was removed in Tesseract 4.00). The VS2010 support for Tesseract 3.05 was not updated to use Leptonica 1.74, so it won't work. Should it be removed, or is it still used? Then it has to be fixed.

@amitdo
Copy link
Collaborator

amitdo commented Apr 23, 2017

Is there a real dependency in 3.05's code (not the build system) on Leptonica 1.74?

@Shreeshrii
Copy link
Collaborator

Shreeshrii commented Apr 23, 2017 via email •
edited
Loading

@amitdo
Copy link
Collaborator

amitdo commented Apr 23, 2017

OK. Thanks Shree.

@amitdo
Copy link
Collaborator

amitdo commented Apr 23, 2017 •
edited
Loading

#739 (comment)

https://github.com/tesseract-ocr/tesseract/blob/3.05/api/baseapi.cpp#L1035

@stweil
Copy link
Member Author

stweil commented Apr 23, 2017

Tesseract 3.05 uses the function pixReadFromMultipageTiff which was added in Leptonica 1.74 unconditionally, so this is a hard dependency (not only for training or some special configurations).

@amitdo
Copy link
Collaborator

amitdo commented Apr 23, 2017 •
edited
Loading

I already got an answer for the dependency issue from Shree (he linked to 245eebd)

Please give an answer to my question:
#835 (comment)

Another one to consider backporting:
#557

@stweil
Copy link
Member Author

stweil commented Apr 23, 2017

Sure, there are more commits which could be backported from the master branch. I did not add the libtiff related commits because 3.05 could be built without them.

@amitdo
Copy link
Collaborator

amitdo commented Apr 23, 2017 •
edited
Loading

#233 was fixed in both 3.05 and 4.00, but in 4.00 the OpenCL code path for multi page tiff was removed (#635).

@zdenop zdenop merged commit 555305f into tesseract-ocr:3.05 Apr 23, 2017
zvezdochiot pushed a commit to ImageProcessing-ElectronicPublications/tesseract that referenced this pull request Mar 28, 2021
@zdenop
Merge pull request tesseract-ocr#835 from stweil/3.05
0fba81d 
3.05: Backports from master branch
zvezdochiot pushed a commit to ImageProcessing-ElectronicPublications/tesseract that referenced this pull request Mar 28, 2021
@zdenop
Merge pull request tesseract-ocr#835 from stweil/3.05
65572b6 
3.05: Backports from master branch
zvezdochiot pushed a commit to ImageProcessing-ElectronicPublications/tesseract that referenced this pull request Mar 28, 2021
@zdenop
Merge pull request tesseract-ocr#835 from stweil/3.05
bd8446e 
3.05: Backports from master branch
zvezdochiot pushed a commit to ImageProcessing-ElectronicPublications/tesseract that referenced this pull request Mar 28, 2021
@zdenop
Merge pull request tesseract-ocr#835 from stweil/3.05
7055c66 
3.05: Backports from master branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@stweil @amitdo @Shreeshrii @zdenop @theraysmith