Use enums for Modes and RawModes in C #8510

Yay295 · 2024-10-28T14:26:42Z

Adds some type safety when comparing modes, and replaces a lot of string comparisons with enum comparisons.

and change findMode() to match

Structs have better type safety, but they make allocation more difficult, especially when we have multiple Python modules trying to share the same code.

this is necessary to have python/typeshed#12791

radarhere · 2024-11-17T04:19:59Z

src/libImaging/Mode.h

+
+typedef struct {
+    const char *const name;
+} ModeData;


You've created a struct with only one member, presumably because you expect to add more members in the future. Are you trying to prepare for #6547?

There are some things I think could be added to this struct in the future, but the more important reason for this as it is right now is type safety. A char * could be almost anything, but a ModeData can only be a ModeData.

Yay295 added 30 commits October 28, 2024 09:58

use a struct for mode names instead of just a string

abe3dfb

add special modes

1f2126b

use mode structs in _imaging.c

cb62dbb

use mode structs in tkImaging.c

7a7e838

use mode structs in encode.c and decode.c

97e29dc

use mode structs in Access.c

820f22c

use mode structs in AlphaComposite.c

b8cead3

use mode structs in Bands.c

58dedbe

use mode structs in Blend.c

74b112d

use mode structs in BoxBlur.c

08575c6

use mode structs in Chops.c

5197ad7

use mode structs in Convert.c

da808ce

use mode structs in Draw.c

2beb5fa

use mode structs in Effects.c

bc1f506

use mode structs in File.c

e6d2f9a

use mode structs in Fill.c

d2e691c

use mode structs in Filter.c

90ea060

use mode structs in Geometry.c

d8f9bfb

use mode structs in GetBBox.c

b7c3c3e

use mode structs in Histo.c

baa95d6

use mode structs in Jpeg2KDecode.c

56e1b3c

use mode structs in Jpeg2KEncode.c

5836c00

use mode structs in JpegDecode.c

6f127e0

use mode structs in JpegEncode.c

68028fd

use mode structs in Matrix.c

e598741

add function isModeI16() to check if a mode is an I;16 mode

cf4a42f

use mode structs in Pack.c

c906098

use mode structs in Palette.c

c587ad1

use mode structs in Paste.c

26b8178

use mode structs in Point.c

f2fac0b

Yay295 added 27 commits October 28, 2024 10:07

use mode structs in Reduce.c

adf97ec

use mode structs in Resample.c

9f28f12

use mode structs in Storage.c

6f0ce3e

use mode structs in TiffDecode.c

91776f2

use (void) for empty function parameters

7cb3efc

set pointer to NULL after free

4347310

use mode structs in Unpack.c

ebbe5d8

use mode structs in map.c

1b1f250

initialize accessors similar to converters/packers/unpackers

d462843

define rawmodes

b594a75

fix findRawMode()

5afeb11

and change findMode() to match

check for null input in findMode() and findRawMode()

05d7b31

replace some string function usage with imaging mode checks

7bd8041

use RawMode struct for jpegmode

e53aa29

use Mode struct for windows display code

20986c8

change mode structs to enums

9c02ccd

Structs have better type safety, but they make allocation more difficult, especially when we have multiple Python modules trying to share the same code.

use mode enums in _webp.c

5f1858c

use mode enums in Jpeg2KDecode.c

268b090

use mode enums in _imagingft.c

cb68244

use more mode enums in decode.c

4f9b68c

add Mode.c as a dependency for _imagingft.c and _webp.c

3b33a2c

use a different temp build dir for each module

c889643

build Mode.c as a common library

0d3c59e

add debug check that all modes and rawmodes are defined

c3c968e

use mode enums in _imagingcms.c

9642192

require types-setuptools>=75.2.0

f7b5726

this is necessary to have python/typeshed#12791

linter changes

3ba2ea7

Yay295 force-pushed the mode_enums branch from 1719eb2 to 3ba2ea7 Compare October 28, 2024 15:17

Merge branch 'main' into mode_enums

4427767

radarhere reviewed Nov 17, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use enums for Modes and RawModes in C #8510

Use enums for Modes and RawModes in C #8510

Yay295 commented Oct 28, 2024

radarhere Nov 17, 2024

Yay295 Nov 17, 2024

Use enums for Modes and RawModes in C #8510

Are you sure you want to change the base?

Use enums for Modes and RawModes in C #8510

Conversation

Yay295 commented Oct 28, 2024

radarhere Nov 17, 2024

Choose a reason for hiding this comment

Yay295 Nov 17, 2024

Choose a reason for hiding this comment