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

GRAPHICS: Various formatting fixes

Browse source
This commit is contained in:
Eric Culp 2012-07-24 17:44:45 -04:00 • committed by Filippos Karapetis
parent 4c967c5fbc
commit 4c4028cf1d
4 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

12
graphics/scaler/edge.cpp
View file

@ -1771,7 +1771,7 @@ int EdgePlugin::fixKnights(int sub_type, Pixel *pixels, int8 *sim) {
#define greenMask 0x07E0
template<typename ColorMask, typename Pixel>
void EdgePlugin::anti_alias_grid_clean_3x(uint8 *dptr, int dstPitch,
void EdgePlugin::antiAliasGridClean3x(uint8 *dptr, int dstPitch,
Pixel *pixels, int sub_type, int16 *bptr) {
Pixel *dptr2;
int16 tmp_grey;
@ -2370,7 +2370,7 @@ void EdgePlugin::anti_alias_grid_clean_3x(uint8 *dptr, int dstPitch,
template<typename ColorMask, typename Pixel>
void EdgePlugin::anti_alias_grid_2x(uint8 *dptr, int dstPitch,
void EdgePlugin::antiAliasGrid2x(uint8 *dptr, int dstPitch,
Pixel *pixels, int sub_type, int16 *bptr,
int8 *sim,
int interpolate_2x) {
@ -3363,7 +3363,7 @@ void EdgePlugin::antiAliasPass3x(const uint8 *src, uint8 *dst,
/* block of solid color */
if (!diffs) {
anti_alias_grid_clean_3x<ColorMask, Pixel>((uint8 *) dptr16, dstPitch, pixels,
antiAliasGridClean3x<ColorMask, Pixel>((uint8 *) dptr16, dstPitch, pixels,
0, NULL);
continue;
}
@ -3377,7 +3377,7 @@ void EdgePlugin::antiAliasPass3x(const uint8 *src, uint8 *dst,
if (sub_type >= 0)
sub_type = fixKnights<Pixel>(sub_type, pixels, sim);
anti_alias_grid_clean_3x<ColorMask, Pixel>((uint8 *) dptr16, dstPitch, pixels,
antiAliasGridClean3x<ColorMask, Pixel>((uint8 *) dptr16, dstPitch, pixels,
sub_type, bplane);
}
}
@ -3443,7 +3443,7 @@ void EdgePlugin::antiAliasPass2x(const uint8 *src, uint8 *dst,
/* block of solid color */
if (!diffs) {
anti_alias_grid_2x<ColorMask, Pixel>((uint8 *) dptr16, dstPitch, pixels,
antiAliasGrid2x<ColorMask, Pixel>((uint8 *) dptr16, dstPitch, pixels,
0, NULL, NULL, 0);
continue;
}
@ -3457,7 +3457,7 @@ void EdgePlugin::antiAliasPass2x(const uint8 *src, uint8 *dst,
if (sub_type >= 0)
sub_type = fixKnights<Pixel>(sub_type, pixels, sim);
anti_alias_grid_2x<ColorMask, Pixel>((uint8 *) dptr16, dstPitch, pixels,
antiAliasGrid2x<ColorMask, Pixel>((uint8 *) dptr16, dstPitch, pixels,
sub_type, bplane, sim,
interpolate_2x);
}

6
graphics/scaler/edge.h
View file

@ -70,7 +70,7 @@ private:
* bitplanes. The increase in image quality is well worth the speed hit.
*/
template<typename ColorMask, typename Pixel>
int16* chooseGreyscale(Pixel *pixels);
int16 *chooseGreyscale(Pixel *pixels);
/**
* Calculate the distance between pixels in RGB space. Greyscale isn't
@ -131,7 +131,7 @@ private:
* Fill pixel grid with or without interpolation, using the detected edge
*/
template<typename ColorMask, typename Pixel>
void anti_alias_grid_2x(uint8 *dptr, int dstPitch,
void antiAliasGrid2x(uint8 *dptr, int dstPitch,
Pixel *pixels, int sub_type, int16 *bptr,
int8 *sim,
int interpolate_2x);
@ -140,7 +140,7 @@ private:
* Fill pixel grid without interpolation, using the detected edge
*/
template<typename ColorMask, typename Pixel>
void anti_alias_grid_clean_3x(uint8 *dptr, int dstPitch,
void antiAliasGridClean3x(uint8 *dptr, int dstPitch,
Pixel *pixels, int sub_type, int16 *bptr);
/**

12
graphics/scalerplugin.cpp
View file

@ -45,17 +45,17 @@ void SourceScaler::scale(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr,
if (!_enable) {
// Do not pass _oldSrc, do not update _oldSrc
internScale(srcPtr, srcPitch,
dstPtr, dstPitch,
NULL, 0,
width, height);
dstPtr, dstPitch,
NULL, 0,
width, height);
return;
}
int offset = (_padding + x) * _format.bytesPerPixel + (_padding + y) * srcPitch;
// Call user defined scale function
internScale(srcPtr, srcPitch,
dstPtr, dstPitch,
_oldSrc + offset, srcPitch,
width, height);
dstPtr, dstPitch,
_oldSrc + offset, srcPitch,
width, height);
// Update old src
byte *oldSrc = _oldSrc + offset;
while (height--) {

4
graphics/scalerplugin.h
View file

@ -29,7 +29,7 @@ class ScalerPluginObject : public PluginObject {
public:
virtual ~ScalerPluginObject() {}
/**
* This function will be called before any scaler is used.
* Precomputed data should be generated here.
@ -61,7 +61,7 @@ public:
virtual uint getFactor() const = 0;
virtual const Common::Array<uint>& getFactors() const { return _factors; }
virtual const Common::Array<uint> &getFactors() const { return _factors; }
/**
* Set the scaling factor.