Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-01 22:07:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LCMS LI16F_FORWARD renamed to LI8F_FORWARD - bug 457626.r=vlad

Browse Source
This commit is contained in:
Bobby Holley 2008-12-06 22:55:10 -08:00
parent 5f37f7253e
commit dabb3abcab
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gfx/thebes/src/gfxPlatform.cpp
View File

@ -642,7 +642,7 @@ gfxPlatform::GetCMSsRGBProfile()
/* Precache the Fixed-point Interpolations for sRGB as an input
profile. See bug 444661 for details. */
cmsPrecacheProfile(gCMSsRGBProfile, CMS_PRECACHE_LI16F_FORWARD);
cmsPrecacheProfile(gCMSsRGBProfile, CMS_PRECACHE_LI8F_FORWARD);
}
return gCMSsRGBProfile;
}

2
gfx/thebes/test/gfxColorManagementTest.cpp
View File

@ -308,7 +308,7 @@ RunTest(struct TestContext *ctx, struct TestParams *params,
/* Precache. */
cmsPrecacheProfile(inProfile, CMS_PRECACHE_LI16W_FORWARD);
cmsPrecacheProfile(inProfile, CMS_PRECACHE_LI16F_FORWARD);
cmsPrecacheProfile(inProfile, CMS_PRECACHE_LI8F_FORWARD);
cmsPrecacheProfile(outProfile, CMS_PRECACHE_LI1616_REVERSE);
cmsPrecacheProfile(outProfile, CMS_PRECACHE_LI168_REVERSE);

10
modules/lcms/include/lcms.h
View File

@ -1776,14 +1776,14 @@ typedef enum {
CMS_PRECACHE_LI1616_REVERSE = 0,
CMS_PRECACHE_LI168_REVERSE = 1,
CMS_PRECACHE_LI16W_FORWARD = 2,
CMS_PRECACHE_LI16F_FORWARD = 3,
CMS_PRECACHE_LI8F_FORWARD = 3,
PRECACHE_TYPE_COUNT
} LCMSPRECACHETYPE;
#define IS_LI_REVERSE(Type) ((Type == CMS_PRECACHE_LI1616_REVERSE) || \
(Type == CMS_PRECACHE_LI168_REVERSE))
#define IS_LI_FORWARD(Type) ((Type == CMS_PRECACHE_LI16W_FORWARD) || \
(Type == CMS_PRECACHE_LI16F_FORWARD))
(Type == CMS_PRECACHE_LI8F_FORWARD))
// Implementation structure for a 16 bit to 16 bit linear interpolations
@ -1811,12 +1811,12 @@ typedef struct _lcms_precache_li16w_impl {
} LCMSPRECACHELI16WIMPL, FAR* LPLCMSPRECACHELI16WIMPL;
// Implementation structure for 16 bit to floating-point linear interpolations
typedef struct _lcms_precache_li16f_impl {
typedef struct _lcms_precache_li8f_impl {
// Tables containing the precomputed values
LPFLOAT Cache[3];
} LCMSPRECACHELI16FIMPL, FAR* LPLCMSPRECACHELI16FIMPL;
} LCMSPRECACHELI8FIMPL, FAR* LPLCMSPRECACHELI8FIMPL;
// This is a struct containing data related to precached linear interpolations
// on a profile.
@ -1838,7 +1838,7 @@ typedef struct _lcms_precache_struct {
LCMSPRECACHELI1616IMPL LI1616_REVERSE;
LCMSPRECACHELI168IMPL LI168_REVERSE;
LCMSPRECACHELI16WIMPL LI16W_FORWARD;
LCMSPRECACHELI16FIMPL LI16F_FORWARD;
LCMSPRECACHELI8FIMPL LI8F_FORWARD;
} Impl;
} LCMSPRECACHE, FAR* LPLCMSPRECACHE;

10
modules/lcms/src/cmsprecache.c
View File

@ -169,10 +169,10 @@ LCMSBOOL LCMSEXPORT cmsPrecacheProfile(cmsHPROFILE hProfile,
cmsLinearInterpFixed((WORD)j, GTables[i]->GammaTable, &p16);
break;
case CMS_PRECACHE_LI16F_FORWARD:
case CMS_PRECACHE_LI8F_FORWARD:
// Allocate the precache tables
cmsAllocPrecacheTables(Icc, Type, LI16F_FORWARD, 3, sizeof(FLOAT), 256);
cmsAllocPrecacheTables(Icc, Type, LI8F_FORWARD, 3, sizeof(FLOAT), 256);
// Calculate the interpolation parameters
cmsCalcL16Params(GTables[0]->nEntries, &p16);
@ -180,7 +180,7 @@ LCMSBOOL LCMSEXPORT cmsPrecacheProfile(cmsHPROFILE hProfile,
// Compute the cache
for (i = 0; i < 3; ++i)
for (j = 0; j < 256; ++j)
Icc->Precache[Type]->Impl.LI16F_FORWARD.Cache[i][j] =
Icc->Precache[Type]->Impl.LI8F_FORWARD.Cache[i][j] =
ToFloatDomain(cmsLinearInterpLUT16(RGB_8_TO_16(((BYTE)j)), GTables[i]->GammaTable, &p16));
break;
@ -233,9 +233,9 @@ void cmsPrecacheFree(LPLCMSPRECACHE Cache) {
_cmsFree(Cache->Impl.LI16W_FORWARD.Cache[i]);
break;
case CMS_PRECACHE_LI16F_FORWARD:
case CMS_PRECACHE_LI8F_FORWARD:
for (i = 0; i < 3; ++i)
_cmsFree(Cache->Impl.LI16F_FORWARD.Cache[i]);
_cmsFree(Cache->Impl.LI8F_FORWARD.Cache[i]);
break;
default:

8
modules/lcms/src/cmsxform.c
View File

@ -654,9 +654,9 @@ void MatrixShaperXFORMFloat(_LPcmsTRANSFORM p,
{
if (MatShaper->L2_Precache != NULL)
{
FloatVals->n[VX] = MatShaper->L2_Precache->Impl.LI16F_FORWARD.Cache[0][In[0]];
FloatVals->n[VY] = MatShaper->L2_Precache->Impl.LI16F_FORWARD.Cache[1][In[1]];
FloatVals->n[VZ] = MatShaper->L2_Precache->Impl.LI16F_FORWARD.Cache[2][In[2]];
FloatVals->n[VX] = MatShaper->L2_Precache->Impl.LI8F_FORWARD.Cache[0][In[0]];
FloatVals->n[VY] = MatShaper->L2_Precache->Impl.LI8F_FORWARD.Cache[1][In[1]];
FloatVals->n[VZ] = MatShaper->L2_Precache->Impl.LI8F_FORWARD.Cache[2][In[2]];
}
else
{
@ -1066,7 +1066,7 @@ LCMSBOOL cmsBuildSmeltMatShaper(_LPcmsTRANSFORM p)
// Check for the relevant precaches
if (p -> dwOriginalFlags & cmsFLAGS_FLOATSHAPER) {
InPrecache = ((LPLCMSICCPROFILE)p->InputProfile)->Precache[CMS_PRECACHE_LI16F_FORWARD];
InPrecache = ((LPLCMSICCPROFILE)p->InputProfile)->Precache[CMS_PRECACHE_LI8F_FORWARD];
OutPrecache = ((LPLCMSICCPROFILE)p->OutputProfile)->Precache[CMS_PRECACHE_LI168_REVERSE];
}
else {