Mathis/sharp
1
0
Fork 0
mirror of https://github.com/lovell/sharp.git synced 2025-12-19 07:15:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only set density option when using magick loader

Browse Source 
to reduce number of warnings from libvips #352
This commit is contained in:
Lovell Fuller
2016-02-04 19:16:49 +00:00
parent 0e29c55d13
commit 736c04a7a4
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/pipeline.cc
View File

@@ -39,6 +39,7 @@ using Nan::Equals;
using vips::VImage;
using vips::VInterpolate;
using vips::VOption;
using vips::VError;
using sharp::Composite;
@@ -222,11 +223,11 @@ class PipelineWorker : public AsyncWorker {
inputImageType = DetermineImageType(baton->bufferIn, baton->bufferInLength);
if (inputImageType != ImageType::UNKNOWN) {
try {
image = VImage::new_from_buffer(
baton->bufferIn, baton->bufferInLength, nullptr, VImage::option()
->set("access", baton->accessMethod)
->set("density", baton->density.data())
);
VOption *option = VImage::option()->set("access", baton->accessMethod);
if (inputImageType == ImageType::MAGICK) {
option->set("density", baton->density.data());
}
image = VImage::new_from_buffer(baton->bufferIn, baton->bufferInLength, nullptr, option);
} catch (...) {
(baton->err).append("Input buffer has corrupt header");
inputImageType = ImageType::UNKNOWN;
@@ -240,11 +241,11 @@ class PipelineWorker : public AsyncWorker {
inputImageType = DetermineImageType(baton->fileIn.data());
if (inputImageType != ImageType::UNKNOWN) {
try {
image = VImage::new_from_file(
baton->fileIn.data(), VImage::option()
->set("access", baton->accessMethod)
->set("density", baton->density.data())
);
VOption *option = VImage::option()->set("access", baton->accessMethod);
if (inputImageType == ImageType::MAGICK) {
option->set("density", baton->density.data());
}
image = VImage::new_from_file(baton->fileIn.data(), option);
} catch (...) {
(baton->err).append("Input file has corrupt header");
inputImageType = ImageType::UNKNOWN;