Merge pull request #188 from DarthAffe/development

Two minor issues
This commit is contained in:
Robert Beekman authored and GitHub committed 2016-11-01 23:05:07 +01:00
commit 638302d7f2
2 files changed
+6 -2

No files matched your search

@@ -118,7 +118,7 @@ namespace Artemis.DeviceProviders.Corsair
}
_keyboardBrush.Image = image;
_keyboard.Update(true);
_keyboard.Update();
image.Dispose();
}
@@ -38,8 +38,12 @@ namespace Artemis.Profiles.Layers.Types.AmbientLight.AmbienceCreator
double widthPixels = effectiveSourceWidth / (double)targetWidth;
double heightPixels = relevantSourceHeight / (double)targetHeight;
if (widthPixels <= 0 || heightPixels <= 0 || (relevantSourceHeight + relevantOffsetTop > sourceHeight) || effectiveSourceWidth > sourceWidth)
if (widthPixels <= 0 || heightPixels <= 0 || (relevantSourceHeight + relevantOffsetTop > sourceHeight) ||
effectiveSourceWidth > sourceWidth)
{
colors = colors.ExtendHeight(targetHeight);
return colors.ToBGRArray();
}
int increment = Math.Max(1, Math.Min(20, settings.Downsampling));
for (int y = 0; y < relevantSourceHeight; y += increment)