mirror of https://github.com/odrling/Aegisub
Removed dependency from universal charset detector (that was the last one)
Originally committed to SVN as r1662.
This commit is contained in:
parent
75b4fb1437
commit
3f4349584f
|
@ -40,10 +40,10 @@
|
|||
#include <algorithm>
|
||||
#include <string>
|
||||
#include "text_file_reader.h"
|
||||
#include "config.h"
|
||||
|
||||
#ifdef __WINDOWS__
|
||||
#ifndef NO_AUTODETECT_CHARSET
|
||||
#define AUTODETECT_CHARSET
|
||||
#ifdef WITH_UNIVCHARDET
|
||||
#include "charset_detect.h"
|
||||
#endif
|
||||
#endif
|
||||
|
@ -143,7 +143,7 @@ wxString TextFileReader::GetEncoding(const wxString _filename) {
|
|||
if (b[i] < 9 || (b[i] > 13 && b[i] < 32)) return _T("binary");
|
||||
}
|
||||
|
||||
#ifdef AUTODETECT_CHARSET
|
||||
#ifdef WITH_UNIVCHARDET
|
||||
// Use universalchardet library to detect charset
|
||||
CharSetDetect det;
|
||||
return det.GetEncoding(_filename);
|
||||
|
|
|
@ -38,12 +38,12 @@
|
|||
|
||||
|
||||
// Enable Automation
|
||||
// Requires: Lua
|
||||
// Requires: Lua (in repository)
|
||||
//#define WITH_AUTOMATION
|
||||
|
||||
|
||||
// Enable Automation 3
|
||||
// Requires: auto3 dll, Lua
|
||||
// Requires: auto3 dll (in repository), Lua (in repository)
|
||||
//#define WITH_AUTO3
|
||||
|
||||
|
||||
|
@ -90,3 +90,8 @@
|
|||
// Enable libass
|
||||
// Requires: libass
|
||||
//#define WITH_LIBASS
|
||||
|
||||
|
||||
// Enable universal charset detector
|
||||
// Requires: universalcharset (in repository)
|
||||
//#define WITH_UNIVCHARDET
|
||||
|
|
Loading…
Reference in New Issue