Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-25 12:44:46 +01:00
Code Issues Projects Releases Wiki Activity

Properly fix null dereference CID 18147

Browse Source
This commit is contained in:
_aLfa_ 2014-11-23 12:48:28 +01:00
parent 280fd62999
commit 4a26d512f5
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Forms/VobSubOcr.cs
View File

@ -2759,13 +2759,10 @@ namespace Nikse.SubtitleEdit.Forms
internal CompareMatch GetNOcrCompareMatchNew(ImageSplitterItem targetItem, NikseBitmap parentBitmap, NOcrDb nOcrDb, bool tryItalicScaling, bool deepSeek)
{
if (nOcrDb != null)
var expandedResult = NOcrFindExpandedMatch(parentBitmap, targetItem, nOcrDb.OcrCharactersExpanded);
if (expandedResult != null)
{
var expandedResult = NOcrFindExpandedMatch(parentBitmap, targetItem, nOcrDb.OcrCharactersExpanded);
if (expandedResult != null)
{
return new CompareMatch(expandedResult.Text, expandedResult.Italic, expandedResult.ExpandCount, null, expandedResult);
}
return new CompareMatch(expandedResult.Text, expandedResult.Italic, expandedResult.ExpandCount, null, expandedResult);
}
bool italic;
@ -8152,7 +8149,14 @@ namespace Nikse.SubtitleEdit.Forms
return;
if (_nOcrDb == null)
{
LoadNOcrWithCurrentLanguage();
if (_nOcrDb == null)
{
MessageBox.Show("Unable to load OCR database.", string.Empty, MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
}
Cursor = Cursors.WaitCursor;
Bitmap bitmap = GetSubtitleBitmap(subtitleListView1.SelectedItems[0].Index);