From 580f27bcc5a176fb6a836b83c53475c8a630c659 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 15 Jan 2019 19:47:43 +0100 Subject: fix --- merge_frames.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'merge_frames.py') diff --git a/merge_frames.py b/merge_frames.py index ed7b9ff..c413b97 100644 --- a/merge_frames.py +++ b/merge_frames.py @@ -25,7 +25,7 @@ def merge_files(file, crop_dir_list, ww, hh, overlap, merge_dir): crop_dir = "crop_{}_{}_{}_{}".format(x, y, w, h) image = Image.open("{}/{}/{}".format(args.dir, crop_dir, fn)) crop = image.crop((overlap, overlap, image.size[0] - overlap * 2, image.size[1] - overlap * 2)) - canvas.paste(image, (x * args.scale, y * args.scale,)) + canvas.paste(crop, (x * args.scale, y * args.scale,)) canvas.save("{}/{}".format(merge_dir, fn)) def merge_dir(): @@ -48,11 +48,11 @@ def merge_dir(): crop_dir_list.append((x, y, w, h,)) crop_dir_list = sorted(crop_dir_list, key=operator.itemgetter(0, 1)) - print("{}x{}".format(ww, hh)) - ww *= args.scale hh *= args.scale + print("{}x{}".format(ww, hh)) + files = sorted(glob.glob("{}/*.png".format(crop_dirs[0]))) dataset = [] for file in files: -- cgit v1.2.3-70-g09d2