Skip to content

Commit

Permalink
Preserve ability to build with original FreeImage (clang-format)
Browse files Browse the repository at this point in the history
  • Loading branch information
eugenegff committed Mar 7, 2024
1 parent e019362 commit 2b46aac
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions OgreMain/src/OgreFreeImageCodec2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,11 @@ THE SOFTWARE.

#include <sstream>

// We want to be compatible with both FreeImage and FreeImageRe, but first specifies sizes as DWORD and second as uint32_t
// On Windows both DWORD (unsigned long) and uint32_t are separate 32bit types, so pointers to them can not be mixed
// We want to be compatible with both FreeImage and FreeImageRe, but first specifies sizes as DWORD and
// second as uint32_t. On Windows both DWORD (unsigned long) and uint32_t are separate 32bit types, so
// pointers to them can not be mixed
#ifndef FISIZE
#define FISIZE decltype( FIICCPROFILE::size ) // DWORD for FreeImage, uint32_t for FreeImageRe
# define FISIZE decltype( FIICCPROFILE::size ) // DWORD for FreeImage, uint32_t for FreeImageRe
#endif

namespace Ogre
Expand Down

0 comments on commit 2b46aac

Please sign in to comment.