summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-reader/ZText.h3
-rw-r--r--noncore/apps/opie-reader/ztxt.h27
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,16 +1,17 @@
#ifndef __Text_h
#define __Text_h
#include <stdio.h>
-#include <zlib.h>
+#include "zlib/zlib.h"
+//#include <zlib.h>
#include <sys/stat.h>
#include "CExpander.h"
class Text: public CExpander {
gzFile file;
unsigned long fsize;
public:
Text() : file(NULL) {};
virtual ~Text()
{
if (file != NULL) gzclose(file);
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
@@ -1,17 +1,18 @@
#ifndef __ztxt_h
#define __ztxt_h
#include "CExpander.h"
-#include <zlib.h>
+#include "zlib/zlib.h"
+//#include <zlib.h>
#include "pdb.h"
/*
* Stuff common to both Weasel Reader and makeztxt
*
* $Id$
*
*/
#ifndef _WEASEL_COMMON_H_
#define _WEASEL_COMMON_H_ 1
@@ -67,36 +68,36 @@ class ztxt : public CExpander, Cpdb
UInt32 buffersize;
UInt32 buffercontent;
UInt8* expandedtextbuffer;
UInt8* compressedtextbuffer;
z_stream zstream;
size_t bufferpos;
UInt16 bufferrec;
zTXT_record0 hdr0;
size_t currentpos;
void home();
public:
virtual void sizes(unsigned long& _file, unsigned long& _text)
- {
- _file = file_length;
- _text = ntohl(hdr0.size);
- }
+ {
+ _file = file_length;
+ _text = ntohl(hdr0.size);
+ }
virtual bool hasrandomaccess() { return (hdr0.randomAccess != 0); }
virtual ~ztxt()
- {
- if (expandedtextbuffer != NULL) delete [] expandedtextbuffer;
- if (compressedtextbuffer != NULL) delete [] compressedtextbuffer;
- if (bInit)
- {
- inflateEnd(&zstream);
- }
- }
+ {
+ if (expandedtextbuffer != NULL) delete [] expandedtextbuffer;
+ if (compressedtextbuffer != NULL) delete [] compressedtextbuffer;
+ if (bInit)
+ {
+ inflateEnd(&zstream);
+ }
+ }
ztxt();
virtual int openfile(const char *src);
virtual int getch();
virtual unsigned int locate();
virtual void locate(unsigned int n);
virtual CList<Bkmk>* getbkmklist();
};
#endif