Fix Windows and 32-bit support #146
Merged
Conversation
This file contains hidden or 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
- Move FFI functions to a separate class. - Split the GLib and GObject symbols into a separate string. - Ensure `g_*` functions are called via `libglib-2.0-0.dll` or `libgobject-2.0-0.dll` on Windows. - Fix 32-bit support, use `PHP_INT_SIZE` to determine `GType`. - Remove debug code in `GValue::toEnum`. - Prefer to call `cast` on the static `\FFI` class. - Remove `Config::error()` in favor of `throw new Exception()`, move error buffer logic to `Vips\Exception`. - Remove `GsfOutputCsvQuotingMode` class. - Remove `Config::printAll`, already exists as `VipsObject::printAll`. - Move `Config::filenameGetFilename` and `Config::filenameGetOptions` to Utils class.
| I've moved the FFI functions back to |
| Sorry for sitting on this, I've been horribly busy this week. I'll read it now. |
jcupitt approved these changes Jul 3, 2022
| Oh I forgot to say, we should update the CHANGELOG and bump the version number. |
| This all looks great -- fixes the issue, and includes lots of useful cleanups. I was groaning and rolling my eyes and thinking I'd need to spend half a day sorting out this linking problem, but you've done it all, and very well! Nice job. |
| ... I added a short CHANGELOG note and tagged it as 2.0.3. |
| Oop, I always forget that |
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants
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.
Change summary:
Move FFI functions to a separate class.Reverted with commit f3086e4.g_*functions are called vialibglib-2.0-0.dllorlibgobject-2.0-0.dllon Windows.PHP_INT_SIZEto determineGType.GValue::toEnum.caston the static\FFIclass.Config::error()in favor ofthrow new Exception(), move error buffer logic toVips\Exception.GsfOutputCsvQuotingModeclass.Config::printAll, already exists asVipsObject::printAll.Config::filenameGetFilenameandConfig::filenameGetOptionsto Utils class.This was successfully tested on my Windows PC using the 64-bit libvips binaries. I also fixed 32-bit support, but for some reason this results in OOM errors (I was able to get the test suite to pass when I disabled the
NewTestandWriteTest, fwiw).(This PR got a bit bigger than I initially thought, I could split the changes if necessary)
Resolves: #144.