Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-28 15:02:35 +01:00
Code Issues Projects Releases Wiki Activity

Fixed crash in OCR when changing "Use color" - thx kurosu :)

Browse Source 
Fix #1727
This commit is contained in:
Nikolaj Olsson 2016-04-26 18:26:36 +02:00
parent 408389b104
commit bbd957bfdb
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Forms/VobSubOcr.cs
View File

@ -5462,7 +5462,7 @@ namespace Nikse.SubtitleEdit.Forms
var bitmap = (Bitmap)e.Argument;
if (bitmap != null)
{
if (_tesseractAsyncIndex >= 0 && _tesseractAsyncIndex < _tesseractAsyncStrings.Length)
if (_tesseractAsyncIndex >= 0 && _tesseractAsyncStrings != null && _tesseractAsyncIndex < _tesseractAsyncStrings.Length)
{
if (string.IsNullOrEmpty(_tesseractAsyncStrings[_tesseractAsyncIndex]))
_tesseractAsyncStrings[_tesseractAsyncIndex] = Tesseract3DoOcrViaExe(bitmap, _languageId, "-psm 6"); // 6 = Assume a single uniform block of text.);
@ -5476,7 +5476,7 @@ namespace Nikse.SubtitleEdit.Forms
if (!e.Cancelled)
{
_tesseractAsyncIndex++;
if (_tesseractAsyncIndex >= 0 && _tesseractAsyncIndex < _tesseractAsyncStrings.Length)
if (_tesseractAsyncIndex >= 0 && _tesseractAsyncStrings != null && _tesseractAsyncIndex < _tesseractAsyncStrings.Length)
_tesseractThread.RunWorkerAsync(GetSubtitleBitmap(_tesseractAsyncIndex));
}
}
@ -7362,8 +7362,11 @@ namespace Nikse.SubtitleEdit.Forms
if (_tesseractThread != null)
{
_tesseractThread.CancelAsync();
if (_tesseractAsyncStrings != null)
{
for (int i = 0; i < _tesseractAsyncStrings.Length; i++)
_tesseractAsyncStrings[i] = string.Empty;
}
_tesseractAsyncIndex = 0;
}
}
@ -8537,6 +8540,14 @@ namespace Nikse.SubtitleEdit.Forms
private void checkBoxTransportStreamGetColorAndSplit_CheckedChanged(object sender, EventArgs e)
{
if (_ocrMethodIndex == _ocrMethodTesseract)
{
_icThreadsStop = true;
_abort = true;
_nocrThreadsStop = true;
ResetTesseractThread();
}
if (checkBoxTransportStreamGetColorAndSplit.Checked)
{
SplitDvbForEachSubImage();