diff --git a/Greenshot-OCR-Plugin/OCRPlugin.cs b/Greenshot-OCR-Plugin/OCRPlugin.cs index f5c9fb07f..134b4df5b 100644 --- a/Greenshot-OCR-Plugin/OCRPlugin.cs +++ b/Greenshot-OCR-Plugin/OCRPlugin.cs @@ -163,10 +163,10 @@ namespace GreenshotOCR { graphics.Clear(Color.White); graphics.DrawImage(capturedImage, Point.Empty); } - filePath = host.SaveToTmpFile(tmpImage, OutputFormat.bmp, 100); + filePath = host.SaveToTmpFile(tmpImage, OutputFormat.bmp, 100, false); } } else { - filePath = host.SaveToTmpFile(capturedImage, OutputFormat.bmp, 100); + filePath = host.SaveToTmpFile(capturedImage, OutputFormat.bmp, 100, false); } } diff --git a/Greenshot/Forms/MainForm.cs b/Greenshot/Forms/MainForm.cs index 7762e0478..665dc002c 100644 --- a/Greenshot/Forms/MainForm.cs +++ b/Greenshot/Forms/MainForm.cs @@ -403,8 +403,8 @@ namespace Greenshot { } catch {} break; case CommandEnum.OpenFile: - LOG.InfoFormat("Open file requested: {0}", filename); string filename = command.Value; + LOG.InfoFormat("Open file requested: {0}", filename); if (File.Exists(filename)) { BeginInvoke((MethodInvoker)delegate { CaptureHelper.CaptureFile(filename); diff --git a/GreenshotConfluencePlugin/ConfluenceConfiguration.cs b/GreenshotConfluencePlugin/ConfluenceConfiguration.cs index 0f2415dee..d458ef5e3 100644 --- a/GreenshotConfluencePlugin/ConfluenceConfiguration.cs +++ b/GreenshotConfluencePlugin/ConfluenceConfiguration.cs @@ -54,6 +54,11 @@ namespace GreenshotConfluencePlugin { get; set; } + [IniProperty("UploadReduceColors", Description="Reduce color amount of the uploaded image to 256", DefaultValue="False")] + public bool UploadReduceColors { + get; + set; + } [IniProperty("OpenPageAfterUpload", Description="Open the page where the picture is uploaded after upload", DefaultValue="True")] public bool OpenPageAfterUpload { get; diff --git a/GreenshotConfluencePlugin/ConfluenceDestination.cs b/GreenshotConfluencePlugin/ConfluenceDestination.cs index d10ac2e29..137fca59d 100644 --- a/GreenshotConfluencePlugin/ConfluenceDestination.cs +++ b/GreenshotConfluencePlugin/ConfluenceDestination.cs @@ -143,7 +143,7 @@ namespace GreenshotConfluencePlugin { private bool upload(Image image, Page page, string filename, bool openPage) { byte[] buffer; using (MemoryStream stream = new MemoryStream()) { - ConfluencePlugin.Host.SaveToStream(image, stream, config.UploadFormat, config.UploadJpegQuality); + ConfluencePlugin.Host.SaveToStream(image, stream, config.UploadFormat, config.UploadJpegQuality, config.UploadReduceColors); // COPY buffer to array buffer = stream.ToArray(); } diff --git a/GreenshotExternalCommandPlugin/ExternalCommandDestination.cs b/GreenshotExternalCommandPlugin/ExternalCommandDestination.cs index 2749fa8cb..7beadd52e 100644 --- a/GreenshotExternalCommandPlugin/ExternalCommandDestination.cs +++ b/GreenshotExternalCommandPlugin/ExternalCommandDestination.cs @@ -90,7 +90,7 @@ namespace ExternalCommand { string fullPath = captureDetails.Filename; if (fullPath == null) { using (Image image = surface.GetImageForExport()) { - fullPath = host.SaveNamedTmpFile(image, captureDetails, OutputFormat.png, 100); + fullPath = host.SaveNamedTmpFile(image, captureDetails, OutputFormat.png, 100, false); } } if (presetCommand != null) { diff --git a/GreenshotImgurPlugin/ImgurConfiguration.cs b/GreenshotImgurPlugin/ImgurConfiguration.cs index 0fcf9696a..33b344ed4 100644 --- a/GreenshotImgurPlugin/ImgurConfiguration.cs +++ b/GreenshotImgurPlugin/ImgurConfiguration.cs @@ -39,6 +39,8 @@ namespace GreenshotImgurPlugin { public OutputFormat UploadFormat; [IniProperty("UploadJpegQuality", Description="JPEG file save quality in %.", DefaultValue="80")] public int UploadJpegQuality; + [IniProperty("UploadReduceColors", Description="Reduce color amount of the uploaded image to 256", DefaultValue="False")] + public bool UploadReduceColors; [IniProperty("UsePageLink", Description = "Use pagelink instead of direct link on the clipboard", DefaultValue = "False")] public bool UsePageLink; diff --git a/GreenshotImgurPlugin/ImgurPlugin.cs b/GreenshotImgurPlugin/ImgurPlugin.cs index 8348cc096..981bc65d9 100644 --- a/GreenshotImgurPlugin/ImgurPlugin.cs +++ b/GreenshotImgurPlugin/ImgurPlugin.cs @@ -140,7 +140,7 @@ namespace GreenshotImgurPlugin { using (MemoryStream stream = new MemoryStream()) { BackgroundForm backgroundForm = BackgroundForm.ShowAndWait(Attributes.Name, lang.GetString(LangKey.communication_wait)); - host.SaveToStream(image, stream, config.UploadFormat, config.UploadJpegQuality); + host.SaveToStream(image, stream, config.UploadFormat, config.UploadJpegQuality, config.UploadReduceColors); try { string filename = Path.GetFileName(host.GetFilename(config.UploadFormat, captureDetails)); ImgurInfo imgurInfo = ImgurUtils.UploadToImgur(stream.GetBuffer(), (int)stream.Length, captureDetails.DateTime.ToString(), filename); @@ -178,7 +178,7 @@ namespace GreenshotImgurPlugin { using (MemoryStream stream = new MemoryStream()) { BackgroundForm backgroundForm = BackgroundForm.ShowAndWait(Attributes.Name, lang.GetString(LangKey.communication_wait)); - imageEditor.SaveToStream(stream, config.UploadFormat, config.UploadJpegQuality); + imageEditor.SaveToStream(stream, config.UploadFormat, config.UploadJpegQuality, config.UploadReduceColors); try { string filename = Path.GetFileName(host.GetFilename(config.UploadFormat, imageEditor.CaptureDetails)); ImgurInfo imgurInfo = ImgurUtils.UploadToImgur(stream.GetBuffer(), (int)stream.Length, imageEditor.CaptureDetails.Title, filename); diff --git a/GreenshotJiraPlugin/JiraDestination.cs b/GreenshotJiraPlugin/JiraDestination.cs index 719c300ef..4424dc97e 100644 --- a/GreenshotJiraPlugin/JiraDestination.cs +++ b/GreenshotJiraPlugin/JiraDestination.cs @@ -105,7 +105,7 @@ namespace GreenshotJiraPlugin { if (jira != null) { using (MemoryStream stream = new MemoryStream()) { using (Image image = surface.GetImageForExport()) { - jiraPlugin.Host.SaveToStream(image, stream, config.UploadFormat, config.UploadJpegQuality); + jiraPlugin.Host.SaveToStream(image, stream, config.UploadFormat, config.UploadJpegQuality, config.UploadReduceColors); } // COPY stream to buffer buffer = stream.ToArray(); @@ -132,7 +132,7 @@ namespace GreenshotJiraPlugin { if (result == DialogResult.OK) { using (MemoryStream stream = new MemoryStream()) { using (Image image = surface.GetImageForExport()) { - jiraPlugin.Host.SaveToStream(image, stream, config.UploadFormat, config.UploadJpegQuality); + jiraPlugin.Host.SaveToStream(image, stream, config.UploadFormat, config.UploadJpegQuality, config.UploadReduceColors); } // COPY stream to buffer buffer = stream.ToArray();