diff --git a/ShareX.HelpersLib/Forms/ClipboardContentViewer.cs b/ShareX.HelpersLib/Forms/ClipboardContentViewer.cs index 06e9ceb70..708f83d05 100644 --- a/ShareX.HelpersLib/Forms/ClipboardContentViewer.cs +++ b/ShareX.HelpersLib/Forms/ClipboardContentViewer.cs @@ -26,7 +26,6 @@ using ShareX.HelpersLib.Properties; using System; using System.Drawing; -using System.Linq; using System.Windows.Forms; namespace ShareX.HelpersLib @@ -62,15 +61,15 @@ private bool CheckClipboardContents() if (Clipboard.ContainsImage()) { - using (Image img = ClipboardHelpers.GetImage()) + using (Bitmap bmp = ClipboardHelpers.GetImage()) { - if (img != null) + if (bmp != null) { ClipboardContentType = EClipboardContentType.Image; - ClipboardContent = img.Clone(); - pbClipboard.LoadImage(img); + ClipboardContent = bmp.Clone(); + pbClipboard.LoadImage(bmp); pbClipboard.Visible = true; - lblQuestion.Text = string.Format(Resources.ClipboardContentViewer_ClipboardContentViewer_Load_Clipboard_content__Image__Size___0_x_1__, img.Width, img.Height); + lblQuestion.Text = string.Format(Resources.ClipboardContentViewer_ClipboardContentViewer_Load_Clipboard_content__Image__Size___0_x_1__, bmp.Width, bmp.Height); return true; } } diff --git a/ShareX.HelpersLib/Forms/ImageViewer.cs b/ShareX.HelpersLib/Forms/ImageViewer.cs index d01ab3585..ad7a87db2 100644 --- a/ShareX.HelpersLib/Forms/ImageViewer.cs +++ b/ShareX.HelpersLib/Forms/ImageViewer.cs @@ -25,7 +25,6 @@ using System; using System.Drawing; -using System.IO; using System.Windows.Forms; namespace ShareX.HelpersLib diff --git a/ShareX.HelpersLib/Helpers/ClipboardHelpers.cs b/ShareX.HelpersLib/Helpers/ClipboardHelpers.cs index 3ce6490c7..59e4e6ebd 100644 --- a/ShareX.HelpersLib/Helpers/ClipboardHelpers.cs +++ b/ShareX.HelpersLib/Helpers/ClipboardHelpers.cs @@ -235,7 +235,7 @@ public static bool CopyTextFromFile(string path) return false; } - public static Image GetImage(bool checkContainsImage = false) + public static Bitmap GetImage(bool checkContainsImage = false) { try { @@ -243,7 +243,7 @@ public static Image GetImage(bool checkContainsImage = false) { if (!checkContainsImage || Clipboard.ContainsImage()) { - return Clipboard.GetImage(); + return (Bitmap)Clipboard.GetImage(); } } } diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.cs b/ShareX.ImageEffectsLib/ImageEffectsForm.cs index c2f7cd1c7..181d56150 100644 --- a/ShareX.ImageEffectsLib/ImageEffectsForm.cs +++ b/ShareX.ImageEffectsLib/ImageEffectsForm.cs @@ -35,7 +35,7 @@ namespace ShareX.ImageEffectsLib { public partial class ImageEffectsForm : Form { - public event Action ImageProcessRequested; + public event Action ImageProcessRequested; public bool AutoGeneratePreviewImage { get; set; } public Bitmap PreviewImage { get; private set; } @@ -68,7 +68,7 @@ public ImageEffectsForm(Bitmap bmp, List presets, int selecte AddAllEffectsToContextMenu(); } - public void EnableToolMode(Action imageProcessRequested, string filePath = null) + public void EnableToolMode(Action imageProcessRequested, string filePath = null) { FilePath = filePath; ImageProcessRequested += imageProcessRequested; @@ -84,11 +84,11 @@ public void EditorMode() btnClose.Text = Resources.ImageEffectsForm_EditorMode_Cancel; } - protected void OnImageProcessRequested(Image img) + protected void OnImageProcessRequested(Bitmap bmp) { if (ImageProcessRequested != null) { - ImageProcessRequested(img); + ImageProcessRequested(bmp); } } @@ -310,7 +310,7 @@ private void GeneratePreviewImage(int padding) } } - private Image ApplyEffects() + private Bitmap ApplyEffects() { ImageEffectPreset preset = GetSelectedPreset(); @@ -614,7 +614,7 @@ private void tsmiLoadImageFromFile_Click(object sender, EventArgs e) private void tsmiLoadImageFromClipboard_Click(object sender, EventArgs e) { - Bitmap bmp = (Bitmap)ClipboardHelpers.GetImage(); + Bitmap bmp = ClipboardHelpers.GetImage(); if (bmp != null) { @@ -648,11 +648,11 @@ private void btnUploadImage_Click(object sender, EventArgs e) { if (PreviewImage != null) { - Image img = ApplyEffects(); + Bitmap bmp = ApplyEffects(); - if (img != null) + if (bmp != null) { - OnImageProcessRequested(img); + OnImageProcessRequested(bmp); } } } diff --git a/ShareX.MediaLib/Forms/ImageCombinerForm.cs b/ShareX.MediaLib/Forms/ImageCombinerForm.cs index a5bf9b4ab..0b538e235 100644 --- a/ShareX.MediaLib/Forms/ImageCombinerForm.cs +++ b/ShareX.MediaLib/Forms/ImageCombinerForm.cs @@ -34,7 +34,7 @@ namespace ShareX.MediaLib { public partial class ImageCombinerForm : Form { - public event Action ProcessRequested; + public event Action ProcessRequested; public ImageCombinerOptions Options { get; private set; } @@ -136,7 +136,7 @@ private void btnCombine_Click(object sender, EventArgs e) if (images.Count > 1) { - Image output = ImageHelpers.CombineImages(images, Options.Orientation, Options.Space); + Bitmap output = ImageHelpers.CombineImages(images, Options.Orientation, Options.Space); OnProcessRequested(output); } @@ -162,11 +162,11 @@ private void btnCombine_Click(object sender, EventArgs e) } } - protected void OnProcessRequested(Image image) + protected void OnProcessRequested(Bitmap bmp) { if (ProcessRequested != null) { - ProcessRequested(image); + ProcessRequested(bmp); } } diff --git a/ShareX.ScreenCaptureLib/Forms/EditorStartupForm.cs b/ShareX.ScreenCaptureLib/Forms/EditorStartupForm.cs index b68edaa49..555226982 100644 --- a/ShareX.ScreenCaptureLib/Forms/EditorStartupForm.cs +++ b/ShareX.ScreenCaptureLib/Forms/EditorStartupForm.cs @@ -71,7 +71,7 @@ private void btnLoadImageFromClipboard_Click(object sender, EventArgs e) { if (Clipboard.ContainsImage()) { - Image = (Bitmap)ClipboardHelpers.GetImage(); + Image = ClipboardHelpers.GetImage(); if (Image != null) { diff --git a/ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs b/ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs index a14c77883..4b646bc51 100644 --- a/ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs +++ b/ShareX.ScreenCaptureLib/Forms/RegionCaptureForm.cs @@ -40,11 +40,11 @@ public sealed class RegionCaptureForm : Form { public static GraphicsPath LastRegionFillPath { get; private set; } - public event Func SaveImageRequested; - public event Func SaveImageAsRequested; - public event Action CopyImageRequested; - public event Action UploadImageRequested; - public event Action PrintImageRequested; + public event Func SaveImageRequested; + public event Func SaveImageAsRequested; + public event Action CopyImageRequested; + public event Action UploadImageRequested; + public event Action PrintImageRequested; public RegionCaptureOptions Options { get; set; } public Rectangle ClientArea { get; private set; } @@ -1341,9 +1341,9 @@ public Bitmap GetResultImage() return null; } - private Image ReceiveImageForTask() + private Bitmap ReceiveImageForTask() { - Image img = GetResultImage(); + Bitmap bmp = GetResultImage(); ShapeManager.IsModified = false; @@ -1352,16 +1352,16 @@ private Image ReceiveImageForTask() CloseWindow(); } - return img; + return bmp; } internal void OnSaveImageRequested() { if (SaveImageRequested != null) { - Image img = ReceiveImageForTask(); + Bitmap bmp = ReceiveImageForTask(); - string imageFilePath = SaveImageRequested(img, ImageFilePath); + string imageFilePath = SaveImageRequested(bmp, ImageFilePath); if (!string.IsNullOrEmpty(imageFilePath)) { @@ -1375,9 +1375,9 @@ internal void OnSaveImageAsRequested() { if (SaveImageAsRequested != null) { - Image img = ReceiveImageForTask(); + Bitmap bmp = ReceiveImageForTask(); - string imageFilePath = SaveImageAsRequested(img, ImageFilePath); + string imageFilePath = SaveImageAsRequested(bmp, ImageFilePath); if (!string.IsNullOrEmpty(imageFilePath)) { @@ -1391,9 +1391,9 @@ internal void OnCopyImageRequested() { if (CopyImageRequested != null) { - Image img = ReceiveImageForTask(); + Bitmap bmp = ReceiveImageForTask(); - CopyImageRequested(img); + CopyImageRequested(bmp); } } @@ -1401,9 +1401,9 @@ internal void OnUploadImageRequested() { if (UploadImageRequested != null) { - Image img = ReceiveImageForTask(); + Bitmap bmp = ReceiveImageForTask(); - UploadImageRequested(img); + UploadImageRequested(bmp); } } @@ -1411,9 +1411,9 @@ internal void OnPrintImageRequested() { if (PrintImageRequested != null) { - Image img = ReceiveImageForTask(); + Bitmap bmp = ReceiveImageForTask(); - PrintImageRequested(img); + PrintImageRequested(bmp); } } diff --git a/ShareX.ScreenCaptureLib/Forms/RegionCaptureTransparentForm.cs b/ShareX.ScreenCaptureLib/Forms/RegionCaptureTransparentForm.cs index aeb31f817..f3b8deb46 100644 --- a/ShareX.ScreenCaptureLib/Forms/RegionCaptureTransparentForm.cs +++ b/ShareX.ScreenCaptureLib/Forms/RegionCaptureTransparentForm.cs @@ -157,7 +157,7 @@ private void RectangleTransparent_MouseUp(object sender, MouseEventArgs e) } } - public Image GetAreaImage(Screenshot screenshot) + public Bitmap GetAreaImage(Screenshot screenshot) { Rectangle rect = SelectionRectangle0Based; diff --git a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs index edf8e2fbb..46440d42d 100644 --- a/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs +++ b/ShareX.ScreenCaptureLib/Forms/ScrollingCaptureForm.cs @@ -37,11 +37,11 @@ namespace ShareX.ScreenCaptureLib { public partial class ScrollingCaptureForm : Form { - public event Action ImageProcessRequested; + public event Action ImageProcessRequested; public ScrollingCaptureOptions Options { get; private set; } public RegionCaptureOptions RegionCaptureOptions { get; private set; } - public Image Result { get; private set; } + public Bitmap Result { get; private set; } private WindowInfo selectedWindow; private Rectangle selectedRectangle; @@ -98,11 +98,11 @@ protected override void Dispose(bool disposing) base.Dispose(disposing); } - protected void OnImageProcessRequested(Image img) + protected void OnImageProcessRequested(Bitmap bmp) { if (ImageProcessRequested != null) { - ImageProcessRequested(img); + ImageProcessRequested(bmp); } } @@ -522,7 +522,7 @@ private void StartProcess() { if (Result != null) { - OnImageProcessRequested((Image)Result.Clone()); + OnImageProcessRequested((Bitmap)Result.Clone()); } } @@ -562,7 +562,7 @@ private void CombineAndPreviewImages() pbOutput.Image = Result; } - private Image CombineImages() + private Bitmap CombineImages() { if (images == null || images.Count == 0) { @@ -613,7 +613,7 @@ private Image CombineImages() output.Add(newImage); } - Image result = ImageHelpers.CombineImages(output); + Bitmap bmpResult = ImageHelpers.CombineImages(output); foreach (Bitmap image in output) { @@ -625,7 +625,7 @@ private Image CombineImages() output.Clear(); - return result; + return bmpResult; } private void GuessEdges() diff --git a/ShareX.ScreenCaptureLib/Screenshot_Transparent.cs b/ShareX.ScreenCaptureLib/Screenshot_Transparent.cs index 112e676fd..32a0cbddb 100644 --- a/ShareX.ScreenCaptureLib/Screenshot_Transparent.cs +++ b/ShareX.ScreenCaptureLib/Screenshot_Transparent.cs @@ -35,7 +35,7 @@ namespace ShareX.ScreenCaptureLib { public partial class Screenshot { - public Image CaptureWindowTransparent(IntPtr handle) + public Bitmap CaptureWindowTransparent(IntPtr handle) { if (handle.ToInt32() > 0) { @@ -154,7 +154,7 @@ public Image CaptureWindowTransparent(IntPtr handle) return null; } - public Image CaptureActiveWindowTransparent() + public Bitmap CaptureActiveWindowTransparent() { IntPtr handle = NativeMethods.GetForegroundWindow(); diff --git a/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs b/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs index 99d869e33..f0f061780 100644 --- a/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs +++ b/ShareX.ScreenCaptureLib/Shapes/ShapeManager.cs @@ -1595,8 +1595,8 @@ private void PasteFromClipboard(bool insertMousePosition) { if (Clipboard.ContainsImage()) { - Image img = ClipboardHelpers.GetImage(); - InsertImage(img); + Bitmap bmp = ClipboardHelpers.GetImage(); + InsertImage(bmp); } else if (Clipboard.ContainsFileDropList()) { diff --git a/ShareX/CaptureHelpers/CaptureRegion.cs b/ShareX/CaptureHelpers/CaptureRegion.cs index 697bc770a..192045b73 100644 --- a/ShareX/CaptureHelpers/CaptureRegion.cs +++ b/ShareX/CaptureHelpers/CaptureRegion.cs @@ -138,22 +138,22 @@ protected ImageInfo ExecuteRegionCaptureLight(TaskSettings taskSettings) protected ImageInfo ExecuteRegionCaptureTransparent(TaskSettings taskSettings) { - Image img = null; + Bitmap bmp = null; using (RegionCaptureTransparentForm rectangleTransparent = new RegionCaptureTransparentForm()) { if (rectangleTransparent.ShowDialog() == DialogResult.OK) { - img = rectangleTransparent.GetAreaImage(TaskHelpers.GetScreenshot(taskSettings)); + bmp = rectangleTransparent.GetAreaImage(TaskHelpers.GetScreenshot(taskSettings)); - if (img != null) + if (bmp != null) { lastRegionCaptureType = RegionCaptureType.Transparent; } } } - return new ImageInfo(img); + return new ImageInfo(bmp); } } } \ No newline at end of file diff --git a/ShareX/Forms/AutoCaptureForm.cs b/ShareX/Forms/AutoCaptureForm.cs index 9de319c7a..9ae1f1a3a 100644 --- a/ShareX/Forms/AutoCaptureForm.cs +++ b/ShareX/Forms/AutoCaptureForm.cs @@ -108,16 +108,16 @@ private void TakeScreenshot() if (!rect.IsEmpty) { - Image img = TaskHelpers.GetScreenshot(TaskSettings).CaptureRectangle(rect); + Bitmap bmp = TaskHelpers.GetScreenshot(TaskSettings).CaptureRectangle(rect); - if (img != null) + if (bmp != null) { TaskSettings.UseDefaultAfterCaptureJob = false; TaskSettings.AfterCaptureJob = TaskSettings.AfterCaptureJob.Remove(AfterCaptureTasks.AnnotateImage); TaskSettings.UseDefaultAdvancedSettings = false; TaskSettings.AdvancedSettings.DisableNotifications = true; - UploadManager.RunImageTask(img, TaskSettings, true, true); + UploadManager.RunImageTask(bmp, TaskSettings, true, true); } } } diff --git a/ShareX/Forms/QRCodeForm.cs b/ShareX/Forms/QRCodeForm.cs index 9f4607410..8302d0f76 100644 --- a/ShareX/Forms/QRCodeForm.cs +++ b/ShareX/Forms/QRCodeForm.cs @@ -194,8 +194,8 @@ private void tsmiUpload_Click(object sender, EventArgs e) { if (pbQRCode.Image != null) { - Image img = (Image)pbQRCode.Image.Clone(); - UploadManager.UploadImage(img); + Bitmap bmp = (Bitmap)pbQRCode.Image.Clone(); + UploadManager.UploadImage(bmp); } } diff --git a/ShareX/ImageInfo.cs b/ShareX/ImageInfo.cs index f23b06b12..8ea8b4c23 100644 --- a/ShareX/ImageInfo.cs +++ b/ShareX/ImageInfo.cs @@ -31,7 +31,7 @@ namespace ShareX { public class ImageInfo : IDisposable { - public Image Image { get; set; } + public Bitmap Image { get; set; } public string WindowTitle { get; set; } public string ProcessName { get; set; } @@ -39,7 +39,7 @@ public ImageInfo() { } - public ImageInfo(Image image) + public ImageInfo(Bitmap image) { Image = image; } diff --git a/ShareX/TaskHelpers.cs b/ShareX/TaskHelpers.cs index 9ff58762c..55fc3604a 100644 --- a/ShareX/TaskHelpers.cs +++ b/ShareX/TaskHelpers.cs @@ -442,11 +442,11 @@ private static void SaveImageAsJPEGStream(Image img, Stream stream, int jpegQual } } - public static void SaveImageAsFile(Image img, TaskSettings taskSettings, bool overwriteFile = false) + public static void SaveImageAsFile(Bitmap bmp, TaskSettings taskSettings, bool overwriteFile = false) { - using (ImageData imageData = PrepareImage(img, taskSettings)) + using (ImageData imageData = PrepareImage(bmp, taskSettings)) { - string fileName = GetFilename(taskSettings, imageData.ImageFormat.GetDescription(), img); + string fileName = GetFilename(taskSettings, imageData.ImageFormat.GetDescription(), bmp); string filePath = Path.Combine(taskSettings.CaptureFolder, fileName); if (!overwriteFile) @@ -462,9 +462,9 @@ public static void SaveImageAsFile(Image img, TaskSettings taskSettings, bool ov } } - public static string GetFilename(TaskSettings taskSettings, string extension, Image image) + public static string GetFilename(TaskSettings taskSettings, string extension, Bitmap bmp) { - ImageInfo imageInfo = new ImageInfo(image); + ImageInfo imageInfo = new ImageInfo(bmp); return GetFilename(taskSettings, extension, imageInfo); } @@ -829,7 +829,7 @@ public static void OpenImageCombiner(TaskSettings taskSettings = null, IEnumerab if (taskSettings == null) taskSettings = TaskSettings.GetDefaultTaskSettings(); ImageCombinerForm imageCombinerForm = new ImageCombinerForm(taskSettings.ToolsSettingsReference.ImageCombinerOptions, imageFiles); - imageCombinerForm.ProcessRequested += img => UploadManager.RunImageTask(img, taskSettings); + imageCombinerForm.ProcessRequested += bmp => UploadManager.RunImageTask(bmp, taskSettings); imageCombinerForm.Show(); } diff --git a/ShareX/TaskManager.cs b/ShareX/TaskManager.cs index 7ece41fef..00a8995fe 100644 --- a/ShareX/TaskManager.cs +++ b/ShareX/TaskManager.cs @@ -148,7 +148,7 @@ private static void Task_StatusChanged(WorkerTask task) UpdateProgressUI(); } - private static void Task_ImageReady(WorkerTask task, Image image) + private static void Task_ImageReady(WorkerTask task, Bitmap image) { TaskThumbnailPanel panel = TaskThumbnailView.FindPanel(task); @@ -158,7 +158,7 @@ private static void Task_ImageReady(WorkerTask task, Image image) if (Program.Settings.TaskViewMode == TaskViewMode.ThumbnailView) { - panel.UpdateThumbnail((Bitmap)image); + panel.UpdateThumbnail(image); } } } @@ -390,7 +390,7 @@ private static void Task_TaskCompleted(WorkerTask task) RightClickAction = info.TaskSettings.AdvancedSettings.ToastWindowRightClickAction, MiddleClickAction = info.TaskSettings.AdvancedSettings.ToastWindowMiddleClickAction, FilePath = info.FilePath, - Image = (Bitmap)task.Image, + Image = task.Image, Text = "ShareX - " + Resources.TaskManager_task_UploadCompleted_ShareX___Task_completed + "\r\n" + result, URL = result }; diff --git a/ShareX/UploadManager.cs b/ShareX/UploadManager.cs index cc8c264d0..e61bce80d 100644 --- a/ShareX/UploadManager.cs +++ b/ShareX/UploadManager.cs @@ -30,7 +30,6 @@ using System; using System.Drawing; using System.IO; -using System.Linq; using System.Threading.Tasks; using System.Web; using System.Windows.Forms; @@ -143,16 +142,16 @@ public static void UploadFolder(TaskSettings taskSettings = null) } } - private static void ProcessImageUpload(Image img, TaskSettings taskSettings) + private static void ProcessImageUpload(Bitmap bmp, TaskSettings taskSettings) { - if (img != null) + if (bmp != null) { if (!taskSettings.AdvancedSettings.ProcessImagesDuringClipboardUpload) { taskSettings.AfterCaptureJob = AfterCaptureTasks.UploadImageToHost; } - RunImageTask(img, taskSettings); + RunImageTask(bmp, taskSettings); } } @@ -208,9 +207,9 @@ public static void ClipboardUpload(TaskSettings taskSettings = null) if (Clipboard.ContainsImage()) { - Image img = ClipboardHelpers.GetImage(); + Bitmap bmp = ClipboardHelpers.GetImage(); - ProcessImageUpload(img, taskSettings); + ProcessImageUpload(bmp, taskSettings); } else if (Clipboard.ContainsText()) { @@ -232,9 +231,9 @@ private static void ClipboardUploadCached(ClipboardContentViewer ccv, TaskSettin if (ccv.ClipboardContentType == EClipboardContentType.Image) { - Image img = (Image)ccv.ClipboardContent; + Bitmap bmp = (Bitmap)ccv.ClipboardContent; - ProcessImageUpload(img, taskSettings); + ProcessImageUpload(bmp, taskSettings); } else if (ccv.ClipboardContentType == EClipboardContentType.Text) { @@ -267,7 +266,7 @@ private static void ProcessClipboardContentViewerDialog(ClipboardContentViewer c } else if (ccv.ClipboardContentType == EClipboardContentType.Image) { - ((Image)ccv.ClipboardContent).Dispose(); + ((Bitmap)ccv.ClipboardContent).Dispose(); } } @@ -329,8 +328,8 @@ public static void DragDropUpload(IDataObject data, TaskSettings taskSettings = } else if (data.GetDataPresent(DataFormats.Bitmap, false)) { - Image img = data.GetData(DataFormats.Bitmap, false) as Image; - RunImageTask(img, taskSettings); + Bitmap bmp = data.GetData(DataFormats.Bitmap, false) as Bitmap; + RunImageTask(bmp, taskSettings); } else if (data.GetDataPresent(DataFormats.Text, false)) { @@ -382,9 +381,9 @@ public static void ShowShortenURLDialog(TaskSettings taskSettings = null) } } - public static void RunImageTask(Image img, TaskSettings taskSettings, bool skipQuickTaskMenu = false, bool skipAfterCaptureWindow = false) + public static void RunImageTask(Bitmap bmp, TaskSettings taskSettings, bool skipQuickTaskMenu = false, bool skipAfterCaptureWindow = false) { - ImageInfo imageInfo = new ImageInfo(img); + ImageInfo imageInfo = new ImageInfo(bmp); RunImageTask(imageInfo, taskSettings, skipQuickTaskMenu, skipAfterCaptureWindow); } @@ -429,21 +428,21 @@ public static void RunImageTask(ImageInfo imageInfo, TaskSettings taskSettings, } } - public static void UploadImage(Image img) + public static void UploadImage(Bitmap bmp) { - if (img != null) + if (bmp != null) { TaskSettings taskSettings = TaskSettings.GetDefaultTaskSettings(); taskSettings.UseDefaultAfterCaptureJob = false; taskSettings.AfterCaptureJob = AfterCaptureTasks.UploadImageToHost; - RunImageTask(img, taskSettings); + RunImageTask(bmp, taskSettings); } } - public static void UploadImage(Image img, ImageDestination imageDestination, FileDestination imageFileDestination) + public static void UploadImage(Bitmap bmp, ImageDestination imageDestination, FileDestination imageFileDestination) { - if (img != null) + if (bmp != null) { TaskSettings taskSettings = TaskSettings.GetDefaultTaskSettings(); taskSettings.UseDefaultAfterCaptureJob = false; @@ -452,7 +451,7 @@ public static void UploadImage(Image img, ImageDestination imageDestination, Fil taskSettings.ImageDestination = imageDestination; taskSettings.ImageFileDestination = imageFileDestination; - RunImageTask(img, taskSettings); + RunImageTask(bmp, taskSettings); } } diff --git a/ShareX/WorkerTask.cs b/ShareX/WorkerTask.cs index 2d71f2eff..e4b78dc17 100644 --- a/ShareX/WorkerTask.cs +++ b/ShareX/WorkerTask.cs @@ -42,7 +42,7 @@ namespace ShareX public class WorkerTask : IDisposable { public delegate void TaskEventHandler(WorkerTask task); - public delegate void TaskImageEventHandler(WorkerTask task, Image image); + public delegate void TaskImageEventHandler(WorkerTask task, Bitmap image); public delegate void UploaderServiceEventHandler(IUploaderService uploaderService); public event TaskEventHandler StatusChanged, UploadStarted, UploadProgressChanged, UploadCompleted, TaskCompleted; @@ -57,7 +57,7 @@ public class WorkerTask : IDisposable public bool RequestSettingUpdate { get; private set; } public bool EarlyURLCopied { get; private set; } public Stream Data { get; private set; } - public Image Image { get; private set; } + public Bitmap Image { get; private set; } public bool KeepImage { get; set; } public string Text { get; private set; } @@ -575,7 +575,7 @@ private bool DoAfterCaptureJobs() if (Info.TaskSettings.AfterCaptureJob.HasFlag(AfterCaptureTasks.AddImageEffects)) { - Image = TaskHelpers.AddImageEffects((Bitmap)Image, Info.TaskSettings.ImageSettingsReference); + Image = TaskHelpers.AddImageEffects(Image, Info.TaskSettings.ImageSettingsReference); if (Image == null) { @@ -586,7 +586,7 @@ private bool DoAfterCaptureJobs() if (Info.TaskSettings.AfterCaptureJob.HasFlag(AfterCaptureTasks.AnnotateImage)) { - Image = TaskHelpers.AnnotateImage((Bitmap)Image, null, Info.TaskSettings, true); + Image = TaskHelpers.AnnotateImage(Image, null, Info.TaskSettings, true); if (Image == null) { @@ -683,7 +683,7 @@ private bool DoAfterCaptureJobs() thumbnailFolder = Info.TaskSettings.CaptureFolder; } - Info.ThumbnailFilePath = TaskHelpers.CreateThumbnail((Bitmap)Image, thumbnailFolder, thumbnailFilename, Info.TaskSettings); + Info.ThumbnailFilePath = TaskHelpers.CreateThumbnail(Image, thumbnailFolder, thumbnailFilename, Info.TaskSettings); if (!string.IsNullOrEmpty(Info.ThumbnailFilePath)) { @@ -1071,11 +1071,11 @@ private void OnImageReady() { if (ImageReady != null) { - Image image = null; + Bitmap image = null; if (Program.Settings.TaskViewMode == TaskViewMode.ThumbnailView && Image != null) { - image = (Image)Image.Clone(); + image = (Bitmap)Image.Clone(); } threadWorker.InvokeAsync(() =>