Fix a very old type confusion error.

PiperOrigin-RevId: 588138163

Author: tensorflower-gardener

tensorflow/core/lib/png/BUILD

@@ -15,13 +15,15 @@ cc_library(
     name = "png_io",
     srcs = ["png_io.cc"],
     hdrs = ["png_io.h"],
+    features = ["-layering_check"],
     deps = [
         "//tensorflow/core/platform:byte_order",
         "//tensorflow/core/platform:logging",
         "//tensorflow/core/platform:png",
         "//tensorflow/core/platform:stringpiece",
         "//tensorflow/core/platform:types",
         "@com_google_absl//absl/base",
+        "@png",
         "@zlib",
     ],
 )

tensorflow/core/lib/png/png_io.cc

@@ -25,6 +25,7 @@ limitations under the License.
 // provokes a compile error. We instead let png.h include what is needed.
 
 #include "absl/base/casts.h"
+#include "png.h"  // from @png
 #include "tensorflow/core/lib/png/png_io.h"
 #include "tensorflow/core/platform/byte_order.h"
 #include "tensorflow/core/platform/logging.h"
@@ -77,7 +78,7 @@ static void Convert8to16(const uint8* p8, int num_comps, int p8_row_bytes,
 
 void ErrorHandler(png_structp png_ptr, png_const_charp msg) {
   DecodeContext* const ctx =
-      absl::bit_cast<DecodeContext*>(png_get_io_ptr(png_ptr));
+      absl::bit_cast<DecodeContext*>(png_get_error_ptr(png_ptr));
   ctx->error_condition = true;
   // To prevent log spam, errors are logged as VLOG(1) instead of ERROR.
   VLOG(1) << "PNG error: " << msg;
@@ -354,8 +355,9 @@ bool WriteImageToBuffer(
 
   png_string->resize(0);
   png_infop info_ptr = nullptr;
-  png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, nullptr,
-                                                ErrorHandler, WarningHandler);
+  DecodeContext decode_context;
+  png_structp png_ptr = png_create_write_struct(
+      PNG_LIBPNG_VER_STRING, &decode_context, ErrorHandler, WarningHandler);
   if (png_ptr == nullptr) return false;
   if (setjmp(png_jmpbuf(png_ptr))) {
     png_destroy_write_struct(&png_ptr, info_ptr ? &info_ptr : nullptr);