Mathis/sharp
1
0
Fork 0
mirror of https://github.com/lovell/sharp.git synced 2026-02-10 08:36:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Expose density metadata; set density of images from vector input

Browse Source
This commit is contained in:
Lovell Fuller
2016-03-01 19:27:47 +00:00
parent d92ea31858
commit bb37dc1ea6
12 changed files with 98 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/pipeline.cc
View File

@@ -58,6 +58,7 @@ using sharp::HasAlpha;
using sharp::ExifOrientation;
using sharp::SetExifOrientation;
using sharp::RemoveExifOrientation;
using sharp::SetDensity;
using sharp::IsJpeg;
using sharp::IsPng;
using sharp::IsWebp;
@@ -118,9 +119,12 @@ class PipelineWorker : public AsyncWorker {
try {
VOption *option = VImage::option()->set("access", baton->accessMethod);
if (inputImageType == ImageType::MAGICK) {
option->set("density", baton->density.data());
option->set("density", std::to_string(baton->density).data());
}
image = VImage::new_from_buffer(baton->bufferIn, baton->bufferInLength, nullptr, option);
if (inputImageType == ImageType::MAGICK) {
SetDensity(image, baton->density);
}
} catch (...) {
(baton->err).append("Input buffer has corrupt header");
inputImageType = ImageType::UNKNOWN;
@@ -136,9 +140,12 @@ class PipelineWorker : public AsyncWorker {
try {
VOption *option = VImage::option()->set("access", baton->accessMethod);
if (inputImageType == ImageType::MAGICK) {
option->set("density", baton->density.data());
option->set("density", std::to_string(baton->density).data());
}
image = VImage::new_from_file(baton->fileIn.data(), option);
if (inputImageType == ImageType::MAGICK) {
SetDensity(image, baton->density);
}
} catch (...) {
(baton->err).append("Input file has corrupt header");
inputImageType = ImageType::UNKNOWN;
@@ -921,7 +928,7 @@ NAN_METHOD(pipeline) {
// Limit input images to a given number of pixels, where pixels = width * height
baton->limitInputPixels = attrAs<int32_t>(options, "limitInputPixels");
// Density/DPI at which to load vector images via libmagick
baton->density = attrAsStr(options, "density");
baton->density = attrAs<int32_t>(options, "density");
// Raw pixel input
baton->rawWidth = attrAs<int32_t>(options, "rawWidth");
baton->rawHeight = attrAs<int32_t>(options, "rawHeight");