mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-28 15:02:35 +01:00
Merge branch 'master' of https://github.com/SubtitleEdit/subtitleedit
This commit is contained in:
commit
383194db95
@ -18,7 +18,6 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
private Bitmap _bitmap;
|
||||
private Bitmap _bitmap2;
|
||||
private double _zoomFactor = 3.0;
|
||||
private double _unItalicFactor;
|
||||
|
||||
public VobSubNOcrCharacterInspect()
|
||||
{
|
||||
@ -31,7 +30,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
DialogResult = DialogResult.Cancel;
|
||||
}
|
||||
|
||||
internal void Initialize(Bitmap bitmap, int pixelsIsSpace, bool rightToLeft, NOcrDb nOcrDb, VobSubOcr vobSubOcr, double unItalicFactor)
|
||||
internal void Initialize(Bitmap bitmap, int pixelsIsSpace, bool rightToLeft, NOcrDb nOcrDb, VobSubOcr vobSubOcr)
|
||||
{
|
||||
_bitmap = bitmap;
|
||||
var nbmp = new NikseBitmap(bitmap);
|
||||
@ -41,7 +40,6 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
_nocrChars = nOcrDb.OcrCharacters;
|
||||
_matchList = new List<VobSubOcr.CompareMatch>();
|
||||
_vobSubOcr = vobSubOcr;
|
||||
_unItalicFactor = unItalicFactor;
|
||||
|
||||
int minLineHeight = 6;
|
||||
_imageList = NikseBitmapImageSplitter.SplitBitmapToLettersNew(nbmp, pixelsIsSpace, rightToLeft, Configuration.Settings.VobSubOcr.TopToBottom, minLineHeight);
|
||||
|
@ -8133,7 +8133,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
var inspect = new VobSubNOcrCharacterInspect();
|
||||
bool oldCorrect = checkBoxNOcrCorrect.Checked;
|
||||
checkBoxNOcrCorrect.Checked = false;
|
||||
inspect.Initialize(bitmap, (int)numericUpDownNumberOfPixelsIsSpaceNOCR.Value, checkBoxRightToLeft.Checked, _nOcrDb, this, _unItalicFactor);
|
||||
inspect.Initialize(bitmap, (int)numericUpDownNumberOfPixelsIsSpaceNOCR.Value, checkBoxRightToLeft.Checked, _nOcrDb, this);
|
||||
if (inspect.ShowDialog(this) == DialogResult.OK)
|
||||
{
|
||||
Cursor = Cursors.WaitCursor;
|
||||
|
@ -711,7 +711,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
|
||||
return sb.ToString();
|
||||
}
|
||||
|
||||
private string ToSccText(string text, string language)
|
||||
private static string ToSccText(string text, string language)
|
||||
{
|
||||
text = FixMax4LinesAndMax32CharsPerLine(text, language);
|
||||
//text = text.Replace("ã", "aã");
|
||||
|
@ -461,7 +461,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
return subtitle;
|
||||
}
|
||||
|
||||
private Subtitle ImportTimeCodesOnSameSeperateLine(string[] lines)
|
||||
private static Subtitle ImportTimeCodesOnSameSeperateLine(string[] lines)
|
||||
{
|
||||
Paragraph p = null;
|
||||
var subtitle = new Subtitle();
|
||||
|
Loading…
Reference in New Issue
Block a user