From 20c83136a9e28836d9e5a24eeb2c7b4f1d11a2ff Mon Sep 17 00:00:00 2001 From: Jaex Date: Fri, 20 Sep 2019 10:48:45 +0300 Subject: [PATCH] Fix PVS high issues --- ShareX.HelpersLib/Helpers/ClipboardHelpers.cs | 7 +------ ShareX.HelpersLib/Helpers/ImageHelpers.cs | 16 +++++----------- ShareX.UploadersLib/Forms/UploadersConfigForm.cs | 7 ++++--- .../ImageUploaders/FlickrUploader.cs | 5 +++-- ShareX/Controls/TaskThumbnailPanel.cs | 12 ++++-------- ShareX/Forms/AfterUploadForm.cs | 2 +- ShareX/TaskHelpers.cs | 4 ++-- ShareX/TaskManager.cs | 4 ++-- 8 files changed, 22 insertions(+), 35 deletions(-) diff --git a/ShareX.HelpersLib/Helpers/ClipboardHelpers.cs b/ShareX.HelpersLib/Helpers/ClipboardHelpers.cs index b43acd8d6..15e615a53 100644 --- a/ShareX.HelpersLib/Helpers/ClipboardHelpers.cs +++ b/ShareX.HelpersLib/Helpers/ClipboardHelpers.cs @@ -284,12 +284,7 @@ private static Image GetImageAlternative() { try { - Image img = GetDIBImage(ms); - - if (img != null) - { - return img; - } + return GetDIBImage(ms); } catch (Exception e) { diff --git a/ShareX.HelpersLib/Helpers/ImageHelpers.cs b/ShareX.HelpersLib/Helpers/ImageHelpers.cs index 35db564d3..4ce3d2e44 100644 --- a/ShareX.HelpersLib/Helpers/ImageHelpers.cs +++ b/ShareX.HelpersLib/Helpers/ImageHelpers.cs @@ -814,27 +814,21 @@ public static bool IsImageTransparent(Bitmap bmp) public static bool AddMetadata(Image img, int id, string text) { - PropertyItem pi; - try { - pi = (PropertyItem)typeof(PropertyItem).GetConstructor(BindingFlags.Instance | BindingFlags.NonPublic, null, new Type[] { }, null).Invoke(null); + PropertyItem pi = (PropertyItem)typeof(PropertyItem).GetConstructor(BindingFlags.Instance | BindingFlags.NonPublic, null, new Type[] { }, null).Invoke(null); pi.Id = id; pi.Len = text.Length + 1; pi.Type = 2; byte[] bytesText = Encoding.ASCII.GetBytes(text + " "); bytesText[bytesText.Length - 1] = 0; pi.Value = bytesText; - - if (pi != null) - { - img.SetPropertyItem(pi); - return true; - } + img.SetPropertyItem(pi); + return true; } catch (Exception e) { - DebugHelper.WriteException(e, "Reflection failed."); + DebugHelper.WriteException(e, "AddMetadata reflection failed."); } return false; @@ -1142,7 +1136,7 @@ public static void Pixelate(Bitmap bmp, int pixelSize) { ColorBgra color = unsafeBitmap.GetPixel(x2, y2); - float pixelWeight = (float)color.Alpha / 255; + float pixelWeight = color.Alpha / 255f; r += color.Red * pixelWeight; g += color.Green * pixelWeight; diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs index ab2e1a718..221a5b606 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs @@ -203,13 +203,14 @@ private void LoadImageUploaderSettings() if (OAuthInfo.CheckOAuth(Config.PhotobucketOAuthInfo)) { lblPhotobucketAccountStatus.Text = Resources.UploadersConfigForm_Login_successful; - txtPhotobucketDefaultAlbumName.Text = Config.PhotobucketAccountInfo.AlbumID; - lblPhotobucketParentAlbumPath.Text = Resources.UploadersConfigForm_LoadSettings_Parent_album_path_e_g_ + " " + - Config.PhotobucketAccountInfo.AlbumID + "/Personal/" + DateTime.Now.Year; } if (Config.PhotobucketAccountInfo != null) { + txtPhotobucketDefaultAlbumName.Text = Config.PhotobucketAccountInfo.AlbumID; + lblPhotobucketParentAlbumPath.Text = Resources.UploadersConfigForm_LoadSettings_Parent_album_path_e_g_ + " " + + Config.PhotobucketAccountInfo.AlbumID + "/Personal/" + DateTime.Now.Year; + cboPhotobucketAlbumPaths.Items.Clear(); if (Config.PhotobucketAccountInfo.AlbumList.Count > 0) diff --git a/ShareX.UploadersLib/ImageUploaders/FlickrUploader.cs b/ShareX.UploadersLib/ImageUploaders/FlickrUploader.cs index aaaf1148e..0aea95689 100644 --- a/ShareX.UploadersLib/ImageUploaders/FlickrUploader.cs +++ b/ShareX.UploadersLib/ImageUploaders/FlickrUploader.cs @@ -129,9 +129,10 @@ public override UploadResult Upload(Stream stream, string fileName) { string photoid = xele.Value; FlickrPhotosGetSizesResponse photos = PhotosGetSizes(photoid); - FlickrPhotosGetSizesSize photo = photos?.sizes?.size?[photos.sizes.size.Length - 1]; - if (photo != null) + if (photos != null && photos.sizes != null && photos.sizes.size != null && photos.sizes.size.Length > 0) { + FlickrPhotosGetSizesSize photo = photos.sizes.size[photos.sizes.size.Length - 1]; + if (Settings.DirectLink) { result.URL = photo.source; diff --git a/ShareX/Controls/TaskThumbnailPanel.cs b/ShareX/Controls/TaskThumbnailPanel.cs index 22ec5e562..43323fdd2 100644 --- a/ShareX/Controls/TaskThumbnailPanel.cs +++ b/ShareX/Controls/TaskThumbnailPanel.cs @@ -462,15 +462,11 @@ private void PbThumbnail_MouseMove(object sender, MouseEventArgs e) { if (Task.Info != null && !string.IsNullOrEmpty(Task.Info.FilePath) && File.Exists(Task.Info.FilePath)) { + Program.MainForm.AllowDrop = false; IDataObject dataObject = new DataObject(DataFormats.FileDrop, new string[] { Task.Info.FilePath }); - - if (dataObject != null) - { - Program.MainForm.AllowDrop = false; - dragBoxFromMouseDown = Rectangle.Empty; - pbThumbnail.DoDragDrop(dataObject, DragDropEffects.Copy | DragDropEffects.Move); - Program.MainForm.AllowDrop = true; - } + dragBoxFromMouseDown = Rectangle.Empty; + pbThumbnail.DoDragDrop(dataObject, DragDropEffects.Copy | DragDropEffects.Move); + Program.MainForm.AllowDrop = true; } else { diff --git a/ShareX/Forms/AfterUploadForm.cs b/ShareX/Forms/AfterUploadForm.cs index e1a636859..48257a06b 100644 --- a/ShareX/Forms/AfterUploadForm.cs +++ b/ShareX/Forms/AfterUploadForm.cs @@ -152,7 +152,7 @@ private void btnCopyLink_Click(object sender, EventArgs e) { url = lvClipboardFormats.Items[0].SubItems[1].Text; } - else if (lvClipboardFormats.SelectedItems.Count > 0) + else { url = lvClipboardFormats.SelectedItems[0].SubItems[1].Text; } diff --git a/ShareX/TaskHelpers.cs b/ShareX/TaskHelpers.cs index 2018f2fc2..787260c8c 100644 --- a/ShareX/TaskHelpers.cs +++ b/ShareX/TaskHelpers.cs @@ -658,8 +658,8 @@ public static Icon GetProgressIcon(int percentage) using (Font font = new Font("Arial", 10)) using (StringFormat sf = new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center }) { - g.DrawString(percentage.ToString(), font, Brushes.Black, size.Width / 2, size.Height / 2, sf); - g.DrawString(percentage.ToString(), font, Brushes.White, size.Width / 2, (size.Height / 2) - 1, sf); + g.DrawString(percentage.ToString(), font, Brushes.Black, size.Width / 2f, size.Height / 2f, sf); + g.DrawString(percentage.ToString(), font, Brushes.White, size.Width / 2f, (size.Height / 2f) - 1, sf); } return Icon.FromHandle(bmp.GetHicon()); diff --git a/ShareX/TaskManager.cs b/ShareX/TaskManager.cs index 93587136b..1d6e3b00d 100644 --- a/ShareX/TaskManager.cs +++ b/ShareX/TaskManager.cs @@ -265,10 +265,10 @@ private static void Task_TaskCompleted(WorkerTask task) { try { - task.KeepImage = false; - if (task != null) { + task.KeepImage = false; + if (task.RequestSettingUpdate) { Program.MainForm.UpdateCheckStates();