Mathis/sharp
1
0
Fork 0
mirror of https://github.com/lovell/sharp.git synced 2025-07-09 18:40:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Match g_malloc/g_free for make benefit glorious nation of Windows

Browse Source 
Remove C++ standard lib from Windows packaging
This commit is contained in:
Lovell Fuller 2015-11-21 22:51:32 +00:00
parent 0ae619dfc5
commit 3dbedf1fb6
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
binding.gyp
View File

@ -179,7 +179,6 @@
'<(module_root_dir)/lib/libquadmath-0.dll', '<(module_root_dir)/lib/libquadmath-0.dll',
'<(module_root_dir)/lib/libsqlite3-0.dll', '<(module_root_dir)/lib/libsqlite3-0.dll',
'<(module_root_dir)/lib/libssp-0.dll', '<(module_root_dir)/lib/libssp-0.dll',
'<(module_root_dir)/lib/libstdc++-6.dll',
'<(module_root_dir)/lib/libtiff-5.dll', '<(module_root_dir)/lib/libtiff-5.dll',
'<(module_root_dir)/lib/libvips-42.dll', '<(module_root_dir)/lib/libvips-42.dll',
'<(module_root_dir)/lib/libxml2-2.dll', '<(module_root_dir)/lib/libxml2-2.dll',

2
docs/install.md
View File

@ -71,7 +71,7 @@ If so, please try `brew link gettext --force`.
[![Windows x64 Build Status](https://ci.appveyor.com/api/projects/status/pgtul704nkhhg6sg)](https://ci.appveyor.com/project/lovell/sharp) [![Windows x64 Build Status](https://ci.appveyor.com/api/projects/status/pgtul704nkhhg6sg)](https://ci.appveyor.com/project/lovell/sharp)
libvips and its dependencies are fetched and stored within `node_modules\sharp` during `npm install`. libvips and its dependencies are fetched and stored within `node_modules\sharp` during `npm install`.
This involves an automated HTTPS download of approximately 11MB. This involves an automated HTTPS download of approximately 9MB.
Only 64-bit (x64) `node.exe` is supported. Only 64-bit (x64) `node.exe` is supported.
The WebP format is currently unavailable on Windows. The WebP format is currently unavailable on Windows.

2
packaging/win/Dockerfile
View File

@ -11,6 +11,6 @@ RUN unzip vips-dev-w64-8.1.1-2.zip
# Clean and zip # Clean and zip
WORKDIR /vips/vips-dev-8.1.1 WORKDIR /vips/vips-dev-8.1.1
RUN rm bin/libvipsCC-42.dll bin/libvips-cpp-42.dll bin/libgsf-win32-1-114.dll RUN rm bin/libvipsCC-42.dll bin/libvips-cpp-42.dll bin/libgsf-win32-1-114.dll bin/libstdc++-6.dll
RUN cp bin/*.dll lib/ RUN cp bin/*.dll lib/
RUN GZIP=-9 tar czf /libvips-8.1.1-win.tar.gz include lib/glib-2.0 lib/libvips.lib lib/libglib-2.0.lib lib/libgobject-2.0.lib lib/*.dll RUN GZIP=-9 tar czf /libvips-8.1.1-win.tar.gz include lib/glib-2.0 lib/libvips.lib lib/libglib-2.0.lib lib/libgobject-2.0.lib lib/*.dll

4
src/metadata.cc
View File

@ -133,7 +133,7 @@ class MetadataWorker : public AsyncWorker {
size_t exifLength; size_t exifLength;
if (!vips_image_get_blob(image, VIPS_META_EXIF_NAME, &exif, &exifLength)) { if (!vips_image_get_blob(image, VIPS_META_EXIF_NAME, &exif, &exifLength)) {
baton->exifLength = exifLength; baton->exifLength = exifLength;
baton->exif = static_cast<char*>(malloc(exifLength)); baton->exif = static_cast<char*>(g_malloc(exifLength));
memcpy(baton->exif, exif, exifLength); memcpy(baton->exif, exif, exifLength);
} }
} }
@ -143,7 +143,7 @@ class MetadataWorker : public AsyncWorker {
size_t iccLength; size_t iccLength;
if (!vips_image_get_blob(image, VIPS_META_ICC_NAME, &icc, &iccLength)) { if (!vips_image_get_blob(image, VIPS_META_ICC_NAME, &icc, &iccLength)) {
baton->iccLength = iccLength; baton->iccLength = iccLength;
baton->icc = static_cast<char*>(malloc(iccLength)); baton->icc = static_cast<char*>(g_malloc(iccLength));
memcpy(baton->icc, icc, iccLength); memcpy(baton->icc, icc, iccLength);
} }
} }