Commit dac6456
authored
Fix more enums carrying stale native values from the OpenCV4->5 migration (#2082)
Auditing for the same class of bug as #2080 (SolvePnPMethod) turned up
two more live cases where a managed enum's numeric values no longer
match their native OpenCV5 counterpart:
- FishEyeCalibrationFlags: cv::fisheye lost its own flag enum in
OpenCV5 and now aliases the unified CALIB_* flags, whose bit
positions are unrelated to the old fisheye-only values. Every flag
except UseIntrinsicGuess/FixIntrinsic (which happened to keep the
same bit) was silently setting the wrong native bits.
- WMFWeightType: declared as a plain 0..5 sequence, but the native
enum is bit flags (1,2,4,8,16,32). Every value except EXP called
the wrong weighting formula in WeightedMedianFilter.
Also removes VideoCaptureAPIs.OPENNI/OPENNI_ASUS/GIGANETIX, whose
native backend IDs (CAP_OPENNI/CAP_OPENNI_ASUS/CAP_GIGANETIX) no
longer exist in OpenCV5 at all (OpenNI was superseded by OpenNI2,
Giganetix support was dropped) - VideoCapture.Open() with these
would silently fail to find a backend.1 parent 52fa2c5 commit dac6456
4 files changed
Lines changed: 56 additions & 41 deletions
File tree
- src/OpenCvSharp/Modules
- calib/Enum
- videoio/Enum
- ximgproc/Enum
- test/OpenCvSharp.Tests/calib3d
Lines changed: 18 additions & 18 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
22 | | - | |
| 22 | + | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | | - | |
| 27 | + | |
28 | 28 | | |
29 | | - | |
| 29 | + | |
30 | 30 | | |
31 | 31 | | |
32 | | - | |
| 32 | + | |
33 | 33 | | |
34 | | - | |
| 34 | + | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
| 37 | + | |
38 | 38 | | |
39 | | - | |
| 39 | + | |
40 | 40 | | |
41 | 41 | | |
42 | | - | |
| 42 | + | |
43 | 43 | | |
44 | | - | |
| 44 | + | |
45 | 45 | | |
46 | 46 | | |
47 | | - | |
| 47 | + | |
48 | 48 | | |
49 | | - | |
| 49 | + | |
50 | 50 | | |
51 | 51 | | |
52 | | - | |
| 52 | + | |
53 | 53 | | |
54 | | - | |
| 54 | + | |
55 | 55 | | |
56 | 56 | | |
57 | | - | |
| 57 | + | |
58 | 58 | | |
59 | | - | |
| 59 | + | |
60 | 60 | | |
61 | 61 | | |
62 | | - | |
| 62 | + | |
63 | 63 | | |
64 | | - | |
| 64 | + | |
65 | 65 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | 69 | | |
80 | 70 | | |
81 | 71 | | |
82 | | - | |
| 72 | + | |
83 | 73 | | |
84 | 74 | | |
85 | 75 | | |
| |||
91 | 81 | | |
92 | 82 | | |
93 | 83 | | |
94 | | - | |
95 | | - | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | 84 | | |
100 | 85 | | |
101 | 86 | | |
102 | | - | |
| 87 | + | |
103 | 88 | | |
104 | 89 | | |
105 | 90 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| 7 | + | |
7 | 8 | | |
8 | 9 | | |
9 | 10 | | |
10 | 11 | | |
11 | 12 | | |
12 | | - | |
| 13 | + | |
13 | 14 | | |
14 | 15 | | |
15 | 16 | | |
16 | 17 | | |
17 | | - | |
| 18 | + | |
18 | 19 | | |
19 | 20 | | |
20 | 21 | | |
21 | 22 | | |
22 | | - | |
| 23 | + | |
23 | 24 | | |
24 | 25 | | |
25 | 26 | | |
26 | 27 | | |
27 | | - | |
| 28 | + | |
28 | 29 | | |
29 | 30 | | |
30 | 31 | | |
31 | 32 | | |
32 | | - | |
| 33 | + | |
33 | 34 | | |
34 | 35 | | |
35 | 36 | | |
36 | 37 | | |
37 | | - | |
| 38 | + | |
38 | 39 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
314 | 314 | | |
315 | 315 | | |
316 | 316 | | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
317 | 346 | | |
318 | 347 | | |
319 | 348 | | |
| |||
0 commit comments