diff options
author | Lode Vandevenne <lvandeve@users.noreply.github.com> | 2019-11-14 22:38:14 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-11-14 22:38:14 +0300 |
commit | e1d431b916c002ca6afd31722779ecf055ca9ad2 (patch) | |
tree | 0328fb4647069c8bac93543964b6da45ffc63808 | |
parent | 4d4a4068c00afdc23ec4240d645df66296a9bb1a (diff) | |
parent | 7e04d427fc846bcada98a61066cb6558d1f55510 (diff) |
Merge pull request #94 from bobsayshilol/abi-fix
Fix ABI incompatibility when calling a C++ compiled lodepng.cpp from C code or vice versa
-rw-r--r-- | lodepng.h | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -755,10 +755,6 @@ typedef struct LodePNGState { LodePNGColorMode info_raw; /*specifies the format in which you would like to get the raw pixel buffer*/ LodePNGInfo info_png; /*info of the PNG image obtained after decoding*/ unsigned error; -#ifdef LODEPNG_COMPILE_CPP - /* For the lodepng::State subclass. */ - virtual ~LodePNGState(){} -#endif } LodePNGState; /*init, cleanup and copy functions to use with this struct*/ @@ -985,7 +981,7 @@ class State : public LodePNGState { public: State(); State(const State& other); - virtual ~State(); + ~State(); State& operator=(const State& other); }; |