mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Now detects encoding when opening son files - thx Jørgen :)
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1021 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
parent
56dbcfd375
commit
1df33d28f8
@ -1719,8 +1719,8 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
|
||||
if (format == null && Path.GetExtension(fileName).ToLower() == ".wsb")
|
||||
{
|
||||
string[] arr = File.ReadAllLines(fileName);
|
||||
List<string> list = new List<string>();
|
||||
string[] arr = File.ReadAllLines(fileName, Utilities.GetEncodingFromFile(fileName));
|
||||
var list = new List<string>();
|
||||
foreach (string l in arr)
|
||||
list.Add(l);
|
||||
var wsb = new Wsb();
|
||||
@ -1737,8 +1737,8 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
if (format == null)
|
||||
{
|
||||
var bdnXml = new BdnXml();
|
||||
string[] arr = File.ReadAllLines(fileName);
|
||||
List<string> list = new List<string>();
|
||||
string[] arr = File.ReadAllLines(fileName, Utilities.GetEncodingFromFile(fileName));
|
||||
var list = new List<string>();
|
||||
foreach (string l in arr)
|
||||
list.Add(l);
|
||||
if (bdnXml.IsMine(list, fileName))
|
||||
@ -1754,16 +1754,14 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
if (format == null || format.Name == new Scenarist().Name)
|
||||
{
|
||||
var son = new Son();
|
||||
string[] arr = File.ReadAllLines(fileName);
|
||||
List<string> list = new List<string>();
|
||||
string[] arr = File.ReadAllLines(fileName, Utilities.GetEncodingFromFile(fileName));
|
||||
var list = new List<string>();
|
||||
foreach (string l in arr)
|
||||
list.Add(l);
|
||||
if (son.IsMine(list, fileName))
|
||||
{
|
||||
if (ContinueNewOrExit())
|
||||
{
|
||||
ImportAndOcrSon(fileName, son, list);
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
@ -1835,7 +1835,7 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
var bitmap = (Bitmap)e.Argument;
|
||||
if (_tesseractAsyncIndex >= 0 && _tesseractAsyncIndex < _tesseractAsyncStrings.Length)
|
||||
{
|
||||
if (string.IsNullOrEmpty(_tesseractAsyncStrings[_tesseractAsyncIndex]))
|
||||
if (string.IsNullOrEmpty(_tesseractAsyncStrings[_tesseractAsyncIndex]) && bitmap != null)
|
||||
_tesseractAsyncStrings[_tesseractAsyncIndex] = Tesseract3DoOcrViaExe(bitmap, _languageId, "-psm 6"); // 6 = Assume a single uniform block of text.);
|
||||
}
|
||||
}
|
||||
@ -2140,6 +2140,9 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
|
||||
private string OcrViaTesseract(Bitmap bitmap, int index)
|
||||
{
|
||||
if (bitmap == null)
|
||||
return string.Empty;
|
||||
|
||||
if (_ocrFixEngine == null)
|
||||
LoadOcrFixEngine();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user