@@ -324,7 +324,10 @@ def main():
324324is_work_scale_set = True
325325img = cv .resize (src = full_img ,dsize = None ,fx = work_scale ,fy = work_scale ,interpolation = cv .INTER_LINEAR_EXACT )
326326if is_seam_scale_set is False :
327- seam_scale = min (1.0 ,np .sqrt (seam_megapix * 1e6 / (full_img .shape [0 ]* full_img .shape [1 ])))
327+ if seam_megapix > 0 :
328+ seam_scale = min (1.0 ,np .sqrt (seam_megapix * 1e6 / (full_img .shape [0 ]* full_img .shape [1 ])))
329+ else :
330+ seam_scale = 1.0
328331seam_work_aspect = seam_scale / work_scale
329332is_seam_scale_set = True
330333img_feat = cv .detail .computeImageFeatures2 (finder ,img )
@@ -345,9 +348,9 @@ def main():
345348img_names_subset = []
346349full_img_sizes_subset = []
347350for i in range (len (indices )):
348- img_names_subset .append (img_names [indices [i , 0 ]])
349- img_subset .append (images [indices [i , 0 ]])
350- full_img_sizes_subset .append (full_img_sizes [indices [i , 0 ]])
351+ img_names_subset .append (img_names [indices [i ]])
352+ img_subset .append (images [indices [i ]])
353+ full_img_sizes_subset .append (full_img_sizes [indices [i ]])
351354images = img_subset
352355img_names = img_names_subset
353356full_img_sizes = full_img_sizes_subset
@@ -479,7 +482,7 @@ def main():
479482blender = cv .detail .Blender_createDefault (cv .detail .Blender_NO )
480483elif blend_type == "multiband" :
481484blender = cv .detail_MultiBandBlender ()
482- blender .setNumBands ((np .log (blend_width )/ np .log (2. )- 1. ).astype (np .int ))
485+ blender .setNumBands ((np .log (blend_width )/ np .log (2. )- 1. ).astype (np .int32 ))
483486elif blend_type == "feather" :
484487blender = cv .detail_FeatherBlender ()
485488blender .setSharpness (1. / blend_width )
@@ -513,6 +516,5 @@ def main():
513516
514517
515518if __name__ == '__main__' :
516- print (__doc__ )
517519main ()
518520cv .destroyAllWindows ()