Merge upstream/master into feature/continue-reading-cover
Resolve conflicts: - GfxRenderer: Add cropX/cropY params to drawBitmap, keep 1-bit BMP support - GfxRenderer: Update drawBitmap1Bit to use readNextRow (API change) - JpegToBmpConverter: Use upstream scaling logic (larger dimension) - HomeActivity: Use StringUtils::checkFileExtension, add hasOpdsUrl - HomeActivity: Keep cover image functionality with own buffer management
This commit is contained in:
@@ -12,8 +12,10 @@
|
||||
class ZipFile;
|
||||
|
||||
class Epub {
|
||||
// the ncx file
|
||||
// the ncx file (EPUB 2)
|
||||
std::string tocNcxItem;
|
||||
// the nav file (EPUB 3)
|
||||
std::string tocNavItem;
|
||||
// where is the EPUBfile?
|
||||
std::string filepath;
|
||||
// the base path for items in the EPUB file
|
||||
@@ -26,6 +28,7 @@ class Epub {
|
||||
bool findContentOpfFile(std::string* contentOpfFile) const;
|
||||
bool parseContentOpf(BookMetadataCache::BookMetadata& bookMetadata);
|
||||
bool parseTocNcxFile() const;
|
||||
bool parseTocNavFile() const;
|
||||
|
||||
public:
|
||||
explicit Epub(std::string filepath, const std::string& cacheDir) : filepath(std::move(filepath)) {
|
||||
|
||||
Reference in New Issue
Block a user