mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 06:26:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix faster_rcnn sample crashed at PoolingInvoker on Windows7(x64). (#10724)

Browse Source 
* fix faster_rcnn sample crashed at PoolingInvoker operator() of pooling_layer.

* find_odj onmouse bug about find matched point status.

* reverted AutoBuffer back to std::vector
This commit is contained in:
Sui Libin 2018-02-12 21:07:56 +08:00 committed by Vadim Pisarevsky
parent b67523550f
commit 1ad814a191
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/dnn/src/layers/pooling_layer.cpp
View File

@ -320,7 +320,7 @@ public:
bool compMaxIdx = computeMaxIdx; bool compMaxIdx = computeMaxIdx;
#if CV_SIMD128 #if CV_SIMD128
const int* ofsptr = &ofsbuf[0]; const int* ofsptr = ofsbuf.empty() ? 0 : (const int*)&ofsbuf[0];
v_float32x4 idx00(0.f, (float)stride_w, (float)(stride_w*2), (float)(stride_w*3)); v_float32x4 idx00(0.f, (float)stride_w, (float)(stride_w*2), (float)(stride_w*3));
v_float32x4 ones = v_setall_f32(1.f); v_float32x4 ones = v_setall_f32(1.f);
v_float32x4 idx_delta = v_setall_f32((float)(inp_width - kernel_w)); v_float32x4 idx_delta = v_setall_f32((float)(inp_width - kernel_w));

3
samples/python/find_obj.py
View File

@ -120,10 +120,11 @@ def explore_match(win, img1, img2, kp_pairs, status = None, H = None):
r = 8 r = 8
m = (anorm(np.array(p1) - (x, y)) < r) | (anorm(np.array(p2) - (x, y)) < r) m = (anorm(np.array(p1) - (x, y)) < r) | (anorm(np.array(p2) - (x, y)) < r)
idxs = np.where(m)[0] idxs = np.where(m)[0]
kp1s, kp2s = [], [] kp1s, kp2s = [], []
for i in idxs: for i in idxs:
(x1, y1), (x2, y2) = p1[i], p2[i] (x1, y1), (x2, y2) = p1[i], p2[i]
col = (red, green)[status[i]] col = (red, green)[status[i][0]]
cv.line(cur_vis, (x1, y1), (x2, y2), col) cv.line(cur_vis, (x1, y1), (x2, y2), col)
kp1, kp2 = kp_pairs[i] kp1, kp2 = kp_pairs[i]
kp1s.append(kp1) kp1s.append(kp1)