Merge branch 'develop_upstream'

# Conflicts:
#	fooocus_version.py
#	modules/util.py
#	tests/test_utils.py
#	webui.py
This commit is contained in:
Manuel Schmid
2024-05-26 15:28:08 +02:00
12 changed files with 98 additions and 25 deletions
+2 -1
View File
@@ -484,7 +484,8 @@ def get_image_size_info(image: np.ndarray, aspect_ratios: list) -> str:
recommended_gcd = math.gcd(recommended_width, recommended_height)
recommended_lcm_ratio = f'{recommended_width // recommended_gcd}:{recommended_height // recommended_gcd}'
size_info += f'\nRecommended Size: {recommended_width} x {recommended_height}, Ratio: {recommended_ratio}, {recommended_lcm_ratio}'
size_info = f'{width} x {height}, {ratio}, {lcm_ratio}'
size_info += f'\n{recommended_width} x {recommended_height}, {recommended_ratio}, {recommended_lcm_ratio}'
return size_info
except Exception as e: