Skip to content

Commit 3670d05

Browse files
benoit-pierreFrenzie
authored andcommitted
lodepng: disable support for ancillary / unknown chunks
1 parent 48b1739 commit 3670d05

File tree

3 files changed

+3
-81
lines changed

3 files changed

+3
-81
lines changed

ffi-cdecl/lodepng_decl.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ cdecl_struct(LodePNGEncoderSettings)
1616
cdecl_type(LodePNGEncoderSettings)
1717
cdecl_struct(LodePNGColorMode)
1818
cdecl_type(LodePNGColorMode)
19-
cdecl_struct(LodePNGTime)
20-
cdecl_type(LodePNGTime)
2119
cdecl_struct(LodePNGInfo)
2220
cdecl_type(LodePNGInfo)
2321
cdecl_struct(LodePNGState)

ffi/lodepng_h.lua

Lines changed: 2 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
-- Automatically generated with: ./build/x86_64-pc-linux-gnu/staging/bin/ffi-cdecl -DLODEPNG_NO_COMPILE_ANCILLARY_CHUNKS ffi-cdecl/lodepng_decl.c
2+
13
local ffi = require("ffi")
24

35
ffi.cdef[[
@@ -25,10 +27,6 @@ struct LodePNGDecoderSettings {
2527
unsigned int ignore_critical;
2628
unsigned int ignore_end;
2729
unsigned int color_convert;
28-
unsigned int read_text_chunks;
29-
unsigned int remember_unknown_chunks;
30-
size_t max_text_size;
31-
size_t max_icc_size;
3230
};
3331
typedef struct LodePNGDecoderSettings LodePNGDecoderSettings;
3432
enum LodePNGFilterStrategy {
@@ -62,8 +60,6 @@ struct LodePNGEncoderSettings {
6260
LodePNGFilterStrategy filter_strategy;
6361
const unsigned char *predefined_filters;
6462
unsigned int force_palette;
65-
unsigned int add_id;
66-
unsigned int text_compression;
6763
};
6864
typedef struct LodePNGEncoderSettings LodePNGEncoderSettings;
6965
struct LodePNGColorMode {
@@ -77,84 +73,11 @@ struct LodePNGColorMode {
7773
unsigned int key_b;
7874
};
7975
typedef struct LodePNGColorMode LodePNGColorMode;
80-
struct LodePNGTime {
81-
unsigned int year;
82-
unsigned int month;
83-
unsigned int day;
84-
unsigned int hour;
85-
unsigned int minute;
86-
unsigned int second;
87-
};
88-
typedef struct LodePNGTime LodePNGTime;
8976
struct LodePNGInfo {
9077
unsigned int compression_method;
9178
unsigned int filter_method;
9279
unsigned int interlace_method;
9380
LodePNGColorMode color;
94-
unsigned int background_defined;
95-
unsigned int background_r;
96-
unsigned int background_g;
97-
unsigned int background_b;
98-
size_t text_num;
99-
char **text_keys;
100-
char **text_strings;
101-
size_t itext_num;
102-
char **itext_keys;
103-
char **itext_langtags;
104-
char **itext_transkeys;
105-
char **itext_strings;
106-
unsigned int exif_defined;
107-
unsigned char *exif;
108-
unsigned int exif_size;
109-
unsigned int time_defined;
110-
LodePNGTime time;
111-
unsigned int phys_defined;
112-
unsigned int phys_x;
113-
unsigned int phys_y;
114-
unsigned int phys_unit;
115-
unsigned int gama_defined;
116-
unsigned int gama_gamma;
117-
unsigned int chrm_defined;
118-
unsigned int chrm_white_x;
119-
unsigned int chrm_white_y;
120-
unsigned int chrm_red_x;
121-
unsigned int chrm_red_y;
122-
unsigned int chrm_green_x;
123-
unsigned int chrm_green_y;
124-
unsigned int chrm_blue_x;
125-
unsigned int chrm_blue_y;
126-
unsigned int srgb_defined;
127-
unsigned int srgb_intent;
128-
unsigned int iccp_defined;
129-
char *iccp_name;
130-
unsigned char *iccp_profile;
131-
unsigned int iccp_profile_size;
132-
unsigned int cicp_defined;
133-
unsigned int cicp_color_primaries;
134-
unsigned int cicp_transfer_function;
135-
unsigned int cicp_matrix_coefficients;
136-
unsigned int cicp_video_full_range_flag;
137-
unsigned int mdcv_defined;
138-
unsigned int mdcv_red_x;
139-
unsigned int mdcv_red_y;
140-
unsigned int mdcv_green_x;
141-
unsigned int mdcv_green_y;
142-
unsigned int mdcv_blue_x;
143-
unsigned int mdcv_blue_y;
144-
unsigned int mdcv_white_x;
145-
unsigned int mdcv_white_y;
146-
unsigned int mdcv_max_luminance;
147-
unsigned int mdcv_min_luminance;
148-
unsigned int clli_defined;
149-
unsigned int clli_max_cll;
150-
unsigned int clli_max_fall;
151-
unsigned int sbit_defined;
152-
unsigned int sbit_r;
153-
unsigned int sbit_g;
154-
unsigned int sbit_b;
155-
unsigned int sbit_a;
156-
unsigned char *unknown_chunks_data[3];
157-
size_t unknown_chunks_size[3];
15881
};
15982
typedef struct LodePNGInfo LodePNGInfo;
16083
struct LodePNGState {

thirdparty/lodepng/overlay/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ project(lodepng LANGUAGES C)
44
file(WRITE lodepng.c "#include \"lodepng.cpp\"\n")
55
add_library(lodepng)
66
target_sources(lodepng PRIVATE lodepng.c)
7+
target_compile_definitions(lodepng PRIVATE LODEPNG_NO_COMPILE_ANCILLARY_CHUNKS)
78

89
install(TARGETS lodepng)
910
install(FILES lodepng.h TYPE INCLUDE)

0 commit comments

Comments
 (0)