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 bug

Browse Source
This commit is contained in:
looly 2021-12-24 16:52:19 +08:00
parent 246966d5f5
commit f8988acc88
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -26,6 +26,7 @@
* 【core 】 修复PasswdStrength检测问题（issue#I4N48X@Gitee）
* 【core 】 修复UserAgentUtil解析EdgA无法识别问题（issue#I4MCBP@Gitee）
* 【extra 】 修复Archiver路径前带/问题（issue#I4NS0F@Gitee）
* 【extra 】 修复getMainColor方法中参数rgbFilters无效问题（pr#2034@Github）
-------------------------------------------------------------------------------------------------------------
# 5.7.17 (2021-12-09)

27
hutool-core/src/main/java/cn/hutool/core/img/ImgUtil.java
View File

@ -2059,12 +2059,8 @@ public class ImgUtil {
r = (pixel & 0xff0000) >> 16;
g = (pixel & 0xff00) >> 8;
b = (pixel & 0xff);
if (rgbFilters != null && rgbFilters.length > 0) {
for (int[] rgbFilter : rgbFilters) {
if (r == rgbFilter[0] && g == rgbFilter[1] && b == rgbFilter[2]) {
break;
}
}
if(matchFilters(r, g, b, rgbFilters)){
continue;
}
countMap.merge(r + "-" + g + "-" + b, 1L, Long::sum);
}
@ -2089,6 +2085,25 @@ public class ImgUtil {
return "#" + rHex + gHex + bHex;
}
/**
* 给定RGB是否匹配过滤器中任何一个RGB颜色
* @param r R
* @param g G
* @param b B
* @param rgbFilters 颜色过滤器
* @return 是否匹配
*/
private static boolean matchFilters(int r, int g, int b, int[]... rgbFilters){
if (rgbFilters != null && rgbFilters.length > 0) {
for (int[] rgbFilter : rgbFilters) {
if (r == rgbFilter[0] && g == rgbFilter[1] && b == rgbFilter[2]) {
return true;
}
}
}
return false;
}
// ------------------------------------------------------------------------------------------------------ 背景图换算
/**