FreshRSS
/
NetNewsWire
mirror of https://github.com/Ranchero-Software/NetNewsWire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Scale images, when needed, before generating inline HTML data in ArticleRenderer — this keeps us from getting huge amounts of data, which slows down rendering." 

This reverts commit c3e26ea307.
This commit is contained in:
Maurice Parker 2019-09-15 04:00:24 -05:00
parent c3e26ea307
commit b07bf73f78
1 changed files with 3 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
Shared/Article Rendering/ArticleRenderer.swift
View File

@ -159,48 +159,6 @@ private extension ArticleRenderer {
return permalink != preferredLink // Make date a link if it’s a different link from the title’s link return permalink != preferredLink // Make date a link if it’s a different link from the title’s link
} }
static let avatarDimension = 48
static let doubledDimension = CGFloat(avatarDimension * 2)
static func imageScaledForDisplay(image: RSImage) -> RSImage {
// Aspect fit.
#if os(macOS)
if image.size.height <= doubledDimension && image.size.width <= doubledDimension {
return image
}
let scaledImage = NSImage.init(size: NSSize(width: doubledDimension, height: doubledDimension))
scaledImage.lockFocus()
var imageRectWidth = doubledDimension
var imageRectHeight = doubledDimension
var imageRectOriginX = CGFloat(0.0)
var imageRectOriginY = CGFloat(0.0)
if image.size.width > image.size.height {
let factor: CGFloat = doubledDimension / image.size.width
imageRectHeight = image.size.height * factor
imageRectOriginY = (doubledDimension - imageRectHeight) / 2.0
}
else if image.size.height > image.size.width {
let factor: CGFloat = doubledDimension / image.size.height
imageRectWidth = image.size.width * factor
imageRectOriginX = (doubledDimension - imageRectWidth) / 2.0
}
image.draw(in: NSRect(x: imageRectOriginX, y: imageRectOriginY, width: imageRectWidth, height: imageRectHeight))
scaledImage.unlockFocus()
return scaledImage
#else //iOS
// TODO: https://github.com/brentsimmons/NetNewsWire/issues/1021
return image
#endif
}
func faviconImgTag(forFeed feed: Feed) -> String? { func faviconImgTag(forFeed feed: Feed) -> String? {
if let cachedImgTag = ArticleRenderer.faviconImgTagCache[feed] { if let cachedImgTag = ArticleRenderer.faviconImgTagCache[feed] {
@ -208,8 +166,7 @@ private extension ArticleRenderer {
} }
if let favicon = appDelegate.faviconDownloader.favicon(for: feed) { if let favicon = appDelegate.faviconDownloader.favicon(for: feed) {
let scaledImage = ArticleRenderer.imageScaledForDisplay(image: favicon) if let s = base64String(forImage: favicon) {
if let s = base64String(forImage: scaledImage) {
var dimension = min(favicon.size.height, CGFloat(ArticleRenderer.avatarDimension)) // Assuming square images. var dimension = min(favicon.size.height, CGFloat(ArticleRenderer.avatarDimension)) // Assuming square images.
dimension = max(dimension, 16) // Some favicons say they’re < 16. Force them larger. dimension = max(dimension, 16) // Some favicons say they’re < 16. Force them larger.
if dimension >= CGFloat(ArticleRenderer.avatarDimension) * 0.8 { //Close enough to scale up. if dimension >= CGFloat(ArticleRenderer.avatarDimension) * 0.8 { //Close enough to scale up.
@ -238,8 +195,7 @@ private extension ArticleRenderer {
} }
if let icon = appDelegate.feedIconDownloader.icon(for: feed) { if let icon = appDelegate.feedIconDownloader.icon(for: feed) {
let scaledImage = ArticleRenderer.imageScaledForDisplay(image: icon) if let s = base64String(forImage: icon) {
if let s = base64String(forImage: scaledImage) {
#if os(macOS) #if os(macOS)
let imgTag = "<img src=\"data:image/tiff;base64, " + s + "\" height=48 width=48 />" let imgTag = "<img src=\"data:image/tiff;base64, " + s + "\" height=48 width=48 />"
#else #else
@ -272,6 +228,7 @@ private extension ArticleRenderer {
return nil return nil
} }
static let avatarDimension = 48
struct Avatar { struct Avatar {
let imageURL: String let imageURL: String