Merge branch 'master' into update-4x

danforthcenter · May 11, 2021 · 78cb01d · 78cb01d
2 parents 3a7beec + f100b41
commit 78cb01d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/plantcv/plantcv/cluster_contours.py b/plantcv/plantcv/cluster_contours.py
@@ -49,13 +49,13 @@ def cluster_contours(img, roi_objects, roi_obj_hierarchy, nrow=1, ncol=1, show_g
         rbreaks = [0, iy]
     else:
         rstep = np.rint(iy / nrow)
-        rstep1 = np.int(rstep)
+        rstep1 = int(rstep)
         rbreaks = range(0, iy, rstep1)
     if ncol == 1:
         cbreaks = [0, ix]
     else:
         cstep = np.rint(ix / ncol)
-        cstep1 = np.int(cstep)
+        cstep1 = int(cstep)
         cbreaks = range(0, ix, cstep1)
 
     # categorize what bin the center of mass of each contour

diff --git a/plantcv/plantcv/visualize/pseudocolor.py b/plantcv/plantcv/visualize/pseudocolor.py
@@ -105,7 +105,7 @@ def pseudocolor(gray_img, obj=None, mask=None, cmap=None, background="image", mi
                                               value=(0, 0, 0))
 
         # Apply the mask
-        masked_img = np.ma.array(gray_img1, mask=~mask.astype(np.bool))
+        masked_img = np.ma.array(gray_img1, mask=~mask.astype(bool))
 
         # Set the background color or type
         if background.upper() == "BLACK":