epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8609 from Mailaender/bad-lock-2

Browse Source 
Fixed another bad choice of lock objects in ColorMixerWidget
This commit is contained in:
Pavel Penev
2015-07-02 21:12:46 +03:00
parent 79d00b2b7c 499667eab5
commit 08a890491b
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
OpenRA.Mods.Common/Widgets/ColorMixerWidget.cs
View File

@@ -98,26 +98,23 @@ namespace OpenRA.Mods.Common.Widgets
hue = H; hue = H;
} }
lock (back) unsafe
{ {
unsafe // Generate palette in HSV
fixed (byte* cc = &back[0])
{ {
// Generate palette in HSV var c = (int*)cc;
fixed (byte* cc = &back[0]) for (var v = 0; v < 256; v++)
{ for (var s = 0; s < 256; s++)
var c = (int*)cc; *(c + (v * 256) + s) = HSLColor.FromHSV(hue, s / 255f, (255 - v) / 255f).RGB.ToArgb();
for (var v = 0; v < 256; v++)
for (var s = 0; s < 256; s++)
*(c + (v * 256) + s) = HSLColor.FromHSV(hue, s / 255f, (255 - v) / 255f).RGB.ToArgb();
}
} }
}
lock (bufferSync) lock (bufferSync)
{ {
var swap = front; var swap = front;
front = back; front = back;
back = swap; back = swap;
}
} }
} }
} }