mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

Fix g++ builds

Browse Source 
enums are (int), G++ objects to (int) and (unsigned) being used together in ?:

Signed-off-by: John Bowler <jbowler@acm.org>
This commit is contained in:
John Bowler 2015-12-03 17:17:42 -08:00
parent 59136cc3b3
commit c8d2efcb50
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pngwrite.c
View File

@ -888,8 +888,8 @@ write_row_non_interlaced(png_structrp png_ptr, png_const_bytep row)
/* There is only one pass, so this is the last pass: */ /* There is only one pass, so this is the last pass: */
write_row_core(png_ptr, row, write_row_core(png_ptr, row,
(row_number == 1U ? png_pass_first_row : 0U) | (row_number == 1U ? png_pass_first_row : 0) |
(last_pass_row ? png_pass_last_row : 0U) | (last_pass_row ? png_pass_last_row : 0) |
png_pass_last); png_pass_last);
if (!last_pass_row) if (!last_pass_row)
@ -914,10 +914,10 @@ write_row_interlaced(png_structrp png_ptr, png_const_bytep row)
const int last_pass_row = row_number == PNG_PASS_ROWS(png_ptr->height, pass); const int last_pass_row = row_number == PNG_PASS_ROWS(png_ptr->height, pass);
write_row_core(png_ptr, row, write_row_core(png_ptr, row,
(row_number == 1U ? png_pass_first_row : 0U) | (row_number == 1U ? png_pass_first_row : 0) |
(last_pass_row ? png_pass_last_row : 0U) | (last_pass_row ? png_pass_last_row : 0) |
(pass == PNG_LAST_PASS(png_ptr->width, png_ptr->height) ? (pass == PNG_LAST_PASS(png_ptr->width, png_ptr->height) ?
png_pass_last : 0U)); png_pass_last : 0));
if (!last_pass_row) if (!last_pass_row)
png_ptr->row_number = row_number; png_ptr->row_number = row_number;
@ -952,11 +952,11 @@ interlace_row(png_structrp png_ptr, png_const_bytep row)
{ {
const unsigned int row_info_flags = const unsigned int row_info_flags =
(row_number == PNG_PASS_START_ROW(pass) ? (row_number == PNG_PASS_START_ROW(pass) ?
png_pass_first_row : 0U) | png_pass_first_row : 0) |
(PNG_LAST_PASS_ROW(row_number, pass, png_ptr->height) ? (PNG_LAST_PASS_ROW(row_number, pass, png_ptr->height) ?
png_pass_last_row : 0U) | png_pass_last_row : 0) |
(pass == PNG_LAST_PASS(png_ptr->width, png_ptr->height) ? (pass == PNG_LAST_PASS(png_ptr->width, png_ptr->height) ?
png_pass_last : 0U); png_pass_last : 0);
if (pass < 6) if (pass < 6)
{ {