Skip to content

Use POSIX data types and macros #878

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

Merged
merged 21 commits into from
Mar 13, 2018
Merged

Use POSIX data types and macros #878

merged 21 commits into from
Mar 13, 2018

Conversation

stweil
Copy link
Member

@stweil stweil commented May 4, 2017

No description provided.

@stweil
Copy link
Member Author

stweil commented May 4, 2017

Ray, this commit has a high probability to conflict with your work, so please select single commits as you like or just tell me which changes can be applied next or when is the best time for such changes.

It would be good to finish the transformation to POSIX data types and macros in the not too far future.

@stweil
Copy link
Member Author

stweil commented May 5, 2017

Rebased PR to trigger a new AppVeyor build (previous build failed, reason unknown).

@egorpugin
Copy link
Contributor

egorpugin commented May 5, 2017

I'm working towards fast and not silent builds on appveyor, but it could take 1-2 month. (cppan related)
But it's possible that your commit really broke something on windows. (I did not do any cppan/appveyor changes during last 1-1.5 month.)

@stweil
Copy link
Member Author

stweil commented May 5, 2017

Could we just remove the i/o redirection in cmake --build . --config Release > bin\Release\log.txt? Writing compiler error messages to a file which cannot be read looks strange.

@egorpugin
Copy link
Contributor

This will make build times up to near 1 hour or even 1+ which is impossible on appveyor.
There are too many warnings, so pushing all of them to stdout/err makes such slow build times.

@stweil
Copy link
Member Author

stweil commented May 5, 2017

Appveyor also supports caching. That could reduce build time significantly.

@egorpugin
Copy link
Contributor

Nice. I'll investigate this, thanks!

@stweil stweil force-pushed the posix branch 2 times, most recently from d2c98c5 to 70b2875 Compare May 6, 2017 06:08
@stweil
Copy link
Member Author

stweil commented May 6, 2017

Build now works. The previous errors were caused by ambiguous calls of ClipToRange.

Appveyor needed about 30 minutes total time with i/o redirection removed.

@stweil stweil mentioned this pull request May 9, 2017
@stweil stweil force-pushed the posix branch 3 times, most recently from 4a956c6 to 9e832e4 Compare May 12, 2017 07:04
@stweil
Copy link
Member Author

stweil commented May 12, 2017

Fixed merge conflicts and rebased PR.

@stweil
Copy link
Member Author

stweil commented May 13, 2017

Fixed merge conflicts and rebased PR.

@stweil stweil force-pushed the posix branch 4 times, most recently from a0cea41 to b123142 Compare May 17, 2017 19:41
@stweil
Copy link
Member Author

stweil commented May 17, 2017

Fixed merge conflicts and rebased PR.

@stweil
Copy link
Member Author

stweil commented Jul 13, 2017

@theraysmith, as you are just preparing a new larger code change: is it possible to use POSIX data types for the new / modified code, and can we switch to POSIX for the rest of the code directly after your update?

@theraysmith
Copy link
Contributor

theraysmith commented Jul 13, 2017 via email

@stweil
Copy link
Member Author

stweil commented Jul 24, 2017

Rebased PR and fixed merge conflicts.

stweil added 21 commits March 13, 2018 19:18
Now all Tesseract data types which are no longer needed can be removed
from ccutil/host.h.

Signed-off-by: Stefan Weil <[email protected]>
…INT*_MAX

Remove the macros which are now unused from ccutil/host.h.
Remove also the obsolete history comments.

Signed-off-by: Stefan Weil <[email protected]>
Error message vom Appveyor CI:

    C:\projects\tesseract\ccstruct\coutln.cpp(818): error C2672: 'ClipToRange': no matching overloaded function found [C:\projects\tesseract\build\libtesseract.vcxproj]
    C:\projects\tesseract\ccstruct\coutln.cpp(818): error C2782: 'T ClipToRange(const T &,const T &,const T &)': template parameter 'T' is ambiguous [C:\projects\tesseract\build\libtesseract.vcxproj]
      c:\projects\tesseract\ccutil\helpers.h(122): note: see declaration of 'ClipToRange'
      C:\projects\tesseract\ccstruct\coutln.cpp(818): note: could be 'char'
      C:\projects\tesseract\ccstruct\coutln.cpp(818): note: or       'int'

Signed-off-by: Stefan Weil <[email protected]>
@stweil
Copy link
Member Author

stweil commented Mar 13, 2018

Fixed merge conflicts and rebased.

@zdenop
Copy link
Contributor

zdenop commented Mar 13, 2018

Can this be merge now?

@stweil
Copy link
Member Author

stweil commented Mar 13, 2018

That would be great! But what about Ray's comment (see above)?

@zdenop
Copy link
Contributor

zdenop commented Mar 13, 2018

He promised to deliver code beginning of August 2017... ;-) And based on Jeff info there will be no new code soon...

@zdenop zdenop merged commit 023e1b3 into tesseract-ocr:master Mar 13, 2018
@stweil stweil deleted the posix branch March 14, 2018 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants