From 3749e167b469b4a5201fd66d257cad553e5df84d Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Thu, 19 Nov 2020 11:51:33 -0500 Subject: [PATCH] LibGfx: Move JPGLoader to a more regular JPG_DEBUG macro as used elsewhere --- Libraries/LibGfx/JPGLoader.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/Libraries/LibGfx/JPGLoader.cpp b/Libraries/LibGfx/JPGLoader.cpp index c12b999525..0ca84283ce 100644 --- a/Libraries/LibGfx/JPGLoader.cpp +++ b/Libraries/LibGfx/JPGLoader.cpp @@ -35,10 +35,7 @@ #include #include -#define JPG_DBG 0 -#define jpg_dbg(x) \ - if (JPG_DBG) \ - dbg() << x +//#define JPG_DEBUG #define JPG_INVALID 0X0000 @@ -378,10 +375,12 @@ static Optional> decode_huffman_stream(JPGLoadingContext& con Vector macroblocks; macroblocks.resize(context.mblock_meta.padded_total); - jpg_dbg("Image width: " << context.frame.width); - jpg_dbg("Image height: " << context.frame.height); - jpg_dbg("Macroblocks in a row: " << context.mblock_meta.hpadded_count); - jpg_dbg("Macroblocks in a column: " << context.mblock_meta.vpadded_count); +#ifdef JPG_DEBUG + dbg() << "Image width: " << context.frame.width; + dbg() << "Image height: " << context.frame.height; + dbg() << "Macroblocks in a row: " << context.mblock_meta.hpadded_count; + dbg() << "Macroblocks in a column: " << context.mblock_meta.vpadded_count; +#endif // Compute huffman codes for DC and AC tables. for (auto& dc_table : context.dc_tables) @@ -698,8 +697,10 @@ static inline bool validate_luma_and_modify_context(const ComponentSpec& luma, J // For easy reference to relevant sample factors. context.hsample_factor = luma.hsample_factor; context.vsample_factor = luma.vsample_factor; - jpg_dbg(String::format("Horizontal Subsampling Factor: %i", luma.hsample_factor)); - jpg_dbg(String::format("Vertical Subsampling Factor: %i", luma.vsample_factor)); +#ifdef JPG_DEBUG + dbg() << String::format("Horizontal Subsampling Factor: %i", luma.hsample_factor); + dbg() << String::format("Vertical Subsampling Factor: %i", luma.vsample_factor); +#endif return true; } return false;