forked from scikit-image/scikit-image
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
added patch changeset_6807f4ee8f5501703e447f95701190c836deaae1.diff
to "cherry-pick" 6807f4e (BF: Initialize firstbg to the numels so if no bg value found, second loop is not executed)
- Loading branch information
1 parent
4b450f6
commit 0b8664a
Showing
3 changed files
with
23 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,11 @@ | ||
skimage (0.12.3-2) unstable; urgency=medium | ||
|
||
* debian/patches | ||
- changeset_6807f4ee8f5501703e447f95701190c836deaae1.diff to initialize | ||
value of firstbg to avoid segfaults (Closes: #840589) | ||
|
||
-- Yaroslav Halchenko <[email protected]> Mon, 12 Dec 2016 12:41:31 -0500 | ||
|
||
skimage (0.12.3-1) unstable; urgency=medium | ||
|
||
[ Stefan van der Walt ] | ||
|
14 changes: 14 additions & 0 deletions
14
debian/patches/changeset_6807f4ee8f5501703e447f95701190c836deaae1.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
From: Yaroslav Halchenko <[email protected]> | ||
Subject: BF: Initialize firstbg to the numels so if no bg value found, second loop is not executed | ||
|
||
--- a/skimage/measure/_ccomp.pyx | ||
+++ b/skimage/measure/_ccomp.pyx | ||
@@ -541,7 +541,7 @@ cdef void scanBG(DTYPE_t *data_p, DTYPE_ | ||
|
||
The result of this function is update of forest_p and bg parameter. | ||
""" | ||
- cdef DTYPE_t i, bgval = bg.background_val, firstbg | ||
+ cdef DTYPE_t i, bgval = bg.background_val, firstbg = shapeinfo.numels | ||
# We find the provisional label of the background, which is the index of | ||
# the first background pixel | ||
for i in range(shapeinfo.numels): |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters