Changeset 103316 in vbox for trunk/src/libs/libpng-1.6.42/pngtrans.c

Timestamp:

Feb 12, 2024 3:57:56 PM (11 months ago)

Author:

vboxsync

Message:

libpng-1.6.42: Applied and adjusted our libpng changes to 1.6.42. bugref:8515

File:

• trunk/src/libs/libpng-1.6.42/pngtrans.c (modified) (6 diffs)

trunk/src/libs/libpng-1.6.42/pngtrans.c

@@ -2 +2 @@
 /* pngtrans.c - transforms the data in a row (used by both readers and writers)
  *
- * Copyright (c) 2018 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
  * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
  * Copyright (c) 1996-1997 Andreas Dilger
@@ -104 +104 @@
    {
       png_ptr->transformations |= PNG_INTERLACE;
-      return (7);
-   }
-
-   return (1);
+      return 7;
+   }
+
+   return 1;
 }
 #endif
@@ -499 +499 @@
    png_bytep ep = row + row_info->rowbytes; /* One beyond end of row */
 
+   png_debug(1, "in png_do_strip_channel");
+
    /* At the start sp will point to the first byte to copy and dp to where
     * it is copied to.  ep always points just beyond the end of the row, so
@@ -699 +701 @@
 png_do_check_palette_indexes(png_structrp png_ptr, png_row_infop row_info)
 {
+   png_debug(1, "in png_do_check_palette_indexes");
+
    if (png_ptr->num_palette < (1 << row_info->bit_depth) &&
       png_ptr->num_palette > 0) /* num_palette can be 0 in MNG files */
@@ -709 +713 @@
        */
       int padding = PNG_PADBITS(row_info->pixel_depth, row_info->width);
-      png_bytep rp = png_ptr->row_buf + row_info->rowbytes - 1;
+      png_bytep rp = png_ptr->row_buf + row_info->rowbytes;
 
       switch (row_info->bit_depth)
@@ -834 +838 @@
 {
    if (png_ptr == NULL)
-      return (NULL);
+      return NULL;
 
    return png_ptr->user_transform_ptr;