ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix img

Browse Source
This commit is contained in:
Looly 2020-07-30 10:06:42 +08:00
parent f349d770e2
commit dd7f04af44
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -8,6 +8,7 @@
### 新特性 ### 新特性
* 【captcha】 AbstractCaptcha增加getImageBase64Data方法（pr#985@Github） * 【captcha】 AbstractCaptcha增加getImageBase64Data方法（pr#985@Github）
* 【core 】 增加PhoneUtil（pr#990@Github） * 【core 】 增加PhoneUtil（pr#990@Github）
* 【core 】 改进Img，目标图片类型未定义使用源图片类型（issue#I1PB0B@Gitee）
### Bug修复 ### Bug修复

14
hutool-core/src/main/java/cn/hutool/core/img/Img.java
View File

@ -134,7 +134,7 @@ public class Img implements Serializable {
} }
/** /**
* 构造 * 构造，目标图片类型取决于来源图片类型
* *
* @param srcImage 来源图片 * @param srcImage 来源图片
*/ */
@ -146,13 +146,21 @@ public class Img implements Serializable {
* 构造 * 构造
* *
* @param srcImage 来源图片 * @param srcImage 来源图片
* @param targetImageType 目标图片类型 * @param targetImageType 目标图片类型，null则读取来源图片类型
* @since 5.0.7 * @since 5.0.7
*/ */
public Img(BufferedImage srcImage, String targetImageType) { public Img(BufferedImage srcImage, String targetImageType) {
this.srcImage = srcImage; this.srcImage = srcImage;
if (null == targetImageType) { if (null == targetImageType) {
targetImageType = ImgUtil.IMAGE_TYPE_JPG; if (srcImage.getType() == BufferedImage.TYPE_INT_ARGB
|| srcImage.getType() == BufferedImage.TYPE_INT_ARGB_PRE
|| srcImage.getType() == BufferedImage.TYPE_4BYTE_ABGR
|| srcImage.getType() == BufferedImage.TYPE_4BYTE_ABGR_PRE
) {
targetImageType = ImgUtil.IMAGE_TYPE_PNG;
} else {
targetImageType = ImgUtil.IMAGE_TYPE_JPG;
}
} }
this.targetImageType = targetImageType; this.targetImageType = targetImageType;
} }