Skip to content

Fix typo in get/set palette functions #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bigunclemax wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix typo in get/set palette functions #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions exoquant.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,10 +253,10 @@ void exq_get_palette(exq_data *pExq, unsigned char *pPal, int nColors)
r /= a; g/= a; b/= a;
}

pPal[0] = (unsigned char)(r / SCALE_R * 255.9f);
pPal[1] = (unsigned char)(g / SCALE_G * 255.9f);
pPal[2] = (unsigned char)(b / SCALE_B * 255.9f);
pPal[3] = (unsigned char)(a / SCALE_A * 255.9f);
pPal[0] = (unsigned char)(r / SCALE_R * 255.0f);
pPal[1] = (unsigned char)(g / SCALE_G * 255.0f);
pPal[2] = (unsigned char)(b / SCALE_B * 255.0f);
pPal[3] = (unsigned char)(a / SCALE_A * 255.0f);

for(j = 0; j < 3; j++)
pPal[j] = (pPal[j] + (1 << (8 - pExq->numBitsPerChannel)) / 2) & channelMask;
Expand All @@ -272,10 +272,10 @@ void exq_set_palette(exq_data *pExq, unsigned char *pPal, int nColors)

for(i = 0; i < nColors; i++)
{
pExq->node[i].avg.r = *pPal++ * SCALE_R / 255.9f;
pExq->node[i].avg.g = *pPal++ * SCALE_G / 255.9f;
pExq->node[i].avg.b = *pPal++ * SCALE_B / 255.9f;
pExq->node[i].avg.a = *pPal++ * SCALE_A / 255.9f;
pExq->node[i].avg.r = *pPal++ * SCALE_R / 255.0f;
pExq->node[i].avg.g = *pPal++ * SCALE_G / 255.0f;
pExq->node[i].avg.b = *pPal++ * SCALE_B / 255.0f;
pExq->node[i].avg.a = *pPal++ * SCALE_A / 255.0f;
}

pExq->optimized = 1;
Expand Down Expand Up @@ -705,4 +705,4 @@ exq_float exq_sort_by_dir(const exq_histogram *pHist)
pHist->color.g * exq_sort_dir.g +
pHist->color.b * exq_sort_dir.b +
pHist->color.a * exq_sort_dir.a;
}
}