Skip to content

Update g2lib png encode/decode to use correct png_voidp define #1977

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
islas merged 1 commit into from
Jan 11, 2024
Merged

Update g2lib png encode/decode to use correct png_voidp define #1977

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
2 changes: 1 addition & 1 deletion external/io_grib2/g2lib/dec_png.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ int DEC_PNG(unsigned char *pngbuf,g2int *width,g2int *height,char *cout)

/* Set new custom read function */

png_set_read_fn(png_ptr,(voidp)&read_io_ptr,(png_rw_ptr)user_read_data);
png_set_read_fn(png_ptr,(png_voidp)&read_io_ptr,(png_rw_ptr)user_read_data);
/* png_init_io(png_ptr, fptr); */

/* Read and decode PNG stream */
Expand Down
2 changes: 1 addition & 1 deletion external/io_grib2/g2lib/enc_png.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ int ENC_PNG(char *data,g2int *width,g2int *height,g2int *nbits,char *pngbuf)

/* Set new custom write functions */

png_set_write_fn(png_ptr,(voidp)&write_io_ptr,(png_rw_ptr)user_write_data,
png_set_write_fn(png_ptr,(png_voidp)&write_io_ptr,(png_rw_ptr)user_write_data,
(png_flush_ptr)user_flush_data);
/* png_init_io(png_ptr, fptr); */
/* png_set_compression_level(png_ptr, Z_BEST_COMPRESSION); */
Expand Down