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

Added color transform capability to sample-interleaved images.

Browse Source 
Changed line interleaved mode: in line and sample interleaved modes, the uncompressed data is now always in sample interleaved format.
This commit is contained in:
jdv_cp 2009-04-19 14:37:24 -07:00
parent faa77d7f9e
commit 3aaa171d3e
10 changed files with 371 additions and 308 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

201
CharLS.vcproj
View File

@ -47,7 +47,6 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
InlineFunctionExpansion="1"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;JPEGLS_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@ -108,96 +107,6 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
UseOfATL="0"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
InlineFunctionExpansion="1"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;JPEGLS_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
SmallerTypeCheck="false"
RuntimeLibrary="3"
BufferSecurityCheck="true"
DisableLanguageExtensions="true"
ForceConformanceInForLoopScope="true"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
CompileAs="2"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)/charls.dll"
LinkIncremental="2"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/jpegls.pdb"
SubSystem="2"
OptimizeForWindows98="0"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(OutDir)/CharLS.lib"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
@ -294,6 +203,96 @@
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="2"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
UseOfMFC="0"
UseOfATL="0"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
InlineFunctionExpansion="1"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;JPEGLS_EXPORTS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
SmallerTypeCheck="false"
RuntimeLibrary="3"
BufferSecurityCheck="true"
DisableLanguageExtensions="true"
ForceConformanceInForLoopScope="true"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
WarningLevel="4"
WarnAsError="true"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
CompileAs="2"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)/charls.dll"
LinkIncremental="2"
GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)/jpegls.pdb"
SubSystem="2"
OptimizeForWindows98="0"
RandomizedBaseAddress="1"
DataExecutionPrevention="0"
ImportLibrary="$(OutDir)/CharLS.lib"
TargetMachine="17"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
@ -418,14 +417,6 @@
EnableIntrinsicFunctions="true"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
@ -439,6 +430,14 @@
EnableFunctionLevelLinking="false"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|x64"
>
<Tool
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|x64"
>
@ -458,6 +457,10 @@
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc"
>
<File
RelativePath=".\colortransform.h"
>
</File>
<File
RelativePath="context.h"
>

127
colortransform.h Normal file
View File

@ -0,0 +1,127 @@
//
// (C) Jan de Vaan 2007-2009, all rights reserved. See the accompanying "License.txt" for licensed use.
//
#ifndef CHARLS_COLORTRANSFORM
#define CHARLS_COLORTRANSFORM
struct TransformNone
{
inlinehint static Triplet Apply(int v1, int v2, int v3)
{ return Triplet(v1, v2, v3); }
};
struct TransformRgbToHp1
{
inlinehint static Triplet Apply(int R, int G, int B)
{
Triplet hp1;
hp1.v2 = BYTE(G);
hp1.v1 = BYTE(R - G + 0x80);
hp1.v3 = BYTE(B - G + 0x80);
return hp1;
}
};
struct TransformHp1ToRgb
{
inlinehint static Triplet Apply(int v1, int v2, int v3)
{ return Triplet(v1 + v2 - 0x80, v2, v3 + v2 - 0x80); }
};
struct TransformRgbToHp2
{
inlinehint static Triplet Apply(int R, int G, int B)
{
//Triplet hp2;
//hp2.v1 = BYTE(R - G + 0x80);
//hp2.v2 = BYTE(G);
//hp2.v3 = BYTE(B - ((R+G )>>1) - 0x80);
//return hp2;
return Triplet(R - G + 0x80, G, B - ((R+G )>>1) - 0x80);
}
};
struct TransformHp2ToRgb
{
inlinehint static Triplet Apply(int v1, int v2, int v3)
{
Triplet rgb;
rgb.R = BYTE(v1 + v2 - 0x80); // new R
rgb.G = BYTE(v2); // new G
rgb.B = BYTE(v3 + ((rgb.R + rgb.G) >> 1) - 0x80); // new B
return rgb;
}
};
struct TransformRgbToHp3
{
inlinehint static Triplet Apply(int R, int G, int B)
{
Triplet hp3;
hp3.v2 = BYTE(B - G + 0x80);
hp3.v3 = BYTE(R - G + 0x80);
hp3.v1 = BYTE(G + ((hp3.v2 + hp3.v3 )>>2) - 0x40);
return hp3;
}
};
struct TransformHp3ToRgb
{
inlinehint static Triplet Apply(int v1, int v2, int v3)
{
int G = v1 - ((v3 + v2)>>2)+0x40;
Triplet rgb;
rgb.R = BYTE(v3 + G - 0x80); // new R
rgb.G = BYTE(G); // new G
rgb.B = BYTE(v2 + G - 0x80); // new B
return rgb;
}
};
template<class TRANSFORM>
void TransformLine(Triplet* pDest, const Triplet* pSrc, int pixelCount, const TRANSFORM&)
{
for (int i = 0; i < pixelCount; ++i)
{
pDest[i] = TRANSFORM::Apply(pSrc[i].v1, pSrc[i].v2, pSrc[i].v3);
}
};
template<class TRANSFORM>
void TransformLineToTriplet(const BYTE* ptypeInput, LONG pixelStrideIn, BYTE* pbyteBuffer, LONG pixelStride, const TRANSFORM&)
{
int cpixel = MIN(pixelStride, pixelStrideIn);
Triplet* ptypeBuffer = (Triplet*)pbyteBuffer;
for (int x = 0; x < cpixel; ++x)
{
ptypeBuffer[x] = TRANSFORM::Apply(ptypeInput[x], ptypeInput[x + pixelStrideIn], ptypeInput[x + 2*pixelStrideIn]);
}
}
template<class TRANSFORM>
void TransformTripletToLine(const BYTE* pbyteInput, LONG pixelStrideIn, BYTE* ptypeBuffer, LONG pixelStride, const TRANSFORM&)
{
int cpixel = MIN(pixelStride, pixelStrideIn);
const Triplet* ptypeBufferIn = (Triplet*)pbyteInput;
for (int x = 0; x < cpixel; ++x)
{
Triplet color = ptypeBufferIn[x];
Triplet colorTranformed = TRANSFORM::Apply(color.v1, color.v2, color.v3);
ptypeBuffer[x] = colorTranformed.v1;
ptypeBuffer[x + pixelStride] = colorTranformed.v2;
ptypeBuffer[x + 2 *pixelStride] = colorTranformed.v3;
}
}
#endif

77
decoderstrategy.h
View File

@ -7,15 +7,22 @@
#define CHARLS_DECODERSTRATEGY
#include "streams.h"
#include "colortransform.h"
class DecoderStrategy
{
public:
DecoderStrategy(const JlsParamaters&) :
DecoderStrategy(const JlsParamaters& info) :
_readCache(0),
_validBits(0),
_pbyteCompressed(0)
{}
_pbyteCompressed(0),
_info(info)
{
if (_info.ilv != ILV_LINE)
{
_info.components = 1;
}
}
enum { IsDecoding = 1};
@ -23,7 +30,7 @@ public:
{}
virtual void SetPresets(const JlsCustomParameters& presets) = 0;
virtual size_t DecodeScan(void* pvoidOut, const Size& size, LONG cline, const void* pvoidIn, size_t cbyte, bool bCheck) = 0;
virtual size_t DecodeScan(void* pvoidOut, const Size& size, const void* pvoidIn, size_t cbyte, bool bCheck) = 0;
void Init(BYTE* pbyteCompressed, size_t cbyte)
{
@ -42,20 +49,63 @@ public:
}
void OnLineBegin(void* /*ptypeInput*/, int /*iline*/, LONG /*cpixel*/, void* /*ptypeBuffer*/, LONG /*pixelStride*/) {}
void OnLineBegin(int iline, LONG cpixel, void* ptypeBuffer, LONG pixelStride)
{}
void OnLineEnd(int iline, LONG cpixel, const Triplet* ptypeBuffer, LONG pixelStride)
{
Triplet* ptypeUnc = ((Triplet*)_ptypeUncompressed) + iline * cpixel;
switch(_info.colorTransform)
{
case COLORXFORM_NONE : return TransformLine(ptypeUnc, ptypeBuffer, cpixel, TransformNone());
case COLORXFORM_HP1 : return TransformLine(ptypeUnc, ptypeBuffer, cpixel, TransformHp1ToRgb());
case COLORXFORM_HP2 : return TransformLine(ptypeUnc, ptypeBuffer, cpixel, TransformHp2ToRgb());
case COLORXFORM_HP3 : return TransformLine(ptypeUnc, ptypeBuffer, cpixel, TransformHp3ToRgb());
}
}
template <class T>
void OnLineEnd(T* ptypeCur, T* ptypeLine, LONG cpixel)
void OnLineEnd(int iline, LONG cpixel, const T* ptypeBuffer, LONG pixelStride)
{
#ifdef _DEBUG
for (LONG i = 0; i < cpixel; ++i)
for (int icomponent = 0; icomponent < _info.components; ++icomponent)
{
//CheckedAssign(ptypeLine[i], ptypeCur[i]);
ptypeLine[i] = ptypeCur[i];
}
T* ptypeUnc = ((T*)_ptypeUncompressed) + (iline *_info.components + icomponent)* cpixel;
#ifdef _DEBUG
for (LONG i = 0; i < cpixel; ++i)
{
//CheckedAssign(ptypeLine[i], ptypeCur[i]);
ptypeUnc[i] = ptypeBuffer[i + icomponent*pixelStride];
}
#else
memcpy(ptypeLine, ptypeCur, cpixel * sizeof(T));
memcpy(ptypeUnc, ptypeBuffer+ icomponent*pixelStride, cpixel * sizeof(T) );
#endif
}
}
void OnLineEnd(int iline, LONG cpixel, const BYTE* ptypeBuffer, LONG pixelStride)
{
BYTE* ptypeUnc = ((BYTE*)(_ptypeUncompressed));
if (_info.components == 1)
{
memcpy(ptypeUnc + cpixel * iline, ptypeBuffer, cpixel * sizeof(BYTE));
return;
}
ptypeUnc += iline * _info.components * cpixel;
switch(_info.colorTransform)
{
case COLORXFORM_NONE : return TransformLineToTriplet(ptypeBuffer, pixelStride, ptypeUnc, cpixel, TransformNone());
case COLORXFORM_HP1 : return TransformLineToTriplet(ptypeBuffer, pixelStride, ptypeUnc, cpixel, TransformHp1ToRgb());
case COLORXFORM_HP2 : return TransformLineToTriplet(ptypeBuffer, pixelStride, ptypeUnc, cpixel, TransformHp2ToRgb());
case COLORXFORM_HP3 : return TransformLineToTriplet(ptypeBuffer, pixelStride, ptypeUnc, cpixel, TransformHp3ToRgb());
}
}
typedef size_t bufType;
@ -226,6 +276,9 @@ public:
return (ReadValue(length - 24) << 24) + ReadValue(24);
}
protected:
JlsParamaters _info;
void* _ptypeUncompressed;
private:
// decoding

111
encoderstrategy.h
View File

@ -2,70 +2,10 @@
// (C) Jan de Vaan 2007-2009, all rights reserved. See the accompanying "License.txt" for licensed use.
//
struct TransformRgbToHp1
{
static Triplet Apply(int R, int G, int B)
{
Triplet hp1;
hp1.v2 = BYTE(G);
hp1.v1 = BYTE(R - G + 0x80);
hp1.v3 = BYTE(B - G + 0x80);
return hp1;
}
};
struct TransformRgbToHp2
{
static Triplet Apply(int R, int G, int B)
{
Triplet hp1;
hp1.v2 = BYTE(G);
hp1.v1 = BYTE(R - G + 0x80);
hp1.v3 = BYTE(B - ((R+G )>>1) - 0x80);
return hp1;
}
};
struct TransformRgbToHp3
{
static Triplet Apply(int R, int G, int B)
{
Triplet hp1;
hp1.v2 = BYTE(B - G + 0x80);
hp1.v3 = BYTE(R - G + 0x80);
hp1.v1 = BYTE(G + ((hp1.v2 + hp1.v3 )>>2) - 0x40);
return hp1;
}
};
template<class TRANSFORM>
void TransformLine(Triplet* pDest, Triplet* pSrc, int pixelCount, const TRANSFORM&)
{
for (int i = 0; i < pixelCount; ++i)
{
pDest[i] = TRANSFORM::Apply(pSrc[i]);
}
}
template<class TRANSFORM>
void TransformLine(BYTE* ptypeInput, LONG cpixel, BYTE* ptypeBuffer, LONG pixelStride, const TRANSFORM&)
{
for (int x = 0; x < cpixel; ++x)
{
Triplet colorTranformed = TRANSFORM::Apply(ptypeInput[x], ptypeInput[x + cpixel], ptypeInput[x + 2*cpixel]);
ptypeBuffer[x] = colorTranformed.v1;
ptypeBuffer[x + pixelStride] = colorTranformed.v2;
ptypeBuffer[x + 2 *pixelStride] = colorTranformed.v3;
}
}
#ifndef CHARLS_ENCODERSTRATEGY
#define CHARLS_ENCODERSTRATEGY
#include "colortransform.h"
#include "decoderstrategy.h"
class EncoderStrategy
@ -79,7 +19,12 @@ public:
_bFFWritten(false),
_cbyteWritten(0),
_info(info)
{};
{
if (_info.ilv != ILV_LINE)
{
_info.components = 1;
}
};
virtual ~EncoderStrategy()
{}
@ -88,43 +33,50 @@ public:
void OnLineBegin(Triplet* ptypeInput, int iline, LONG cpixel, Triplet* ptypeBuffer, LONG /*pixelStride*/)
void OnLineBegin(int iline, LONG cpixel, Triplet* ptypeBuffer, LONG /*pixelStride*/)
{
memcpy(ptypeBuffer, ptypeInput + cpixel*iline, cpixel * sizeof(Triplet));
Triplet* ptypeInput = ((Triplet*)(_ptypeUncompressed));
switch(_info.colorTransform)
{
case COLORXFORM_NONE : return TransformLine(ptypeBuffer, ptypeInput + cpixel*iline, cpixel, TransformNone());
case COLORXFORM_HP1 : return TransformLine(ptypeBuffer, ptypeInput + cpixel*iline, cpixel, TransformRgbToHp1());
case COLORXFORM_HP2 : return TransformLine(ptypeBuffer, ptypeInput + cpixel*iline, cpixel, TransformRgbToHp2());
case COLORXFORM_HP3 : return TransformLine(ptypeBuffer, ptypeInput + cpixel*iline, cpixel, TransformRgbToHp3());
}
}
void OnLineBegin(USHORT* ptypeInput, int iline, LONG cpixel, USHORT* ptypeBuffer, LONG /*pixelStride*/)
void OnLineBegin(int iline, LONG cpixel, USHORT* ptypeBuffer, LONG /*pixelStride*/)
{
USHORT* ptypeInput = ((USHORT*)(_ptypeUncompressed));
memcpy(ptypeBuffer, ptypeInput + cpixel*iline, cpixel * sizeof(USHORT));
}
void OnLineBegin(BYTE* ptypeInput, int iline, LONG cpixel, BYTE* ptypeBuffer, LONG pixelStride)
void OnLineBegin(int iline, LONG cpixel, BYTE* ptypeBuffer, LONG pixelStride)
{
if (_info.colorTransform == 0)
BYTE* ptypeUnc = ((BYTE*)(_ptypeUncompressed));
if (_info.components == 1)
{
for (int i = 0; i < _info.components; ++i)
{
memcpy(ptypeBuffer + pixelStride * i, ptypeInput + cpixel * (iline * _info.components + i),
cpixel * sizeof(BYTE));
}
memcpy(ptypeBuffer, ptypeUnc + cpixel * iline, cpixel * sizeof(BYTE));
return;
}
ptypeInput += iline * _info.components * cpixel;
ptypeUnc += iline * _info.components * cpixel;
switch(_info.colorTransform)
{
case COLORXFORM_HP1 : return TransformLine(ptypeInput, cpixel, ptypeBuffer, pixelStride, TransformRgbToHp1());
case COLORXFORM_HP2 : return TransformLine(ptypeInput, cpixel, ptypeBuffer, pixelStride, TransformRgbToHp2());
case COLORXFORM_HP3 : return TransformLine(ptypeInput, cpixel, ptypeBuffer, pixelStride, TransformRgbToHp3());
case COLORXFORM_NONE : return TransformTripletToLine(ptypeUnc, cpixel, ptypeBuffer, pixelStride, TransformNone());
case COLORXFORM_HP1 : return TransformTripletToLine(ptypeUnc, cpixel, ptypeBuffer, pixelStride, TransformRgbToHp1());
case COLORXFORM_HP2 : return TransformTripletToLine(ptypeUnc, cpixel, ptypeBuffer, pixelStride, TransformRgbToHp2());
case COLORXFORM_HP3 : return TransformTripletToLine(ptypeUnc, cpixel, ptypeBuffer, pixelStride, TransformRgbToHp3());
}
}
void OnLineEnd(void* /*ptypeCur*/, void* /*ptypeLine*/, LONG /*cpixel*/) {};
void OnLineEnd(int iline, LONG cpixel, void* ptypeBuffer, LONG pixelStride) {};
virtual void SetPresets(const JlsCustomParameters& presets) = 0;
virtual size_t EncodeScan(const void* pvoid, const Size& size, LONG ccomp, void* pvoidOut, size_t cbyte, void* pvoidCompare) = 0;
virtual size_t EncodeScan(const void* pvoid, const Size& size, void* pvoidOut, size_t cbyte, void* pvoidCompare) = 0;
protected:
@ -214,6 +166,7 @@ protected:
protected:
JlsParamaters _info;
const void* _ptypeUncompressed;
private:

85
header.cpp
View File

@ -167,7 +167,6 @@ size_t JLSOutputStream::Write(BYTE* pdata, size_t cbyteLength)
WriteByte(0xFF);
WriteByte(JPEG_SOI);
for (size_t i = 0; i < _segments.size(); ++i)
{
_segments[i]->Write(this);
@ -229,7 +228,6 @@ void JLSInputStream::ReadPixels(void* pvoid, LONG cbyteAvailable)
{
ReadScan(pvoid);
}
DoColorXForm(pvoid);
}
// ReadNBytes()
@ -419,9 +417,8 @@ int JLSInputStream::ReadWord()
void JLSInputStream::ReadScan(void* pvout)
{
std::auto_ptr<DecoderStrategy> qcodec(JlsCodecFactory<DecoderStrategy>().GetCodec(_info, _info.custom));
LONG cline = _info.ilv == ILV_LINE ? _info.components : 1;
Size size = Size(_info.width,_info.height);
_cbyteOffset += qcodec->DecodeScan(pvout, size, cline, _pdata + _cbyteOffset, _cbyteLength - _cbyteOffset, _bCompare);
_cbyteOffset += qcodec->DecodeScan(pvout, size, _pdata + _cbyteOffset, _cbyteLength - _cbyteOffset, _bCompare);
};
@ -440,12 +437,9 @@ public:
void Write(JLSOutputStream* pstream)
{
JlsParamaters info = _info;
info.components = _ccompScan;
LONG ccompInterleaved = _info.ilv == ILV_LINE ? _ccompScan : 1;
info.components = _ccompScan;
std::auto_ptr<EncoderStrategy> qcodec(JlsCodecFactory<EncoderStrategy>().GetCodec(info, _info.custom));
size_t cbyteWritten = qcodec->EncodeScan((BYTE*)_pvoidRaw, Size(_info.width, _info.height), ccompInterleaved, pstream->GetPos(), pstream->GetLength(), pstream->_bCompare ? pstream->GetPos() : NULL);
size_t cbyteWritten = qcodec->EncodeScan((BYTE*)_pvoidRaw, Size(_info.width, _info.height), pstream->GetPos(), pstream->GetLength(), pstream->_bCompare ? pstream->GetPos() : NULL);
pstream->Seek(cbyteWritten);
}
@ -514,76 +508,3 @@ void JLSInputStream::ReadColorXForm()
}
}
//
// DoColorXForm()
//
void JLSInputStream::DoColorXForm(void* pvoid)
{
if (_info.colorTransform == COLORXFORM_NONE)
return;
if (_info.ilv != ILV_LINE)
return;
if (_info.components != 3)
return;
if (_info.bitspersample != 8)
return;
// colorXForm
int lwidth = _info.width*_info.components*((_info.bitspersample + 7)/8);
int w = _info.width;
switch(_info.colorTransform)
{
case COLORXFORM_HP1:
for(int y = 0; y < _info.height; y++)
{
BYTE* pix = (BYTE*)pvoid + y*lwidth;
for(int x = 0; x < _info.width; x++)
{
BYTE r = pix[x]; // R
BYTE g = pix[x+w]; // G
BYTE b = pix[x+w*2];// B
pix[x] = r + g - 0x80; // new R
pix[x+w] = g; // new G
pix[x+w*2] = b + g - 0x80; // new B
}
}
break;
case COLORXFORM_HP2:
for(int y = 0; y < _info.height; y++)
{
BYTE* pix = (BYTE*)pvoid + y*lwidth;
for(int x = 0; x < _info.width; x++)
{
int v1 = pix[x]; // R
int v2 = pix[x+w]; // G
int v3 = pix[x+w*2];// B
pix[x] = BYTE(v1 + v2 - 0x80); // new R
pix[x+w] = BYTE(v2); // new G
pix[x+w*2] = BYTE(v3 + ((pix[x] + pix[x+w]) >> 1) - 0x80); // new B
}
}
break;
case COLORXFORM_HP3:
for(int y = 0; y < _info.height; y++)
{
BYTE* pix = (BYTE*)pvoid + y*lwidth;
for(int x = 0; x < _info.width; x++)
{
int v1 = pix[x]; // R
int v2 = pix[x+w]; // G
int v3 = pix[x+w*2];// B
int G = v1 - ((v3 + v2)>>2)+0x40;
pix[x] = BYTE(v3 + G - 0x80); // new R
pix[x+w] = BYTE(G); // new G
pix[x+w*2] = BYTE(v2 + G - 0x80); // new B
}
}
break;
case COLORXFORM_NONE:
default:
break;
}
}

40
scan.h
View File

@ -186,14 +186,14 @@ public:
void DoLine(SAMPLE* pdummy);
void DoLine(Triplet* pdummy);
void DoScan(PIXEL* ptype, BYTE* pbyteCompressed, size_t cbyteCompressed);
void DoScan(BYTE* pbyteCompressed, size_t cbyteCompressed);
public:
void InitDefault();
void InitParams(LONG t1, LONG t2, LONG t3, LONG nReset);
size_t EncodeScan(const void* pvoid, const Size& size, LONG components, void* pvoidOut, size_t cbyte, void* pvoidCompare);
size_t DecodeScan(void* pvoidOut, const Size& size, LONG components, const void* pvoidIn, size_t cbyte, bool bCompare);
size_t EncodeScan(const void* pvoid, const Size& size, void* pvoidOut, size_t cbyte, void* pvoidCompare);
size_t DecodeScan(void* pvoidOut, const Size& size, const void* pvoidIn, size_t cbyte, bool bCompare);
protected:
// codec parameters
@ -202,7 +202,6 @@ protected:
LONG T1;
LONG T2;
LONG T3;
LONG _components; // only set for line interleaved mode
// compression context
JlsContext _contexts[365];
@ -696,57 +695,56 @@ void JlsCodec<TRAITS,STRATEGY>::DoLine(Triplet*)
template<class TRAITS, class STRATEGY>
void JlsCodec<TRAITS,STRATEGY>::DoScan(PIXEL* ptype, BYTE* pbyteCompressed, size_t cbyteCompressed)
void JlsCodec<TRAITS,STRATEGY>::DoScan(BYTE* pbyteCompressed, size_t cbyteCompressed)
{
STRATEGY::Init(pbyteCompressed, cbyteCompressed);
LONG pixelstride = _size.cx + 4;
int components = STRATEGY::_info.components;
std::vector<PIXEL> vectmp;
vectmp.resize((_components*2) * pixelstride);
vectmp.resize((components*2) * pixelstride);
std::vector<LONG> rgRUNindex;
rgRUNindex.resize(_components);
rgRUNindex.resize(components);
for (LONG iline = 0; iline < _size.cy; ++iline)
{
ptypePrev = &vectmp[1];
ptypeCur = &vectmp[1 + _components* pixelstride];
ptypeCur = &vectmp[1 + components* pixelstride];
if ((iline & 1) == 1)
{
std::swap(ptypePrev, ptypeCur);
}
STRATEGY::OnLineBegin(ptype, iline, _size.cx, ptypeCur, pixelstride);
for (int component = 0; component < _components; ++component)
STRATEGY::OnLineBegin(iline, _size.cx, ptypeCur, pixelstride);
for (int component = 0; component < components; ++component)
{
RUNindex = rgRUNindex[component];
PIXEL* ptypeLine = ptype + (iline * _components + component) * _size.cx;
// initialize edge pixels used for prediction
ptypePrev[_size.cx] = ptypePrev[_size.cx - 1];
ptypeCur[-1] = ptypePrev[0];
DoLine((PIXEL*) NULL); // dummy arg for overload resolution
STRATEGY::OnLineEnd(ptypeCur, ptypeLine, _size.cx);
rgRUNindex[component] = RUNindex;
ptypePrev += pixelstride;
ptypeCur += pixelstride;
}
STRATEGY::OnLineEnd(iline, _size.cx, ptypeCur - (components * pixelstride), pixelstride);
}
}
template<class TRAITS, class STRATEGY>
size_t JlsCodec<TRAITS,STRATEGY>::EncodeScan(const void* pvoid, const Size& size, LONG components, void* pvoidOut, size_t cbyte, void* pvoidCompare)
size_t JlsCodec<TRAITS,STRATEGY>::EncodeScan(const void* pvoid, const Size& size, void* pvoidOut, size_t cbyte, void* pvoidCompare)
{
_size = size;
_components = components;
const PIXEL* ptype = static_cast<const PIXEL*>(pvoid);
BYTE* pbyteCompressed = static_cast<BYTE*>(pvoidOut);
if (pvoidCompare != NULL)
@ -757,7 +755,9 @@ size_t JlsCodec<TRAITS,STRATEGY>::EncodeScan(const void* pvoid, const Size& size
STRATEGY::_qdecoder = pdecoder;
}
DoScan(const_cast<PIXEL*>(ptype), pbyteCompressed, cbyte);
STRATEGY::_ptypeUncompressed = pvoid;
DoScan(pbyteCompressed, cbyte);
STRATEGY::Flush();
@ -768,7 +768,7 @@ size_t JlsCodec<TRAITS,STRATEGY>::EncodeScan(const void* pvoid, const Size& size
template<class TRAITS, class STRATEGY>
size_t JlsCodec<TRAITS,STRATEGY>::DecodeScan(void* pvoidOut, const Size& size, LONG components, const void* pvoidIn, size_t cbyte, bool bCompare)
size_t JlsCodec<TRAITS,STRATEGY>::DecodeScan(void* pvoidOut, const Size& size, const void* pvoidIn, size_t cbyte, bool bCompare)
{
PIXEL* ptypeOut = static_cast<PIXEL*>(pvoidOut);
BYTE* pbyteCompressed = const_cast<BYTE*>(static_cast<const BYTE*>(pvoidIn));
@ -786,9 +786,9 @@ size_t JlsCodec<TRAITS,STRATEGY>::DecodeScan(void* pvoidOut, const Size& size, L
cbyteRead += cbyteScanheader;
_size = size;
_components = components;
DoScan(const_cast<PIXEL*>(ptypeOut), pbyteCompressed + cbyteRead, cbyte - cbyteRead);
STRATEGY::_ptypeUncompressed = ptypeOut;
DoScan(pbyteCompressed + cbyteRead, cbyte - cbyteRead);
return STRATEGY::GetCurBytePos() - pbyteCompressed;
}

2
stdafx.h
View File

@ -8,9 +8,9 @@
#if defined(WIN32)
#define CHARLS_IMEXPORT __declspec(dllexport)
#pragma warning (disable:4100)
#endif
#include "util.h"

3
streams.h
View File

@ -145,8 +145,7 @@ private:
// Color Transform Application Markers & Code Stream (HP extension)
void ReadColorSpace();
void ReadColorXForm();
void DoColorXForm(void* pvoid);
private:
const BYTE* _pdata;
size_t _cbyteOffset;

15
test/test.cpp
View File

@ -11,6 +11,7 @@
#include "../util.h"
#include "../defaulttraits.h"
#include "../losslesstraits.h"
#include "../colortransform.h"
#include "time.h"
@ -107,7 +108,6 @@ void TestRoundTrip(const char* strName, std::vector<BYTE>& rgbyteRaw, Size size,
{
params.ilv = ILV_LINE;
params.colorTransform = 1;
Triplet2Line(rgbyteRaw,size);
}
size_t cbyteCompressed;
@ -173,6 +173,8 @@ void TestCompliance(const BYTE* pbyteCompressed, int cbyteCompressed, const BYTE
}
void TestFile(SZC strName, int ioffs, Size size2, int cbit, int ccomp)
{
std::vector<BYTE> rgbyteUncompressed;
@ -277,9 +279,6 @@ void TestNoiseImage()
}
void DecompressFile(SZC strNameEncoded, SZC strNameRaw, int ioffs)
{
std::cout << "Conformance test:" << strNameEncoded << "\n\r";
@ -308,11 +307,6 @@ void DecompressFile(SZC strNameEncoded, SZC strNameRaw, int ioffs)
Triplet2Planar(rgbyteRaw, Size(metadata.width, metadata.height));
}
if (metadata.ilv == ILV_LINE && metadata.components == 3)
{
Triplet2Line(rgbyteRaw, Size(metadata.width, metadata.height));
}
TestCompliance(&rgbyteFile[0], rgbyteFile.size(), &rgbyteRaw[0], rgbyteRaw.size());
}
@ -418,6 +412,7 @@ void TestConformance()
// Test 3
DecompressFile("test/conformance/T8C2E0.JLS", "test/conformance/TEST8.PPM", 15);
// Test 4
DecompressFile("test/conformance/T8C0E3.JLS", "test/conformance/TEST8.PPM",15);
@ -436,7 +431,7 @@ void TestConformance()
// Test 10
DecompressFile("test/conformance/T8NDE3.JLS", "test/conformance/TEST8BS2.PGM",15);
// Test 11
DecompressFile("test/conformance/T16E0.JLS", "test/conformance/TEST16.PGM",16);

18
util.h
View File

@ -118,9 +118,21 @@ struct Triplet
v3((BYTE)x3)
{};
BYTE v1;
BYTE v2;
BYTE v3;
union
{
BYTE v1;
BYTE R;
};
union
{
BYTE v2;
BYTE G;
};
union
{
BYTE v3;
BYTE B;
};
};