Skip to content
This repository was archived by the owner on Oct 18, 2023. It is now read-only.

Commit a750355

Browse files
committed
Allow get's on 3D matrices
1 parent 4746761 commit a750355

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

cc/core/Mat.cc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@ NAN_METHOD(Mat::FlattenFloat) {
219219
NAN_METHOD(Mat::At) {
220220
FF_METHOD_CONTEXT("Mat::At");
221221
cv::Mat matSelf = FF_UNWRAP_MAT_AND_GET(info.This());
222-
FF_ASSERT_INDEX_RANGE(info[0]->Int32Value(), matSelf.rows - 1, "Mat::At row");
223-
FF_ASSERT_INDEX_RANGE(info[1]->Int32Value(), matSelf.cols - 1, "Mat::At col");
222+
FF_ASSERT_INDEX_RANGE(info[0]->Int32Value(), matSelf.size[0] - 1, "Mat::At row");
223+
FF_ASSERT_INDEX_RANGE(info[1]->Int32Value(), matSelf.size[1] - 1, "Mat::At col");
224224
v8::Local<v8::Value> val;
225225
FF_MAT_APPLY_TYPED_OPERATOR(matSelf, val, matSelf.type(), FF_MAT_AT, FF::matGet);
226226
v8::Local<v8::Value> jsVal;
@@ -250,8 +250,8 @@ NAN_METHOD(Mat::At) {
250250
NAN_METHOD(Mat::AtRaw) {
251251
FF_METHOD_CONTEXT("Mat::AtRaw");
252252
cv::Mat matSelf = FF_UNWRAP_MAT_AND_GET(info.This());
253-
FF_ASSERT_INDEX_RANGE(info[0]->Int32Value(), matSelf.rows - 1, "Mat::At row");
254-
FF_ASSERT_INDEX_RANGE(info[1]->Int32Value(), matSelf.cols - 1, "Mat::At col");
253+
FF_ASSERT_INDEX_RANGE(info[0]->Int32Value(), matSelf.size[0] - 1, "Mat::At row");
254+
FF_ASSERT_INDEX_RANGE(info[1]->Int32Value(), matSelf.size[1] - 1, "Mat::At col");
255255
v8::Local<v8::Value> val;
256256
FF_MAT_APPLY_TYPED_OPERATOR(matSelf, val, matSelf.type(), FF_MAT_AT, FF::matGet);
257257
FF_RETURN(val);
@@ -260,8 +260,8 @@ NAN_METHOD(Mat::AtRaw) {
260260
NAN_METHOD(Mat::Set) {
261261
FF_METHOD_CONTEXT("Mat::Set");
262262
cv::Mat matSelf = FF_UNWRAP_MAT_AND_GET(info.This());
263-
FF_ASSERT_INDEX_RANGE(info[0]->Int32Value(), matSelf.rows - 1, "Mat::Set row");
264-
FF_ASSERT_INDEX_RANGE(info[1]->Int32Value(), matSelf.cols - 1, "Mat::Set col");
263+
FF_ASSERT_INDEX_RANGE(info[0]->Int32Value(), matSelf.size[0] - 1, "Mat::At row");
264+
FF_ASSERT_INDEX_RANGE(info[1]->Int32Value(), matSelf.size[1] - 1, "Mat::At col");
265265

266266
int cn = matSelf.channels();
267267
if (info[2]->IsArray()) {

0 commit comments

Comments
 (0)