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.

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

Fix some typos (found by codespell) #466

Merged
merged 3 commits into from
Nov 22, 2016
Merged

Conversation

stweil
Copy link
Contributor

@stweil stweil commented Nov 4, 2016

Signed-off-by: Stefan Weil sw@weilnetz.de

@jbreiden
Copy link
Contributor

jbreiden commented Nov 4, 2016 via email

@stweil
Copy link
Contributor Author

stweil commented Nov 4, 2016

Which changes are you referring to? Those from the 3.04 branch? As far as I can see, there is only commit 56c1a4a missing in master, and two small updates in vs2010/ (see https://github.com/stweil/tesseract/tree/merge-3.04). If you want, I can send a pull request for the merge.

@amitdo
Copy link
Collaborator

amitdo commented Nov 4, 2016

They want to merge google private new LSTM codebase with the public github repo.

@stweil
Copy link
Contributor Author

stweil commented Nov 4, 2016

Are you sure? I assume that the LSTM codebase is also based on some release from the official Tesseract on GitHub. Then merging should not be too complicated. It would be rather straight forward if that code were a branch of the GitHub repository.

@amitdo
Copy link
Collaborator

amitdo commented Nov 4, 2016

Are you sure?

Well, it's quite obvious (to me at least) from reading his comment.

It would be rather straight forward if that code were a branch of the GitHub repository.

It might be based on an old branch (3.03?)

@jbreiden
Copy link
Contributor

jbreiden commented Nov 4, 2016

Without going into the gory details, Amitdo is basically correct. There are about 10K lines of code being synchronized today with manual review. It's not a strict requirement to pause non-critical development activity (like fixing typos in comments). But it helps a little.

@stweil
Copy link
Contributor Author

stweil commented Nov 13, 2016

@jbreiden, my main focus is currently the OpenCL part – hopefully this does not interfere with the new code. Please tell us if you need more help with the merge or testing of the new code (like porting to Windows, for example).

@mindis
Copy link

mindis commented Nov 21, 2016

Hi, what is expected release date of 4.0?

@amitdo
Copy link
Collaborator

amitdo commented Nov 22, 2016

The eagle has landed...

@stweil
Copy link
Contributor Author

stweil commented Nov 22, 2016

I rebased the PR, fixed the merge conflict and added another commit for some new typos.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
All of them were found and fixed by codespell.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
@zdenop zdenop merged commit cdc2863 into tesseract-ocr:master Nov 22, 2016
@stweil stweil deleted the opencl branch November 23, 2016 06:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants