mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Raised the warnings level in the introjucer, and fixed a few warnings that were thrown up by this.

Browse source
This commit is contained in:
jules 2015-03-31 11:44:10 +01:00
parent 452a1f3475
commit f6395d4cda
18 changed files with 78 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/juce_graphics/colour/juce_PixelFormats.h
View file

@ -107,7 +107,7 @@ public:
template <class Pixel>
forcedinline void blend (const Pixel& src) noexcept
{
const uint32 alpha = 0x100 - src.getAlpha();
const uint32 alpha = (uint32) (0x100 - src.getAlpha());
uint32 rb = src.getRB() + maskPixelComponents (getRB() * alpha);
uint32 ag = src.getAG() + maskPixelComponents (getAG() * alpha);
argb = clampPixelComponents (rb) + (clampPixelComponents (ag) << 8);
@ -234,9 +234,9 @@ public:
}
else
{
components.b = (uint8) jmin ((uint32) 0xff, (components.b * 0xff) / alpha);
components.g = (uint8) jmin ((uint32) 0xff, (components.g * 0xff) / alpha);
components.r = (uint8) jmin ((uint32) 0xff, (components.r * 0xff) / alpha);
components.b = (uint8) jmin ((uint32) 0xffu, (components.b * 0xffu) / alpha);
components.g = (uint8) jmin ((uint32) 0xffu, (components.g * 0xffu) / alpha);
components.r = (uint8) jmin ((uint32) 0xffu, (components.r * 0xffu) / alpha);
}
}
}
@ -350,7 +350,7 @@ public:
template <class Pixel>
forcedinline void blend (const Pixel& src) noexcept
{
const uint32 alpha = 0x100 - src.getAlpha();
const uint32 alpha = (uint32) (0x100 - src.getAlpha());
uint32 rb = clampPixelComponents (src.getRB() + maskPixelComponents (getRB() * alpha));
uint32 ag = src.getAG() + (g * alpha >> 8);