Merge branch 'master' into mod/master-img
Merge upstream perf: Improve large CSS files handling (#779) Conflicts resolved: - Section.cpp: Combined mod's image support variables with master's CSS parser loading pattern - CssParser.cpp: Accepted master's streaming parser rewrite, ported mod's width property handler into parseDeclarationIntoStyle() Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
#include <HalStorage.h>
|
||||
|
||||
#include "CrossPointSettings.h"
|
||||
#include "Epub.h"
|
||||
#include "EpubReaderActivity.h"
|
||||
#include "Txt.h"
|
||||
@@ -35,7 +36,7 @@ std::unique_ptr<Epub> ReaderActivity::loadEpub(const std::string& path) {
|
||||
}
|
||||
|
||||
auto epub = std::unique_ptr<Epub>(new Epub(path, "/.crosspoint"));
|
||||
if (epub->load()) {
|
||||
if (epub->load(true, SETTINGS.embeddedStyle == 0)) {
|
||||
return epub;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user