Skip to content

Fix bitmap disposal leaks and isDrawing stuck state from PR review #631

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheJoeFin merged 3 commits into from
Mar 8, 2026
Merged

Fix bitmap disposal leaks and isDrawing stuck state from PR review #631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a1f9a28
Initial plan
Copilot Mar 8, 2026
06c4f51
Fix bitmap disposal, isDrawing reset, and indentation per review comm…
Copilot Mar 8, 2026
1fcc08a
Remove using statement for selectionBitmap in table OCR
TheJoeFin Mar 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Text-Grab/Utilities/OcrUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public static async Task<string> GetRegionsTextAsTableAsync(Window passedWindow,
int thisCorrectedTop = (int)absPosPoint.Y + selectedRegion.Top;

Rectangle correctedRegion = new(thisCorrectedLeft, thisCorrectedTop, selectedRegion.Width, selectedRegion.Height);
Bitmap bmp = ImageMethods.GetRegionOfScreenAsBitmap(correctedRegion);
using Bitmap bmp = ImageMethods.GetRegionOfScreenAsBitmap(correctedRegion);
double scale = await GetIdealScaleFactorForOcrAsync(bmp, compatibleLanguage);
using Bitmap scaledBitmap = ImageMethods.ScaleBitmapUniform(bmp, scale);
DpiScale dpiScale = VisualTreeHelper.GetDpi(passedWindow);
Expand Down Expand Up @@ -212,7 +212,7 @@ public static async Task<string> GetTextFromBitmapSourceAsTableAsync(BitmapSourc
public static async Task<(IOcrLinesWords?, double)> GetOcrResultFromRegionAsync(Rectangle region, ILanguage language)
{
language = GetCompatibleOcrLanguage(language);
Bitmap bmp = ImageMethods.GetRegionOfScreenAsBitmap(region);
using Bitmap bmp = ImageMethods.GetRegionOfScreenAsBitmap(region);

if (language is WindowsAiLang)
{
Expand Down
4 changes: 3 additions & 1 deletion Text-Grab/Views/FullscreenGrab.SelectionStyles.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1064,7 +1064,9 @@ private async Task CommitSelectionAsync(FullscreenCaptureResult selection, bool
}
else if (isTable)
{
using Bitmap selectionBitmap = ImageMethods.GetRegionOfScreenAsBitmap(selection.CaptureRegion.AsRectangle());
// TODO: Look into why this happens and find a better way to dispose the bitmap
// DO NOT add a using statement to this selected bitmap, it crashes the app
Bitmap selectionBitmap = ImageMethods.GetRegionOfScreenAsBitmap(selection.CaptureRegion.AsRectangle());
TextFromOCR = await OcrUtilities.GetTextFromBitmapAsTableAsync(selectionBitmap, selectedOcrLang);
}
else
Expand Down
6 changes: 5 additions & 1 deletion Text-Grab/Views/GrabFrame.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1387,7 +1387,11 @@ private async Task DrawOcrRectanglesAsync(string searchWord = "")
}

if (ocrResultOfWindow is null)
{
isDrawing = false;
reDrawTimer.Start();
return;
}

isSpaceJoining = CurrentLanguage!.IsSpaceJoining();

Expand Down Expand Up @@ -2687,7 +2691,7 @@ private void ResetGrabFrame()
if (!hasLoadedImageSource)
frameContentImageSource = null;

ClearRenderedWordBorders();
ClearRenderedWordBorders();
MatchesTXTBLK.Text = "- Matches";
UpdateFrameText();
}
Expand Down