mirror of
https://github.com/lovell/sharp.git
synced 2025-12-19 07:15:08 +01:00
Windows: ensure C++ runtime is linked statically (#3110)
And remove the empty invalid parameter handler, which should
be present in the C layer instead.
This partially reverts commit
659cdabd8e,
the added test case in that commit is still preserved.
This commit is contained in:
committed by
GitHub
parent
55efe5602b
commit
c2ecde6a16
16
src/sharp.cc
16
src/sharp.cc
@@ -13,7 +13,6 @@
|
||||
// limitations under the License.
|
||||
|
||||
#include <napi.h>
|
||||
#include <cstdlib>
|
||||
#include <vips/vips8>
|
||||
|
||||
#include "common.h"
|
||||
@@ -22,14 +21,6 @@
|
||||
#include "utilities.h"
|
||||
#include "stats.h"
|
||||
|
||||
#if defined(_MSC_VER) && _MSC_VER >= 1400 // MSVC 2005/8
|
||||
static void empty_invalid_parameter_handler(const wchar_t* expression,
|
||||
const wchar_t* function, const wchar_t* file, unsigned int line,
|
||||
uintptr_t reserved) {
|
||||
// No-op.
|
||||
}
|
||||
#endif
|
||||
|
||||
static void* sharp_vips_init(void*) {
|
||||
g_setenv("VIPS_MIN_STACK_SIZE", "2m", FALSE);
|
||||
vips_init("sharp");
|
||||
@@ -43,13 +34,6 @@ Napi::Object init(Napi::Env env, Napi::Object exports) {
|
||||
g_log_set_handler("VIPS", static_cast<GLogLevelFlags>(G_LOG_LEVEL_WARNING),
|
||||
static_cast<GLogFunc>(sharp::VipsWarningCallback), nullptr);
|
||||
|
||||
// Tell the CRT to not exit the application when an invalid parameter is
|
||||
// passed. The main issue is that invalid FDs will trigger this behaviour.
|
||||
// See: https://github.com/libvips/libvips/pull/2571.
|
||||
#if defined(_MSC_VER) && _MSC_VER >= 1400 // MSVC 2005/8
|
||||
_set_invalid_parameter_handler(empty_invalid_parameter_handler);
|
||||
#endif
|
||||
|
||||
// Methods available to JavaScript
|
||||
exports.Set("metadata", Napi::Function::New(env, metadata));
|
||||
exports.Set("pipeline", Napi::Function::New(env, pipeline));
|
||||
|
||||
Reference in New Issue
Block a user