Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop

Browse Source
This commit is contained in:
Florian Küpper authored and GitHub committed 2016-12-26 22:46:23 +01:00
2 parents 6bb67f218a 0eb28b1bc9
commit b8b8141cfe
3 files changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Lib/Draw/CDirect3D.cs
+3 -3
View File
@@ -556,13 +556,13 @@ namespace Vocaluxe.Lib.Draw
/// </summary>
public void MakeScreenShot()
{
string file = CHelper.GetUniqueFileName(Path.Combine(CSettings.DataFolder, CSettings.FolderNameScreenshots), "Screenshot.bmp");
string file = CHelper.GetUniqueFileName(Path.Combine(CSettings.DataFolder, CSettings.FolderNameScreenshots), "Screenshot.png");
//create a surface of the frame
using (Surface surface = _Device.GetBackBuffer(0, 0))
{
var screen = new Bitmap(Surface.ToStream(surface, ImageFileFormat.Bmp));
screen.Save(file, ImageFormat.Bmp);
var screen = new Bitmap(Surface.ToStream(surface, ImageFileFormat.Png));
screen.Save(file, ImageFormat.Png);
screen.Dispose();
}
}
Vocaluxe/Lib/Draw/CDrawWinForm.cs
+1 -1
View File
@@ -303,7 +303,7 @@ namespace Vocaluxe.Lib.Draw
public void MakeScreenShot()
{
string file = CHelper.GetUniqueFileName(Path.Combine(CSettings.DataFolder, CSettings.FolderNameScreenshots), "Screenshot.bmp");
string file = CHelper.GetUniqueFileName(Path.Combine(CSettings.DataFolder, CSettings.FolderNameScreenshots), "Screenshot.png");
_Backbuffer.Save(file, ImageFormat.Png);
}
Vocaluxe/Lib/Draw/COpenGL.cs
+2 -2
View File
@@ -291,7 +291,7 @@ namespace Vocaluxe.Lib.Draw
public void MakeScreenShot()
{
string file = CHelper.GetUniqueFileName(Path.Combine(CSettings.DataFolder, CSettings.FolderNameScreenshots), "Screenshot.bmp");
string file = CHelper.GetUniqueFileName(Path.Combine(CSettings.DataFolder, CSettings.FolderNameScreenshots), "Screenshot.png");
int width = GetScreenWidth();
int height = GetScreenHeight();
@@ -304,7 +304,7 @@ namespace Vocaluxe.Lib.Draw
screen.UnlockBits(bmpData);
screen.RotateFlip(RotateFlipType.RotateNoneFlipY);
screen.Save(file, ImageFormat.Bmp);
screen.Save(file, ImageFormat.Png);
}
}