Skip to content

Commit 0bd1995

Browse files
fixed some opencv version checks + fixed package-lock.json
1 parent c3546f9 commit 0bd1995

File tree

4 files changed

+21
-7
lines changed

4 files changed

+21
-7
lines changed

cc/core/MatBindings.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,8 @@ namespace MatBindings {
731731
);
732732
}
733733
};
734-
734+
735+
#if CV_VERSION_MINOR > 1
735736
struct RotateWorker : public OpWithCodeWorker {
736737
public:
737738
RotateWorker(cv::Mat self) : OpWithCodeWorker(self) {
@@ -742,6 +743,7 @@ namespace MatBindings {
742743
return "";
743744
}
744745
};
746+
#endif
745747

746748

747749
}

cc/core/MatCalib3dBindings.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,8 @@ namespace MatCalib3dBindings {
702702
);
703703
}
704704
};
705-
705+
706+
#if CV_VERSION_MINOR > 0
706707
struct FindEssentialMatWorker : public CatchCvExceptionWorker {
707708
public:
708709
cv::Mat self;
@@ -803,6 +804,8 @@ namespace MatCalib3dBindings {
803804
);
804805
}
805806
};
807+
808+
#endif
806809

807810

808811
}

cc/modules/calib3d/calib3dBindings.h

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,8 @@ namespace Calib3dBindings {
620620
);
621621
}
622622
};
623-
623+
624+
#if CV_VERSION_MINOR > 0
624625
struct SampsonDistanceWorker : public CatchCvExceptionWorker {
625626
public:
626627
cv::Vec2d pt1;
@@ -706,7 +707,9 @@ namespace Calib3dBindings {
706707
);
707708
}
708709
};
709-
710+
#endif
711+
712+
#if CV_VERSION_MINOR > 1
710713
struct CalibrateCameraExtendedWorker : public CalibrateCameraWorker {
711714
public:
712715
cv::Mat stdDeviationsIntrinsics;
@@ -791,7 +794,9 @@ namespace Calib3dBindings {
791794
return "";
792795
}
793796
};
794-
797+
#endif
798+
799+
#if CV_VERSION_MINOR > 2
795800
struct SolveP3PWorker : public SolvePxPWorker {
796801
public:
797802
int flags = cv::SOLVEPNP_P3P;
@@ -819,6 +824,7 @@ namespace Calib3dBindings {
819824
);
820825
}
821826
};
827+
#endif
822828

823829

824830
}

package-lock.json

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)