Bug 712876 - Replace ISO-8859-9 (latin5, etc.) decoder with windows-1254 decoder; r=smontagu
authorMasatoshi Kimura <VYV03354@nifty.ne.jp>
Wed, 28 Dec 2011 00:49:57 +0100
changeset 84641 4fb24658d1f2b0c62ad3da8e4c3823ac878b6e91
parent 84640 3e315088e24399f50180c5217a3db86b364e8713
child 84642 d10b118890e4fb2bc4f1127e6291f104720603fb
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmontagu
bugs712876
milestone12.0a1
Bug 712876 - Replace ISO-8859-9 (latin5, etc.) decoder with windows-1254 decoder; r=smontagu
intl/uconv/ucvlatin/8859-9.ut
intl/uconv/ucvlatin/nsISO88599ToUnicode.cpp
intl/uconv/ucvlatin/nsISO88599ToUnicode.h
deleted file mode 100644
--- a/intl/uconv/ucvlatin/8859-9.ut
+++ /dev/null
@@ -1,146 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-/*========================================================
-  This is a Generated file. Please don't edit it.
-
-  The tool which used to generate this file is called fromu.
-  If you have any problem of this file. Please contact 
-  Netscape Client International Team or 
-  ftang@netscape <Frank Tang> 
-
-              Table in Debug form 
-Begin of Item 0000
- Format 0
-  srcBegin = 0000
-  srcEnd = 009F
-  destBegin = 0000
-End of Item 0000 
-
-Begin of Item 0001
- Format 0
-  srcBegin = 00A0
-  srcEnd = 00CF
-  destBegin = 00A0
-End of Item 0001 
-
-Begin of Item 0002
- Format 0
-  srcBegin = 00D1
-  srcEnd = 00DC
-  destBegin = 00D1
-End of Item 0002 
-
-Begin of Item 0003
- Format 0
-  srcBegin = 00DF
-  srcEnd = 00EF
-  destBegin = 00DF
-End of Item 0003 
-
-Begin of Item 0004
- Format 0
-  srcBegin = 00F1
-  srcEnd = 00FC
-  destBegin = 00F1
-End of Item 0004 
-
-Begin of Item 0005
- Format 2
-  srcBegin = 00D0
-  destBegin = 011E
-End of Item 0005 
-
-Begin of Item 0006
- Format 1
-  srcBegin = 00DD
-  srcEnd = 00DE
-  mappingOffset = 0000
- Mapping  = 
-  0130 015E 
-End of Item 0006 
-
-Begin of Item 0007
- Format 2
-  srcBegin = 00F0
-  destBegin = 011F
-End of Item 0007 
-
-Begin of Item 0008
- Format 1
-  srcBegin = 00FD
-  srcEnd = 00FF
-  mappingOffset = 0002
- Mapping  = 
-  0131 015F 00FF 
-End of Item 0008 
-
-========================================================*/
-/* Offset=0x0000  ItemOfList */
-  0x0009,
-/*-------------------------------------------------------*/
-/* Offset=0x0001  offsetToFormatArray */
-  0x0004,
-/*-------------------------------------------------------*/
-/* Offset=0x0002  offsetToMapCellArray */ 
-  0x0007,
-/*-------------------------------------------------------*/
-/* Offset=0x0003  offsetToMappingTable */ 
-  0x0022,
-/*-------------------------------------------------------*/
-/*       Offset=0x0004   Start of Format Array */ 
-/*	Total of Format 0 : 0x0005			 */
-/*	Total of Format 1 : 0x0002			 */
-/*	Total of Format 2 : 0x0002			 */
-/*	Total of Format 3 : 0x0000			 */
-
-0x0000, 0x2120, 0x0001, 
-/*-------------------------------------------------------*/
-/*       Offset=0x0007   Start of MapCell Array */ 
-/* 0000 */    0x0000, 0x009F, 0x0000, 
-/* 0001 */    0x00A0, 0x00CF, 0x00A0, 
-/* 0002 */    0x00D1, 0x00DC, 0x00D1, 
-/* 0003 */    0x00DF, 0x00EF, 0x00DF, 
-/* 0004 */    0x00F1, 0x00FC, 0x00F1, 
-/* 0005 */    0x00D0, 0x0000, 0x011E, 
-/* 0006 */    0x00DD, 0x00DE, 0x0000, 
-/* 0007 */    0x00F0, 0x0000, 0x011F, 
-/* 0008 */    0x00FD, 0x00FF, 0x0002, 
-/*-------------------------------------------------------*/
-/*       Offset=0x0022   Start of MappingTable */ 
-
-/* 0000 */    0x0130, 0x015E, 0x0131, 0x015F, 0x00FF, 
-/*	End of table Total Length = 0x0027 * 2 */
--- a/intl/uconv/ucvlatin/nsISO88599ToUnicode.cpp
+++ b/intl/uconv/ucvlatin/nsISO88599ToUnicode.cpp
@@ -33,22 +33,15 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #include "nsUCConstructors.h"
 #include "nsISO88599ToUnicode.h"
 
-//----------------------------------------------------------------------
-// Global functions and data [declaration]
-
-static const PRUint16 g_utMappingTable[] = {
-#include "8859-9.ut"
-};
-
 nsresult
 nsISO88599ToUnicodeConstructor(nsISupports *aOuter, REFNSIID aIID,
                                void **aResult) 
 {
-  return CreateOneByteDecoder((uMappingTable*) &g_utMappingTable,
-                              aOuter, aIID, aResult);
+  // Just make it an alias to windows-1254 decoder. (bug 712876)
+  return nsCP1254ToUnicodeConstructor(aOuter, aIID, aResult);
 }
--- a/intl/uconv/ucvlatin/nsISO88599ToUnicode.h
+++ b/intl/uconv/ucvlatin/nsISO88599ToUnicode.h
@@ -33,21 +33,16 @@
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef nsISO88599ToUnicode_h___
 #define nsISO88599ToUnicode_h___
 
-#include "nsISupports.h"
+#include "nsCP1254ToUnicode.h"
 
-/**
- * A character set converter from ISO88599 to Unicode.
- *
- * @created         05/Apr/1999
- * @author  Catalin Rotaru [CATA]
- */
+// Just make it an alias to windows-1254 decoder. (bug 712876)
 nsresult
 nsISO88599ToUnicodeConstructor(nsISupports *aOuter, REFNSIID aIID,
                                void **aResult);
 
 #endif /* nsISO88599ToUnicode_h___ */