fotolab 0.33.0__tar.gz → 0.33.1__tar.gz

{fotolab-0.33.0/src/fotolab.egg-info → fotolab-0.33.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fotolab
-Version: 0.33.0
+Version: 0.33.1
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
 License-Expression: AGPL-3.0-or-later
 Project-URL: Changelog, https://github.com/kianmeng/fotolab/blob/master/CHANGELOG.md

{fotolab-0.33.0 → fotolab-0.33.1}/pyproject.toml

@@ -7,7 +7,7 @@ where = ["src"]
 
 [project]
 name = "fotolab"
-version = "0.33.0"
+version = "0.33.1"
 authors = [{name = "Kian-Meng Ang", email = "kianmeng@cpan.org"}]
 requires-python = ">=3.9"
 readme = "README.md"

{fotolab-0.33.0 → fotolab-0.33.1}/src/fotolab/subcommands/resize.py

@@ -168,26 +168,26 @@ def _resize_image(original_image, args):
 
 
 def _calc_new_image_dimension(image, args) -> tuple:
-    new_width = args.width
-    new_height = args.height
-
     old_width, old_height = image.size
     log.debug("old image dimension: %d x %d", old_width, old_height)
 
-    if args.width != DEFAULT_WIDTH:
-        aspect_ratio = old_height / old_width
-        log.debug("aspect ratio: %f", aspect_ratio)
+    new_width = args.width
+    new_height = args.height
 
-        new_height = math.ceil(args.width * aspect_ratio)
-        log.debug("new height: %d", new_height)
+    original_aspect_ratio = old_width / old_height
 
-    if args.height != DEFAULT_HEIGHT:
-        aspect_ratio = old_width / old_height
-        log.debug("aspect ratio: %f", aspect_ratio)
+    if new_width != DEFAULT_WIDTH and new_height == DEFAULT_HEIGHT:
+        # user provided width, calculate height to maintain aspect ratio
+        new_height = math.ceil(new_width / original_aspect_ratio)
+        log.debug("new height calculated based on width: %d", new_height)
+    elif new_height != DEFAULT_HEIGHT and new_width == DEFAULT_WIDTH:
+        # user provided height, calculate width to maintain aspect ratio
+        new_width = math.ceil(new_height * original_aspect_ratio)
+        log.debug("new width calculated based on height: %d", new_width)
 
-        new_width = math.floor(args.height * aspect_ratio)
-        log.debug("new width: %d", new_width)
+    # if both are default, no calculation needed, use defaults
+    # due to argparse's mutually exclusive group, it's not possible for both
+    # new_width and new_height to be non-default when --canvas is False
 
     log.debug("new image dimension: %d x %d", new_width, new_height)
-
     return (new_width, new_height)

{fotolab-0.33.0 → fotolab-0.33.1/src/fotolab.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fotolab
-Version: 0.33.0
+Version: 0.33.1
 Author-email: Kian-Meng Ang <kianmeng@cpan.org>
 License-Expression: AGPL-3.0-or-later
 Project-URL: Changelog, https://github.com/kianmeng/fotolab/blob/master/CHANGELOG.md