From 2623b8380feb9f615531febb83f11cd2cfa8a817 Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Fri, 9 Oct 2009 15:37:55 +0000
Subject: [PATCH] Update universalchardet to 29631:4dd0cf2ba86f (2009-06-27). 
 Closes #866.

Originally committed to SVN as r3662.
---
 aegisub/universalchardet/CharDistribution.h    |  5 ++---
 aegisub/universalchardet/JpCntx.cpp            |  2 +-
 aegisub/universalchardet/JpCntx.h              |  5 ++---
 aegisub/universalchardet/nsSBCSGroupProber.cpp | 13 +++++++------
 aegisub/universalchardet/nsSBCSGroupProber.h   |  2 +-
 aegisub/universalchardet/nsSBCharSetProber.h   |  1 +
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/aegisub/universalchardet/CharDistribution.h b/aegisub/universalchardet/CharDistribution.h
index 36ad57ca6..99f338ca6 100644
--- a/aegisub/universalchardet/CharDistribution.h
+++ b/aegisub/universalchardet/CharDistribution.h
@@ -45,11 +45,10 @@
 class CharDistributionAnalysis
 {
 public:
-  CharDistributionAnalysis() {Reset();};
-  virtual ~CharDistributionAnalysis() {};
+  CharDistributionAnalysis() {Reset();}
 
   //feed a block of data and do distribution analysis
-  void HandleData(const char* aBuf, PRUint32 aLen) {};
+  void HandleData(const char* aBuf, PRUint32 aLen) {}
   
   //Feed a character with known length
   void HandleOneChar(const char* aStr, PRUint32 aCharLen)
diff --git a/aegisub/universalchardet/JpCntx.cpp b/aegisub/universalchardet/JpCntx.cpp
index ed7be2d8f..9a8cc1d54 100644
--- a/aegisub/universalchardet/JpCntx.cpp
+++ b/aegisub/universalchardet/JpCntx.cpp
@@ -39,7 +39,7 @@
 #include "JpCntx.h"
 
 //This is hiragana 2-char sequence table, the number in each cell represents its frequency category
-const char jp2CharContext[83][83] = 
+const PRUint8 jp2CharContext[83][83] = 
 { 
 { 0,0,0,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,1,},
 { 2,4,0,4,0,3,0,4,0,3,4,4,4,2,4,3,3,4,3,2,3,3,4,2,3,3,3,2,4,1,4,3,3,1,5,4,3,4,3,4,3,5,3,0,3,5,4,2,0,3,1,0,3,3,0,3,3,0,1,1,0,4,3,0,3,3,0,4,0,2,0,3,5,5,5,5,4,0,4,1,0,3,4,},
diff --git a/aegisub/universalchardet/JpCntx.h b/aegisub/universalchardet/JpCntx.h
index 0b13ecb0a..aaa1576d9 100644
--- a/aegisub/universalchardet/JpCntx.h
+++ b/aegisub/universalchardet/JpCntx.h
@@ -46,13 +46,12 @@
 #define MAX_REL_THRESHOLD     1000
 
 //hiragana frequency category table
-extern const char jp2CharContext[83][83];
+extern const PRUint8 jp2CharContext[83][83];
 
 class JapaneseContextAnalysis
 {
 public:
-  JapaneseContextAnalysis() {Reset();};
-  virtual ~JapaneseContextAnalysis() {};
+  JapaneseContextAnalysis() {Reset();}
 
   void HandleData(const char* aBuf, PRUint32 aLen);
 
diff --git a/aegisub/universalchardet/nsSBCSGroupProber.cpp b/aegisub/universalchardet/nsSBCSGroupProber.cpp
index 65afdfef0..d8fef879c 100644
--- a/aegisub/universalchardet/nsSBCSGroupProber.cpp
+++ b/aegisub/universalchardet/nsSBCSGroupProber.cpp
@@ -56,21 +56,22 @@ nsSBCSGroupProber::nsSBCSGroupProber()
   mProbers[7] = new nsSingleByteCharSetProber(&Win1253Model);
   mProbers[8] = new nsSingleByteCharSetProber(&Latin5BulgarianModel);
   mProbers[9] = new nsSingleByteCharSetProber(&Win1251BulgarianModel);
+  mProbers[10] = new nsSingleByteCharSetProber(&TIS620ThaiModel);
 
   nsHebrewProber *hebprober = new nsHebrewProber();
   // Notice: Any change in these indexes - 10,11,12 must be reflected
   // in the code below as well.
-  mProbers[10] = hebprober;
-  mProbers[11] = new nsSingleByteCharSetProber(&Win1255Model, PR_FALSE, hebprober); // Logical Hebrew
-  mProbers[12] = new nsSingleByteCharSetProber(&Win1255Model, PR_TRUE, hebprober); // Visual Hebrew
+  mProbers[11] = hebprober;
+  mProbers[12] = new nsSingleByteCharSetProber(&Win1255Model, PR_FALSE, hebprober); // Logical Hebrew
+  mProbers[13] = new nsSingleByteCharSetProber(&Win1255Model, PR_TRUE, hebprober); // Visual Hebrew
   // Tell the Hebrew prober about the logical and visual probers
-  if (mProbers[10] && mProbers[11] && mProbers[12]) // all are not null
+  if (mProbers[11] && mProbers[12] && mProbers[13]) // all are not null
   {
-    hebprober->SetModelProbers(mProbers[11], mProbers[12]);
+    hebprober->SetModelProbers(mProbers[12], mProbers[13]);
   }
   else // One or more is null. avoid any Hebrew probing, null them all
   {
-    for (PRUint32 i = 10; i <= 12; ++i)
+    for (PRUint32 i = 11; i <= 13; ++i)
     { 
       delete mProbers[i]; 
       mProbers[i] = 0; 
diff --git a/aegisub/universalchardet/nsSBCSGroupProber.h b/aegisub/universalchardet/nsSBCSGroupProber.h
index faa57ed14..cfbf7e169 100644
--- a/aegisub/universalchardet/nsSBCSGroupProber.h
+++ b/aegisub/universalchardet/nsSBCSGroupProber.h
@@ -40,7 +40,7 @@
 #define nsSBCSGroupProber_h__
 
 
-#define NUM_OF_SBCS_PROBERS    13
+#define NUM_OF_SBCS_PROBERS    14
 
 class nsCharSetProber;
 class nsSBCSGroupProber: public nsCharSetProber {
diff --git a/aegisub/universalchardet/nsSBCharSetProber.h b/aegisub/universalchardet/nsSBCharSetProber.h
index c927f4b1b..b629feb34 100644
--- a/aegisub/universalchardet/nsSBCharSetProber.h
+++ b/aegisub/universalchardet/nsSBCharSetProber.h
@@ -119,6 +119,7 @@ extern const SequenceModel Win1251BulgarianModel;
 extern const SequenceModel Latin2HungarianModel;
 extern const SequenceModel Win1250HungarianModel;
 extern const SequenceModel Win1255Model;
+extern const SequenceModel TIS620ThaiModel;
 
 #endif /* nsSingleByteCharSetProber_h__ */