py-img-processor 1.0.3__py3-none-any.whl → 1.1.0__py3-none-any.whl

imgprocessor/__init__.py

@@ -5,7 +5,7 @@ import importlib
 
 
 __all__ = ["settings", "VERSION"]
-__version__ = "1.0.3"
+__version__ = "1.1.0"
 
 
 VERSION = __version__

imgprocessor/enums.py

@@ -51,8 +51,8 @@ class OpAction(ChoiceEnum):
 class ResizeMode(ChoiceEnum):
     """图像缩放的模式"""
 
-    LFIT = ("lfit", "等比缩放，缩放图限制为指定w与h的矩形内的最大图片")  # 类似ImageOps.contain
-    MFIT = ("mfit", "等比缩放，缩放图为延伸出指定w与h的矩形框外的最小图片")  # 类似ImageOps.cover
+    LFIT = ("lfit", "等比缩放，缩放图限制为指定w与h的矩形内的最大图片")  # 类似 ImageOps.contain
+    MFIT = ("mfit", "等比缩放，缩放图为延伸出指定w与h的矩形框外的最小图片")  # 类似 ImageOps.cover
     FIT = ("fit", "将原图等比缩放为延伸出指定w与h的矩形框外的最小图片，然后将超出的部分进行居中裁剪")  # ImageOps.fit
     PAD = ("pad", "将原图缩放为指定w与h的矩形内的最大图片，然后使用指定颜色居中填充空白部分")  # ImageOps.pad
     FIXED = ("fixed", "固定宽高，强制缩放")

imgprocessor/parsers/base.py

@@ -208,11 +208,11 @@ def compute_by_geography(
         if "x" in pf:
             if x < 0 or x > 100:
                 raise ParamValidateException(f"pf={pf}包含了x，所以x作为百分比取值范围为[0,100]")
-            x = int(src_w * x / 100)
+            x = round(src_w * x / 100)
         if "y" in pf:
             if y < 0 or y > 100:
                 raise ParamValidateException(f"pf={pf}包含了y，所以y作为百分比取值范围为[0,100]")
-            y = int(src_h * y / 100)
+            y = round(src_h * y / 100)
     return x, y
 
 
@@ -231,11 +231,11 @@ def compute_by_ratio(src_w: int, src_h: int, ratio: str) -> tuple[int, int]:
     wr, hr = int(w_r), int(h_r)
     if src_w * hr > src_h * wr:
         # 相对于目标比例，宽长了
-        w = int(src_h * wr / hr)
+        w = round(src_h * wr / hr)
         h = src_h
     elif src_w * hr < src_h * wr:
         w = src_w
-        h = int(src_w * hr / wr)
+        h = round(src_w * hr / wr)
     else:
         # 刚好符合比例
         w, h = src_w, src_h

imgprocessor/parsers/crop.py

@@ -64,14 +64,14 @@ class CropParser(BaseParser):
             if "w" in pf:
                 if w < 0 or w > 100:
                     raise ParamValidateException(f"pf={pf}包含了w，所以w作为百分比取值范围为[0,100]")
-                w = int(src_w * w / 100)
+                w = round(src_w * w / 100)
             elif not w:
                 w = src_w
 
             if "h" in pf:
                 if h < 0 or h > 100:
                     raise ParamValidateException(f"pf={pf}包含了h，所以h作为百分比取值范围为[0,100]")
-                h = int(src_h * h / 100)
+                h = round(src_h * h / 100)
             elif not h:
                 h = src_h
 

imgprocessor/parsers/merge.py

@@ -100,7 +100,7 @@ class MergeParser(BaseParser):
             params = ProcessParams.parse_str(self.action)
             im2 = handle_img_actions(im2, params.actions)
         if self.p:
-            w2, h2 = int(src_w * self.p / 100), int(src_h * self.p / 100)
+            w2, h2 = round(src_w * self.p / 100), round(src_h * self.p / 100)
             im2 = im2.resize((w2, h2), resample=Image.LANCZOS)
         w2, h2 = im2.size
 

imgprocessor/parsers/resize.py

@@ -57,45 +57,46 @@ class ResizeParser(BaseParser):
                 # w,h按指定的即可，无需计算
                 w, h = self.w, self.h
             elif self.m == enums.ResizeMode.MFIT:
+                # 低版本Pillow未实现 ImageOps.cover 方法，自行处理
                 # 等比缩放
                 if self.w and self.h:
                     # 指定w与h的矩形外的最小图像
                     if self.w / self.h > src_w / src_h:
-                        w, h = self.w, int(self.w * src_h / src_w)
+                        w, h = self.w, round(self.w * src_h / src_w)
                     else:
-                        w, h = int(self.h * src_w / src_h), self.h
+                        w, h = round(self.h * src_w / src_h), self.h
                 elif self.w:
-                    w, h = self.w, int(self.w * src_h / src_w)
+                    w, h = self.w, round(self.w * src_h / src_w)
                 else:
-                    w, h = int(self.h * src_w / src_h), self.h
+                    w, h = round(self.h * src_w / src_h), self.h
             else:
                 # 默认 enums.ResizeMode.LFIT
                 # 等比缩放
                 if self.w and self.h:
                     # 指定w与h的矩形内的最大图像
                     if self.w / self.h > src_w / src_h:
-                        w, h = int(self.h * src_w / src_h), self.h
+                        w, h = round(self.h * src_w / src_h), self.h
                     else:
-                        w, h = self.w, int(self.w * src_h / src_w)
+                        w, h = self.w, round(self.w * src_h / src_w)
                 elif self.w:
-                    w, h = self.w, int(self.w * src_h / src_w)
+                    w, h = self.w, round(self.w * src_h / src_w)
                 else:
-                    w, h = int(self.h * src_w / src_h), self.h
+                    w, h = round(self.h * src_w / src_h), self.h
         elif self.l:
             # 按最长边缩放
             if src_w > src_h:
-                w, h = self.l, int(src_h * self.l / src_w)
+                w, h = self.l, round(src_h * self.l / src_w)
             else:
-                w, h = int(src_w * self.l / src_h), self.l
+                w, h = round(src_w * self.l / src_h), self.l
         elif self.s:
             # 按最短边缩放
             if src_w > src_h:
-                w, h = int(src_w * self.s / src_h), self.s
+                w, h = round(src_w * self.s / src_h), self.s
             else:
-                w, h = self.s, int(src_h * self.s / src_w)
+                w, h = self.s, round(src_h * self.s / src_w)
         elif self.p:
             # 按照比例缩放
-            w, h = int(src_w * self.p / 100), int(src_h * self.p / 100)
+            w, h = round(src_w * self.p / 100), round(src_h * self.p / 100)
         else:
             # 缺少参数
             raise ParamValidateException("resize操作缺少合法参数")

imgprocessor/parsers/watermark.py

@@ -132,7 +132,7 @@ class WatermarkParser(BaseParser):
 
         # 阴影要单独处理透明度，放在文字之前处理
         if self.shadow:
-            offset = max(int(self.size / 20), 2)
+            offset = max(round(self.size / 20), 2)
             shadow_color = "#000000"
             # 左上到右下的阴影，只保留这一个
             draw.text((x2 + offset, y2 + offset), self.text, font=font, fill=shadow_color)
@@ -140,7 +140,7 @@ class WatermarkParser(BaseParser):
             # draw.text((x2 + offset, y2 - offset), self.text, font=font, fill=shadow_color)
             # draw.text((x2 - offset, y2 - offset), self.text, font=font, fill=shadow_color)
             _, _, _, alpha_channel = mark.split()
-            alpha_channel = alpha_channel.point(lambda i: min(int(255 * self.shadow / 100), i))
+            alpha_channel = alpha_channel.point(lambda i: min(round(255 * self.shadow / 100), i))
             mark.putalpha(alpha_channel)
 
         # 处理文字
@@ -168,7 +168,7 @@ class WatermarkParser(BaseParser):
             # 处理缩放
             rate = min(src_w, src_h) / self.design
             if rate != 1:
-                w, h = int(w * rate), int(h * rate)
+                w, h = round(w * rate), round(h * rate)
                 mark = mark.resize((w, h), resample=Image.LANCZOS)
 
         if 0 < self.rotate < 360:
@@ -180,17 +180,17 @@ class WatermarkParser(BaseParser):
         if w > src_w or h > src_h:
             # 水印大小超过原图了, 原图矩形内的最大图像
             if w / h > src_w / src_h:
-                w, h = src_w, int(src_w * h / w)
+                w, h = src_w, round(src_w * h / w)
                 self.x = 0
             else:
-                w, h = int(src_h * w / h), src_h
+                w, h = round(src_h * w / h), src_h
                 self.y = 0
             mark = mark.resize((w, h), resample=Image.LANCZOS)
 
         if self.t < 100:
             # 处理透明度
             _, _, _, alpha_channel = mark.split()
-            alpha_channel = alpha_channel.point(lambda i: min(int(255 * self.t / 100), i))
+            alpha_channel = alpha_channel.point(lambda i: min(round(255 * self.t / 100), i))
             mark.putalpha(alpha_channel)
 
         # 计算位置，粘贴水印

{py_img_processor-1.0.3.dist-info → py_img_processor-1.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-img-processor
-Version: 1.0.3
+Version: 1.1.0
 Summary: Image editor using Python and Pillow.
 Home-page: https://github.com/SkylerHu/py-img-processor.git
 Author: SkylerHu
@@ -54,7 +54,7 @@ Image editor using Python and Pillow.
 
 ## 2. 使用(Usage)
 
-具体使用说明查看 [readthedocs](https://py-img-processor.readthedocs.io) 。
+具体使用说明查看 [readthedocs](https://py-img-processor.readthedocs.io/) 。
 
 ## 2.1 运行配置
 可以通过指定环境变量`PY_SETTINGS_MODULE`加载配置文件：

py_img_processor-1.1.0.dist-info/RECORD

@@ -0,0 +1,23 @@
+imgprocessor/__init__.py,sha256=2ebw4pYHInmKQKQEbkwQ-fHx0uM7ED026wgR04y7EYo,2243
+imgprocessor/enums.py,sha256=-eA9pv5g-0Xm23jrHv5aJf2g56t95-hUgzSz4xlx5Go,3042
+imgprocessor/exceptions.py,sha256=kj9win_XjCbZnXr93sYs4Cfg1hAJX2fn5hgr1YMNoHQ,384
+imgprocessor/main.py,sha256=QDkz__RJ_iIjrb1p56bhPzZ7yLbtzhXvvKpLmvkJEkI,4133
+imgprocessor/processor.py,sha256=4f6DTNeIRMTAlvtEn7UQQFuNUxMQJSB_dfkzERjvUQ4,4388
+imgprocessor/utils.py,sha256=KBRQJaN8FuuRD2QQPYuuHQ7S-2ML-ctz4rstQTrEdog,1202
+imgprocessor/parsers/__init__.py,sha256=3aSxKTflK2hZxaiYtaX3HsFvLwg9QE7YLIp4gdTf7T8,3004
+imgprocessor/parsers/alpha.py,sha256=grOnmZSYhO0wI2pJfGz6CfTwOTc8kfcxspmfM0nzAzA,865
+imgprocessor/parsers/base.py,sha256=80VTehgA8LwwVety3_IGSJ_vsX01mWAZNb-c6v3AT2o,11832
+imgprocessor/parsers/blur.py,sha256=Y9BeTK7e-y8HPNeLQxgtqiquOVf2cVLXhXn1bv9072g,661
+imgprocessor/parsers/circle.py,sha256=z0IZZSv_zuY2jzB6kN01sB1jGhBure33DPt7JAEeNsk,1653
+imgprocessor/parsers/crop.py,sha256=P2kqNVn9tiorq_kgBXLxygthL2EKulNkP6aRh1FrmVw,3464
+imgprocessor/parsers/gray.py,sha256=ZDBHZlBfI91TePWWBU0feSHmtD1ekre5-uV2BDLFTKA,396
+imgprocessor/parsers/merge.py,sha256=JwJKIVlmeKxEQIeuYBKT_i5E6jBBOM2m4fqKWpPfuhs,4049
+imgprocessor/parsers/resize.py,sha256=Zeh9LDLQVaEqijcOsljKGDNTQ2rUmijzQ0ziAgYsSoI,5020
+imgprocessor/parsers/rotate.py,sha256=EDKvlxTgZZu7vAkSS9cuZ296dbAhe5Aq6huH9Hjtvy0,722
+imgprocessor/parsers/watermark.py,sha256=y5ddCw9lRS1fwMjHtI0lIGpWcCIFSQA6Q0l7gpcNS7g,8488
+py_img_processor-1.1.0.dist-info/LICENSE,sha256=Sr4UxtHWGmoO_enyTUeAN276LkBqJpse0guCcb6f9BQ,1066
+py_img_processor-1.1.0.dist-info/METADATA,sha256=bEzbYrVLFqjJBP6pbvt-55Tq789Yo6e_L3Pgyi--RCY,7286
+py_img_processor-1.1.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+py_img_processor-1.1.0.dist-info/entry_points.txt,sha256=MLeLjzpkH7DkDMgICWCQ99D9ElqAvTBVBGA8yjg4dhQ,57
+py_img_processor-1.1.0.dist-info/top_level.txt,sha256=5Pm26oHcqZoihGGxc5N6qQJ2LuVa2i4au_uqHBMqehI,13
+py_img_processor-1.1.0.dist-info/RECORD,,

py_img_processor-1.0.3.dist-info/RECORD

@@ -1,23 +0,0 @@
-imgprocessor/__init__.py,sha256=tq1x_qEidPWZdqdHZVvzOyMycI_yOa2dCqHVnaAhrnQ,2243
-imgprocessor/enums.py,sha256=PgV1KCzdyfOk6VrxmiHZg8mjpYZJ9YG-O-35wtFPah0,3040
-imgprocessor/exceptions.py,sha256=kj9win_XjCbZnXr93sYs4Cfg1hAJX2fn5hgr1YMNoHQ,384
-imgprocessor/main.py,sha256=QDkz__RJ_iIjrb1p56bhPzZ7yLbtzhXvvKpLmvkJEkI,4133
-imgprocessor/processor.py,sha256=4f6DTNeIRMTAlvtEn7UQQFuNUxMQJSB_dfkzERjvUQ4,4388
-imgprocessor/utils.py,sha256=KBRQJaN8FuuRD2QQPYuuHQ7S-2ML-ctz4rstQTrEdog,1202
-imgprocessor/parsers/__init__.py,sha256=3aSxKTflK2hZxaiYtaX3HsFvLwg9QE7YLIp4gdTf7T8,3004
-imgprocessor/parsers/alpha.py,sha256=grOnmZSYhO0wI2pJfGz6CfTwOTc8kfcxspmfM0nzAzA,865
-imgprocessor/parsers/base.py,sha256=xOLBF4w_o5_lzPf7Fzmsqdp1_Ljju9P4CZCMHfyfBZM,11824
-imgprocessor/parsers/blur.py,sha256=Y9BeTK7e-y8HPNeLQxgtqiquOVf2cVLXhXn1bv9072g,661
-imgprocessor/parsers/circle.py,sha256=z0IZZSv_zuY2jzB6kN01sB1jGhBure33DPt7JAEeNsk,1653
-imgprocessor/parsers/crop.py,sha256=5Zg_TaAOa-JCZSDEpZqTX0T3sUDoHGJZzXQdOTinbTI,3460
-imgprocessor/parsers/gray.py,sha256=ZDBHZlBfI91TePWWBU0feSHmtD1ekre5-uV2BDLFTKA,396
-imgprocessor/parsers/merge.py,sha256=qKXK9ZUEYvPPBuR-pRvGG-JAuV4Z3aLYbmTjZWkwvNI,4045
-imgprocessor/parsers/resize.py,sha256=Kgayf-VQH9BuLCA77yOoGUTI8NPo9qOK4RitPPXk7I8,4912
-imgprocessor/parsers/rotate.py,sha256=EDKvlxTgZZu7vAkSS9cuZ296dbAhe5Aq6huH9Hjtvy0,722
-imgprocessor/parsers/watermark.py,sha256=HSUnsyyCnG6F6pKSj3NHo8xT2-PC2BpBNve_PQ4cISg,8474
-py_img_processor-1.0.3.dist-info/LICENSE,sha256=Sr4UxtHWGmoO_enyTUeAN276LkBqJpse0guCcb6f9BQ,1066
-py_img_processor-1.0.3.dist-info/METADATA,sha256=TdgvvJiI9SKMaOooqPOP0zmAAq2cmLFhWEOdwjmfbiU,7285
-py_img_processor-1.0.3.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-py_img_processor-1.0.3.dist-info/entry_points.txt,sha256=MLeLjzpkH7DkDMgICWCQ99D9ElqAvTBVBGA8yjg4dhQ,57
-py_img_processor-1.0.3.dist-info/top_level.txt,sha256=5Pm26oHcqZoihGGxc5N6qQJ2LuVa2i4au_uqHBMqehI,13
-py_img_processor-1.0.3.dist-info/RECORD,,