cpp/charls
1
0
Fork 0
mirror of https://github.com/team-charls/charls synced 2025-03-28 21:03:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use exception handling everywhere when reading

Browse Source
This commit is contained in:
jdv_cp 2009-03-09 13:46:19 -07:00
parent 105136964c
commit 19b42c469e
5 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
header.cpp
View File

@ -170,19 +170,17 @@ JLSInputStream::JLSInputStream(const BYTE* pdata, int cbyteLength) :
//
// Read()
//
bool JLSInputStream::Read(void* pvoid, int cbyteAvailable)
void JLSInputStream::Read(void* pvoid, int cbyteAvailable)
{
if (!ReadHeader())
return false;
return ReadPixels(pvoid, cbyteAvailable);
ReadHeader();
ReadPixels(pvoid, cbyteAvailable);
}
//
// ReadPixels()
//
bool JLSInputStream::ReadPixels(void* pvoid, int cbyteAvailable)
void JLSInputStream::ReadPixels(void* pvoid, int cbyteAvailable)
{
int cbytePlane = _info.width * _info.height * ((_info.bitspersample + 7)/8);
@ -195,7 +193,6 @@ bool JLSInputStream::ReadPixels(void* pvoid, int cbyteAvailable)
for (int icomp = 0; icomp < _info.components; ++icomp)
{
ReadScan(pbyte);
pbyte += cbytePlane;
}
}
@ -203,26 +200,24 @@ bool JLSInputStream::ReadPixels(void* pvoid, int cbyteAvailable)
{
ReadScan(pvoid);
}
return true;
}
//
// ReadHeader()
//
int JLSInputStream::ReadHeader()
void JLSInputStream::ReadHeader()
{
if (ReadByte() != 0xFF)
return 0;
throw JlsException(InvalidCompressedData);
if (ReadByte() != JPEG_SOI)
return 0;
throw JlsException(InvalidCompressedData);
for (;;)
{
if (ReadByte() != 0xFF)
return 0;
throw JlsException(InvalidCompressedData);
BYTE marker = (BYTE)ReadByte();
@ -235,16 +230,15 @@ int JLSInputStream::ReadHeader()
case JPEG_SOF: ReadStartOfFrame(); break;
case JPEG_COM: ReadComment(); break;
case JPEG_LSE: ReadPresetParameters(); break;
// Other tags not supported (among which DNL DRI)
default:
return 0;
default: throw JlsException(ImageTypeNotSupported);
}
if (marker == JPEG_SOS)
{
_cbyteOffset = cbyteStart - 2;
return _cbyteOffset;
return;
}
_cbyteOffset = cbyteStart + cbyteMarker;
}

24
interface.cpp
View File

@ -89,12 +89,8 @@ __declspec(dllexport) JLS_ERROR JpegLsDecode(void* pdataUncompressed, int cbyteU
try
{
if (!reader.Read(pdataUncompressed, cbyteUncompressed))
return InvalidCompressedData;
reader.GetBytesRead();
reader.Read(pdataUncompressed, cbyteUncompressed);
return OK;
}
catch (JlsException e)
{
@ -151,10 +147,18 @@ __declspec(dllexport) JLS_ERROR JpegLsVerifyEncode(const void* pdataUncompressed
__declspec(dllexport) JLS_ERROR JpegLsReadHeader(const void* pdataCompressed, int cbyteCompressed, JlsParamaters* pparams)
{
JLSInputStream reader((BYTE*)pdataCompressed, cbyteCompressed);
reader.ReadHeader();
JlsParamaters info = reader.GetMetadata();
*pparams = info;
return OK;
try
{
JLSInputStream reader((BYTE*)pdataCompressed, cbyteCompressed);
reader.ReadHeader();
JlsParamaters info = reader.GetMetadata();
*pparams = info;
return OK;
}
catch (JlsException e)
{
return e._error;
}
}
}

3
interface.h
View File

@ -9,7 +9,8 @@ enum JLS_ERROR
ParameterValueNotSupported,
UncompressedBufferTooSmall,
CompressedBufferTooSmall,
InvalidCompressedData
InvalidCompressedData,
ImageTypeNotSupported
};
class JlsException

6
streams.h
View File

@ -109,13 +109,13 @@ public:
const JlsCustomParameters& GetCustomPreset() const
{ return _info.custom; }
bool Read(void* pvoid, int cbyteAvailable);
int ReadHeader();
void Read(void* pvoid, int cbyteAvailable);
void ReadHeader();
void EnableCompare(bool bCompare)
{ _bCompare = bCompare; }
private:
bool ReadPixels(void* pvoid, int cbyteAvailable);
void ReadPixels(void* pvoid, int cbyteAvailable);
void ReadScan(void*);
void ReadStartOfScan();
void ReadPresetParameters();

4
test/test.cpp
View File

@ -332,7 +332,7 @@ void TestSmallBuffer()
std::vector<BYTE> rgbyteOut;
rgbyteOut.resize(512 * 511);
JLS_ERROR error = JpegLsDecode(&rgbyteOut[0], rgbyteOut.size(), &rgbyteCompressed[0], int(rgbyteCompressed.size()));
ASSERT(error == JLS_ERROR::UncompressedBufferTooSmall);
ASSERT(error == UncompressedBufferTooSmall);
}
@ -348,7 +348,7 @@ void TestDamagedBitStream()
std::vector<BYTE> rgbyteOut;
rgbyteOut.resize(512 * 512);
JLS_ERROR error = JpegLsDecode(&rgbyteOut[0], rgbyteOut.size(), &rgbyteCompressed[0], int(rgbyteCompressed.size()));
ASSERT(error == JLS_ERROR::InvalidCompressedData);
ASSERT(error == InvalidCompressedData);
}