Fix some trivial warnings
No (C) for this (a machine could do it)
diff --git a/poppler/JPXStream.cc b/poppler/JPXStream.cc
index 1f73058..d1e4f45 100644
--- a/poppler/JPXStream.cc
+++ b/poppler/JPXStream.cc
@@ -250,7 +250,7 @@
haveCompMap = false;
haveChannelDefn = false;
- img.tiles = NULL;
+ img.tiles = nullptr;
bitBuf = 0;
bitBufLen = 0;
bitBufSkip = false;
@@ -289,7 +289,7 @@
unsigned int comp, i, k, r, pre, sb;
gfree(bpc);
- bpc = NULL;
+ bpc = nullptr;
if (havePalette) {
gfree(palette.bpc);
gfree(palette.c);
@@ -356,7 +356,7 @@
}
}
gfree(img.tiles);
- img.tiles = NULL;
+ img.tiles = nullptr;
}
bufStr->close();
}
@@ -412,7 +412,7 @@
tileIdx = ((curY - img.yTileOffset) / img.yTileSize) * img.nXTiles
+ (curX - img.xTileOffset) / img.xTileSize;
#if 1 //~ ignore the palette, assume the PDF ColorSpace object is valid
- if (img.tiles == NULL || tileIdx >= img.nXTiles * img.nYTiles || img.tiles[tileIdx].tileComps == NULL) {
+ if (img.tiles == nullptr || tileIdx >= img.nXTiles * img.nYTiles || img.tiles[tileIdx].tileComps == nullptr) {
error(errSyntaxError, getPos(), "Unexpected tileIdx in fillReadBuf in JPX stream");
return;
}
@@ -465,7 +465,7 @@
}
GooString *JPXStream::getPSFilter(int psLevel, const char *indent) {
- return NULL;
+ return nullptr;
}
bool JPXStream::isBinary(bool last) {
@@ -989,10 +989,10 @@
img.tiles[i].tileComps = (JPXTileComp *)gmallocn(img.nComps,
sizeof(JPXTileComp));
for (comp = 0; comp < img.nComps; ++comp) {
- img.tiles[i].tileComps[comp].quantSteps = NULL;
- img.tiles[i].tileComps[comp].data = NULL;
- img.tiles[i].tileComps[comp].buf = NULL;
- img.tiles[i].tileComps[comp].resLevels = NULL;
+ img.tiles[i].tileComps[comp].quantSteps = nullptr;
+ img.tiles[i].tileComps[comp].data = nullptr;
+ img.tiles[i].tileComps[comp].buf = nullptr;
+ img.tiles[i].tileComps[comp].resLevels = nullptr;
}
}
for (comp = 0; comp < img.nComps; ++comp) {
@@ -1024,7 +1024,7 @@
"JPX COD marker segment before SIZ segment");
return false;
}
- if (img.tiles == NULL || img.nXTiles * img.nYTiles == 0 || img.tiles[0].tileComps == NULL) {
+ if (img.tiles == nullptr || img.nXTiles * img.nYTiles == 0 || img.tiles[0].tileComps == nullptr) {
error(errSyntaxError, getPos(), "Error in JPX COD marker segment");
return false;
}
@@ -1074,12 +1074,12 @@
(JPXResLevel *)gmallocn_checkoverflow(
(img.tiles[i].tileComps[comp].nDecompLevels + 1),
sizeof(JPXResLevel));
- if (img.tiles[i].tileComps[comp].resLevels == NULL) {
+ if (img.tiles[i].tileComps[comp].resLevels == nullptr) {
error(errSyntaxError, getPos(), "Error in JPX COD marker segment");
return false;
}
for (r = 0; r <= img.tiles[i].tileComps[comp].nDecompLevels; ++r) {
- img.tiles[i].tileComps[comp].resLevels[r].precincts = NULL;
+ img.tiles[i].tileComps[comp].resLevels[r].precincts = nullptr;
}
}
}
@@ -1164,7 +1164,7 @@
(img.tiles[i].tileComps[comp].nDecompLevels + 1),
sizeof(JPXResLevel));
for (r = 0; r <= img.tiles[i].tileComps[comp].nDecompLevels; ++r) {
- img.tiles[i].tileComps[comp].resLevels[r].precincts = NULL;
+ img.tiles[i].tileComps[comp].resLevels[r].precincts = nullptr;
}
}
for (r = 0; r <= img.tiles[0].tileComps[comp].nDecompLevels; ++r) {
@@ -1607,7 +1607,7 @@
for (r = 0;
r <= img.tiles[tileIdx].tileComps[comp].nDecompLevels;
++r) {
- img.tiles[tileIdx].tileComps[comp].resLevels[r].precincts = NULL;
+ img.tiles[tileIdx].tileComps[comp].resLevels[r].precincts = nullptr;
}
}
for (r = 0; r <= img.tiles[tileIdx].tileComps[0].nDecompLevels; ++r) {
@@ -1667,7 +1667,7 @@
(img.tiles[tileIdx].tileComps[comp].nDecompLevels + 1),
sizeof(JPXResLevel));
for (r = 0; r <= img.tiles[tileIdx].tileComps[comp].nDecompLevels; ++r) {
- img.tiles[tileIdx].tileComps[comp].resLevels[r].precincts = NULL;
+ img.tiles[tileIdx].tileComps[comp].resLevels[r].precincts = nullptr;
}
for (r = 0; r <= img.tiles[tileIdx].tileComps[comp].nDecompLevels; ++r) {
if (img.tiles[tileIdx].tileComps[comp].style & 0x01) {
@@ -2082,8 +2082,8 @@
}
memset(cb->touched, 0,
(1 << (tileComp->codeBlockW + tileComp->codeBlockH)));
- cb->arithDecoder = NULL;
- cb->stats = NULL;
+ cb->arithDecoder = nullptr;
+ cb->stats = nullptr;
++cb;
}
}
diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
index 3b850c8..195232f 100644
--- a/poppler/SplashOutputDev.cc
+++ b/poppler/SplashOutputDev.cc
@@ -3609,7 +3609,7 @@
tf = maskColors == nullptr && useIccImageSrc(&imgData) ? &iccTransform : nullptr;
#else
src = maskColors ? &alphaImageSrc : &imageSrc;
- tf = NULL;
+ tf = nullptr;
#endif
splash->drawImage(src, tf, &imgData, srcMode, maskColors ? true : false,
width, height, mat, interpolate);
diff --git a/poppler/Stream.cc b/poppler/Stream.cc
index d606f99..68c4f11 100644
--- a/poppler/Stream.cc
+++ b/poppler/Stream.cc
@@ -2419,9 +2419,9 @@
x = y = dy = 0;
for (i = 0; i < 4; ++i) {
for (j = 0; j < 32; ++j) {
- rowBuf[i][j] = NULL;
+ rowBuf[i][j] = nullptr;
}
- frameBuf[i] = NULL;
+ frameBuf[i] = nullptr;
}
if (!dctClipInit) {
@@ -2562,10 +2562,10 @@
for (i = 0; i < 4; ++i) {
for (j = 0; j < 32; ++j) {
gfree(rowBuf[i][j]);
- rowBuf[i][j] = NULL;
+ rowBuf[i][j] = nullptr;
}
gfree(frameBuf[i]);
- frameBuf[i] = NULL;
+ frameBuf[i] = nullptr;
}
FilterStream::close();
}
@@ -3827,10 +3827,10 @@
GooString *s;
if (psLevel < 2) {
- return NULL;
+ return nullptr;
}
if (!(s = str->getPSFilter(psLevel, indent))) {
- return NULL;
+ return nullptr;
}
s->append(indent)->append("<< >> /DCTDecode filter\n");
return s;
diff --git a/qt5/src/poppler-document.cc b/qt5/src/poppler-document.cc
index a76da0a..216ef58 100644
--- a/qt5/src/poppler-document.cc
+++ b/qt5/src/poppler-document.cc
@@ -639,7 +639,7 @@
#if defined(USE_CMS)
return (void*)GfxColorSpace::getRGBProfile();
#else
- return NULL;
+ return nullptr;
#endif
}
@@ -648,7 +648,7 @@
#if defined(USE_CMS)
return (void*)GfxColorSpace::getDisplayProfile();
#else
- return NULL;
+ return nullptr;
#endif
}
diff --git a/qt5/src/poppler-form.cc b/qt5/src/poppler-form.cc
index 4485f98..38ebf2d 100644
--- a/qt5/src/poppler-form.cc
+++ b/qt5/src/poppler-form.cc
@@ -565,9 +565,9 @@
SignatureValidationInfo::HashAlgorithm SignatureValidationInfo::hashAlgorithm() const
{
+#ifdef ENABLE_NSS3
Q_D(const SignatureValidationInfo);
-#ifdef ENABLE_NSS3
switch (d->hash_algorithm)
{
case HASH_AlgMD2:
