RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-19 14:12:11 +00:00
Code Issues Activity Actions

LibGfx/PNG: Use a StringView to compare the chunk type

Browse source
This commit is contained in:
Lucas CHOLLET 2023-06-11 16:20:14 -04:00 • committed by Andreas Kling
parent dbcf63e85e
commit 96a1a8512f
1 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Userland/Libraries/LibGfx/ImageFormats/PNGLoader.cpp
View file

@ -12,7 +12,6 @@
#include <LibGfx/ImageFormats/PNGLoader.h> #include <LibGfx/ImageFormats/PNGLoader.h>
#include <LibGfx/ImageFormats/PNGShared.h> #include <LibGfx/ImageFormats/PNGShared.h>
#include <LibGfx/Painter.h> #include <LibGfx/Painter.h>
#include <string.h>
namespace Gfx { namespace Gfx {
@ -1209,9 +1208,10 @@ static bool process_chunk(Streamer& streamer, PNGLoadingContext& context)
dbgln_if(PNG_DEBUG, "Bail at chunk_size"); dbgln_if(PNG_DEBUG, "Bail at chunk_size");
return false; return false;
} }
u8 chunk_type[5];
chunk_type[4] = '\0'; Array<u8, 4> chunk_type_buffer;
if (!streamer.read_bytes(chunk_type, 4)) { StringView const chunk_type { chunk_type_buffer.span() };
if (!streamer.read_bytes(chunk_type_buffer.data(), chunk_type_buffer.size())) {
dbgln_if(PNG_DEBUG, "Bail at chunk_type"); dbgln_if(PNG_DEBUG, "Bail at chunk_type");
return false; return false;
} }
@ -1227,31 +1227,31 @@ static bool process_chunk(Streamer& streamer, PNGLoadingContext& context)
} }
dbgln_if(PNG_DEBUG, "Chunk type: '{}', size: {}, crc: {:x}", chunk_type, chunk_size, chunk_crc); dbgln_if(PNG_DEBUG, "Chunk type: '{}', size: {}, crc: {:x}", chunk_type, chunk_size, chunk_crc);
if (!strcmp((char const*)chunk_type, "IHDR")) if (chunk_type == "IHDR"sv)
return process_IHDR(chunk_data, context); return process_IHDR(chunk_data, context);
if (!strcmp((char const*)chunk_type, "IDAT")) if (chunk_type == "IDAT"sv)
return process_IDAT(chunk_data, context); return process_IDAT(chunk_data, context);
if (!strcmp((char const*)chunk_type, "PLTE")) if (chunk_type == "PLTE"sv)
return process_PLTE(chunk_data, context); return process_PLTE(chunk_data, context);
if (!strcmp((char const*)chunk_type, "cHRM")) if (chunk_type == "cHRM"sv)
return process_cHRM(chunk_data, context); return process_cHRM(chunk_data, context);
if (!strcmp((char const*)chunk_type, "cICP")) if (chunk_type == "cICP"sv)
return process_cICP(chunk_data, context); return process_cICP(chunk_data, context);
if (!strcmp((char const*)chunk_type, "iCCP")) if (chunk_type == "iCCP"sv)
return process_iCCP(chunk_data, context); return process_iCCP(chunk_data, context);
if (!strcmp((char const*)chunk_type, "gAMA")) if (chunk_type == "gAMA"sv)
return process_gAMA(chunk_data, context); return process_gAMA(chunk_data, context);
if (!strcmp((char const*)chunk_type, "sRGB")) if (chunk_type == "sRGB"sv)
return process_sRGB(chunk_data, context); return process_sRGB(chunk_data, context);
if (!strcmp((char const*)chunk_type, "tRNS")) if (chunk_type == "tRNS"sv)
return process_tRNS(chunk_data, context); return process_tRNS(chunk_data, context);
if (!strcmp((char const*)chunk_type, "acTL")) if (chunk_type == "acTL"sv)
return process_acTL(chunk_data, context); return process_acTL(chunk_data, context);
if (!strcmp((char const*)chunk_type, "fcTL")) if (chunk_type == "fcTL"sv)
return process_fcTL(chunk_data, context); return process_fcTL(chunk_data, context);
if (!strcmp((char const*)chunk_type, "fdAT")) if (chunk_type == "fdAT"sv)
return process_fdAT(chunk_data, context); return process_fdAT(chunk_data, context);
if (!strcmp((char const*)chunk_type, "IEND")) if (chunk_type == "IEND"sv)
return process_IEND(chunk_data, context); return process_IEND(chunk_data, context);
return true; return true;
} }