Skip to content

Commit eef86fb

Browse files
committed
Fixed HOG.groupRectangles return result
1 parent 8ed4b3b commit eef86fb

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

cc/modules/objdetect/HOGDescriptorBindings.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,7 @@ namespace HOGDescriptorBindings {
356356
}
357357

358358
v8::Local<v8::Value> getReturnValue() {
359-
v8::Local<v8::Object> ret = Nan::New<v8::Object>();
360-
return ret;
359+
return ObjectArrayConverter<Rect, cv::Rect2d, cv::Rect>::wrap(rectList);
361360
}
362361

363362
bool unwrapRequiredArgs(Nan::NAN_METHOD_ARGS_TYPE info) {

lib/typings/HOGDescriptor.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ export class HOGDescriptor {
3333
detectROIAsync(img: Mat, locations: Point2[], hitThreshold?: number, winStride?: Size, padding?: Size): Promise<{ foundLocations: Point2[], confidences: number[] }>;
3434
getDaimlerPeopleDetector(): number[];
3535
getDefaultPeopleDetector(): number[];
36-
groupRectangles(rectList: Rect[], weights: number[], groupThreshold: number, eps: number): void;
37-
groupRectanglesAsync(rectList: Rect[], weights: number[], groupThreshold: number, eps: number): Promise<void>;
36+
groupRectangles(rectList: Rect[], weights: number[], groupThreshold: number, eps: number): Rect[];
37+
groupRectanglesAsync(rectList: Rect[], weights: number[], groupThreshold: number, eps: number): Promise<Rect[]>;
3838
load(path: string): void;
3939
save(path: string): void;
4040
setSVMDetector(detector: number[]): void;

test/tests/modules/objdetect/HOGDescriptorTests.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -412,14 +412,14 @@ module.exports = () => {
412412
});
413413

414414
describe('groupRectangles', () => {
415-
const expectOutput = () => {
416-
// expect to not throw
415+
const expectOutput = (result) => {
416+
expect(result).to.be.an('array');
417+
result.forEach(rect => expect(rect).instanceOf(cv.Rect));
417418
};
418-
419419
const rectList = [new cv.Rect(0, 0, 10, 10), new cv.Rect(0, 0, 20, 20)];
420420
const weights = [0.5, 1.0];
421421
const groupThreshold = 1;
422-
const eps = 0.5;
422+
const eps = 2.0;
423423

424424
generateAPITests({
425425
getDut: () => getTestHOG(),

0 commit comments

Comments
 (0)