From d489095bcdf9603053ebd514588093a991605ffb Mon Sep 17 00:00:00 2001 From: "FWoltermann@gmail.com" Date: Fri, 9 Dec 2011 15:37:22 +0000 Subject: More string and fopen safety measures --- nGenEx/PngImage.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'nGenEx/PngImage.cpp') diff --git a/nGenEx/PngImage.cpp b/nGenEx/PngImage.cpp index 3f429ec..abfac7d 100644 --- a/nGenEx/PngImage.cpp +++ b/nGenEx/PngImage.cpp @@ -45,7 +45,7 @@ int PngImage::Load(char *filename) int status = PNG_INVALID; FILE* f; - f = fopen(filename,"rb"); + fopen_s(&f, filename,"rb"); if (f == NULL) return PNG_NOFILE; @@ -208,11 +208,11 @@ PngImage::CreateImage(png_structp png_ptr, png_infop info_ptr) // paletted: else if (bpp == 8) { DWORD pal[256]; - - png_bytep trans_alpha; int num_trans; png_color_16p trans_color; - png_colorp palette; - int num_palette; - + + png_bytep trans_alpha; int num_trans; png_color_16p trans_color; + png_colorp palette; + int num_palette; + png_get_tRNS(png_ptr, info_ptr, &trans_alpha, &num_trans, &trans_color); png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette); -- cgit v1.1