v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3900 from Saalvage/decltype 

Utilize decltype for slightly improved syntax
pull/3905/head^2
Kim Kulling 2021-05-16 21:16:22 +02:00 committed by GitHub
parent 596f7db9f9 6dec8ad5f3
commit 0c9947f8b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
include/assimp/Bitmap.h
View File

@ -75,13 +75,12 @@ protected:
uint32_t offset; uint32_t offset;
// We define the struct size because sizeof(Header) might return a wrong result because of structure padding. // We define the struct size because sizeof(Header) might return a wrong result because of structure padding.
// Moreover, we must use this ugly and error prone syntax because Visual Studio neither support constexpr or sizeof(name_of_field). static constexpr std::size_t header_size =
static const std::size_t header_size = sizeof(type) +
sizeof(uint16_t) + // type sizeof(size) +
sizeof(uint32_t) + // size sizeof(reserved1) +
sizeof(uint16_t) + // reserved1 sizeof(reserved2) +
sizeof(uint16_t) + // reserved2 sizeof(offset);
sizeof(uint32_t); // offset
}; };
struct DIB { struct DIB {
@ -98,22 +97,21 @@ protected:
uint32_t nb_important_colors; uint32_t nb_important_colors;
// We define the struct size because sizeof(DIB) might return a wrong result because of structure padding. // We define the struct size because sizeof(DIB) might return a wrong result because of structure padding.
// Moreover, we must use this ugly and error prone syntax because Visual Studio neither support constexpr or sizeof(name_of_field). static constexpr std::size_t dib_size =
static const std::size_t dib_size = sizeof(size) +
sizeof(uint32_t) + // size sizeof(width) +
sizeof(int32_t) + // width sizeof(height) +
sizeof(int32_t) + // height sizeof(planes) +
sizeof(uint16_t) + // planes sizeof(bits_per_pixel) +
sizeof(uint16_t) + // bits_per_pixel sizeof(compression) +
sizeof(uint32_t) + // compression sizeof(image_size) +
sizeof(uint32_t) + // image_size sizeof(x_resolution) +
sizeof(int32_t) + // x_resolution sizeof(y_resolution) +
sizeof(int32_t) + // y_resolution sizeof(nb_colors) +
sizeof(uint32_t) + // nb_colors sizeof(nb_important_colors);
sizeof(uint32_t); // nb_important_colors
}; };
static const std::size_t mBytesPerPixel = 4; static constexpr std::size_t mBytesPerPixel = 4;
public: public:
static void Save(aiTexture* texture, IOStream* file); static void Save(aiTexture* texture, IOStream* file);