valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove hsl stuff from classes/feeds, we take care of this when choosing the color

This commit is contained in:
Andrew Dolgov 2013-04-15 17:07:06 +04:00
parent a8c93f0a81
commit 12a6bd28ac
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
classes/feeds.php
View File

@ -408,15 +408,7 @@ class Feeds extends Handler_Protected {
if ($fav_color) { if ($fav_color) {
if (!isset($rgba_cache[$feed_id])) { if (!isset($rgba_cache[$feed_id])) {
$hsl = rgb2hsl(_color_unpack($fav_color)); $rgba_cache[$feed_id] = join(",", _color_unpack($fav_color));
if ($hsl[1] < 0.1)
$hsl[2] = 1;
else if ($hsl[2] < 0.25)
$hsl[2] = 0.25;
$rgba_cache[$feed_id] = join(",", hsl2rgb($hsl));
} }
$rgba = $rgba_cache[$feed_id]; $rgba = $rgba_cache[$feed_id];

2
include/rssfuncs.php
View File

@ -417,6 +417,8 @@
$favicon_color = db_escape_string($link, $favicon_color = db_escape_string($link,
calculate_avg_color($favicon_file)); calculate_avg_color($favicon_file));
if ($debug_enabled) _debug("color: $favicon_color");
$favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'"; $favicon_colorstring = ",favicon_avg_color = '".$favicon_color."'";
} }