sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a shitload of warnings in 64 bits mode

Browse Source 
Former-commit-id: 5bc0c622c20eae45df51bb1ee62e5ed566e58a1b [formerly a8befbed30cb897ce876fd3b46a3585e1b70613e]
Former-commit-id: 999225e414c0d6a3e9c6868f040b68045b2ba724
This commit is contained in:
Lynix
2016-06-13 21:09:55 +02:00
parent 6eca751ee5
commit c528640d80
39 changed files with 191 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Utility/AbstractAtlas.hpp
View File

@@ -29,7 +29,7 @@ namespace Nz
virtual void Clear() = 0;
virtual void Free(SparsePtr<const Rectui> rects, SparsePtr<unsigned int> layers, unsigned int count) = 0;
virtual AbstractImage* GetLayer(unsigned int layerIndex) const = 0;
virtual unsigned int GetLayerCount() const = 0;
virtual std::size_t GetLayerCount() const = 0;
virtual UInt32 GetStorage() const = 0;
virtual bool Insert(const Image& image, Rectui* rect, bool* flipped, unsigned int* layerIndex) = 0;

4
include/Nazara/Utility/AbstractImage.hpp
View File

@@ -28,8 +28,8 @@ namespace Nz
virtual unsigned int GetHeight(UInt8 level = 0) const = 0;
virtual UInt8 GetLevelCount() const = 0;
virtual UInt8 GetMaxLevel() const = 0;
virtual unsigned int GetMemoryUsage() const = 0;
virtual unsigned int GetMemoryUsage(UInt8 level) const = 0;
virtual std::size_t GetMemoryUsage() const = 0;
virtual std::size_t GetMemoryUsage(UInt8 level) const = 0;
virtual Vector3ui GetSize(UInt8 level = 0) const = 0;
virtual ImageType GetType() const = 0;
virtual unsigned int GetWidth(UInt8 level = 0) const = 0;

8
include/Nazara/Utility/AbstractTextDrawer.hpp
View File

@@ -27,10 +27,10 @@ namespace Nz
virtual ~AbstractTextDrawer();
virtual const Recti& GetBounds() const = 0;
virtual Font* GetFont(unsigned int index) const = 0;
virtual unsigned int GetFontCount() const = 0;
virtual const Glyph& GetGlyph(unsigned int index) const = 0;
virtual unsigned int GetGlyphCount() const = 0;
virtual Font* GetFont(std::size_t index) const = 0;
virtual std::size_t GetFontCount() const = 0;
virtual const Glyph& GetGlyph(std::size_t index) const = 0;
virtual std::size_t GetGlyphCount() const = 0;
struct Glyph
{

4
include/Nazara/Utility/Font.hpp
View File

@@ -61,8 +61,8 @@ namespace Nz
bool ExtractGlyph(unsigned int characterSize, char32_t character, UInt32 style, FontGlyph* glyph) const;
const std::shared_ptr<AbstractAtlas>& GetAtlas() const;
unsigned int GetCachedGlyphCount(unsigned int characterSize, UInt32 style) const;
unsigned int GetCachedGlyphCount() const;
std::size_t GetCachedGlyphCount(unsigned int characterSize, UInt32 style) const;
std::size_t GetCachedGlyphCount() const;
String GetFamilyName() const;
int GetKerning(unsigned int characterSize, char32_t first, char32_t second) const;
const Glyph& GetGlyph(unsigned int characterSize, UInt32 style, char32_t character) const;

8
include/Nazara/Utility/Formats/MD5AnimParser.hpp
View File

@@ -47,12 +47,12 @@ namespace Nz
Ternary Check();
unsigned int GetAnimatedComponentCount() const;
std::size_t GetAnimatedComponentCount() const;
const Frame* GetFrames() const;
unsigned int GetFrameCount() const;
unsigned int GetFrameRate() const;
std::size_t GetFrameCount() const;
std::size_t GetFrameRate() const;
const Joint* GetJoints() const;
unsigned int GetJointCount() const;
std::size_t GetJointCount() const;
bool Parse();

4
include/Nazara/Utility/Formats/MD5MeshParser.hpp
View File

@@ -58,9 +58,9 @@ namespace Nz
Ternary Check();
const Joint* GetJoints() const;
unsigned int GetJointCount() const;
std::size_t GetJointCount() const;
const Mesh* GetMeshes() const;
unsigned int GetMeshCount() const;
std::size_t GetMeshCount() const;
bool Parse();

13
include/Nazara/Utility/GuillotineImageAtlas.hpp
View File

@@ -23,16 +23,17 @@ namespace Nz
GuillotineImageAtlas();
virtual ~GuillotineImageAtlas();
void Clear();
void Free(SparsePtr<const Rectui> rects, SparsePtr<unsigned int> layers, unsigned int count);
void Clear() override;
void Free(SparsePtr<const Rectui> rects, SparsePtr<unsigned int> layers, unsigned int count) override;
GuillotineBinPack::FreeRectChoiceHeuristic GetRectChoiceHeuristic() const;
GuillotineBinPack::GuillotineSplitHeuristic GetRectSplitHeuristic() const;
AbstractImage* GetLayer(unsigned int layerIndex) const;
unsigned int GetLayerCount() const;
UInt32 GetStorage() const;
AbstractImage* GetLayer(unsigned int layerIndex) const override;
std::size_t GetLayerCount() const override;
UInt32 GetStorage() const override;
bool Insert(const Image& image, Rectui* rect, bool* flipped, unsigned int* layerIndex);
bool Insert(const Image& image, Rectui* rect, bool* flipped, unsigned int* layerIndex) override;
void SetRectChoiceHeuristic(GuillotineBinPack::FreeRectChoiceHeuristic heuristic);
void SetRectSplitHeuristic(GuillotineBinPack::GuillotineSplitHeuristic heuristic);

4
include/Nazara/Utility/Image.hpp
View File

@@ -84,8 +84,8 @@ namespace Nz
unsigned int GetHeight(UInt8 level = 0) const;
UInt8 GetLevelCount() const;
UInt8 GetMaxLevel() const;
unsigned int GetMemoryUsage() const;
unsigned int GetMemoryUsage(UInt8 level) const;
std::size_t GetMemoryUsage() const;
std::size_t GetMemoryUsage(UInt8 level) const;
Color GetPixelColor(unsigned int x, unsigned int y = 0, unsigned int z = 0) const;
UInt8* GetPixels(unsigned int x = 0, unsigned int y = 0, unsigned int z = 0, UInt8 level = 0);
Vector3ui GetSize(UInt8 level = 0) const;

4
include/Nazara/Utility/PixelFormat.inl
View File

@@ -100,7 +100,7 @@ namespace Nz
counter |= blueMask;
counter |= alphaMask;
bitsPerPixel = counter.Count();
bitsPerPixel = static_cast<UInt8>(counter.Count());
}
inline bool PixelFormatInfo::Validate() const
@@ -116,7 +116,7 @@ namespace Nz
for (unsigned int i = 0; i < 4; ++i)
{
unsigned int usedBits = masks[i]->Count();
UInt8 usedBits = static_cast<UInt8>(masks[i]->Count());
if (usedBits == 0)
continue;

8
include/Nazara/Utility/SimpleTextDrawer.hpp
View File

@@ -32,10 +32,10 @@ namespace Nz
unsigned int GetCharacterSize() const;
const Color& GetColor() const;
Font* GetFont() const;
Font* GetFont(unsigned int index) const override;
unsigned int GetFontCount() const override;
const Glyph& GetGlyph(unsigned int index) const override;
unsigned int GetGlyphCount() const override;
Font* GetFont(std::size_t index) const override;
std::size_t GetFontCount() const override;
const Glyph& GetGlyph(std::size_t index) const override;
std::size_t GetGlyphCount() const override;
UInt32 GetStyle() const;
const String& GetText() const;