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

avoid segfault with unknown interpolator

Browse Source
This commit is contained in:
Bernhard K. Weisshuhn
2015-04-19 23:10:29 +02:00
parent 6fc62d39c9
commit 8ac33aad69
3 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common.cc
View File

@@ -134,6 +134,9 @@ namespace sharp {
*/
int InterpolatorWindowSize(char const *name) {
VipsInterpolate *interpolator = vips_interpolate_new(name);
if (interpolator == NULL) {
return -1;
}
int window_size = vips_interpolate_get_window_size(interpolator);
g_object_unref(interpolator);
return window_size;

6
src/resize.cc
View File

@@ -261,6 +261,9 @@ class ResizeWorker : public NanAsyncWorker {
// Get window size of interpolator, used for determining shrink vs affine
int interpolatorWindowSize = InterpolatorWindowSize(baton->interpolator.c_str());
if (InterpolatorWindowSize < 0) {
return Error();
}
// Scaling calculations
double xfactor = 1.0;
@@ -510,6 +513,9 @@ class ResizeWorker : public NanAsyncWorker {
}
// Create interpolator - "bilinear" (default), "bicubic" or "nohalo"
VipsInterpolate *interpolator = vips_interpolate_new(baton->interpolator.c_str());
if (interpolator == NULL) {
return Error();
}
vips_object_local(hook, interpolator);
// Perform affine transformation
VipsImage *affined;