-rw-r--r-- | noncore/apps/opie-reader/ZText.h | 3 | ||||
-rw-r--r-- | noncore/apps/opie-reader/ztxt.h | 27 |
2 files changed, 16 insertions, 14 deletions
diff --git a/noncore/apps/opie-reader/ZText.h b/noncore/apps/opie-reader/ZText.h index 2848af7..4b1b96e 100644 --- a/noncore/apps/opie-reader/ZText.h +++ b/noncore/apps/opie-reader/ZText.h | |||
@@ -1,7 +1,8 @@ | |||
1 | #ifndef __Text_h | 1 | #ifndef __Text_h |
2 | #define __Text_h | 2 | #define __Text_h |
3 | #include <stdio.h> | 3 | #include <stdio.h> |
4 | #include <zlib.h> | 4 | #include "zlib/zlib.h" |
5 | //#include <zlib.h> | ||
5 | #include <sys/stat.h> | 6 | #include <sys/stat.h> |
6 | 7 | ||
7 | #include "CExpander.h" | 8 | #include "CExpander.h" |
diff --git a/noncore/apps/opie-reader/ztxt.h b/noncore/apps/opie-reader/ztxt.h index b8ad29c..6352cfc 100644 --- a/noncore/apps/opie-reader/ztxt.h +++ b/noncore/apps/opie-reader/ztxt.h | |||
@@ -2,7 +2,8 @@ | |||
2 | #define __ztxt_h | 2 | #define __ztxt_h |
3 | 3 | ||
4 | #include "CExpander.h" | 4 | #include "CExpander.h" |
5 | #include <zlib.h> | 5 | #include "zlib/zlib.h" |
6 | //#include <zlib.h> | ||
6 | #include "pdb.h" | 7 | #include "pdb.h" |
7 | /* | 8 | /* |
8 | * Stuff common to both Weasel Reader and makeztxt | 9 | * Stuff common to both Weasel Reader and makeztxt |
@@ -76,20 +77,20 @@ class ztxt : public CExpander, Cpdb | |||
76 | void home(); | 77 | void home(); |
77 | public: | 78 | public: |
78 | virtual void sizes(unsigned long& _file, unsigned long& _text) | 79 | virtual void sizes(unsigned long& _file, unsigned long& _text) |
79 | { | 80 | { |
80 | _file = file_length; | 81 | _file = file_length; |
81 | _text = ntohl(hdr0.size); | 82 | _text = ntohl(hdr0.size); |
82 | } | 83 | } |
83 | virtual bool hasrandomaccess() { return (hdr0.randomAccess != 0); } | 84 | virtual bool hasrandomaccess() { return (hdr0.randomAccess != 0); } |
84 | virtual ~ztxt() | 85 | virtual ~ztxt() |
85 | { | 86 | { |
86 | if (expandedtextbuffer != NULL) delete [] expandedtextbuffer; | 87 | if (expandedtextbuffer != NULL) delete [] expandedtextbuffer; |
87 | if (compressedtextbuffer != NULL) delete [] compressedtextbuffer; | 88 | if (compressedtextbuffer != NULL) delete [] compressedtextbuffer; |
88 | if (bInit) | 89 | if (bInit) |
89 | { | 90 | { |
90 | inflateEnd(&zstream); | 91 | inflateEnd(&zstream); |
91 | } | 92 | } |
92 | } | 93 | } |
93 | ztxt(); | 94 | ztxt(); |
94 | virtual int openfile(const char *src); | 95 | virtual int openfile(const char *src); |
95 | virtual int getch(); | 96 | virtual int getch(); |