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

Back out READ/WRITE_INTERLACING changes

Browse Source 
Now that the code works consistently so that these just switch off the support
for having libpng do the interlace/deinterlace the old names make more sense,
restoring them avoids cruft in the configuration file and avoids an unnecessary
version specific change.

Signed-off-by: John Bowler <jbowler@acm.org>
This commit is contained in:
John Bowler
2015-11-22 20:25:24 -08:00
parent caa716d859
commit 504ebd427d
17 changed files with 82 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pngwrite.c
View File

@@ -599,7 +599,7 @@ png_write_image(png_structrp png_ptr, png_bytepp image)
png_debug(1, "in png_write_image");
#ifdef PNG_WRITE_INTERLACE_SUPPORTED
#ifdef PNG_WRITE_INTERLACING_SUPPORTED
/* Initialize interlace handling. If image is not interlaced,
* this will set pass to 1
*/
@@ -626,7 +626,7 @@ png_write_image(png_structrp png_ptr, png_bytepp image)
}
}
#if defined(PNG_WRITE_INTERLACE_SUPPORTED) ||\
#if defined(PNG_WRITE_INTERLACING_SUPPORTED) ||\
defined(PNG_WRITE_TRANSFORMS_SUPPORTED)
static void
write_row_buffered(png_structrp png_ptr, png_const_bytep row,
@@ -727,7 +727,7 @@ copy_row(png_const_structrp png_ptr, png_bytep row_buffer,
}
#endif /* WRITE_TRANSFORMS */
#ifdef PNG_WRITE_INTERLACE_SUPPORTED
#ifdef PNG_WRITE_INTERLACING_SUPPORTED
static void
interlace_row_lbd(png_const_structrp png_ptr, png_bytep dp, png_const_bytep sp,
png_uint_32 x, unsigned int count, const unsigned int B)
@@ -821,7 +821,7 @@ interlace_row_byte(png_const_structrp png_ptr, png_bytep dp, png_const_bytep sp,
--count, sp += inc * cbytes, dp += cbytes)
memcpy(dp, sp, cbytes);
}
#endif /* WRITE_INTERLACE */
#endif /* WRITE_INTERLACING */
static void
write_row_unbuffered(png_structrp png_ptr, png_const_bytep row,
@@ -935,7 +935,7 @@ write_row_interlaced(png_structrp png_ptr, png_const_bytep row)
}
}
#ifdef PNG_WRITE_INTERLACE_SUPPORTED
#ifdef PNG_WRITE_INTERLACING_SUPPORTED
/* Interlace a row then write it out. */
static int
interlace_row(png_structrp png_ptr, png_const_bytep row)
@@ -1004,7 +1004,7 @@ interlace_row(png_structrp png_ptr, png_const_bytep row)
return write_row;
}
#endif /* WRITE_INTERLACE */
#endif /* WRITE_INTERLACING */
/* Called by user to write a row of image data */
void PNGAPI
@@ -1067,7 +1067,7 @@ png_write_row(png_structrp png_ptr, png_const_bytep row)
if (png_ptr->interlaced == PNG_INTERLACE_NONE)
write_row_non_interlaced(png_ptr, row);
# ifdef PNG_WRITE_INTERLACE_SUPPORTED
# ifdef PNG_WRITE_INTERLACING_SUPPORTED
/* Optional: libpng does the interlacing, app passes every row of the
* image the required number of times.
*/