Commit 465edbbf authored by Adrian Johnson's avatar Adrian Johnson

Fix remaining -Wundef warnings

and make -Wundef a default warning
parent b424862b
......@@ -110,6 +110,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(_warn "${_warn} -Wnon-virtual-dtor")
set(_warn "${_warn} -Woverloaded-virtual")
set(_warn "${_warn} -Wmissing-declarations")
set(_warn "${_warn} -Wundef")
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0")
set(_warn "${_warn} -Wsuggest-override")
endif()
......@@ -117,7 +118,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
# set extra warnings
set(_warnx "${_warnx} -Wconversion")
set(_warnx "${_warnx} -Wshadow")
set(_warnx "${_warnx} -Wundef")
set(_warnx "${_warnx} -Wuseless-cast")
set(_warnx "${_warnx} -Wzero-as-null-pointer-constant")
......
......@@ -13,7 +13,7 @@
#include "poppler-config.h"
#if USE_FIXEDPOINT
#ifdef USE_FIXEDPOINT
#ifdef USE_GCC_PRAGMAS
#pragma interface
......
......@@ -14,7 +14,7 @@
#include "TiffWriter.h"
#if ENABLE_LIBTIFF
#ifdef ENABLE_LIBTIFF
#include <string.h>
......
......@@ -399,7 +399,7 @@ GBool openTempFile(GooString **name, FILE **f, const char *mode) {
char *s;
int fd;
#if HAVE_MKSTEMP
#ifdef HAVE_MKSTEMP
if ((s = getenv("TMPDIR"))) {
*name = new GooString(s);
} else {
......@@ -554,13 +554,13 @@ char *getLine(char *buf, int size, FILE *f) {
}
int Gfseek(FILE *f, Goffset offset, int whence) {
#if HAVE_FSEEKO
#if defined(HAVE_FSEEKO)
return fseeko(f, offset, whence);
#elif HAVE_FSEEK64
#elif defined(HAVE_FSEEK64)
return fseek64(f, offset, whence);
#elif defined(__MINGW32__)
return fseeko64(f, offset, whence);
#elif _WIN32
#elif defined(_WIN32)
return _fseeki64(f, offset, whence);
#else
return fseek(f, offset, whence);
......@@ -568,13 +568,13 @@ int Gfseek(FILE *f, Goffset offset, int whence) {
}
Goffset Gftell(FILE *f) {
#if HAVE_FSEEKO
#if defined(HAVE_FSEEKO)
return ftello(f);
#elif HAVE_FSEEK64
#elif defined(HAVE_FSEEK64)
return ftell64(f);
#elif defined(__MINGW32__)
return ftello64(f);
#elif _WIN32
#elif defined(_WIN32)
return _ftelli64(f);
#else
return ftell(f);
......@@ -582,11 +582,11 @@ Goffset Gftell(FILE *f) {
}
Goffset GoffsetMax() {
#if HAVE_FSEEKO
#if defined(HAVE_FSEEKO)
return (std::numeric_limits<off_t>::max)();
#elif HAVE_FSEEK64 || defined(__MINGW32__)
#elif defined(HAVE_FSEEK64) || defined(__MINGW32__)
return (std::numeric_limits<off64_t>::max)();
#elif _WIN32
#elif defined(_WIN32)
return (std::numeric_limits<__int64>::max)();
#else
return (std::numeric_limits<long>::max)();
......
......@@ -53,21 +53,21 @@ extern "C" {
#else
# include <unistd.h>
# include <sys/types.h>
# ifdef VMS
# if defined(VMS)
# include "vms_dirent.h"
# elif HAVE_DIRENT_H
# elif defined(HAVE_DIRENT_H)
# include <dirent.h>
# define NAMLEN(d) strlen((d)->d_name)
# else
# define dirent direct
# define NAMLEN(d) (d)->d_namlen
# if HAVE_SYS_NDIR_H
# ifdef HAVE_SYS_NDIR_H
# include <sys/ndir.h>
# endif
# if HAVE_SYS_DIR_H
# ifdef HAVE_SYS_DIR_H
# include <sys/dir.h>
# endif
# if HAVE_NDIR_H
# ifdef HAVE_NDIR_H
# include <ndir.h>
# endif
# endif
......
......@@ -77,7 +77,7 @@
#include <string.h>
#include <algorithm>
#if MULTITHREADED
#ifdef MULTITHREADED
# define annotLocker() MutexLocker locker(&mutex)
# define annotCondLocker(X) MutexLocker locker(&mutex, (X))
#else
......@@ -1328,7 +1328,7 @@ void Annot::initialize(PDFDoc *docA, Dict *dict) {
oc = dict->lookupNF("OC");
#if MULTITHREADED
#ifdef MULTITHREADED
gInitMutex(&mutex);
#endif
}
......@@ -1567,17 +1567,17 @@ void Annot::incRefCnt() {
}
void Annot::decRefCnt() {
#if MULTITHREADED
#ifdef MULTITHREADED
gLockMutex(&mutex);
#endif
if (--refCnt == 0) {
#if MULTITHREADED
#ifdef MULTITHREADED
gUnlockMutex(&mutex);
#endif
delete this;
return;
}
#if MULTITHREADED
#ifdef MULTITHREADED
gUnlockMutex(&mutex);
#endif
}
......@@ -1604,7 +1604,7 @@ Annot::~Annot() {
if (color)
delete color;
#if MULTITHREADED
#ifdef MULTITHREADED
gDestroyMutex(&mutex);
#endif
}
......
......@@ -683,7 +683,7 @@ protected:
GBool ok;
bool hasRef;
#if MULTITHREADED
#ifdef MULTITHREADED
GooMutex mutex;
#endif
};
......
......@@ -35,7 +35,7 @@
#include "Object.h"
#include "Array.h"
#if MULTITHREADED
#ifdef MULTITHREADED
# define arrayLocker() MutexLocker locker(&mutex)
#else
# define arrayLocker()
......@@ -49,7 +49,7 @@ Array::Array(XRef *xrefA) {
elems = NULL;
size = length = 0;
ref = 1;
#if MULTITHREADED
#ifdef MULTITHREADED
gInitMutex(&mutex);
#endif
}
......@@ -60,7 +60,7 @@ Array::~Array() {
for (i = 0; i < length; ++i)
elems[i].free();
gfree(elems);
#if MULTITHREADED
#ifdef MULTITHREADED
gDestroyMutex(&mutex);
#endif
}
......
......@@ -79,7 +79,7 @@ private:
int size; // size of <elems> array
int length; // number of elements in array
int ref; // reference count
#if MULTITHREADED
#ifdef MULTITHREADED
mutable GooMutex mutex;
#endif
};
......
......@@ -312,7 +312,7 @@ CMap::CMap(GooString *collectionA, GooString *cMapNameA) {
vector[i].cid = 0;
}
refCnt = 1;
#if MULTITHREADED
#ifdef MULTITHREADED
gInitMutex(&mutex);
#endif
}
......@@ -324,7 +324,7 @@ CMap::CMap(GooString *collectionA, GooString *cMapNameA, int wModeA) {
wMode = wModeA;
vector = NULL;
refCnt = 1;
#if MULTITHREADED
#ifdef MULTITHREADED
gInitMutex(&mutex);
#endif
}
......@@ -432,7 +432,7 @@ CMap::~CMap() {
if (vector) {
freeCMapVector(vector);
}
#if MULTITHREADED
#ifdef MULTITHREADED
gDestroyMutex(&mutex);
#endif
}
......@@ -449,11 +449,11 @@ void CMap::freeCMapVector(CMapVectorEntry *vec) {
}
void CMap::incRefCnt() {
#if MULTITHREADED
#ifdef MULTITHREADED
gLockMutex(&mutex);
#endif
++refCnt;
#if MULTITHREADED
#ifdef MULTITHREADED
gUnlockMutex(&mutex);
#endif
}
......@@ -461,11 +461,11 @@ void CMap::incRefCnt() {
void CMap::decRefCnt() {
GBool done;
#if MULTITHREADED
#ifdef MULTITHREADED
gLockMutex(&mutex);
#endif
done = --refCnt == 0;
#if MULTITHREADED
#ifdef MULTITHREADED
gUnlockMutex(&mutex);
#endif
if (done) {
......
......@@ -33,7 +33,7 @@
#include "goo/gtypes.h"
#include "CharTypes.h"
#if MULTITHREADED
#ifdef MULTITHREADED
#include "goo/GooMutex.h"
#endif
......@@ -114,7 +114,7 @@ private:
CMapVectorEntry *vector; // vector for first byte (NULL for
// identity CMap)
int refCnt;
#if MULTITHREADED
#ifdef MULTITHREADED
GooMutex mutex;
#endif
};
......
......@@ -49,7 +49,7 @@
#include "Gfx.h"
#include "Page.h"
#if HAVE_FCNTL_H && HAVE_SYS_MMAN_H && HAVE_SYS_STAT_H
#if defined(HAVE_FCNTL_H) && defined(HAVE_SYS_MMAN_H) && defined(HAVE_SYS_STAT_H)
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/mman.h>
......@@ -60,7 +60,7 @@
#pragma implementation
#endif
#if MULTITHREADED
#ifdef MULTITHREADED
# define fontEngineLocker() MutexLocker locker(&mutex)
#else
# define fontEngineLocker()
......@@ -207,7 +207,7 @@ _ft_new_face_uncached (FT_Library lib,
return gTrue;
}
#if CAN_CHECK_OPEN_FACES
#ifdef CAN_CHECK_OPEN_FACES
static struct _ft_face_data {
struct _ft_face_data *prev, *next, **head;
......@@ -817,7 +817,7 @@ CairoFontEngine::CairoFontEngine(FT_Library libA) {
FT_Library_Version(lib, &major, &minor, &patch);
useCIDs = major > 2 ||
(major == 2 && (minor > 1 || (minor == 1 && patch > 7)));
#if MULTITHREADED
#ifdef MULTITHREADED
gInitMutex(&mutex);
#endif
}
......@@ -829,7 +829,7 @@ CairoFontEngine::~CairoFontEngine() {
if (fontCache[i])
delete fontCache[i];
}
#if MULTITHREADED
#ifdef MULTITHREADED
gDestroyMutex(&mutex);
#endif
}
......
......@@ -121,7 +121,7 @@ private:
CairoFont *fontCache[cairoFontCacheSize];
FT_Library lib;
GBool useCIDs;
#if MULTITHREADED
#ifdef MULTITHREADED
GooMutex mutex;
#endif
};
......
......@@ -64,7 +64,7 @@
#include "FileSpec.h"
#include "StructTreeRoot.h"
#if MULTITHREADED
#ifdef MULTITHREADED
# define catalogLocker() MutexLocker locker(&mutex)
#else
# define catalogLocker()
......@@ -74,7 +74,7 @@
//------------------------------------------------------------------------
Catalog::Catalog(PDFDoc *docA) {
#if MULTITHREADED
#ifdef MULTITHREADED
gInitMutex(&mutex);
#endif
ok = gTrue;
......@@ -169,7 +169,7 @@ Catalog::~Catalog() {
delete optContent;
delete viewerPrefs;
delete structTreeRoot;
#if MULTITHREADED
#ifdef MULTITHREADED
gDestroyMutex(&mutex);
#endif
}
......
......@@ -283,7 +283,7 @@ private:
NameTree *getEmbeddedFileNameTree();
NameTree *getJSNameTree();
LinkDest *createLinkDest(Object *obj);
#if MULTITHREADED
#ifdef MULTITHREADED
GooMutex mutex;
#endif
......
......@@ -484,7 +484,7 @@ CharCodeToUnicode::CharCodeToUnicode() {
sMapLen = sMapSize = 0;
refCnt = 1;
isIdentity = gFalse;
#if MULTITHREADED
#ifdef MULTITHREADED
gInitMutex(&mutex);
#endif
}
......@@ -502,7 +502,7 @@ CharCodeToUnicode::CharCodeToUnicode(GooString *tagA) {
sMapLen = sMapSize = 0;
refCnt = 1;
isIdentity = gFalse;
#if MULTITHREADED
#ifdef MULTITHREADED
gInitMutex(&mutex);
#endif
}
......@@ -524,7 +524,7 @@ CharCodeToUnicode::CharCodeToUnicode(GooString *tagA, Unicode *mapA,
sMapSize = sMapSizeA;
refCnt = 1;
isIdentity = gFalse;
#if MULTITHREADED
#ifdef MULTITHREADED
gInitMutex(&mutex);
#endif
}
......@@ -538,17 +538,17 @@ CharCodeToUnicode::~CharCodeToUnicode() {
for (int i = 0; i < sMapLen; ++i) gfree(sMap[i].u);
gfree(sMap);
}
#if MULTITHREADED
#ifdef MULTITHREADED
gDestroyMutex(&mutex);
#endif
}
void CharCodeToUnicode::incRefCnt() {
#if MULTITHREADED
#ifdef MULTITHREADED
gLockMutex(&mutex);
#endif
++refCnt;
#if MULTITHREADED
#ifdef MULTITHREADED
gUnlockMutex(&mutex);
#endif
}
......@@ -556,11 +556,11 @@ void CharCodeToUnicode::incRefCnt() {
void CharCodeToUnicode::decRefCnt() {
GBool done;
#if MULTITHREADED
#ifdef MULTITHREADED
gLockMutex(&mutex);
#endif
done = --refCnt == 0;
#if MULTITHREADED
#ifdef MULTITHREADED
gUnlockMutex(&mutex);
#endif
if (done) {
......
......@@ -35,7 +35,7 @@
#include "CharTypes.h"
#include "goo/gtypes.h"
#if MULTITHREADED
#ifdef MULTITHREADED
#include "goo/GooMutex.h"
#endif
......@@ -116,7 +116,7 @@ private:
int sMapLen, sMapSize;
int refCnt;
GBool isIdentity;
#if MULTITHREADED
#ifdef MULTITHREADED
GooMutex mutex;
#endif
};
......
......@@ -41,7 +41,7 @@
#include "XRef.h"
#include "Dict.h"
#if MULTITHREADED
#ifdef MULTITHREADED
# define dictLocker() MutexLocker locker(&mutex)
#else
# define dictLocker()
......@@ -81,7 +81,7 @@ Dict::Dict(XRef *xrefA) {
size = length = 0;
ref = 1;
sorted = gFalse;
#if MULTITHREADED
#ifdef MULTITHREADED
gInitMutex(&mutex);
#endif
}
......@@ -90,7 +90,7 @@ Dict::Dict(Dict* dictA) {
xref = dictA->xref;
size = length = dictA->length;
ref = 1;
#if MULTITHREADED
#ifdef MULTITHREADED
gInitMutex(&mutex);
#endif
......@@ -124,7 +124,7 @@ Dict::~Dict() {
entries[i].val.free();
}
gfree(entries);
#if MULTITHREADED
#ifdef MULTITHREADED
gDestroyMutex(&mutex);
#endif
}
......
......@@ -105,7 +105,7 @@ private:
int size; // size of <entries> array
int length; // number of entries in dictionary
int ref; // reference count
#if MULTITHREADED
#ifdef MULTITHREADED
mutable GooMutex mutex;
#endif
......
......@@ -18,7 +18,7 @@
#include "poppler-config.h"
#if ENABLE_ZLIB_UNCOMPRESS
#ifdef ENABLE_ZLIB_UNCOMPRESS
#include "FlateStream.h"
......
......@@ -4160,7 +4160,7 @@ void Gfx::opXObject(Object args[], int numArgs) {
return;
}
#if OPI_SUPPORT
#ifdef OPI_SUPPORT
Object opiDict = obj1.streamGetDict()->lookup("OPI");
if (opiDict.isDict()) {
out->opiBegin(state, opiDict.getDict());
......@@ -4203,7 +4203,7 @@ void Gfx::opXObject(Object args[], int numArgs) {
} else {
error(errSyntaxError, getPos(), "XObject subtype is missing or wrong type");
}
#if OPI_SUPPORT
#ifdef OPI_SUPPORT
if (opiDict.isDict()) {
out->opiEnd(state, opiDict.getDict());
}
......
......@@ -78,7 +78,7 @@
#include "GlobalParams.h"
#include "GfxFont.h"
#if WITH_FONTCONFIGURATION_FONTCONFIG
#ifdef WITH_FONTCONFIGURATION_FONTCONFIG
#include <fontconfig/fontconfig.h>
#endif
......@@ -88,7 +88,7 @@
# include <strings.h>
#endif
#if MULTITHREADED
#ifdef MULTITHREADED
# define lockGlobalParams gLockMutex(&mutex)
# define lockUnicodeMapCache gLockMutex(&unicodeMapCacheMutex)
# define lockCMapCache gLockMutex(&cMapCacheMutex)
......@@ -540,7 +540,7 @@ GlobalParams::GlobalParams(const char *customPopplerDataDir)
UnicodeMap *map;
int i;
#if MULTITHREADED
#ifdef MULTITHREADED
gInitMutex(&mutex);
gInitMutex(&unicodeMapCacheMutex);
gInitMutex(&cMapCacheMutex);
......@@ -786,7 +786,7 @@ GlobalParams::~GlobalParams() {
deleteGooList(plugins, Plugin);
#endif
#if MULTITHREADED
#ifdef MULTITHREADED
gDestroyMutex(&mutex);
gDestroyMutex(&unicodeMapCacheMutex);
gDestroyMutex(&cMapCacheMutex);
......@@ -887,7 +887,7 @@ FILE *GlobalParams::findToUnicodeFile(GooString *name) {
return NULL;
}
#if WITH_FONTCONFIGURATION_FONTCONFIG
#ifdef WITH_FONTCONFIGURATION_FONTCONFIG
static GBool findModifier(const char *name, const char *modifier, const char **start)
{
const char *match;
......@@ -1077,7 +1077,7 @@ GooString *GlobalParams::findFontFile(GooString *fontName) {
/* if you can't or don't want to use Fontconfig, you need to implement
this function for your platform. For Windows, it's in GlobalParamsWin.cc
*/
#if WITH_FONTCONFIGURATION_FONTCONFIG
#ifdef WITH_FONTCONFIGURATION_FONTCONFIG
// not needed for fontconfig
void GlobalParams::setupBaseFonts(char *dir) {
}
......
......@@ -45,7 +45,7 @@
#include "goo/gtypes.h"
#include "CharTypes.h"
#if MULTITHREADED
#ifdef MULTITHREADED
#include "goo/GooMutex.h"
#endif
......@@ -240,7 +240,7 @@ private:
// [XpdfSecurityHandler]
#endif
#if MULTITHREADED
#ifdef MULTITHREADED
GooMutex mutex;
GooMutex unicodeMapCacheMutex;
GooMutex cMapCacheMutex;
......
......@@ -54,7 +54,7 @@ description for all fonts available in Windows. That's how MuPDF works.
#include "Lexer.h"
#include "Parser.h"
#if MULTITHREADED
#ifdef MULTITHREADED
# define lockGlobalParams gLockMutex(&mutex)
# define lockUnicodeMapCache gLockMutex(&unicodeMapCacheMutex)
# define lockCMapCache gLockMutex(&cMapCacheMutex)
......
......@@ -170,7 +170,7 @@ void OutputDev::markPoint(char *name, Dict *properties) {
}
#if OPI_SUPPORT
#ifdef OPI_SUPPORT
void OutputDev::opiBegin(GfxState *state, Dict *opiDict) {
}
......
......@@ -309,7 +309,7 @@ public:
#if OPI_SUPPORT
#ifdef OPI_SUPPORT
//----- OPI functions
virtual void opiBegin(GfxState *state, Dict *opiDict);
virtual void opiEnd(GfxState *state, Dict *opiDict);
......
......@@ -80,7 +80,7 @@
#include "PDFDoc.h"
#include "Hints.h"
#if MULTITHREADED
#ifdef MULTITHREADED
# define pdfdocLocker() MutexLocker locker(&mutex)
#else
# define pdfdocLocker()
......@@ -105,7 +105,7 @@
void PDFDoc::init()
{
#if MULTITHREADED
#ifdef MULTITHREADED
gInitMutex(&mutex);
#endif
ok = gFalse;
......@@ -341,7 +341,7 @@ PDFDoc::~PDFDoc() {
gfree(fileNameU);
}
#endif
#if MULTITHREADED
#ifdef MULTITHREADED
gDestroyMutex(&mutex);
#endif
}
......
......@@ -382,7 +382,7 @@ private:
int fopenErrno;
Goffset startXRefPos; // offset of last xref table
#if MULTITHREADED
#ifdef MULTITHREADED
GooMutex mutex;
#endif
};
......
......@@ -18,7 +18,7 @@
#include "PDFDoc.h"
#include "LocalPDFDocBuilder.h"
#include "StdinPDFDocBuilder.h"
#if ENABLE_LIBCURL
#ifdef ENABLE_LIBCURL
#include "CurlPDFDocBuilder.h"
#endif
#include "ErrorCodes.h"
......@@ -34,7 +34,7 @@ PDFDocFactory::PDFDocFactory(GooList *pdfDocBuilders)
} else {
builders = new GooList();
}
#if ENABLE_LIBCURL
#ifdef ENABLE_LIBCURL
builders->insert(0, new CurlPDFDocBuilder());
#endif
builders->insert(0, new StdinPDFDocBuilder());
......
......@@ -1288,7 +1288,7 @@ void PSOutputDev::init(PSOutputFunc outputFuncA, void *outputStreamA,
inUncoloredPattern = gFalse;
t3FillColorOnly = gFalse;
#if OPI_SUPPORT
#ifdef OPI_SUPPORT
// initialize OPI nesting levels
opi13Nest = 0;
opi20Nest = 0;
......@@ -1724,7 +1724,7 @@ void PSOutputDev::writeDocSetup(PDFDoc *doc, Catalog *catalog,
writePSFmt("{0:d} {1:d} pdfSetupPaper\n", paperWidth, paperHeight);
}
}
#if OPI_SUPPORT
#ifdef OPI_SUPPORT
if (generateOPI) {
writePS("/opiMatrix matrix currentmatrix def\n");
}
......@@ -2986,7 +2986,7 @@ void PSOutputDev::setupImage(Ref id, Stream *str, GBool mask) {
if (useCompressed) {
str = str->getUndecodedStream();
}
#if ENABLE_ZLIB
#ifdef ENABLE_ZLIB
if (useFlate) {
str = new FlateEncoder(str);
} else
......@@ -3221,7 +3221,7 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
void *annotDisplayDecideCbkData) {
PreScanOutputDev *scan;
GBool rasterize;
#if HAVE_SPLASH
#ifdef HAVE_SPLASH
GBool useFlate, useLZW;
SplashOutputDev *splashOut;
SplashColor paperColor;
......@@ -3259,7 +3259,7 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
return gTrue;
}
#if HAVE_SPLASH
#ifdef HAVE_SPLASH
// get the rasterization parameters
useFlate = getEnableFlate() && level >= psLevel3;
useLZW = getEnableLZW();
......@@ -3576,7 +3576,7 @@ GBool PSOutputDev::checkPageSlice(Page *page, double /*hDPI*/, double /*vDPI*/,
isGray = gFalse;
}
str0->reset();
#if ENABLE_ZLIB
#ifdef ENABLE_ZLIB
if (useFlate) {
if (isGray && numComps == 4) {
str = new FlateEncoder(new CMYKGrayEncoder(str0));
......@@ -6068,7 +6068,7 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
// end of image dictionary
writePS(">>\n");
#if OPI_SUPPORT
#ifdef OPI_SUPPORT
if (opi13Nest) {
if (inlineImg) {
// this can't happen -- OPI dictionaries are in XObjects
......@@ -6121,7 +6121,7 @@ void PSOutputDev::doImageL2(Object *ref, GfxImageColorMap *colorMap,
// add newline and trailer to the end
writePSChar('\n');
writePS("%-EOD-\n");
#if OPI_SUPPORT
#ifdef OPI_SUPPORT
if (opi13Nest) {
writePS("%%EndData\n");
}
......@@ -6218,7 +6218,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
if (maskUseCompressed) {
maskStr = maskStr->getUndecodedStream();
}
#if ENABLE_ZLIB
#ifdef ENABLE_ZLIB
if (maskUseFlate) {
maskStr = new FlateEncoder(maskStr);
} else
......@@ -6267,7 +6267,7 @@ void PSOutputDev::doImageL3(Object *ref, GfxImageColorMap *colorMap,
if (inlineImg) {
// create an array
str2 = new FixedLengthEncoder(str, len);
#if ENABLE_ZLIB
#ifdef ENABLE_ZLIB