8000 foreign: inline parent build chain calls where applicable (#4548) · libvips/libvips@67eb11b · GitHub
[go: up one dir, main page]
Skip to content

Commit 67eb11b

Browse files
kleisaukekleisauke
authored
foreign: inline parent build chain calls where applicable (#4548)
Non-functional change.
1 parent e570446 commit 67eb11b

31 files changed

+147
-346
lines changed

‎libvips/foreign/csvload.c

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,8 @@ vips_foreign_load_csv_build(VipsObject *object)
140140
csv->sepmap[(int) '\n'] = 0;
141141
csv->whitemap[(int) '\n'] = 0;
142142

143-
if (VIPS_OBJECT_CLASS(vips_foreign_load_csv_parent_class)->build(object))
144-
return -1;
145-
146-
return 0;
143+
return VIPS_OBJECT_CLASS(vips_foreign_load_csv_parent_class)
144+
->build(object);
147145
}
148146

149147
static VipsForeignFlags
@@ -556,10 +554,8 @@ vips_foreign_load_csv_file_build(VipsObject *object)
556554
vips_source_new_from_file(file->filename)))
557555
return -1;
558556

559-
if (VIPS_OBJECT_CLASS(vips_foreign_load_csv_file_parent_class)->build(object))
560-
return -1;
561-
562-
return 0;
557+
return VIPS_OBJECT_CLASS(vips_foreign_load_csv_file_parent_class)
558+
->build(object);
563559
}
564560

565561
static const char *vips_foreign_load_csv_suffs[] = {
@@ -622,11 +618,8 @@ vips_foreign_load_csv_source_build(VipsObject *object)
622618
g_object_ref(csv->source);
623619
}
624620

625-
if (VIPS_OBJECT_CLASS( A3E2 vips_foreign_load_csv_source_parent_class)
626-
->build(object))
627-
return -1;
628-
629-
return 0;
621+
return VIPS_OBJECT_CLASS(vips_foreign_load_csv_source_parent_class)
622+
->build(object);
630623
}
631624

632625
static gboolean

‎libvips/foreign/dzsave.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2510,11 +2510,8 @@ vips_foreign_save_dz_target_build(VipsObject *object)
25102510
dz->target = target->target;
25112511
g_object_ref(dz->target);
25122512

2513-
if (VIPS_OBJECT_CLASS(vips_foreign_save_dz_target_parent_class)
2514-
->build(object))
2515-
return -1;
2516-
2517-
return 0;
2513+
return VIPS_OBJECT_CLASS(vips_foreign_save_dz_target_parent_class)
2514+
->build(object);
25182515
}
25192516

25202517
static void
@@ -2570,11 +2567,8 @@ vips_foreign_save_dz_file_build(VipsObject *object)
25702567

25712568
dz->filename = file->filename;
25722569

2573-
if (VIPS_OBJECT_CLASS(vips_foreign_save_dz_file_parent_class)
2574-
->build(object))
2575-
return -1;
2576-
2577-
return 0;
2570+
return VIPS_OBJECT_CLASS(vips_foreign_save_dz_file_parent_class)
2571+
->build(object);
25782572
}
25792573

25802574
static void

‎libvips/foreign/fitsload.c

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,8 @@ vips_foreign_load_fits_build(VipsObject *object)
105105
fits->filename = filename;
106106
}
107107

108-
if (VIPS_OBJECT_CLASS(vips_foreign_load_fits_parent_class)->build(object))
109-
return -1;
110-
111-
return 0;
108+
return VIPS_OBJECT_CLASS(vips_foreign_load_fits_parent_class)
109+
->build(object);
112110
}
113111

114112
static VipsForeignFlags
@@ -229,11 +227,8 @@ vips_foreign_load_fits_file_build(VipsObject *object)
229227
!(fits->source = vips_source_new_from_file(file->filename)))
230228
return -1;
231229

232-
if (VIPS_OBJECT_CLASS(vips_foreign_load_fits_file_parent_class)
233-
->build(object))
234-
return -1;
235-
236-
return 0;
230+
return VIPS_OBJECT_CLASS(vips_foreign_load_fits_file_parent_class)
231+
->build(object);
237232
}
238233

239234
static void
@@ -294,11 +289,8 @@ vips_foreign_load_fits_source_build(VipsObject *object)
294289
g_object_ref(fits->source);
295290
}
296291

297-
if (VIPS_OBJECT_CLASS(vips_foreign_load_fits_source_parent_class)
298-
->build(object))
299-
return -1;
300-
301-
return 0;
292+
return VIPS_OBJECT_CLASS(vips_foreign_load_fits_source_parent_class)
293+
->build(object);
302294
}
303295

304296
static gboolean

‎libvips/foreign/foreign.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1808,10 +1808,7 @@ vips_foreign_save_build(VipsObject *object)
18081808
save->ready = ready;
18091809
}
18101810

1811-
if (VIPS_OBJECT_CLASS(vips_foreign_save_parent_class)->build(object))
1812-
return -1;
1813-
1814-
return 0;
1811+
return VIPS_OBJECT_CLASS(vips_foreign_save_parent_class)->build(object);
18151812
}
18161813

18171814
#define UC VIPS_FORMAT_UCHAR

‎libvips/foreign/heifload.c

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -373,10 +373,8 @@ vips_foreign_load_heif_build(VipsObject *object)
373373
}
374374
}
375375

376-
if (VIPS_OBJECT_CLASS(vips_foreign_load_heif_parent_class)->build(object))
377-
return -1;
378-
379-
return 0;
376+
return VIPS_OBJECT_CLASS(vips_foreign_load_heif_parent_class)
377+
->build(object);
380378
}
381379

382380
static const char *heif_magic[] = {
@@ -1232,11 +1230,8 @@ vips_foreign_load_heif_file_build(VipsObject *object)
12321230
!(heif->source = vips_source_new_from_file(file->filename)))
12331231
return -1;
12341232

1235-
if (VIPS_OBJECT_CLASS(vips_foreign_load_heif_file_parent_class)
1236-
->build(object))
1237-
return -1;
1238-
1239-
return 0;
1233+
return VIPS_OBJECT_CLASS(vips_foreign_load_heif_file_parent_class)
1234+
->build(object);
12401235
}
12411236

12421237
static int
@@ -1308,11 +1303,8 @@ vips_foreign_load_heif_buffer_build(VipsObject *object)
13081303
VIPS_AREA(buffer->buf)->length)))
13091304
return -1;
13101305

1311-
if (VIPS_OBJECT_CLASS(vips_foreign_load_heif_file_parent_class)
1312-
->build(object))
1313-
return -1;
1314-
1315-
return 0;
1306+
return VIPS_OBJECT_CLASS(vips_foreign_load_heif_buffer_parent_class)
1307+
->build(object);
13161308
}
13171309

13181310
static gboolean
@@ -1376,11 +1368,8 @@ vips_foreign_load_heif_source_build(VipsObject *object)
13761368
g_object_ref(heif->source);
13771369
}
13781370

1379-
if (VIPS_OBJECT_CLASS(vips_foreign_load_heif_source_parent_class)
1380-
->build(object))
1381-
return -1;
1382-
1383-
return 0;
1371+
return VIPS_OBJECT_CLASS(vips_foreign_load_heif_source_parent_class)
1372+
->build(object);
13841373
}
13851374

13861375
static gboolean

‎libvips/foreign/heifsave.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -860,11 +860,8 @@ vips_foreign_save_heif_file_build(VipsObject *object)
860860
if (vips_iscasepostfix(file->filename, ".avif"))
861861
heif->compression = VIPS_FOREIGN_HEIF_COMPRESSION_AV1;
862862

863-
if (VIPS_OBJECT_CLASS(vips_foreign_save_heif_file_parent_class)
864-
->build(object))
865-
return -1;
866-
867-
return 0;
863+
return VIPS_OBJECT_CLASS(vips_foreign_save_heif_file_parent_class)
864+
->build(object);
868865
}
869866

870867
static void
@@ -982,11 +979,8 @@ vips_foreign_save_heif_target_build(VipsObject *object)
982979
g_object_ref(heif->target);
983980
}
984981

985-
if (VIPS_OBJECT_CLASS(vips_foreign_save_heif_target_parent_class)
986-
->build(object))
987-
return -1;
988-
989-
return 0;
982+
return VIPS_OBJECT_CLASS(vips_foreign_save_heif_target_parent_class)
983+
->build(object);
990984
}
991985

992986
static void

‎libvips/foreign/jp2kload.c

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -241,10 +241,8 @@ vips_foreign_load_jp2k_build(VipsObject *object)
241241
}
242242
}
243243

244-
if (VIPS_OBJECT_CLASS(vips_foreign_load_jp2k_parent_class)->build(object))
245-
return -1;
246-
247-
return 0;
244+
return VIPS_OBJECT_CLASS(vips_foreign_load_jp2k_parent_class)
245+
->build(object);
248246
}
249247

250248
#define JP2_RFC3745_MAGIC "\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a"
@@ -1277,11 +1275,8 @@ vips_foreign_load_jp2k_file_build(VipsObject *object)
12771275
!(jp2k->source = vips_source_new_from_file(file->filename)))
12781276
return -1;
12791277

1280-
if (VIPS_OBJECT_CLASS(vips_foreign_load_jp2k_file_parent_class)
1281-
->build(object))
1282-
return -1;
1283-
1284-
return 0;
1278+
return VIPS_OBJECT_CLASS(vips_foreign_load_jp2k_file_parent_class)
1279+
->build(object);
12851280
}
12861281

12871282
const char *vips__jp2k_suffs[] = {
@@ -1359,11 +1354,8 @@ vips_foreign_load_jp2k_buffer_build(VipsObject *object)
13591354
VIPS_AREA(buffer->buf)->length)))
13601355
return -1;
13611356

1362-
if (VIPS_OBJECT_CLASS(vips_foreign_load_jp2k_file_parent_class)
1363-
->build(object))
1364-
return -1;
1365-
1366-
return 0;
1357+
return VIPS_OBJECT_CLASS(vips_foreign_load_jp2k_buffer_parent_class)
1358+
->build(object);
13671359
}
13681360

13691361
static gboolean
@@ -1434,11 +1426,8 @@ vips_foreign_load_jp2k_source_build(VipsObject *object)
14341426
g_object_ref(jp2k->source);
14351427
}
14361428

1437-
if (VIPS_OBJECT_CLASS(vips_foreign_load_jp2k_source_parent_class)
1438-
->build(object))
1439-
return -1;
1440-
1441-
return 0;
1429+
return VIPS_OBJECT_CLASS(vips_foreign_load_jp2k_source_parent_class)
1430+
->build(object);
14421431
}
14431432

14441433
static void

‎libvips/foreign/jp2ksave.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,11 +1040,8 @@ vips_foreign_save_jp2k_file_build(VipsObject *object)
10401040
if (!(jp2k->target = vips_target_new_to_file(file->filename)))
10411041
return -1;
10421042

1043-
if (VIPS_OBJECT_CLASS(vips_foreign_save_jp2k_file_parent_class)
1044-
->build(object))
1045-
return -1;
1046-
1047-
return 0;
1043+
return VIPS_OBJECT_CLASS(vips_foreign_save_jp2k_file_parent_class)
1044+
->build(object);
10481045
}
10491046

10501047
static void
@@ -1158,11 +1155,8 @@ vips_foreign_save_jp2k_target_build(VipsObject *object)
11581155
g_object_ref(jp2k->target);
11591156
}
11601157

1161-
if (VIPS_OBJECT_CLASS(vips_foreign_save_jp2k_target_parent_class)
1162-
->build(object))
1163-
return -1;
1164-
1165-
return 0;
1158+
return VIPS_OBJECT_CLASS(vips_foreign_save_jp2k_target_parent_class)
1159+
->build(object);
11661160
}
11671161

11681162
static void

‎libvips/foreign/jpegload.c

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,8 @@ vips_foreign_load_jpeg_build(VipsObject *object)
117117
return -1;
118118
}
119119

120-
if (VIPS_OBJECT_CLASS(vips_foreign_load_jpeg_parent_class)->build(object))
121-
return -1;
122-
123-
return 0;
120+
return VIPS_OBJECT_CLASS(vips_foreign_load_jpeg_parent_class)
121+
->build(object);
124122
}
125123

126124
static VipsForeignFlags
@@ -241,11 +239,8 @@ vips_foreign_load_jpeg_source_build(VipsObject *object)
241239
g_object_ref(jpeg->source);
242240
}
243241

244-
if (VIPS_OBJECT_CLASS(vips_foreign_load_jpeg_source_parent_class)
245-
->build(object))
246-
return -1;
247-
248-
return 0;
242+
return VIPS_OBJECT_CLASS(vips_foreign_load_jpeg_source_parent_class)
243+
->build(object);
249244
}
250245

251246
static gboolean
@@ -310,11 +305,8 @@ vips_foreign_load_jpeg_file_build(VipsObject *object)
310305
vips_source_new_from_file(file->filename)))
311306
return -1;
312307

313-
if (VIPS_OBJECT_CLASS(vips_foreign_load_jpeg_file_parent_class)
314-
->build(object))
315-
return -1;
316-
317-
return 0;
308+
return VIPS_OBJECT_CLASS(vips_foreign_load_jpeg_file_parent_class)
309+
->build(object);
318310
}
319311

320312
static gboolean
@@ -388,11 +380,8 @@ vips_foreign_load_jpeg_buffer_build(VipsObject *object)
388380
VIPS_AREA(buffer->blob)->length)))
389381
return -1;
390382

391-
if (VIPS_OBJECT_CLASS(vips_foreign_load_jpeg_buffer_parent_class)
392-
->build(object))
393-
return -1;
394-
395-
return 0;
383+
return VIPS_OBJECT_CLASS(vips_foreign_load_jpeg_buffer_parent_class)
384+
->build(object);
396385
}
397386

398387
static gboolean

‎libvips/foreign/jxlload.c

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,8 @@ vips_foreign_load_jxl_build(VipsObject *object)
205205
return -1;
206206
}
207207

208-
if (VIPS_OBJECT_CLASS(vips_foreign_load_jxl_parent_class)->build(object))
209-
return -1;
210-
211-
return 0;
208+
return VIPS_OBJECT_CLASS(vips_foreign_load_jxl_parent_class)
209+
->build(object);
212210
}
213211

214212
static gboolean
@@ -1164,10 +1162,8 @@ vips_foreign_load_jxl_file_build(VipsObject *object)
11641162
!(jxl->source = vips_source_new_from_file(file->filename)))
11651163
return -1;
11661164

1167-
if (VIPS_OBJECT_CLASS(vips_foreign_load_jxl_file_parent_class)->build(object))
1168-
return -1;
1169-
1170-
return 0;
1165+
return VIPS_OBJECT_CLASS(vips_foreign_load_jxl_file_parent_class)
1166+
->build(object);
11711167
}
11721168

11731169
const char *vips__jxl_suffs[] = { ".jxl", NULL };
@@ -1244,10 +1240,8 @@ vips_foreign_load_jxl_buffer_build(VipsObject *object)
12441240
VIPS_AREA(buffer->buf)->length)))
12451241
return -1;
12461242

1247-
if (VIPS_OBJECT_CLASS(vips_foreign_load_jxl_file_parent_class)->build(object))
1248-
return -1;
1249-
1250-
return 0;
1243+
return VIPS_OBJECT_CLASS(vips_foreign_load_jxl_buffer_parent_class)
1244+
->build(object);
12511245
}
12521246

12531247
static gboolean
@@ -1318,11 +1312,8 @@ vips_foreign_load_jxl_source_build(VipsObject *object)
13181312
g_object_ref(jxl->source);
13191313
}
13201314

1321-
if (VIPS_OBJECT_CLASS(vips_foreign_load_jxl_source_parent_class)
1322-
->build(object))
1323-
return -1;
1324-
1325-
return 0;
1315+
return VIPS_OBJECT_CLASS(vips_foreign_load_jxl_source_parent_class)
1316+
->build(object);
13261317
}
13271318

13281319
static void

0 commit comments

Comments
 (0)
0