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

View File

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

View File

@ -134,7 +134,7 @@ public class Img implements Serializable {
}
/**
* 构造
* 构造目标图片类型取决于来源图片类型
*
* @param srcImage 来源图片
*/
@ -146,13 +146,21 @@ public class Img implements Serializable {
* 构造
*
* @param srcImage 来源图片
* @param targetImageType 目标图片类型
* @param targetImageType 目标图片类型null则读取来源图片类型
* @since 5.0.7
*/
public Img(BufferedImage srcImage, String targetImageType) {
this.srcImage = srcImage;
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;
}