From 6f68b6c3520f66ae0a54346c6f357a5f53dedec0 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Tue, 20 Mar 2018 10:29:28 +0200 Subject: [PATCH] Fixed JPEG errors reporting GCC/Clang reported these warnings: src/textures/jpegtexture.cpp:305:29: warning: data argument not used by format string [-Wformat-extra-args] src/textures/jpegtexture.cpp:388:28: warning: data argument not used by format string [-Wformat-extra-args] src/textures/jpegtexture.cpp:432:29: warning: data argument not used by format string [-Wformat-extra-args] src/textures/jpegtexture.cpp:481:28: warning: data argument not used by format string [-Wformat-extra-args] --- src/textures/jpegtexture.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/textures/jpegtexture.cpp b/src/textures/jpegtexture.cpp index 93aac09ca..33ecaf148 100644 --- a/src/textures/jpegtexture.cpp +++ b/src/textures/jpegtexture.cpp @@ -302,7 +302,7 @@ uint8_t *FJPEGTexture::MakeTexture (FRenderStyle style) (cinfo.out_color_space == JCS_YCbCr && cinfo.num_components == 3) || (cinfo.out_color_space == JCS_GRAYSCALE && cinfo.num_components == 1))) { - Printf(TEXTCOLOR_ORANGE, "Unsupported color format in %s\n", Wads.GetLumpFullPath(SourceLump).GetChars()); + Printf(TEXTCOLOR_ORANGE "Unsupported color format in %s\n", Wads.GetLumpFullPath(SourceLump).GetChars()); } else { @@ -385,7 +385,7 @@ uint8_t *FJPEGTexture::MakeTexture (FRenderStyle style) } catch (int) { - Printf(TEXTCOLOR_ORANGE, "JPEG error in %s\n", Wads.GetLumpFullPath(SourceLump).GetChars()); + Printf(TEXTCOLOR_ORANGE "JPEG error in %s\n", Wads.GetLumpFullPath(SourceLump).GetChars()); } jpeg_destroy_decompress(&cinfo); if (buff != NULL) @@ -429,7 +429,7 @@ int FJPEGTexture::CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate, FC (cinfo.out_color_space == JCS_YCbCr && cinfo.num_components == 3) || (cinfo.out_color_space == JCS_GRAYSCALE && cinfo.num_components == 1))) { - Printf(TEXTCOLOR_ORANGE, "Unsupported color format in %s\n", Wads.GetLumpFullPath(SourceLump).GetChars()); + Printf(TEXTCOLOR_ORANGE "Unsupported color format in %s\n", Wads.GetLumpFullPath(SourceLump).GetChars()); } else { @@ -478,7 +478,7 @@ int FJPEGTexture::CopyTrueColorPixels(FBitmap *bmp, int x, int y, int rotate, FC } catch (int) { - Printf(TEXTCOLOR_ORANGE, "JPEG error in %s\n", Wads.GetLumpFullPath(SourceLump).GetChars()); + Printf(TEXTCOLOR_ORANGE "JPEG error in %s\n", Wads.GetLumpFullPath(SourceLump).GetChars()); } jpeg_destroy_decompress(&cinfo); if (buff != NULL) delete [] buff;