From 1ff3f481c448fd8bc1eaf7b8b14b2d21ae36d92f Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Sat, 14 May 2022 15:07:45 +1000 Subject: [PATCH] Launcher: Change yellow to red for invalid field value errors --- misc/D3D11ShaderGen.c | 2 +- src/LScreens.c | 12 ++++++------ src/Launcher.c | 14 +++++++------- src/_D3D11Shaders.h | 30 +++++++++++++++--------------- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/misc/D3D11ShaderGen.c b/misc/D3D11ShaderGen.c index 0fdae3b5d..558ebfd81 100644 --- a/misc/D3D11ShaderGen.c +++ b/misc/D3D11ShaderGen.c @@ -116,7 +116,7 @@ static void CompileShader(LPCSTR src, LPCSTR name, LPCSTR profile, const D3D_SHA unsigned char* data = GetBlobPointer(shaderBlob); SIZE_T size = GetBlobSize(shaderBlob); - printf("static unsigned char %s[%i] = {\n", name, size); + printf("static const unsigned char %s[%i] = {\n", name, size); for (int i = 0; i < size; ) { diff --git a/src/LScreens.c b/src/LScreens.c index d9f2122dc..2521c67c1 100644 --- a/src/LScreens.c +++ b/src/LScreens.c @@ -510,7 +510,7 @@ static void DirectConnectScreen_StartClient(void* w) { int index = String_LastIndexOf(addr, ':'); if (index == 0 || index == addr->length - 1) { - LLabel_SetConst(status, "&eInvalid address"); return; + LLabel_SetConst(status, "&cInvalid address"); return; } /* support either "[IP]" or "[IP]:[PORT]" */ @@ -523,13 +523,13 @@ static void DirectConnectScreen_StartClient(void* w) { } if (!user->length) { - LLabel_SetConst(status, "&eUsername required"); return; + LLabel_SetConst(status, "&cUsername required"); return; } if (!Socket_ValidAddress(&ip)) { - LLabel_SetConst(status, "&eInvalid ip"); return; + LLabel_SetConst(status, "&cInvalid ip"); return; } if (!Convert_ParseUInt16(&port, &raw_port)) { - LLabel_SetConst(status, "&eInvalid port"); return; + LLabel_SetConst(status, "&cInvalid port"); return; } if (!mppass->length) mppass = &defMppass; @@ -718,10 +718,10 @@ static void MainScreen_DoLogin(void) { cc_string* pass = &s->iptPassword.text; if (!user->length) { - LLabel_SetConst(&s->lblStatus, "&eUsername required"); return; + LLabel_SetConst(&s->lblStatus, "&cUsername required"); return; } if (!pass->length) { - LLabel_SetConst(&s->lblStatus, "&ePassword required"); return; + LLabel_SetConst(&s->lblStatus, "&cPassword required"); return; } if (GetTokenTask.Base.working) return; diff --git a/src/Launcher.c b/src/Launcher.c index 64e1bcaf5..762ecb67c 100644 --- a/src/Launcher.c +++ b/src/Launcher.c @@ -313,13 +313,13 @@ const struct LauncherTheme Launcher_NordicTheme = { BitmapCol_Make( 76, 86, 106, 255), /* button highlight */ }; -CC_NOINLINE static void Launcher_GetCol(const char* key, BitmapCol* col) { +CC_NOINLINE static void ParseColor(const char* key, BitmapCol* color) { cc_uint8 rgb[3]; cc_string value; if (!Options_UNSAFE_Get(key, &value)) return; if (!PackedCol_TryParseHex(&value, rgb)) return; - *col = BitmapCol_Make(rgb[0], rgb[1], rgb[2], 255); + *color = BitmapCol_Make(rgb[0], rgb[1], rgb[2], 255); } void Launcher_LoadTheme(void) { @@ -330,11 +330,11 @@ void Launcher_LoadTheme(void) { Launcher_Theme = Launcher_ModernTheme; Launcher_Theme.ClassicBackground = Options_GetBool("nostalgia-classicbg", false); - Launcher_GetCol("launcher-back-col", &Launcher_Theme.BackgroundColor); - Launcher_GetCol("launcher-btn-border-col", &Launcher_Theme.ButtonBorderColor); - Launcher_GetCol("launcher-btn-fore-active-col", &Launcher_Theme.ButtonForeActiveColor); - Launcher_GetCol("launcher-btn-fore-inactive-col", &Launcher_Theme.ButtonForeColor); - Launcher_GetCol("launcher-btn-highlight-inactive-col", &Launcher_Theme.ButtonHighlightColor); + ParseColor("launcher-back-col", &Launcher_Theme.BackgroundColor); + ParseColor("launcher-btn-border-col", &Launcher_Theme.ButtonBorderColor); + ParseColor("launcher-btn-fore-active-col", &Launcher_Theme.ButtonForeActiveColor); + ParseColor("launcher-btn-fore-inactive-col", &Launcher_Theme.ButtonForeColor); + ParseColor("launcher-btn-highlight-inactive-col", &Launcher_Theme.ButtonHighlightColor); } CC_NOINLINE static void Launcher_SetCol(const char* key, BitmapCol col) { diff --git a/src/_D3D11Shaders.h b/src/_D3D11Shaders.h index 1f3c13f9e..a0af7a9e0 100644 --- a/src/_D3D11Shaders.h +++ b/src/_D3D11Shaders.h @@ -3,7 +3,7 @@ //######################################################################################################################## //------------------------------------------------------Vertex shaders---------------------------------------------------- //######################################################################################################################## -static unsigned char vs_colored[804] = { +static const unsigned char vs_colored[804] = { 0x44,0x58,0x42,0x43,0x1a,0x76,0x9d,0x56,0x98,0x2d,0x30,0x9a,0x2f,0x00,0xd8,0xb0,0x6d,0xda,0x7a,0x6b,0x01,0x00,0x00,0x00,0x24,0x03,0x00,0x00,0x05,0x00,0x00,0x00, 0x34,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x50,0x01,0x00,0x00,0xa4,0x01,0x00,0x00,0xa8,0x02,0x00,0x00,0x52,0x44,0x45,0x46,0xc4,0x00,0x00,0x00,0x01,0x00,0x00,0x00, 0x48,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x04,0xfe,0xff,0x00,0x09,0x00,0x00,0x94,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -31,7 +31,7 @@ static unsigned char vs_colored[804] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, }; -static unsigned char vs_textured[912] = { +static const unsigned char vs_textured[912] = { 0x44,0x58,0x42,0x43,0x05,0x38,0x0a,0xc5,0x5e,0x15,0x86,0xef,0xa6,0xbc,0xb1,0x6a,0x8b,0x6c,0xf4,0x1e,0x01,0x00,0x00,0x00,0x90,0x03,0x00,0x00,0x05,0x00,0x00,0x00, 0x34,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x70,0x01,0x00,0x00,0xe4,0x01,0x00,0x00,0x14,0x03,0x00,0x00,0x52,0x44,0x45,0x46,0xc4,0x00,0x00,0x00,0x01,0x00,0x00,0x00, 0x48,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x04,0xfe,0xff,0x00,0x09,0x00,0x00,0x94,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -62,7 +62,7 @@ static unsigned char vs_textured[912] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, }; -static unsigned char vs_textured_offset[976] = { +static const unsigned char vs_textured_offset[976] = { 0x44,0x58,0x42,0x43,0x5c,0x17,0x5e,0xed,0xce,0x9c,0xa2,0x40,0x5c,0x3e,0x7c,0x93,0xb5,0xed,0x14,0x40,0x01,0x00,0x00,0x00,0xd0,0x03,0x00,0x00,0x05,0x00,0x00,0x00, 0x34,0x00,0x00,0x00,0x34,0x01,0x00,0x00,0xa4,0x01,0x00,0x00,0x18,0x02,0x00,0x00,0x54,0x03,0x00,0x00,0x52,0x44,0x45,0x46,0xf8,0x00,0x00,0x00,0x01,0x00,0x00,0x00, 0x48,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x04,0xfe,0xff,0x00,0x09,0x00,0x00,0xc8,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -100,7 +100,7 @@ static unsigned char vs_textured_offset[976] = { //######################################################################################################################## //------------------------------------------------------Pixel shaders----------------------------------------------------- //######################################################################################################################## -static unsigned char ps_colored[424] = { +static const unsigned char ps_colored[424] = { 0x44,0x58,0x42,0x43,0x16,0x20,0x1a,0xbf,0xc8,0x73,0x21,0xb1,0xcb,0xa1,0x3a,0x9c,0xc5,0xa5,0x36,0x55,0x01,0x00,0x00,0x00,0xa8,0x01,0x00,0x00,0x05,0x00,0x00,0x00, 0x34,0x00,0x00,0x00,0x88,0x00,0x00,0x00,0xb8,0x00,0x00,0x00,0xec,0x00,0x00,0x00,0x2c,0x01,0x00,0x00,0x52,0x44,0x45,0x46,0x4c,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x04,0xff,0xff,0x00,0x09,0x00,0x00,0x1c,0x00,0x00,0x00,0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66, @@ -116,7 +116,7 @@ static unsigned char ps_colored[424] = { 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, }; -static unsigned char ps_textured[632] = { +static const unsigned char ps_textured[632] = { 0x44,0x58,0x42,0x43,0x6b,0x07,0x3a,0x46,0xe7,0x48,0xcd,0xc6,0x61,0xf4,0x31,0x00,0x4d,0xa2,0x88,0x52,0x01,0x00,0x00,0x00,0x78,0x02,0x00,0x00,0x05,0x00,0x00,0x00, 0x34,0x00,0x00,0x00,0xdc,0x00,0x00,0x00,0x2c,0x01,0x00,0x00,0x60,0x01,0x00,0x00,0xfc,0x01,0x00,0x00,0x52,0x44,0x45,0x46,0xa0,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x04,0xff,0xff,0x00,0x09,0x00,0x00,0x6e,0x00,0x00,0x00,0x5c,0x00,0x00,0x00,0x03,0x00,0x00,0x00, @@ -138,7 +138,7 @@ static unsigned char ps_textured[632] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, }; -static unsigned char ps_colored_test[512] = { +static const unsigned char ps_colored_test[512] = { 0x44,0x58,0x42,0x43,0x96,0x8a,0x87,0x09,0x0b,0x87,0x03,0xec,0x5f,0xc8,0x2e,0xe4,0x75,0xae,0x39,0xc8,0x01,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x05,0x00,0x00,0x00, 0x34,0x00,0x00,0x00,0x88,0x00,0x00,0x00,0xb8,0x00,0x00,0x00,0xec,0x00,0x00,0x00,0x84,0x01,0x00,0x00,0x52,0x44,0x45,0x46,0x4c,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x04,0xff,0xff,0x00,0x09,0x00,0x00,0x1c,0x00,0x00,0x00,0x4d,0x69,0x63,0x72,0x6f,0x73,0x6f,0x66, @@ -156,7 +156,7 @@ static unsigned char ps_colored_test[512] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, }; -static unsigned char ps_textured_test[732] = { +static const unsigned char ps_textured_test[732] = { 0x44,0x58,0x42,0x43,0x79,0x06,0x95,0x54,0x09,0x72,0xe5,0xe5,0x96,0x93,0xa5,0x15,0x18,0x9d,0xd3,0x7e,0x01,0x00,0x00,0x00,0xdc,0x02,0x00,0x00,0x05,0x00,0x00,0x00, 0x34,0x00,0x00,0x00,0xdc,0x00,0x00,0x00,0x2c,0x01,0x00,0x00,0x60,0x01,0x00,0x00,0x60,0x02,0x00,0x00,0x52,0x44,0x45,0x46,0xa0,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x04,0xff,0xff,0x00,0x09,0x00,0x00,0x6e,0x00,0x00,0x00,0x5c,0x00,0x00,0x00,0x03,0x00,0x00,0x00, @@ -181,7 +181,7 @@ static unsigned char ps_textured_test[732] = { 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, }; -static unsigned char ps_colored_linear[820] = { +static const unsigned char ps_colored_linear[820] = { 0x44,0x58,0x42,0x43,0x27,0xe1,0x98,0x91,0x12,0xf0,0xc7,0xbe,0xa2,0xc1,0xfd,0x91,0xb8,0x46,0xe9,0xbd,0x01,0x00,0x00,0x00,0x34,0x03,0x00,0x00,0x05,0x00,0x00,0x00, 0x34,0x00,0x00,0x00,0x30,0x01,0x00,0x00,0x84,0x01,0x00,0x00,0xb8,0x01,0x00,0x00,0xb8,0x02,0x00,0x00,0x52,0x44,0x45,0x46,0xf4,0x00,0x00,0x00,0x01,0x00,0x00,0x00, 0x48,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x04,0xff,0xff,0x00,0x09,0x00,0x00,0xc4,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -209,7 +209,7 @@ static unsigned char ps_colored_linear[820] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, }; -static unsigned char ps_textured_linear[1044] = { +static const unsigned char ps_textured_linear[1044] = { 0x44,0x58,0x42,0x43,0x59,0x5a,0xb3,0x03,0x81,0x82,0x6a,0x8b,0x7e,0x65,0xc8,0xaa,0xb8,0x36,0xec,0xd1,0x01,0x00,0x00,0x00,0x14,0x04,0x00,0x00,0x05,0x00,0x00,0x00, 0x34,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xf4,0x01,0x00,0x00,0x28,0x02,0x00,0x00,0x98,0x03,0x00,0x00,0x52,0x44,0x45,0x46,0x44,0x01,0x00,0x00,0x01,0x00,0x00,0x00, 0x98,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x04,0xff,0xff,0x00,0x09,0x00,0x00,0x14,0x01,0x00,0x00,0x7c,0x00,0x00,0x00,0x03,0x00,0x00,0x00, @@ -244,7 +244,7 @@ static unsigned char ps_textured_linear[1044] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, }; -static unsigned char ps_colored_test_linear[900] = { +static const unsigned char ps_colored_test_linear[900] = { 0x44,0x58,0x42,0x43,0x79,0x00,0x3d,0xf6,0xaf,0xd3,0x96,0xb1,0xe1,0x6e,0x4b,0x98,0x41,0x12,0xca,0xfb,0x01,0x00,0x00,0x00,0x84,0x03,0x00,0x00,0x05,0x00,0x00,0x00, 0x34,0x00,0x00,0x00,0x30,0x01,0x00,0x00,0x84,0x01,0x00,0x00,0xb8,0x01,0x00,0x00,0x08,0x03,0x00,0x00,0x52,0x44,0x45,0x46,0xf4,0x00,0x00,0x00,0x01,0x00,0x00,0x00, 0x48,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x04,0xff,0xff,0x00,0x09,0x00,0x00,0xc4,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -275,7 +275,7 @@ static unsigned char ps_colored_test_linear[900] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, }; -static unsigned char ps_textured_test_linear[1124] = { +static const unsigned char ps_textured_test_linear[1124] = { 0x44,0x58,0x42,0x43,0x4e,0x9a,0x3f,0xb6,0x19,0x9a,0x4d,0x46,0x2b,0xbc,0xdf,0x61,0xbc,0x58,0xca,0x1d,0x01,0x00,0x00,0x00,0x64,0x04,0x00,0x00,0x05,0x00,0x00,0x00, 0x34,0x00,0x00,0x00,0x80,0x01,0x00,0x00,0xf4,0x01,0x00,0x00,0x28,0x02,0x00,0x00,0xe8,0x03,0x00,0x00,0x52,0x44,0x45,0x46,0x44,0x01,0x00,0x00,0x01,0x00,0x00,0x00, 0x98,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x04,0xff,0xff,0x00,0x09,0x00,0x00,0x14,0x01,0x00,0x00,0x7c,0x00,0x00,0x00,0x03,0x00,0x00,0x00, @@ -313,7 +313,7 @@ static unsigned char ps_textured_test_linear[1124] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, }; -static unsigned char ps_colored_density[884] = { +static const unsigned char ps_colored_density[884] = { 0x44,0x58,0x42,0x43,0x43,0xb6,0xd9,0xcf,0x9d,0xee,0x27,0x19,0x5e,0x95,0x23,0x0a,0xb4,0x2e,0x13,0x9e,0x01,0x00,0x00,0x00,0x74,0x03,0x00,0x00,0x05,0x00,0x00,0x00, 0x34,0x00,0x00,0x00,0x34,0x01,0x00,0x00,0x88,0x01,0x00,0x00,0xbc,0x01,0x00,0x00,0xf8,0x02,0x00,0x00,0x52,0x44,0x45,0x46,0xf8,0x00,0x00,0x00,0x01,0x00,0x00,0x00, 0x48,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x04,0xff,0xff,0x00,0x09,0x00,0x00,0xc8,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -343,7 +343,7 @@ static unsigned char ps_colored_density[884] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, }; -static unsigned char ps_textured_density[1108] = { +static const unsigned char ps_textured_density[1108] = { 0x44,0x58,0x42,0x43,0xbd,0x5a,0xe6,0x95,0x7a,0x65,0x61,0x88,0x78,0xfb,0xd6,0x87,0x26,0xab,0x9c,0xc3,0x01,0x00,0x00,0x00,0x54,0x04,0x00,0x00,0x05,0x00,0x00,0x00, 0x34,0x00,0x00,0x00,0x84,0x01,0x00,0x00,0xf8,0x01,0x00,0x00,0x2c,0x02,0x00,0x00,0xd8,0x03,0x00,0x00,0x52,0x44,0x45,0x46,0x48,0x01,0x00,0x00,0x01,0x00,0x00,0x00, 0x98,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x04,0xff,0xff,0x00,0x09,0x00,0x00,0x18,0x01,0x00,0x00,0x7c,0x00,0x00,0x00,0x03,0x00,0x00,0x00, @@ -380,7 +380,7 @@ static unsigned char ps_textured_density[1108] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, }; -static unsigned char ps_colored_test_density[964] = { +static const unsigned char ps_colored_test_density[964] = { 0x44,0x58,0x42,0x43,0xb8,0x70,0x06,0x48,0x53,0x63,0x9b,0x19,0xc6,0x55,0x92,0x58,0xea,0xa8,0xfa,0x3a,0x01,0x00,0x00,0x00,0xc4,0x03,0x00,0x00,0x05,0x00,0x00,0x00, 0x34,0x00,0x00,0x00,0x34,0x01,0x00,0x00,0x88,0x01,0x00,0x00,0xbc,0x01,0x00,0x00,0x48,0x03,0x00,0x00,0x52,0x44,0x45,0x46,0xf8,0x00,0x00,0x00,0x01,0x00,0x00,0x00, 0x48,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x04,0xff,0xff,0x00,0x09,0x00,0x00,0xc8,0x00,0x00,0x00,0x3c,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -413,7 +413,7 @@ static unsigned char ps_colored_test_density[964] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, }; -static unsigned char ps_textured_test_density[1188] = { +static const unsigned char ps_textured_test_density[1188] = { 0x44,0x58,0x42,0x43,0x2f,0xba,0xf4,0xad,0xe4,0x86,0x2d,0x86,0x66,0x95,0xeb,0xcc,0x6c,0x15,0xbb,0x2d,0x01,0x00,0x00,0x00,0xa4,0x04,0x00,0x00,0x05,0x00,0x00,0x00, 0x34,0x00,0x00,0x00,0x84,0x01,0x00,0x00,0xf8,0x01,0x00,0x00,0x2c,0x02,0x00,0x00,0x28,0x04,0x00,0x00,0x52,0x44,0x45,0x46,0x48,0x01,0x00,0x00,0x01,0x00,0x00,0x00, 0x98,0x00,0x00,0x00,0x03,0x00,0x00,0x00,0x1c,0x00,0x00,0x00,0x00,0x04,0xff,0xff,0x00,0x09,0x00,0x00,0x18,0x01,0x00,0x00,0x7c,0x00,0x00,0x00,0x03,0x00,0x00,0x00,