thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GRAPHICS: 32bpp-ize chooseGreyscale for Edge plugin

Browse source
This commit is contained in:
Eric Culp 2012-06-29 05:09:37 -04:00 • committed by Filippos Karapetis
parent 4552ec6138
commit 0dcd6bae37
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
graphics/scaler/edge.cpp
View file

@ -329,14 +329,15 @@ uint16 convertTo16Bit(Pixel p) {
* bitplanes. The increase in image quality is well worth the speed hit.
*
*/
int16 *EdgePlugin::chooseGreyscale(uint16 *pixels) {
template<typename ColorMask, typename Pixel>
int16 *EdgePlugin::chooseGreyscale(Pixel *pixels) {
int i, j;
int32 scores[3];
for (i = 0; i < 3; i++) {
int16 *diff_ptr;
int16 *bptr;
uint16 *pptr;
Pixel *pptr;
int16 *grey_ptr;
int16 center;
int32 sum_diffs;
@ -349,10 +350,10 @@ int16 *EdgePlugin::chooseGreyscale(uint16 *pixels) {
bptr = _bplanes[i];
pptr = pixels;
for (j = 9; j; --j)
*bptr++ = grey_ptr[*pptr++];
*bptr++ = grey_ptr[convertTo16Bit<ColorMask, Pixel>(*pptr++)];
bptr = _bplanes[i];
center = grey_ptr[pixels[4]];
center = grey_ptr[convertTo16Bit<ColorMask, Pixel>(pixels[4])];
diff_ptr = _greyscaleDiffs[i];
/* calculate the delta from center pixel */
@ -3416,7 +3417,7 @@ void EdgePlugin::antiAliasPass3x(const uint8 *src, uint8 *dst,
}
#endif
diffs = chooseGreyscale(pixels);
diffs = chooseGreyscale<ColorMask, Pixel>(pixels);
/* block of solid color */
if (!diffs) {
@ -3495,7 +3496,7 @@ void EdgePlugin::antiAliasPass2x(const uint8 *src, uint8 *dst,
}
#endif
diffs = chooseGreyscale(pixels);
diffs = chooseGreyscale<ColorMask, Pixel>(pixels);
/* block of solid color */
if (!diffs) {

3
graphics/scaler/edge.h
View file

@ -39,7 +39,8 @@ public:
virtual const char *getName() const;
virtual const char *getPrettyName() const;
private:
int16* chooseGreyscale(uint16 *pixels);
template<typename ColorMask, typename Pixel>
int16* chooseGreyscale(Pixel *pixels);
template<typename ColorMask, typename Pixel>
int32 calcPixelDiffNosqrt(Pixel pixel1, Pixel pixel2);
int findPrincipleAxis(uint16 *pixels, int16 *diffs, int16 *bplane,