Skip to content

Commit aadc274

Browse files
committed
Fix transposed calloc warning in GCC 14
1 parent ff7e9f8 commit aadc274

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

Source/ThirdParty/tinyexr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10887,7 +10887,7 @@ static int DecodeChunk(EXRImage *exr_image, const EXRHeader *exr_header,
1088710887
size_t num_tiles = offsets.size(); // = # of blocks
1088810888

1088910889
exr_image->tiles = static_cast<EXRTile *>(
10890-
calloc(sizeof(EXRTile), static_cast<size_t>(num_tiles)));
10890+
calloc(static_cast<size_t>(num_tiles), sizeof(EXRTile)));
1089110891

1089210892
int err_code = TINYEXR_SUCCESS;
1089310893

Source/wuffs-v0.3.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22295,7 +22295,7 @@ wuffs_adler32__hasher__initialize(
2229522295
wuffs_adler32__hasher*
2229622296
wuffs_adler32__hasher__alloc() {
2229722297
wuffs_adler32__hasher* x =
22298-
(wuffs_adler32__hasher*)(calloc(sizeof(wuffs_adler32__hasher), 1));
22298+
(wuffs_adler32__hasher*)(calloc(1, sizeof(wuffs_adler32__hasher)));
2229922299
if (!x) {
2230022300
return NULL;
2230122301
}
@@ -22820,7 +22820,7 @@ wuffs_bmp__decoder__initialize(
2282022820
wuffs_bmp__decoder*
2282122821
wuffs_bmp__decoder__alloc() {
2282222822
wuffs_bmp__decoder* x =
22823-
(wuffs_bmp__decoder*)(calloc(sizeof(wuffs_bmp__decoder), 1));
22823+
(wuffs_bmp__decoder*)(1, calloc(sizeof(wuffs_bmp__decoder)));
2282422824
if (!x) {
2282522825
return NULL;
2282622826
}
@@ -25511,7 +25511,7 @@ wuffs_bzip2__decoder__initialize(
2551125511
wuffs_bzip2__decoder*
2551225512
wuffs_bzip2__decoder__alloc() {
2551325513
wuffs_bzip2__decoder* x =
25514-
(wuffs_bzip2__decoder*)(calloc(sizeof(wuffs_bzip2__decoder), 1));
25514+
(wuffs_bzip2__decoder*)(calloc(1, sizeof(wuffs_bzip2__decoder)));
2551525515
if (!x) {
2551625516
return NULL;
2551725517
}
@@ -27027,7 +27027,7 @@ wuffs_cbor__decoder__initialize(
2702727027
wuffs_cbor__decoder*
2702827028
wuffs_cbor__decoder__alloc() {
2702927029
wuffs_cbor__decoder* x =
27030-
(wuffs_cbor__decoder*)(calloc(sizeof(wuffs_cbor__decoder), 1));
27030+
(wuffs_cbor__decoder*)(calloc(1, sizeof(wuffs_cbor__decoder)));
2703127031
if (!x) {
2703227032
return NULL;
2703327033
}
@@ -28337,7 +28337,7 @@ wuffs_crc32__ieee_hasher__initialize(
2833728337
wuffs_crc32__ieee_hasher*
2833828338
wuffs_crc32__ieee_hasher__alloc() {
2833928339
wuffs_crc32__ieee_hasher* x =
28340-
(wuffs_crc32__ieee_hasher*)(calloc(sizeof(wuffs_crc32__ieee_hasher), 1));
28340+
(wuffs_crc32__ieee_hasher*)(calloc(1, sizeof(wuffs_crc32__ieee_hasher)));
2834128341
if (!x) {
2834228342
return NULL;
2834328343
}
@@ -29042,7 +29042,7 @@ wuffs_deflate__decoder__initialize(
2904229042
wuffs_deflate__decoder*
2904329043
wuffs_deflate__decoder__alloc() {
2904429044
wuffs_deflate__decoder* x =
29045-
(wuffs_deflate__decoder*)(calloc(sizeof(wuffs_deflate__decoder), 1));
29045+
(wuffs_deflate__decoder*)(calloc(1, sizeof(wuffs_deflate__decoder)));
2904629046
if (!x) {
2904729047
return NULL;
2904829048
}
@@ -31230,7 +31230,7 @@ wuffs_lzw__decoder__initialize(
3123031230
wuffs_lzw__decoder*
3123131231
wuffs_lzw__decoder__alloc() {
3123231232
wuffs_lzw__decoder* x =
31233-
(wuffs_lzw__decoder*)(calloc(sizeof(wuffs_lzw__decoder), 1));
31233+
(wuffs_lzw__decoder*)(calloc(1, sizeof(wuffs_lzw__decoder)));
3123431234
if (!x) {
3123531235
return NULL;
3123631236
}
@@ -31928,7 +31928,7 @@ wuffs_gif__decoder__initialize(
3192831928
wuffs_gif__decoder*
3192931929
wuffs_gif__decoder__alloc() {
3193031930
wuffs_gif__decoder* x =
31931-
(wuffs_gif__decoder*)(calloc(sizeof(wuffs_gif__decoder), 1));
31931+
(wuffs_gif__decoder*)(calloc(1, sizeof(wuffs_gif__decoder)));
3193231932
if (!x) {
3193331933
return NULL;
3193431934
}
@@ -34573,7 +34573,7 @@ wuffs_gzip__decoder__initialize(
3457334573
wuffs_gzip__decoder*
3457434574
wuffs_gzip__decoder__alloc() {
3457534575
wuffs_gzip__decoder* x =
34576-
(wuffs_gzip__decoder*)(calloc(sizeof(wuffs_gzip__decoder), 1));
34576+
(wuffs_gzip__decoder*)(calloc(1, sizeof(wuffs_gzip__decoder)));
3457734577
if (!x) {
3457834578
return NULL;
3457934579
}
@@ -35372,7 +35372,7 @@ wuffs_json__decoder__initialize(
3537235372
wuffs_json__decoder*
3537335373
wuffs_json__decoder__alloc() {
3537435374
wuffs_json__decoder* x =
35375-
(wuffs_json__decoder*)(calloc(sizeof(wuffs_json__decoder), 1));
35375+
(wuffs_json__decoder*)(calloc(1, sizeof(wuffs_json__decoder)));
3537635376
if (!x) {
3537735377
return NULL;
3537835378
}
@@ -37350,7 +37350,7 @@ wuffs_nie__decoder__initialize(
3735037350
wuffs_nie__decoder*
3735137351
wuffs_nie__decoder__alloc() {
3735237352
wuffs_nie__decoder* x =
37353-
(wuffs_nie__decoder*)(calloc(sizeof(wuffs_nie__decoder), 1));
37353+
(wuffs_nie__decoder*)(calloc(1, sizeof(wuffs_nie__decoder)));
3735437354
if (!x) {
3735537355
return NULL;
3735637356
}
@@ -38342,7 +38342,7 @@ wuffs_zlib__decoder__initialize(
3834238342
wuffs_zlib__decoder*
3834338343
wuffs_zlib__decoder__alloc() {
3834438344
wuffs_zlib__decoder* x =
38345-
(wuffs_zlib__decoder*)(calloc(sizeof(wuffs_zlib__decoder), 1));
38345+
(wuffs_zlib__decoder*)(calloc(1, sizeof(wuffs_zlib__decoder)));
3834638346
if (!x) {
3834738347
return NULL;
3834838348
}
@@ -39207,7 +39207,7 @@ wuffs_png__decoder__initialize(
3920739207
wuffs_png__decoder*
3920839208
wuffs_png__decoder__alloc() {
3920939209
wuffs_png__decoder* x =
39210-
(wuffs_png__decoder*)(calloc(sizeof(wuffs_png__decoder), 1));
39210+
(wuffs_png__decoder*)(calloc(1, sizeof(wuffs_png__decoder)));
3921139211
if (!x) {
3921239212
return NULL;
3921339213
}
@@ -45287,7 +45287,7 @@ wuffs_tga__decoder__initialize(
4528745287
wuffs_tga__decoder*
4528845288
wuffs_tga__decoder__alloc() {
4528945289
wuffs_tga__decoder* x =
45290-
(wuffs_tga__decoder*)(calloc(sizeof(wuffs_tga__decoder), 1));
45290+
(wuffs_tga__decoder*)(calloc(1, sizeof(wuffs_tga__decoder)));
4529145291
if (!x) {
4529245292
return NULL;
4529345293
}
@@ -46676,7 +46676,7 @@ wuffs_wbmp__decoder__initialize(
4667646676
wuffs_wbmp__decoder*
4667746677
wuffs_wbmp__decoder__alloc() {
4667846678
wuffs_wbmp__decoder* x =
46679-
(wuffs_wbmp__decoder*)(calloc(sizeof(wuffs_wbmp__decoder), 1));
46679+
(wuffs_wbmp__decoder*)(calloc(1, sizeof(wuffs_wbmp__decoder)));
4668046680
if (!x) {
4668146681
return NULL;
4668246682
}

0 commit comments

Comments
 (0)