github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-14 17:13:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Creating a branch 1.1 where I will try to make the 1.1.7 build available, this means I need to merge some changes from 2.0 to here.

Browse source
This commit is contained in:
RKrom 2013-12-04 17:46:02 +01:00
parent 2a8e2475d8
commit a03bc31aef
247 changed files with 6986 additions and 8233 deletions
Download patch file Download diff file Expand all files Collapse all files

4
GreenshotPlugin/Core/ClipboardHelper.cs
View file

@ -346,6 +346,7 @@ EndSelection:<<<<<<<4
returnImage = GetImageFormat(currentFormat, dataObject);
}
if (returnImage != null) {
ImageHelper.Orientate(returnImage);
return returnImage;
}
} else {
@ -416,9 +417,6 @@ EndSelection:<<<<<<<4
MemoryStream imageStream = GetFromDataObject(dataObject, format) as MemoryStream;
if (isValidStream(imageStream)) {
try {
using (FileStream fs = new FileStream(@"C:\Localdata\test.png", FileMode.OpenOrCreate)) {
imageStream.WriteTo(fs);
}
imageStream.Seek(0, SeekOrigin.Begin);
using (Image tmpImage = Image.FromStream(imageStream, true, true)) {
if (tmpImage != null) {