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

Updates to keep Xcode 4.3 happy.

Browse source
This commit is contained in:
jules 2012-02-23 21:10:49 +00:00
parent d2a4173ab4
commit b6a22826fe
5 changed files with 23 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/juce_graphics/colour/juce_Colours.cpp
View file

@ -168,7 +168,7 @@ const Colour Colours::yellowgreen (0xff9acd32);
Colour Colours::findColourForName (const String& colourName,
const Colour& defaultColour)
{
static const int presets[] =
static const uint32 presets[] =
{
// (first value is the string's hashcode, second is ARGB)
@ -311,11 +311,11 @@ Colour Colours::findColourForName (const String& colourName,
0xe1b5130f, 0xff9acd32 /* yellowgreen */
};
const int hash = colourName.trim().toLowerCase().hashCode();
const uint32 hash = (uint32) colourName.trim().toLowerCase().hashCode();
for (int i = 0; i < numElementsInArray (presets); i += 2)
if (presets [i] == hash)
return Colour ((uint32) presets [i + 1]);
return Colour (presets [i + 1]);
return defaultColour;
}