paczek/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix warning with GCC in our lowlevel PNG texture code.

Browse Source 
Ensure a variable is not clobbered by libpng's use of longjmp. Make code
more consistent.

Differential Revision: https://code.wildfiregames.com/D35
This was SVN commit r19111.
This commit is contained in:
Nicolas Auvray 2017-01-04 21:05:08 +00:00
parent 81eb74163e
commit 4068f2e14a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source/lib/tex/tex_png.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2015 Wildfire Games
/* Copyright (c) 2017 Wildfire Games
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -306,7 +306,6 @@ TIMER_ACCRUE(tc_png_decode);
// limitation: palette images aren't supported
Status TexCodecPng::encode(Tex* RESTRICT t, DynArray* RESTRICT da) const
{
Status ret = ERR::FAIL;
png_infop info_ptr = 0;
// allocate PNG structures; use default stderr and longjmp error handlers
@ -315,19 +314,21 @@ Status TexCodecPng::encode(Tex* RESTRICT t, DynArray* RESTRICT da) const
WARN_RETURN(ERR::FAIL);
info_ptr = png_create_info_struct(png_ptr);
if(!info_ptr)
goto fail;
{
png_destroy_write_struct(&png_ptr, &info_ptr);
WARN_RETURN(ERR::NO_MEM);
}
// setup error handling
if(setjmp(png_jmpbuf(png_ptr)))
{
// libpng longjmps here after an error
goto fail;
png_destroy_write_struct(&png_ptr, &info_ptr);
WARN_RETURN(ERR::FAIL);
}
ret = png_encode_impl(t, png_ptr, info_ptr, da);
Status ret = png_encode_impl(t, png_ptr, info_ptr, da);
// shared cleanup
fail:
png_destroy_write_struct(&png_ptr, &info_ptr);
return ret;
}