diff options
| author | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2011-12-09 15:37:22 +0000 |
|---|---|---|
| committer | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2011-12-09 15:37:22 +0000 |
| commit | d489095bcdf9603053ebd514588093a991605ffb (patch) | |
| tree | db03ad0a00e1466fef64290adfecd67bc9373d1c /nGenEx/PngImage.cpp | |
| parent | 4f272a3e310be77b4ba16fdfd2c9b6735f411037 (diff) | |
| download | starshatter-d489095bcdf9603053ebd514588093a991605ffb.zip starshatter-d489095bcdf9603053ebd514588093a991605ffb.tar.gz starshatter-d489095bcdf9603053ebd514588093a991605ffb.tar.bz2 | |
More string and fopen safety measures
Diffstat (limited to 'nGenEx/PngImage.cpp')
| -rw-r--r-- | nGenEx/PngImage.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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);
|