diff options
| author | Haibo Huang <hhb@google.com> | 2019-06-10 15:41:45 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-10 15:41:45 -0700 |
| commit | 54ca51b2ee6da088d5eb1c7ef6430b1c83019977 (patch) | |
| tree | 478f3db238be7e08885ac80ac8ef1be9935441bb /contrib/examples/pngpixel.c | |
| parent | d38b284c2743fe6dd42a018ea1fec4910d24e20e (diff) | |
| parent | 490afb6c027627b58763a986e1b464d85814080e (diff) | |
Merge "Merge tag 'v1.6.37' into HEAD" am: 7794b22253 am: aa0ce810a6
am: 490afb6c02
Change-Id: Iae0f97a038a679d50a719acd9fb9951b53f96a85
Diffstat (limited to 'contrib/examples/pngpixel.c')
| -rw-r--r-- | contrib/examples/pngpixel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/examples/pngpixel.c b/contrib/examples/pngpixel.c index f762379ed..9185d518f 100644 --- a/contrib/examples/pngpixel.c +++ b/contrib/examples/pngpixel.c @@ -42,7 +42,7 @@ component(png_const_bytep row, png_uint_32 x, unsigned int c, png_uint_32 bit_offset_hi = bit_depth * ((x >> 6) * channels); png_uint_32 bit_offset_lo = bit_depth * ((x & 0x3f) * channels + c); - row = (png_const_bytep)(((PNG_CONST png_byte (*)[8])row) + bit_offset_hi); + row = (png_const_bytep)(((const png_byte (*)[8])row) + bit_offset_hi); row += bit_offset_lo >> 3; bit_offset_lo &= 0x07; @@ -73,7 +73,7 @@ static void print_pixel(png_structp png_ptr, png_infop info_ptr, png_const_bytep row, png_uint_32 x) { - PNG_CONST unsigned int bit_depth = png_get_bit_depth(png_ptr, info_ptr); + unsigned int bit_depth = png_get_bit_depth(png_ptr, info_ptr); switch (png_get_color_type(png_ptr, info_ptr)) { @@ -87,7 +87,7 @@ print_pixel(png_structp png_ptr, png_infop info_ptr, png_const_bytep row, */ case PNG_COLOR_TYPE_PALETTE: { - PNG_CONST int index = component(row, x, 0, bit_depth, 1); + int index = component(row, x, 0, bit_depth, 1); png_colorp palette = NULL; int num_palette = 0; |