windows jpeg support #841
windows jpeg support #841
Conversation
|
Any update on this one? Can it be merged? |
|
👍 Looks good. Builds and tests pass on Win 10, VC2015, libjpeg-turbo-1.5.1 x64. |
|
Awesome 👍 Should this be backported to 1.x also? (I can fix it) Hopefully I'll get some time this week to merge a few of the ready PRs, including this :) |
|
It's non-breaking, so seems suited to 1.x, yes. Thanks! |
|
(I used libjpeg-turbo-1.5.1-vc64.exe 2016-09-21 from your link, which has bin/libjpeg62.dll) |
| @@ -880,7 +880,11 @@ cairo_status_t | |||
| Image::loadJPEG(FILE *stream) { | |||
| cairo_status_t status; | |||
|
|
|||
| #if defined(_MSC_VER) | |||
| if (false) { // Force using loadJPEGFromBuffer | |||
| #else | |||
| if (data_mode == DATA_IMAGE) { // Can lazily read in the JPEG. | |||
There was a problem hiding this comment.
Why not put the #if defined(_MSC_VER) inside of this this if-statment and avoid if (false) { and duplicating if (data_mode == DATA_IMAGE) {?
There was a problem hiding this comment.
@LinusU To prevent repeating the buffer reading stuff https://github.com/Automattic/node-canvas/blob/master/src/Image.cc#L901-L911
Can of course refactor if you wish. Let me know.
|
Sorry for the delay on this, merging now 👍 |
|
@LinusU Great! Thanks. |
Cleaned up replacement for PR #815