godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-13 13:31:48 +00:00
Code Releases Wiki Activity

Use std::size instead of sizeof(a) / sizeof(a[0]) pattern throughout the codebase.

Browse Source
This commit is contained in:
Lukas Tenbrink
2025-02-04 17:35:39 +01:00
parent f0f5319b0b
commit e34f1f504c
33 changed files with 71 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform/windows/export/export_plugin.cpp
View File

@@ -96,7 +96,7 @@ Error EditorExportPlatformWindows::_process_icon(const Ref<EditorExportPreset> &
Ref<Image> src_image = _load_icon_or_splash_image(p_src_path, &err);
ERR_FAIL_COND_V(err != OK || src_image.is_null() || src_image->is_empty(), ERR_CANT_OPEN);
for (size_t i = 0; i < sizeof(icon_size) / sizeof(icon_size[0]); ++i) {
for (size_t i = 0; i < std::size(icon_size); ++i) {
int size = (icon_size[i] == 0) ? 256 : icon_size[i];
Ref<Image> res_image = src_image->duplicate();
@@ -107,7 +107,7 @@ Error EditorExportPlatformWindows::_process_icon(const Ref<EditorExportPreset> &
}
uint16_t valid_icon_count = 0;
for (size_t i = 0; i < sizeof(icon_size) / sizeof(icon_size[0]); ++i) {
for (size_t i = 0; i < std::size(icon_size); ++i) {
if (images.has(icon_size[i])) {
valid_icon_count++;
} else {
@@ -129,7 +129,7 @@ Error EditorExportPlatformWindows::_process_icon(const Ref<EditorExportPreset> &
// Write ICONDIRENTRY.
uint32_t img_offset = 6 + 16 * valid_icon_count;
for (size_t i = 0; i < sizeof(icon_size) / sizeof(icon_size[0]); ++i) {
for (size_t i = 0; i < std::size(icon_size); ++i) {
if (images.has(icon_size[i])) {
const IconData &di = images[icon_size[i]];
fw->store_8(icon_size[i]); // Width in pixels.
@@ -146,7 +146,7 @@ Error EditorExportPlatformWindows::_process_icon(const Ref<EditorExportPreset> &
}
// Write image data.
for (size_t i = 0; i < sizeof(icon_size) / sizeof(icon_size[0]); ++i) {
for (size_t i = 0; i < std::size(icon_size); ++i) {
if (images.has(icon_size[i])) {
const IconData &di = images[icon_size[i]];
fw->store_buffer(di.data.ptr(), di.data.size());