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

Make Charles compile with Gnu C++ (just compile, for now!)

Browse Source
This commit is contained in:
jdv_cp 2009-03-11 23:37:55 -07:00
parent 19b42c469e
commit c06d34c370
17 changed files with 197 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CharLS.vcproj
View File

@ -51,7 +51,7 @@
SmallerTypeCheck="false"
RuntimeLibrary="3"
BufferSecurityCheck="true"
DisableLanguageExtensions="false"
DisableLanguageExtensions="true"
ForceConformanceInForLoopScope="true"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
@ -147,7 +147,7 @@
StructMemberAlignment="0"
BufferSecurityCheck="false"
EnableFunctionLevelLinking="false"
DisableLanguageExtensions="false"
DisableLanguageExtensions="true"
ForceConformanceInForLoopScope="true"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"

9
context.h
View File

@ -3,7 +3,8 @@
//
#pragma once
#ifndef CHARLS_CONTEXT
#define CHARLS_CONTEXT
#define MIN_C -128
@ -61,7 +62,7 @@ public:
if (B <= - N)
{
B = max(-N + 1, B + N);
B = MAX(-N + 1, B + N);
if (C > MIN_C)
{
C--;
@ -69,7 +70,7 @@ public:
}
else if (B > 0)
{
B = min(B - N, 0);
B = MIN(B - N, 0);
if (C < MAX_C)
{
C++;
@ -94,3 +95,5 @@ public:
}
};
#endif

12
contextrunmode.h
View File

@ -2,8 +2,9 @@
// (C) Jan de Vaan 2007-2009, all rights reserved. See the accompanying "License.txt" for licensed use.
//
#pragma once
#ifndef CHARLS_CONTEXTRUNMODE
#define CHARLS_CONTEXTRUNMODE
struct CContextRunMode
{
@ -34,7 +35,7 @@ struct CContextRunMode
for(; Ntest < TEMP; k++)
{
Ntest <<= 1;
assert(k <= 32);
ASSERT(k <= 32);
};
return k;
}
@ -64,16 +65,15 @@ struct CContextRunMode
if ((k != 0 || (2 * Nn >= N)) == map)
{
assert(map == ComputeMap(-int(errvalabs), k));
ASSERT(map == ComputeMap(-int(errvalabs), k));
return -int(errvalabs);
}
assert(map == ComputeMap(errvalabs, k));
ASSERT(map == ComputeMap(errvalabs, k));
return errvalabs;
}
bool ComputeMap(int Errval, int k) const
{
if ((k == 0) && (Errval > 0) && (2 * Nn < N))
@ -94,3 +94,5 @@ struct CContextRunMode
return k != 0 || (2 * Nn >= N );
}
};
#endif

6
decoderstrategy.h
View File

@ -3,9 +3,9 @@
//
#pragma once
#ifndef CHARLS_DECODERSTRATEGY
#define CHARLS_DECODERSTRATEGY
#include <ASSERT.h>
#include "streams.h"
class DecoderStrategy
@ -34,6 +34,7 @@ public:
MakeValid();
}
inlinehint void Skip(int length)
{
@ -203,3 +204,4 @@ private:
};
#endif

10
defaulttraits.h
View File

@ -3,7 +3,8 @@
//
#pragma once
#ifndef CHARLS_DEFAULTTRAITS
#define CHARLS_DEFAULTTRAITS
// Default traits that support all JPEG LS paramaters.
@ -39,9 +40,9 @@ public:
NEAR = jls_near;
MAXVAL = max;
RANGE = (MAXVAL + 2 * NEAR )/(2 * NEAR + 1) + 1;
bpp = log2(max);
LIMIT = 2 * (bpp + max(8,bpp));
qbpp = log2(RANGE);
bpp = log_2(max);
LIMIT = 2 * (bpp + MAX(8,bpp));
qbpp = log_2(RANGE);
RESET = BASIC_RESET;
}
@ -116,3 +117,4 @@ private:
};
#endif

142
encoderstrategy.h
View File

@ -3,7 +3,8 @@
//
#pragma once
#ifndef CHARLS_ENCODERSTRATEGY
#define CHARLS_ENCODERSTRATEGY
#include "decoderstrategy.h"
@ -24,7 +25,8 @@ public:
virtual ~EncoderStrategy()
{}
int PeekByte();
template <class T>
void OnLineBegin(T* ptypeCur, T* ptypeLine, int cpixel)
@ -40,88 +42,88 @@ public:
protected:
void Init(BYTE* pbyteCompressed, int cbyte)
{
bitpos = 32;
valcurrent = 0;
_pbyteCompressed = pbyteCompressed;
_cbyteCompressed = cbyte;
}
void AppendToBitStream(UINT value, UINT length)
{
ASSERT(length < 32 && length >= 0);
ASSERT((_qdecoder == NULL) || (length == 0 && value == 0) ||( _qdecoder->ReadLongValue(length) == value));
if (length < 32)
void Init(BYTE* pbyteCompressed, int cbyte)
{
UINT mask = (1 << (length)) - 1;
ASSERT((value | mask) == mask);
bitpos = 32;
valcurrent = 0;
_pbyteCompressed = pbyteCompressed;
_cbyteCompressed = cbyte;
}
bitpos -= length;
if (bitpos >= 0)
{
valcurrent = valcurrent | (value << bitpos);
return;
}
valcurrent |= value >> -bitpos;
Flush();
ASSERT(bitpos >=0);
valcurrent |= value << bitpos;
void AppendToBitStream(UINT value, UINT length)
{
ASSERT(length < 32 && length >= 0);
}
ASSERT((_qdecoder == NULL) || (length == 0 && value == 0) ||( _qdecoder->ReadLongValue(length) == value));
inline bool hasbit(UINT i, int ibit)
{
return (i & (1 << ibit)) != 0;
}
void Flush()
{
for (int i = 0; i < 4; ++i)
{
if (bitpos >= 32)
break;
if (_bFFWritten)
if (length < 32)
{
// insert highmost bit
*_pbyteCompressed = BYTE(valcurrent >> 25);
valcurrent = valcurrent << 7;
bitpos += 7;
_bFFWritten = false;
UINT mask = (1 << (length)) - 1;
ASSERT((value | mask) == mask);
}
else
bitpos -= length;
if (bitpos >= 0)
{
*_pbyteCompressed = BYTE(valcurrent >> 24);
valcurrent = valcurrent << 8;
bitpos += 8;
_bFFWritten = *_pbyteCompressed == 0xFF;
valcurrent = valcurrent | (value << bitpos);
return;
}
valcurrent |= value >> -bitpos;
Flush();
ASSERT(bitpos >=0);
valcurrent |= value << bitpos;
}
inline bool hasbit(UINT i, int ibit)
{
return (i & (1 << ibit)) != 0;
}
void Flush()
{
for (int i = 0; i < 4; ++i)
{
if (bitpos >= 32)
break;
if (_bFFWritten)
{
// insert highmost bit
*_pbyteCompressed = BYTE(valcurrent >> 25);
valcurrent = valcurrent << 7;
bitpos += 7;
_bFFWritten = false;
}
else
{
*_pbyteCompressed = BYTE(valcurrent >> 24);
valcurrent = valcurrent << 8;
bitpos += 8;
_bFFWritten = *_pbyteCompressed == 0xFF;
}
_pbyteCompressed++;
_cbyteCompressed--;
_cbyteWritten++;
}
_pbyteCompressed++;
_cbyteCompressed--;
_cbyteWritten++;
}
}
int GetLength()
{
return _cbyteWritten - (bitpos -32)/8;
};
int GetLength()
{
return _cbyteWritten - (bitpos -32)/8;
};
inlinehint void AppendOnesToBitStream(UINT length)
{
AppendToBitStream((1 << length) - 1, length);
}
inlinehint void AppendOnesToBitStream(UINT length)
{
AppendToBitStream((1 << length) - 1, length);
}
DecoderStrategy* _qdecoder;
@ -137,3 +139,5 @@ private:
bool _bFFWritten;
int _cbyteWritten;
};
#endif

1
header.cpp
View File

@ -7,6 +7,7 @@
#include "streams.h"
#include "decoderstrategy.h"
#include "encoderstrategy.h"
#include <memory>
bool IsDefault(const JlsCustomParameters* pcustom)

5
header.h
View File

@ -3,7 +3,9 @@
//
#pragma once
#ifndef CHARLS_HEADER
#define CHARLS_HEADER
#include "streams.h"
#define JPEG_SOI 0xD8
@ -42,3 +44,4 @@ public:
virtual void Write(JLSOutputStream* pstream) = 0;
};
#endif

5
interface.cpp
View File

@ -4,8 +4,6 @@
#include "header.h"
JLS_ERROR CheckInput(const void* pdataCompressed, int cbyteCompressed, const void* pdataUncompressed, int cbyteUncompressed, const JlsParamaters* pparams)
{
if (pparams == NULL)
@ -161,4 +159,5 @@ __declspec(dllexport) JLS_ERROR JpegLsReadHeader(const void* pdataCompressed, in
}
}
}
}

2
interface.h
View File

@ -67,4 +67,4 @@ extern "C"
}
#endif
#endif

10
jpegls.cpp
View File

@ -81,7 +81,7 @@ STRATEGY* JlsCodecFactory<STRATEGY>::GetCodec(const JlsParamaters& _info, const
STRATEGY* pstrategy = NULL;
if (presets.RESET != 0 && presets.RESET != BASIC_RESET)
{
typename DefaultTraitsT<BYTE,BYTE> traits((1 << _info.bitspersample) - 1, _info.allowedlossyerror);
DefaultTraitsT<BYTE,BYTE> traits((1 << _info.bitspersample) - 1, _info.allowedlossyerror);
traits.MAXVAL = presets.MAXVAL;
traits.RESET = presets.RESET;
pstrategy = new JlsCodec<DefaultTraitsT<BYTE, BYTE>, STRATEGY>(traits);
@ -108,7 +108,7 @@ STRATEGY* JlsCodecFactory<STRATEGY>::GetCodecImpl(const JlsParamaters& _info)
if (_info.allowedlossyerror == 0)
return new JlsCodec<LosslessTraitsT<Triplet,8>, STRATEGY>();
typename DefaultTraitsT<BYTE,Triplet> traits((1 << _info.bitspersample) - 1, _info.allowedlossyerror);
DefaultTraitsT<BYTE,Triplet> traits((1 << _info.bitspersample) - 1, _info.allowedlossyerror);
return new JlsCodec<DefaultTraitsT<BYTE,Triplet>, STRATEGY>(traits);
}
@ -130,13 +130,13 @@ STRATEGY* JlsCodecFactory<STRATEGY>::GetCodecImpl(const JlsParamaters& _info)
if (_info.bitspersample <= 8)
{
typename DefaultTraitsT<BYTE, BYTE> traits((1 << _info.bitspersample) - 1, _info.allowedlossyerror);
DefaultTraitsT<BYTE, BYTE> traits((1 << _info.bitspersample) - 1, _info.allowedlossyerror);
return new JlsCodec<DefaultTraitsT<BYTE, BYTE>, STRATEGY>(traits);
}
if (_info.bitspersample <= 16)
{
typename DefaultTraitsT<USHORT, USHORT> traits((1 << _info.bitspersample) - 1, _info.allowedlossyerror);
DefaultTraitsT<USHORT, USHORT> traits((1 << _info.bitspersample) - 1, _info.allowedlossyerror);
return new JlsCodec<DefaultTraitsT<USHORT, USHORT>, STRATEGY>(traits);
}
return NULL;
@ -144,4 +144,4 @@ STRATEGY* JlsCodecFactory<STRATEGY>::GetCodecImpl(const JlsParamaters& _info)
template class JlsCodecFactory<DecoderStrategy>;
template class JlsCodecFactory<EncoderStrategy>;
template class JlsCodecFactory<EncoderStrategy>;

6
lookuptable.h
View File

@ -3,8 +3,8 @@
//
#pragma once
#ifndef CHARLS_LOOKUPTABLE
#define CHARLS_LOOKUPTABLE
struct Code
@ -64,3 +64,5 @@ void CTable::AddEntry(BYTE bvalue, Code c)
rgtype[(bvalue << (cbit - length)) + i] = c;
}
}
#endif

10
losslesstraits.h
View File

@ -3,7 +3,9 @@
//
#pragma once
#ifndef CHARLS_LOSSLESSTRAITS
#define CHARLS_LOSSLESSTRAITS
//
// optimized trait classes for lossless compression of 8 bit color and 8/16 bit monochrome images.
@ -19,7 +21,7 @@ struct LosslessTraitsImplT
qbpp = bitsperpixel,
RANGE = (1 << bpp),
MAXVAL= (1 << bpp) - 1,
LIMIT = 2 * (bitsperpixel + max(8,bitsperpixel)),
LIMIT = 2 * (bitsperpixel + MAX(8,bitsperpixel)),
RESET = BASIC_RESET,
};
@ -68,7 +70,7 @@ struct LosslessTraitsT<BYTE,8> : public LosslessTraitsImplT<BYTE, 8>
{ return (signed char)Errval; }
static inlinehint int ComputeErrVal(int d)
{ return signed char(d); }
{ return (signed char)(d); }
static inlinehint BYTE ComputeReconstructedSample(int Px, int ErrVal)
{ return BYTE(Px + ErrVal); }
@ -115,3 +117,5 @@ struct LosslessTraitsT<Triplet,8> : public LosslessTraitsImplT<BYTE,8>
};
#endif

83
scan.h
View File

@ -2,16 +2,17 @@
// (C) Jan de Vaan 2007-2009, all rights reserved. See the accompanying "License.txt" for licensed use.
//
#pragma once
#ifndef CHARLS_SCAN
#define CHARLS_SCAN
#include "lookuptable.h"
extern CTable rgtableShared[16];
extern std::vector<signed char> rgquant8Ll;
extern std::vector<signed char> rgquant10Ll;
extern std::vector<signed char> rgquant12Ll;
extern std::vector<signed char> rgquant16Ll;
//
// Apply
//
@ -31,7 +32,7 @@ Presets ComputeDefault(int MAXVAL, int NEAR)
{
Presets preset;
int FACTOR = (min(MAXVAL, 4095) + 128)/256;
int FACTOR = (MIN(MAXVAL, 4095) + 128)/256;
preset.T1 = CLAMP(FACTOR * (BASIC_T1 - 2) + 2 + 3*NEAR, NEAR + 1, MAXVAL);
preset.T2 = CLAMP(FACTOR * (BASIC_T2 - 3) + 3 + 5*NEAR, preset.T1, MAXVAL);
@ -169,9 +170,9 @@ public:
inlinehint void EncodeMappedValue(int k, UINT mappederval, UINT limit);
void IncrementRunIndex()
{ RUNindex = min(31,RUNindex + 1); }
{ RUNindex = MIN(31,RUNindex + 1); }
void DecrementRunIndex()
{ RUNindex = max(0,RUNindex - 1); }
{ RUNindex = MAX(0,RUNindex - 1); }
int DecodeRIError(CContextRunMode& ctx);
Triplet DecodeRIPixel(Triplet Ra, Triplet Rb);
@ -234,10 +235,10 @@ typename TRAITS::SAMPLE JlsCodec<TRAITS,STRATEGY>::DoRegular(int Qs, int, int pr
int Px = traits.CorrectPrediction(pred + ApplySign(ctx.C, sign));
int ErrVal;
const Code& code = rgtableShared[k].Get(PeekByte());
const Code& code = rgtableShared[k].Get(STRATEGY::PeekByte());
if (code.GetLength() != 0)
{
Skip(code.GetLength());
STRATEGY::Skip(code.GetLength());
ErrVal = code.GetValue();
ASSERT(abs(ErrVal) < 65535);
}
@ -266,7 +267,7 @@ typename TRAITS::SAMPLE JlsCodec<TRAITS,STRATEGY>::DoRegular(int Qs, int x, int
EncodeMappedValue(k, GetMappedErrVal(ctx.GetErrorCorrection(k | traits.NEAR) ^ ErrVal), traits.LIMIT);
ctx.UpdateVariables(ErrVal, traits.NEAR, traits.RESET);
ASSERT(traits.IsNear(traits.ComputeReconstructedSample(Px, ApplySign(ErrVal, sign)), x));
return static_cast<TRAITS::SAMPLE>(traits.ComputeReconstructedSample(Px, ApplySign(ErrVal, sign)));
return static_cast<SAMPLE>(traits.ComputeReconstructedSample(Px, ApplySign(ErrVal, sign)));
}
@ -313,15 +314,15 @@ CTable InitTable(int k)
template<class TRAITS, class STRATEGY>
UINT JlsCodec<TRAITS,STRATEGY>::DecodeValue(int k, UINT limit, int qbpp)
{
UINT highbits = ReadHighbits();
UINT highbits = STRATEGY::ReadHighbits();
if (highbits >= limit - (qbpp + 1))
return ReadValue(qbpp) + 1;
return STRATEGY::ReadValue(qbpp) + 1;
if (k == 0)
return highbits;
return (highbits << k) + ReadValue(k);
return (highbits << k) + STRATEGY::ReadValue(k);
}
@ -335,24 +336,24 @@ inlinehint void JlsCodec<TRAITS,STRATEGY>::EncodeMappedValue(int k, UINT mappede
{
if (highbits + 1 > 31)
{
AppendToBitStream(0, highbits / 2);
STRATEGY::AppendToBitStream(0, highbits / 2);
highbits = highbits - highbits / 2;
}
AppendToBitStream(1, highbits + 1);
AppendToBitStream((mappederval & ((1 << k) - 1)), k);
STRATEGY::AppendToBitStream(1, highbits + 1);
STRATEGY::AppendToBitStream((mappederval & ((1 << k) - 1)), k);
return;
}
if (limit - traits.qbpp > 31)
{
AppendToBitStream(0, 31);
AppendToBitStream(1, limit - traits.qbpp - 31);
STRATEGY::AppendToBitStream(0, 31);
STRATEGY::AppendToBitStream(1, limit - traits.qbpp - 31);
}
else
{
AppendToBitStream(1, limit - traits.qbpp);
STRATEGY::AppendToBitStream(1, limit - traits.qbpp);
}
AppendToBitStream((mappederval - 1) & ((1 << traits.qbpp) - 1), traits.qbpp);
STRATEGY::AppendToBitStream((mappederval - 1) & ((1 << traits.qbpp) - 1), traits.qbpp);
}
@ -428,7 +429,7 @@ void JlsCodec<TRAITS,STRATEGY>::EncodeRunPixels(int runLength, bool bEndofline)
{
while (runLength >= (1 << J[RUNindex]))
{
AppendOnesToBitStream(1);
STRATEGY::AppendOnesToBitStream(1);
runLength = runLength - (1 << J[RUNindex]);
IncrementRunIndex();
}
@ -437,12 +438,12 @@ void JlsCodec<TRAITS,STRATEGY>::EncodeRunPixels(int runLength, bool bEndofline)
{
if (runLength != 0)
{
AppendOnesToBitStream(1);
STRATEGY::AppendOnesToBitStream(1);
}
}
else
{
AppendToBitStream(runLength, J[RUNindex] + 1); // leading 0 + actual remaining length
STRATEGY::AppendToBitStream(runLength, J[RUNindex] + 1); // leading 0 + actual remaining length
}
}
@ -452,9 +453,9 @@ template<class TRAITS, class STRATEGY>
int JlsCodec<TRAITS,STRATEGY>::DecodeRunPixels(PIXEL Ra, PIXEL* ptype, int cpixelMac)
{
int ipixel = 0;
while (ReadBit())
while (STRATEGY::ReadBit())
{
int cpixel = min(1 << J[RUNindex], cpixelMac - ipixel);
int cpixel = MIN(1 << J[RUNindex], cpixelMac - ipixel);
ipixel += cpixel;
ASSERT(ipixel <= cpixelMac);
@ -471,7 +472,7 @@ int JlsCodec<TRAITS,STRATEGY>::DecodeRunPixels(PIXEL Ra, PIXEL* ptype, int cpixe
if (ipixel != cpixelMac)
{
// incomplete run
ipixel += (J[RUNindex] > 0) ? ReadValue(J[RUNindex]) : 0;
ipixel += (J[RUNindex] > 0) ? STRATEGY::ReadValue(J[RUNindex]) : 0;
}
for (int i = 0; i < ipixel; ++i)
@ -569,13 +570,13 @@ typename TRAITS::SAMPLE JlsCodec<TRAITS,STRATEGY>::EncodeRIPixel(int x, int Ra,
{
int ErrVal = traits.ComputeErrVal(x - Ra);
EncodeRIError(_contextRunmode[1], ErrVal);
return static_cast<TRAITS::SAMPLE>(traits.ComputeReconstructedSample(Ra, ErrVal));
return static_cast<SAMPLE>(traits.ComputeReconstructedSample(Ra, ErrVal));
}
else
{
int ErrVal = traits.ComputeErrVal((x - Rb) * Sign(Rb - Ra));
EncodeRIError(_contextRunmode[0], ErrVal);
return static_cast<TRAITS::SAMPLE>(traits.ComputeReconstructedSample(Rb, ErrVal * Sign(Rb - Ra)));
return static_cast<SAMPLE>(traits.ComputeReconstructedSample(Rb, ErrVal * Sign(Rb - Ra)));
}
}
@ -705,7 +706,7 @@ void JlsCodec<TRAITS,STRATEGY>::DoLine(Triplet*)
template<class TRAITS, class STRATEGY>
void JlsCodec<TRAITS,STRATEGY>::DoScan(PIXEL* ptype, BYTE* pbyteCompressed, int cbyteCompressed)
{
Init(pbyteCompressed, cbyteCompressed);
STRATEGY::Init(pbyteCompressed, cbyteCompressed);
int pixelstride = _size.cx + 4;
@ -731,9 +732,9 @@ void JlsCodec<TRAITS,STRATEGY>::DoScan(PIXEL* ptype, BYTE* pbyteCompressed, int
ptypePrev[_size.cx] = ptypePrev[_size.cx - 1];
ptypeCur[-1] = ptypePrev[0];
OnLineBegin(ptypeCur, ptypeLine, _size.cx);
STRATEGY::OnLineBegin(ptypeCur, ptypeLine, _size.cx);
DoLine((PIXEL*) NULL); // dummy arg for overload resolution
OnLineEnd(ptypeCur, ptypeLine, _size.cx);
STRATEGY::OnLineEnd(ptypeCur, ptypeLine, _size.cx);
rgRUNindex[icomponent] = RUNindex;
}
@ -755,14 +756,14 @@ int JlsCodec<TRAITS,STRATEGY>::EncodeScan(const void* pvoid, const Size& size, i
DecoderStrategy* pdecoder = new JlsCodec<TRAITS,DecoderStrategy>(traits);
BYTE* pbyteCompare = (BYTE*)pvoidCompare;
pdecoder->Init(pbyteCompare, cbyte);
EncoderStrategy::_qdecoder = pdecoder;
STRATEGY::_qdecoder = pdecoder;
}
DoScan(const_cast<PIXEL*>(ptype), pbyteCompressed, cbyte);
Flush();
STRATEGY::Flush();
return GetLength();
return STRATEGY::GetLength();
}
@ -791,7 +792,7 @@ int JlsCodec<TRAITS,STRATEGY>::DecodeScan(void* pvoidOut, const Size& size, int
DoScan(const_cast<PIXEL*>(ptypeOut), pbyteCompressed + cbyteRead, cbyte);
return GetCurBytePos() - pbyteCompressed;
return STRATEGY::GetCurBytePos() - pbyteCompressed;
}
@ -808,13 +809,15 @@ void JlsCodec<TRAITS,STRATEGY>::InitParams(int t1, int t2, int t3, int nReset)
InitQuantizationLUT();
int A = max(2, (traits.RANGE + 32)/64);
int A = MAX(2, (traits.RANGE + 32)/64);
for (UINT Q = 0; Q < sizeof(_contexts) / sizeof(_contexts[0]); ++Q)
{
_contexts[Q] = JlsContext(A);
}
_contextRunmode[0] = CContextRunMode(max(2, (traits.RANGE + 32)/64), 0, nReset);
_contextRunmode[1] = CContextRunMode(max(2, (traits.RANGE + 32)/64), 1, nReset);
_contextRunmode[0] = CContextRunMode(MAX(2, (traits.RANGE + 32)/64), 0, nReset);
_contextRunmode[1] = CContextRunMode(MAX(2, (traits.RANGE + 32)/64), 1, nReset);
RUNindex = 0;
}
#endif

13
stdafx.h
View File

@ -3,21 +3,13 @@
// are changed infrequently
//
#pragma once
#ifndef STDAFX
#define STDAFX
typedef unsigned int UINT;
typedef unsigned char BYTE;
typedef unsigned short USHORT;
#ifndef max
#define max(a,b) (((a) > (b)) ? (a) : (b))
#endif
#ifndef min
#define min(a,b) (((a) < (b)) ? (a) : (b))
#endif
#ifdef _DEBUG
#include <assert.h>
#define ASSERT(t) assert(t)
@ -27,3 +19,4 @@ typedef unsigned short USHORT;
#define CHARLS_IMEXPORT __declspec(dllexport)
#endif

4
streams.h
View File

@ -3,7 +3,8 @@
//
#pragma once
#ifndef CHARLS_STREAMS
#define CHARLS_STREAMS
#include <vector>
#include "util.h"
@ -135,3 +136,4 @@ private:
#endif

33
util.h
View File

@ -3,23 +3,38 @@
//
#pragma once
#ifndef CHARLS_UTIL
#define CHARLS_UTIL
#pragma pack (push)
#pragma pack (1)
#undef NEAR
#ifdef _USRDLL
#ifdef _DEBUG
#define inlinehint
#else
#define inlinehint __forceinline
#endif
#else
#define inlinehint __inline
#endif
#ifndef MAX
#define MAX(a,b) (((a) > (b)) ? (a) : (b))
#endif
#ifndef MIN
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
#endif
const int BASIC_RESET = 64;
inline int log2(UINT n)
inline int log_2(UINT n)
{
int x = 0;
while (n > (1U << x))
@ -42,13 +57,15 @@ struct Size
inline __forceinline int Sign(int n)
inline int Sign(int n)
{ return (n >> 31) | 1;}
inline __forceinline int BitWiseSign(int i)
inline int BitWiseSign(int i)
{ return (i >> 31); }
#pragma pack(push, 1)
struct Triplet
{
Triplet() :
@ -69,7 +86,7 @@ struct Triplet
};
#pragma pack (pop)
#pragma pack(pop)
#include "interface.h"
@ -79,3 +96,5 @@ inline bool operator==(const Triplet& lhs, const Triplet& rhs)
inline bool operator!=(const Triplet& lhs, const Triplet& rhs)
{ return !(lhs == rhs); }
#endif