Revert partially (auto) "reformat code! now the code is only ugly on the *inside*"

[xonotic/netradiant.git] / plugins / image / ktx.cpp

diff --git a/plugins/image/ktx.cpp b/plugins/image/ktx.cpp
index 582d0b8b3652eeee74b321c3522e5bd983e09126..696ede55dfcaba4b9d5a27cdf6795adfe91f6acf 100644 (file)
--- a/plugins/image/ktx.cpp
+++ b/plugins/image/ktx.cpp
@@ -29,24 +29,25 @@
 #include "imagelib.h"
 
 
-#define KTX_TYPE_UNSIGNED_BYTE                         0x1401
-#define KTX_TYPE_UNSIGNED_SHORT_4_4_4_4                0x8033
-#define KTX_TYPE_UNSIGNED_SHORT_5_5_5_1                0x8034
-#define KTX_TYPE_UNSIGNED_SHORT_5_6_5          0x8363
+const int KTX_TYPE_UNSIGNED_BYTE                       = 0x1401;
+const int KTX_TYPE_UNSIGNED_SHORT_4_4_4_4      = 0x8033;
+const int KTX_TYPE_UNSIGNED_SHORT_5_5_5_1      = 0x8034;
+const int KTX_TYPE_UNSIGNED_SHORT_5_6_5                = 0x8363;
 
-#define KTX_FORMAT_ALPHA                                       0x1906
-#define KTX_FORMAT_RGB                                         0x1907
-#define KTX_FORMAT_RGBA                                                0x1908
-#define KTX_FORMAT_LUMINANCE                           0x1909
-#define KTX_FORMAT_LUMINANCE_ALPHA                     0x190A
-#define KTX_FORMAT_BGR                                         0x80E0
-#define KTX_FORMAT_BGRA                                                0x80E1
+const int KTX_FORMAT_ALPHA                                     = 0x1906;
+const int KTX_FORMAT_RGB                                       = 0x1907;
+const int KTX_FORMAT_RGBA                                      = 0x1908;
+const int KTX_FORMAT_LUMINANCE                         = 0x1909;
+const int KTX_FORMAT_LUMINANCE_ALPHA           = 0x190A;
+const int KTX_FORMAT_BGR                                       = 0x80E0;
+const int KTX_FORMAT_BGRA                                      = 0x80E1;
 
-#define KTX_FORMAT_ETC1_RGB8                           0x8D64
+const int KTX_FORMAT_ETC1_RGB8                         = 0x8D64;
 
 class KTX_Decoder
 {
 public:
+       virtual ~KTX_Decoder() = default;
        virtual void Decode( PointerInputStream& istream, byte* out ) = 0;
        virtual unsigned int GetPixelSize() = 0;
 };