Mathis/sharp
1
0
Fork 0
mirror of https://github.com/lovell/sharp.git synced 2025-07-09 10:30:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Trim space from end of libvips error messages

Browse Source
This commit is contained in:
Lovell Fuller 2023-03-24 09:58:21 +00:00
parent 0af070ed93
commit b55e58f31e
6 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common.cc
View File

@ -226,6 +226,13 @@ namespace sharp {
return EndsWith(str, ".v") || EndsWith(str, ".V") || EndsWith(str, ".vips") || EndsWith(str, ".VIPS");
}
/*
Trim space from end of string.
*/
std::string TrimEnd(std::string const &str) {
return str.substr(0, str.find_last_not_of(" \n\r\f") + 1);
}
/*
Provide a string identifier for the given image type.
*/

5
src/common.h
View File

@ -182,6 +182,11 @@ namespace sharp {
bool IsDzZip(std::string const &str);
bool IsV(std::string const &str);
/*
Trim space from end of string.
*/
std::string TrimEnd(std::string const &str);
/*
Provide a string identifier for the given image type.
*/

2
src/metadata.cc
View File

@ -247,7 +247,7 @@ class MetadataWorker : public Napi::AsyncWorker {
}
Callback().MakeCallback(Receiver().Value(), { env.Null(), info });
} else {
Callback().MakeCallback(Receiver().Value(), { Napi::Error::New(env, baton->err).Value() });
Callback().MakeCallback(Receiver().Value(), { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() });
}
delete baton->input;

2
src/pipeline.cc
View File

@ -1234,7 +1234,7 @@ class PipelineWorker : public Napi::AsyncWorker {
Callback().MakeCallback(Receiver().Value(), { env.Null(), info });
}
} else {
Callback().MakeCallback(Receiver().Value(), { Napi::Error::New(env, baton->err).Value() });
Callback().MakeCallback(Receiver().Value(), { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() });
}
// Delete baton

2
src/stats.cc
View File

@ -143,7 +143,7 @@ class StatsWorker : public Napi::AsyncWorker {
info.Set("dominant", dominant);
Callback().MakeCallback(Receiver().Value(), { env.Null(), info });
} else {
Callback().MakeCallback(Receiver().Value(), { Napi::Error::New(env, baton->err).Value() });
Callback().MakeCallback(Receiver().Value(), { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() });
}
delete baton->input;

2
test/unit/extract.js
View File

@ -293,7 +293,7 @@ describe('Partial image extraction', function () {
.extract({ left: 3000, top: 10, width: 10, height: 10 })
.toBuffer(function (err) {
assert(err instanceof Error);
assert.strictEqual(err.message, 'extract_area: bad extract area\n');
assert.strictEqual(err.message, 'extract_area: bad extract area');
done();
});
});