Skip to content

Commit ac890c3

Browse files
committed
Avoid generating redundant enums
1 parent f36f216 commit ac890c3

File tree

3 files changed

+1
-74
lines changed

3 files changed

+1
-74
lines changed

examples/generate_phpdoc.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# needs pyvips 2.2.3 or later
44

55
from pyvips import Image, Introspect, GValue, Error, \
6-
ffi, enum_dict, flags_dict, vips_lib, gobject_lib, \
6+
ffi, enum_dict, flags_dict, gobject_lib, \
77
type_map, type_name, type_from_name, nickname_find
88

99
# This file generates the phpdoc comments for the magic methods and properties.
@@ -275,11 +275,6 @@ def add_nickname(gtype, a, b):
275275

276276

277277
def generate_enums():
278-
# otherwise we're missing some enums
279-
vips_lib.vips_token_get_type()
280-
vips_lib.vips_saveable_get_type()
281-
vips_lib.vips_image_type_get_type()
282-
283278
all_enums = []
284279

285280
def add_enum(gtype, a, b):
@@ -292,10 +287,6 @@ def add_enum(gtype, a, b):
292287

293288
type_map(type_from_name('GEnum'), add_enum)
294289

295-
# Filter internal enums
296-
blacklist = ['VipsImageType', 'VipsToken']
297-
all_enums = [name for name in all_enums if name not in blacklist]
298-
299290
for name in all_enums:
300291
gtype = type_from_name(name)
301292
php_name = remove_prefix(name)

src/FFI.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -551,9 +551,6 @@ private static function init(): void
551551
GType vips_interpretation_get_type (void);
552552
GType vips_operation_flags_get_type (void);
553553
GType vips_band_format_get_type (void);
554-
GType vips_token_get_type (void);
555-
GType vips_saveable_get_type (void);
556-
GType vips_image_type_get_type (void);
557554
558555
void vips_image_set_progress (VipsImage* image, bool progress);
559556
void vips_image_set_kill (VipsImage* image, bool kill);
@@ -822,9 +819,6 @@ private static function init(): void
822819
self::$vips->vips_interpretation_get_type();
823820
self::$vips->vips_operation_flags_get_type();
824821
self::$vips->vips_band_format_get_type();
825-
self::$vips->vips_token_get_type();
826-
self::$vips->vips_saveable_get_type();
827-
self::$vips->vips_image_type_get_type();
828822

829823
// look these up in advance
830824
self::$ctypes = [

src/ForeignSaveable.php

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)