summaryrefslogtreecommitdiffstats
path: root/src/lib/util/png.cpp
diff options
context:
space:
mode:
author AJR <ajrhacker@users.noreply.github.com>2021-02-14 11:05:57 -0500
committer AJR <ajrhacker@users.noreply.github.com>2021-02-14 11:05:57 -0500
commitbc0146c2038c46f789a246d5616afd7c425157f3 (patch)
treeb4d39194034b4c6e56ccd4035d25636034be43ca /src/lib/util/png.cpp
parent91310bcdeb7ab0ff661738b212017bf836f4e8ad (diff)
Eliminate ARRAY_LENGTH template in favor of C++17's std::size
* osdcomm.h: Move definition of EQUIVALENT_ARRAY to coretmpl.h * sharc.cpp, gt64xxx.cpp, ym2413.cpp, gb_lcd.cpp, snes_ppu.cpp: Use STRUCT_MEMBER for save state registration * gio/newport.cpp, megadrive/svp.cpp, nes_ctrl/bcbattle.cpp, arm7.cpp, tms9995.cpp, pckeybrd.cpp, sa1110.cpp, sa1111.cpp, jangou_blitter.cpp, vic4567.cpp: Use std::fill(_n) instead of memset * emucore.h: Remove obsolete typedef
Diffstat (limited to 'src/lib/util/png.cpp')
-rw-r--r--src/lib/util/png.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/util/png.cpp b/src/lib/util/png.cpp
index 67e3366606b..0605206bbf1 100644
--- a/src/lib/util/png.cpp
+++ b/src/lib/util/png.cpp
@@ -123,7 +123,7 @@ private:
png_error process(std::list<image_data_chunk> const &idata)
{
// do some basic checks for unsupported images
- if (!pnginfo.bit_depth || (ARRAY_LENGTH(samples) <= pnginfo.color_type) || !samples[pnginfo.color_type])
+ if (!pnginfo.bit_depth || (std::size(samples) <= pnginfo.color_type) || !samples[pnginfo.color_type])
return png_error::UNSUPPORTED_FORMAT; // unknown colour format
if ((0 != pnginfo.interlace_method) && (1 != pnginfo.interlace_method))
return png_error::UNSUPPORTED_FORMAT; // unknown interlace method
@@ -474,7 +474,7 @@ public:
// do some basic checks for unsupported images
if ((8 > pnginfo.bit_depth) || (pnginfo.bit_depth % 8))
return png_error::UNSUPPORTED_FORMAT; // only do multiples of 8bps here - expand lower bit depth first
- if ((ARRAY_LENGTH(samples) <= pnginfo.color_type) || !samples[pnginfo.color_type])
+ if ((std::size(samples) <= pnginfo.color_type) || !samples[pnginfo.color_type])
return png_error::UNSUPPORTED_FORMAT; // unknown colour sample format
if ((0 != pnginfo.interlace_method) && (1 != pnginfo.interlace_method))
return png_error::UNSUPPORTED_FORMAT; // unknown interlace method
@@ -721,7 +721,7 @@ public:
static png_error verify_header(core_file &fp)
{
- EQUIVALENT_ARRAY(PNG_SIGNATURE, std::uint8_t) signature;
+ std::uint8_t signature[sizeof(PNG_SIGNATURE)];
// read 8 bytes
if (fp.read(signature, sizeof(signature)) != sizeof(signature))