diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-07-04 18:05:49 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2012-07-04 18:05:49 +0000 |
commit | 876f75726e98919f528b6a6c1512bbc3d171e2fc (patch) | |
tree | 8f32ccc826e02aac45d1d1a94eb9edcdf8a6c993 /converter/other | |
parent | 53151c11a295f36538421dd1627511ebee4050be (diff) | |
download | netpbm-mirror-876f75726e98919f528b6a6c1512bbc3d171e2fc.tar.gz netpbm-mirror-876f75726e98919f528b6a6c1512bbc3d171e2fc.tar.xz netpbm-mirror-876f75726e98919f528b6a6c1512bbc3d171e2fc.zip |
cleanup
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1707 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other')
-rw-r--r-- | converter/other/bmptopnm.c | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/converter/other/bmptopnm.c b/converter/other/bmptopnm.c index 7f2c4a5b..84d39989 100644 --- a/converter/other/bmptopnm.c +++ b/converter/other/bmptopnm.c @@ -1276,15 +1276,6 @@ readColorMap(FILE * const ifP, colorMapP, bmpHeader.cmapsize, &bytesRead); *posP += bytesRead; - - if (bytesRead != BMPlencolormap(bmpHeader.class, bmpHeader.cBitCount, - bmpHeader.cmapsize)) { - - pm_message("warning: %u-byte RGB table, expected %u bytes", - bytesRead, - BMPlencolormap(bmpHeader.class, bmpHeader.cBitCount, - bmpHeader.cmapsize)); - } } @@ -1306,23 +1297,6 @@ readRaster(FILE * const ifP, -static void -warnIfBadFileSize(struct bmpInfoHeader const bmpHeader, - unsigned int const pos) { - - unsigned int const expectedSize = - BMPlenfileGen(bmpHeader.class, bmpHeader.cBitCount, - bmpHeader.cmapsize, bmpHeader.cols, - bmpHeader.rows, bmpHeader.imageSize, - bmpHeader.compression); - - if (pos != expectedSize) - pm_message("warning: read %u bytes, expected to read %u bytes", - pos, expectedSize); -} - - - static bool isValidBmpBpp(unsigned int const cBitCount) { @@ -1394,8 +1368,6 @@ readBmp(FILE * const ifP, readRaster(ifP, bmpHeader, bmpRasterP, &pos); - warnIfBadFileSize(bmpHeader, pos); - if (fgetc(ifP) != EOF) pm_message("warning: some image data remains unread."); |