diff options
Diffstat (limited to 'fofi')
-rw-r--r-- | fofi/FoFiBase.cc | 6 | ||||
-rw-r--r-- | fofi/FoFiBase.h | 5 | ||||
-rw-r--r-- | fofi/FoFiType1.cc | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/fofi/FoFiBase.cc b/fofi/FoFiBase.cc index abd0d5db..8ca381b3 100644 --- a/fofi/FoFiBase.cc +++ b/fofi/FoFiBase.cc @@ -38,15 +38,15 @@ // FoFiBase //------------------------------------------------------------------------ -FoFiBase::FoFiBase(char *fileA, int lenA, GBool freeFileDataA) { - fileData = file = (Guchar *)fileA; +FoFiBase::FoFiBase(const char *fileA, int lenA, GBool freeFileDataA) { + file = (const Guchar *)fileA; len = lenA; freeFileData = freeFileDataA; } FoFiBase::~FoFiBase() { if (freeFileData) { - gfree(fileData); + gfree((char*)file); } } diff --git a/fofi/FoFiBase.h b/fofi/FoFiBase.h index a34acc7e..e3413b10 100644 --- a/fofi/FoFiBase.h +++ b/fofi/FoFiBase.h @@ -46,7 +46,7 @@ public: protected: - FoFiBase(char *fileA, int lenA, GBool freeFileDataA); + FoFiBase(const char *fileA, int lenA, GBool freeFileDataA); static char *readFile(const char *fileName, int *fileLen); // S = signed / U = unsigned @@ -63,8 +63,7 @@ protected: GBool checkRegion(int pos, int size) const; - Guchar *fileData; - Guchar *file; + const Guchar *file; int len; GBool freeFileData; }; diff --git a/fofi/FoFiType1.cc b/fofi/FoFiType1.cc index 14fd5109..a5d73e0e 100644 --- a/fofi/FoFiType1.cc +++ b/fofi/FoFiType1.cc @@ -395,9 +395,9 @@ void FoFiType1::undoPFB() { pos2 += segLen; } if (freeFileData) { - gfree(fileData); + gfree((char*)file); } - file = fileData = file2; + file = file2; freeFileData = gTrue; len = pos2; } |