more MS-DOS stuff in generic wxFileDialog

[wxWidgets.git] / src / png / pngget.c

diff --git a/src/png/pngget.c b/src/png/pngget.c
index eb2f64fade15b5154410c9ef7da40b5cd7a5f62b..484a0117c857ffa7ada7fd30fc2de679c43b82df 100644 (file)
--- a/src/png/pngget.c
+++ b/src/png/pngget.c
@@ -1,12 +1,11 @@
 
 /* pngget.c - retrieval of values from info struct
  *
 
 /* pngget.c - retrieval of values from info struct
  *

- * libpng 1.0.1
+ * libpng 1.0.3 - January 14, 1999

  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
  * Copyright (c) 1996, 1997 Andreas Dilger

- * Copyright (c) 1998, Glenn Randers-Pehrson
- * March 15, 1998
+ * Copyright (c) 1998, 1999 Glenn Randers-Pehrson

  */
 
 #define PNG_INTERNAL
  */
 
 #define PNG_INTERNAL


@@ -302,11 +301,11 @@ png_get_pHYs_dpi(png_structp png_ptr, png_infop info_ptr,
    }
    return (retval);
 }
    }
    return (retval);
 }

-#endif
-
+#endif /* PNG_READ_pHYs_SUPPORTED */

 #endif  /* PNG_INCH_CONVERSIONS */
 
 /* png_get_channels really belongs in here, too, but it's been around longer */
 #endif  /* PNG_INCH_CONVERSIONS */
 
 /* png_get_channels really belongs in here, too, but it's been around longer */

+

 #endif  /* PNG_EASY_ACCESS_SUPPORTED */
 
 png_byte
 #endif  /* PNG_EASY_ACCESS_SUPPORTED */
 
 png_byte


@@ -424,7 +423,7 @@ png_get_IHDR(png_structp png_ptr, png_infop info_ptr,
    png_uint_32 *width, png_uint_32 *height, int *bit_depth,
    int *color_type, int *interlace_type, int *compression_type,
    int *filter_type)
    png_uint_32 *width, png_uint_32 *height, int *bit_depth,
    int *color_type, int *interlace_type, int *compression_type,
    int *filter_type)

-   
+

 {
    if (png_ptr != NULL && info_ptr != NULL && width != NULL && height != NULL &&
       bit_depth != NULL && color_type != NULL)
 {
    if (png_ptr != NULL && info_ptr != NULL && width != NULL && height != NULL &&
       bit_depth != NULL && color_type != NULL)


@@ -642,3 +641,10 @@ png_get_tRNS(png_structp png_ptr, png_infop info_ptr,
 }
 #endif
 
 }
 #endif
 

+#if defined(PNG_READ_RGB_TO_GRAY_SUPPORTED)
+png_byte
+png_get_rgb_to_gray_status (png_structp png_ptr)
+{
+   return png_ptr->rgb_to_gray_status;
+}
+#endif