10000 foreign: inline parent build chain calls where applicable by kleisauke · Pull Request #4548 · libvips/libvips · GitHub
[go: up one dir, main page]
Skip to content

foreign: inline parent build chain calls where applicable #4548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 2, 2025
Merged

foreign: inline parent build chain calls where applicable #4548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions libvips/foreign/csvload.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,8 @@ vips_foreign_load_csv_build(VipsObject *object)
csv->sepmap[(int) '\n'] = 0;
csv->whitemap[(int) '\n'] = 0;

if (VIPS_OBJECT_CLASS(vips_foreign_load_csv_parent_class)->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_csv_parent_class)
->build(object);
}

static VipsForeignFlags
Expand Down Expand Up @@ -556,10 +554,8 @@ vips_foreign_load_csv_file_build(VipsObject *object)
vips_source_new_from_file(file->filename)))
return -1;

if (VIPS_OBJECT_CLASS(vips_foreign_load_csv_file_parent_class)->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_csv_file_parent_class)
->build(object);
}

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

if (VIPS_OBJECT_CLASS(vips_foreign_load_csv_source_parent_class)
->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_csv_source_parent_class)
->build(object);
}

static gboolean
Expand Down
14 changes: 4 additions & 10 deletions libvips/foreign/dzsave.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2510,11 +2510,8 @@ vips_foreign_save_dz_target_build(VipsObject *object)
dz->target = target->target;
g_object_ref(dz->target);

if (VIPS_OBJECT_CLASS(vips_foreign_save_dz_target_parent_class)
->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_save_dz_target_parent_class)
->build(object);
}

static void
Expand Down Expand Up @@ -2570,11 +2567,8 @@ vips_foreign_save_dz_file_build(VipsObject *object)

dz->filename = file->filename;

if (VIPS_OBJECT_CLASS(vips_foreign_save_dz_file_parent_class)
->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_save_dz_file_parent_class)
->build(object);
}

static void
Expand Down
20 changes: 6 additions & 14 deletions libvips/foreign/fitsload.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,8 @@ vips_foreign_load_fits_build(VipsObject *object)
fits->filename = filename;
}

if (VIPS_OBJECT_CLASS(vips_foreign_load_fits_parent_class)->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_fits_parent_class)
->build(object);
}

static VipsForeignFlags
Expand Down Expand Up @@ -229,11 +227,8 @@ vips_foreign_load_fits_file_build(VipsObject *object)
!(fits->source = vips_source_new_from_file(file->filename)))
return -1;

if (VIPS_OBJECT_CLASS(vips_foreign_load_fits_file_parent_class)
->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_fits_file_parent_class)
->build(object);
}

static void
Expand Down Expand Up @@ -294,11 +289,8 @@ vips_foreign_load_fits_source_build(VipsObject *object)
g_object_ref(fits->source);
}

if (VIPS_OBJECT_CLASS(vips_foreign_load_fits_source_parent_class)
->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_fits_source_parent_class)
->build(object);
}

static gboolean
Expand Down
5 changes: 1 addition & 4 deletions libvips/foreign/foreign.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1808,10 +1808,7 @@ vips_foreign_save_build(VipsObject *object)
save->ready = ready;
}

if (VIPS_OBJECT_CLASS(vips_foreign_save_parent_class)->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_save_parent_class)->build(object);
}

#define UC VIPS_FORMAT_UCHAR
Expand Down
27 changes: 8 additions & 19 deletions libvips/foreign/heifload.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,10 +373,8 @@ vips_foreign_load_heif_build(VipsObject *object)
}
}

if (VIPS_OBJECT_CLASS(vips_foreign_load_heif_parent_class)->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_heif_parent_class)
->build(object);
}

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

if (VIPS_OBJECT_CLASS(vips_foreign_load_heif_file_parent_class)
->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_heif_file_parent_class)
->build(object);
}

static int
Expand Down Expand Up @@ -1308,11 +1303,8 @@ vips_foreign_load_heif_buffer_build(VipsObject *object)
VIPS_AREA(buffer->buf)->length)))
return -1;

if (VIPS_OBJECT_CLASS(vips_foreign_load_heif_file_parent_class)
->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_heif_buffer_parent_class)
->build(object);
}

static gboolean
Expand Down Expand Up @@ -1376,11 +1368,8 @@ vips_foreign_load_heif_source_build(VipsObject *object)
g_object_ref(heif->source);
}

if (VIPS_OBJECT_CLASS(vips_foreign_load_heif_source_parent_class)
->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_heif_source_parent_class)
->build(object);
}

static gboolean
Expand Down
14 changes: 4 additions & 10 deletions libvips/foreign/heifsave.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,11 +860,8 @@ vips_foreign_save_heif_file_build(VipsObject *object)
if (vips_iscasepostfix(file->filename, ".avif"))
heif->compression = VIPS_FOREIGN_HEIF_COMPRESSION_AV1;

if (VIPS_OBJECT_CLASS(vips_foreign_save_heif_file_parent_class)
->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_save_heif_file_parent_class)
->build(object);
}

static void
Expand Down Expand Up @@ -982,11 +979,8 @@ vips_foreign_save_heif_target_build(VipsObject *object)
g_object_ref(heif->target);
}

if (VIPS_OBJECT_CLASS(vips_foreign_save_heif_target_parent_class)
->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_save_heif_target_parent_class)
->build(object);
}

static void
Expand Down
27 changes: 8 additions & 19 deletions libvips/foreign/jp2kload.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,8 @@ vips_foreign_load_jp2k_build(VipsObject *object)
}
}

if (VIPS_OBJECT_CLASS(vips_foreign_load_jp2k_parent_class)->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_jp2k_parent_class)
->build(object);
}

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

if (VIPS_OBJECT_CLASS(vips_foreign_load_jp2k_file_parent_class)
->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_jp2k_file_parent_class)
->build(object);
}

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

if (VIPS_OBJECT_CLASS(vips_foreign_load_jp2k_file_parent_class)
->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_jp2k_buffer_parent_class)
->build(object);
} 10000

static gboolean
Expand Down Expand Up @@ -1434,11 +1426,8 @@ vips_foreign_load_jp2k_source_build(VipsObject *object)
g_object_ref(jp2k->source);
}

if (VIPS_OBJECT_CLASS(vips_foreign_load_jp2k_source_parent_class)
->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_jp2k_source_parent_class)
->build(object);
}

static void
Expand Down
14 changes: 4 additions & 10 deletions libvips/foreign/jp2ksave.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1040,11 +1040,8 @@ vips_foreign_save_jp2k_file_build(VipsObject *object)
if (!(jp2k->target = vips_target_new_to_file(file->filename)))
return -1;

if (VIPS_OBJECT_CLASS(vips_foreign_save_jp2k_file_parent_class)
->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_save_jp2k_file_parent_class)
->build(object);
}

static void
Expand Down Expand Up @@ -1158,11 +1155,8 @@ vips_foreign_save_jp2k_target_build(VipsObject *object)
g_object_ref(jp2k->target);
}

if (VIPS_OBJECT_CLASS(vips_foreign_save_jp2k_target_parent_class)
->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_save_jp2k_target_parent_class)
->build(object);
}

static void
Expand Down
27 changes: 8 additions & 19 deletions libvips/foreign/jpegload.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,8 @@ vips_foreign_load_jpeg_build(VipsObject *object)
return -1;
}

if (VIPS_OBJECT_CLASS(vips_foreign_load_jpeg_parent_class)->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_jpeg_parent_class)
->build(object);
}

static VipsForeignFlags
Expand Down Expand Up @@ -241,11 +239,8 @@ vips_foreign_load_jpeg_source_build(VipsObject *object)
g_object_ref(jpeg->source);
}

if (VIPS_OBJECT_CLASS(vips_foreign_load_jpeg_source_parent_class)
->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_jpeg_source_parent_class)
->build(object);
}

static gboolean
Expand Down Expand Up @@ -310,11 +305,8 @@ vips_foreign_load_jpeg_file_build(VipsObject *object)
vips_source_new_from_file(file->filename)))
return -1;

if (VIPS_OBJECT_CLASS(vips_foreign_load_jpeg_file_parent_class)
->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_jpeg_file_parent_class)
->build(object);
}

static gboolean
Expand Down Expand Up @@ -388,11 +380,8 @@ vips_foreign_load_jpeg_buffer_build(VipsObject *object)
VIPS_AREA(buffer->blob)->length)))
return -1;

if (VIPS_OBJECT_CLASS(vips_foreign_load_jpeg_buffer_parent_class)
->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_jpeg_buffer_parent_class)
->build(object);
}

static gboolean
Expand Down
25 changes: 8 additions & 17 deletions libvips/foreign/jxlload.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,8 @@ vips_foreign_load_jxl_build(VipsObject *object)
return -1;
}

if (VIPS_OBJECT_CLASS(vips_foreign_load_jxl_parent_class)->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_jxl_parent_class)
->build(object);
}

static gboolean
Expand Down Expand Up @@ -1164,10 +1162,8 @@ vips_foreign_load_jxl_file_build(VipsObject *object)
!(jxl->source = vips_source_new_from_file(file->filename)))
return -1;

if (VIPS_OBJECT_CLASS(vips_foreign_load_jxl_file_parent_class)->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_jxl_file_parent_class)
->build(object);
}

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

if (VIPS_OBJECT_CLASS(vips_foreign_load_jxl_file_parent_class)->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_jxl_buffer_parent_class)
->build(object);
}

static gboolean
Expand Down Expand Up @@ -1318,11 +1312,8 @@ vips_foreign_load_jxl_source_build(VipsObject *object)
g_object_ref(jxl->source);
}

if (VIPS_OBJECT_CLASS(vips_foreign_load_jxl_source_parent_class)
->build(object))
return -1;

return 0;
return VIPS_OBJECT_CLASS(vips_foreign_load_jxl_source_parent_class)
->build(object);
}

static void
Expand Down
Loading
Loading
0