yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-05 02:39:23 +02:00
Code Issues Releases Wiki Activity

EncryptionInfo moved to ZLFile level

Browse source
This commit is contained in:
Nikolay Pultsin 2014-02-16 13:50:43 +00:00
parent 7fc0963b65
commit 34ac528222
11 changed files with 81 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

8
jni/NativeFormats/fbreader/src/formats/xhtml/XHTMLReader.h
View file

@ -34,7 +34,7 @@ class ZLFile;
class BookReader;
class XHTMLReader;
class EncryptionInfo;
class EncryptionMap;
class XHTMLTagAction {
@ -63,8 +63,9 @@ private:
static std::map<shared_ptr<FullNamePredicate>,XHTMLTagAction*> ourNsTagActions;
public:
XHTMLReader(BookReader &modelReader);
bool readFile(const ZLFile &file, const std::string &referenceName, shared_ptr<EncryptionInfo> encryptionInfo);
XHTMLReader(BookReader &modelReader, shared_ptr<EncryptionMap> map);
bool readFile(const ZLFile &file, const std::string &referenceName);
const std::string &fileAlias(const std::string &fileName) const;
const std::string normalizedReference(const std::string &reference) const;
void setMarkFirstImageAsCover();
@ -88,6 +89,7 @@ private:
mutable std::map<std::string,std::string> myFileNumbers;
BookReader &myModelReader;
shared_ptr<EncryptionMap> myEncryptionMap;
std::string myPathPrefix;
std::string myReferenceAlias;
std::string myReferenceDirName;