Changeset 25126 in vbox for trunk/src/VBox/Main/DisplayImpl.cpp

Timestamp:

Dec 1, 2009 12:53:38 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

55504

Message:

Main: fixes for libpng14 (public ticket #5615)

File:

• trunk/src/VBox/Main/DisplayImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/DisplayImpl.cpp

@@ -309 +309 @@
             png_infop info_ptr = NULL;
             png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
-                                                          png_voidp_NULL, /* error/warning context pointer */
-                                                          png_error_ptr_NULL /* error function */,
-                                                          png_error_ptr_NULL /* warning function */);
+                                                          (png_voidp)NULL, /* error/warning context pointer */
+                                                          (png_error_ptr)NULL, /* error function */
+                                                          (png_error_ptr)NULL /* warning function */);
             if (png_ptr)
             {
@@ -373 +373 @@
                 }
 
-                png_destroy_write_struct(&png_ptr, info_ptr? &info_ptr: png_infopp_NULL);
+                png_destroy_write_struct(&png_ptr, info_ptr ? &info_ptr 
+                                                            : (png_infopp)NULL);
             }
             else