use libjpeg-turbo, use common libs with crengine #243
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Switch libjpeg to libjpeg-turbo: This will give a slight performance advantage. Also, it will offer us the Turbo-JPEG API, which is a much simpler approach to render JPEG/JFIF data. This is without setjmp/longjmp exceptions and will allow for an easy FFI-based pic_jpeg interface. Also fix dependencies of our CREngine integration to use the common build of Freetype, libpng and jpeg (using libjpeg-turbo). This will mainly make the resulting library smaller, and remove redundant code.
|
Note: This will require nasm on build-time. We could get rid when we use --disable-simd with configure, and it is relevant only on x86/x86_64. Please discuss. |
|
Note: This probably needs more testing before using it. |
|
IIRC, jpeg-turbo also provides neon assembly routines, so the nasm comment would also apply for the Kindle/Kobo builds ;). |
I'm actually not sure why this has worked before. The error crept up the first time for me here.
|
PNG rendering via CREngine seems to be broken. Not sure yet why that is, will investigate. Freetype and JPEG seem to work just fine. |
use our own zlib build with CREngine (needed when the sysroot/system does not provide a zlib - also this will use a known version)
|
UPDATE: |
And also revert the lazily load pthread. It seems that luajit cannot resolve symbols recursively from dynamically linked libraries like in the linux. So that we do need to get platform specific pthread libraries in different platforms. So does the mupdf library.
fix win32 port
chrox
added a commit
that referenced
this pull request
Oct 22, 2014
use libjpeg-turbo, use common libs with crengine
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Switch libjpeg to libjpeg-turbo: This will give a slight performance
advantage. Also, it will offer us the Turbo-JPEG API, which is a much
simpler approach to render JPEG/JFIF data. This is without
setjmp/longjmp exceptions and will allow for an easy FFI-based pic_jpeg
interface.
Also fix dependencies of our CREngine integration to use the common
build of Freetype, libpng and jpeg (using libjpeg-turbo). This will
mainly make the resulting library smaller, and remove redundant code.
Needs koreader/crengine#3