diff options
| -rw-r--r-- | graphics/pixelformat.h | 2 | ||||
| -rw-r--r-- | graphics/scaler.cpp | 15 |
2 files changed, 1 insertions, 16 deletions
diff --git a/graphics/pixelformat.h b/graphics/pixelformat.h index b08321efd7..400385c93a 100644 --- a/graphics/pixelformat.h +++ b/graphics/pixelformat.h @@ -76,7 +76,6 @@ struct PixelFormat { byte rLoss, gLoss, bLoss, aLoss; /**< Precision loss of each color component. */ byte rShift, gShift, bShift, aShift; /**< Binary left shift of each color component in the pixel value. */ -#ifdef ENABLE_16BIT inline PixelFormat() { bytesPerPixel = rLoss = gLoss = bLoss = aLoss = @@ -91,6 +90,7 @@ struct PixelFormat { rShift = RShift, gShift = GShift, bShift = BShift, aShift = AShift; } +#ifdef ENABLE_16BIT //Convenience constructor from enum type //TODO: BGR support //TODO: Specify alpha position diff --git a/graphics/scaler.cpp b/graphics/scaler.cpp index 3a2643ff91..082258bfc0 100644 --- a/graphics/scaler.cpp +++ b/graphics/scaler.cpp @@ -30,32 +30,17 @@ int gBitFormat = 565; -#ifdef ENABLE_16BIT static const Graphics::PixelFormat gPixelFormat555( -#else -static const Graphics::PixelFormat gPixelFormat555 = { -#endif 2, 3, 3, 3, 8, 10, 5, 0, 0 -#ifdef ENABLE_16BIT ); static const Graphics::PixelFormat gPixelFormat565( -#else - }; - -static const Graphics::PixelFormat gPixelFormat565 = { -#endif 2, 3, 2, 3, 8, 11, 5, 0, 0 -#ifdef ENABLE_16BIT ); -#else - }; -#endif - #ifndef DISABLE_HQ_SCALERS |