Match g_malloc/g_free for make benefit glorious nation of Windows

Remove C++ standard lib from Windows packaging
lovell · Nov 21, 2015 · 3dbedf1 · 3dbedf1
1 parent 0ae619d
commit 3dbedf1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -179,7 +179,6 @@
             '<(module_root_dir)/lib/libquadmath-0.dll',
             '<(module_root_dir)/lib/libsqlite3-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/libvips-42.dll',
             '<(module_root_dir)/lib/libxml2-2.dll',

diff --git a/docs/install.md b/docs/install.md
@@ -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)
 
 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.
 The WebP format is currently unavailable on Windows.

diff --git a/packaging/win/Dockerfile b/packaging/win/Dockerfile
@@ -11,6 +11,6 @@ RUN unzip vips-dev-w64-8.1.1-2.zip
 
 # Clean and zip
 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 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
diff --git a/src/metadata.cc b/src/metadata.cc
@@ -133,7 +133,7 @@ class MetadataWorker : public AsyncWorker {
         size_t exifLength;
         if (!vips_image_get_blob(image, VIPS_META_EXIF_NAME, &exif, &exifLength)) {
           baton->exifLength = exifLength;
-          baton->exif = static_cast<char*>(malloc(exifLength));
+          baton->exif = static_cast<char*>(g_malloc(exifLength));
           memcpy(baton->exif, exif, exifLength);
         }
       }
@@ -143,7 +143,7 @@ class MetadataWorker : public AsyncWorker {
         size_t iccLength;
         if (!vips_image_get_blob(image, VIPS_META_ICC_NAME, &icc, &iccLength)) {
           baton->iccLength = iccLength;
-          baton->icc = static_cast<char*>(malloc(iccLength));
+          baton->icc = static_cast<char*>(g_malloc(iccLength));
           memcpy(baton->icc, icc, iccLength);
         }
       }