fixed handling of dst offset in wxAlphaBlend()

[wxWidgets.git] / src / common / fmapbase.cpp

diff --git a/src/common/fmapbase.cpp b/src/common/fmapbase.cpp
index e5a48a160295d23d1f0e607ddfa6485d9e9bd9b7..4a8a019edd7e2d151d8f93ed1e774d665a9570ca 100644 (file)
--- a/src/common/fmapbase.cpp
+++ b/src/common/fmapbase.cpp
@@ -152,63 +152,65 @@ static const wxChar* gs_encodingDescs[] =
 };
 
 // and the internal names (these are not translated on purpose!)
 };
 
 // and the internal names (these are not translated on purpose!)

-static const wxChar* gs_encodingNames[WXSIZEOF(gs_encodingDescs)][7] =
+static const wxChar* gs_encodingNames[WXSIZEOF(gs_encodingDescs)][10] =

 {
 {

-    { wxT( "iso-8859-1" ), NULL },
-    { wxT( "iso-8859-2" ), NULL },
-    { wxT( "iso-8859-3" ), NULL },
-    { wxT( "iso-8859-4" ), NULL },
-    { wxT( "iso-8859-5" ), NULL },
-    { wxT( "iso-8859-6" ), NULL },
-    { wxT( "iso-8859-7" ), NULL },
-    { wxT( "iso-8859-8" ), NULL },
-    { wxT( "iso-8859-9" ), NULL },
-    { wxT( "iso-8859-10" ), NULL },
-    { wxT( "iso-8859-11" ), NULL },
-    { wxT( "iso-8859-12" ), NULL },
-    { wxT( "iso-8859-13" ), NULL },
-    { wxT( "iso-8859-14" ), NULL },
-    { wxT( "iso-8859-15" ), NULL },
+    // names from the columns correspond to these OS:
+    //      Linux        Solaris and IRIX       HP-UX             AIX
+    { _T("ISO-8859-1"),  _T("ISO8859-1"),  _T("iso88591"),  _T("8859-1"), wxT("iso_8859_1"), NULL },
+    { _T("ISO-8859-2"),  _T("ISO8859-2"),  _T("iso88592"),  _T("8859-2"), NULL },
+    { _T("ISO-8859-3"),  _T("ISO8859-3"),  _T("iso88593"),  _T("8859-3"), NULL },
+    { _T("ISO-8859-4"),  _T("ISO8859-4"),  _T("iso88594"),  _T("8859-4"), NULL },
+    { _T("ISO-8859-5"),  _T("ISO8859-5"),  _T("iso88595"),  _T("8859-5"), NULL },
+    { _T("ISO-8859-6"),  _T("ISO8859-6"),  _T("iso88596"),  _T("8859-6"), NULL },
+    { _T("ISO-8859-7"),  _T("ISO8859-7"),  _T("iso88597"),  _T("8859-7"), NULL },
+    { _T("ISO-8859-8"),  _T("ISO8859-8"),  _T("iso88598"),  _T("8859-8"), NULL },
+    { _T("ISO-8859-9"),  _T("ISO8859-9"),  _T("iso88599"),  _T("8859-9"), NULL },
+    { _T("ISO-8859-10"), _T("ISO8859-10"), _T("iso885910"), _T("8859-10"), NULL },
+    { _T("ISO-8859-11"), _T("ISO8859-11"), _T("iso885911"), _T("8859-11"), NULL },
+    { _T("ISO-8859-12"), _T("ISO8859-12"), _T("iso885912"), _T("8859-12"), NULL },
+    { _T("ISO-8859-13"), _T("ISO8859-13"), _T("iso885913"), _T("8859-13"), NULL },
+    { _T("ISO-8859-14"), _T("ISO8859-14"), _T("iso885914"), _T("8859-14"), NULL },
+    { _T("ISO-8859-15"), _T("ISO8859-15"), _T("iso885915"), _T("8859-15"), NULL },
+

     // although koi8-ru is not strictly speaking the same as koi8-r,
     // they are similar enough to make mapping it to koi8 better than
     // not recognizing it at all
     // although koi8-ru is not strictly speaking the same as koi8-r,
     // they are similar enough to make mapping it to koi8 better than
     // not recognizing it at all

-    { wxT( "koi8-r" ), wxT( "koi8-ru" ), NULL },
-    { wxT( "koi8-u" ), NULL },
-    { wxT( "windows-874" ), NULL },
-    { wxT( "windows-932" ), NULL },
-    { wxT( "windows-936" ), NULL },
-    { wxT( "windows-949" ), wxT( "euc-kr" ),
-      wxT( "euckr" ), wxT( "euc_kr" ), NULL },
-    { wxT( "windows-950" ), NULL },
-    { wxT( "windows-1250" ), NULL },
-    { wxT( "windows-1251" ), NULL },
-    { wxT( "windows-1252" ), NULL },
-    { wxT( "windows-1253" ), NULL },
-    { wxT( "windows-1254" ), NULL },
-    { wxT( "windows-1255" ), NULL },
-    { wxT( "windows-1256" ), NULL },
-    { wxT( "windows-1257" ), NULL },
-    { wxT( "windows-437" ), NULL },
-    { wxT( "UTF-7" ), NULL },
-    { wxT( "UTF-8" ), NULL },
-    { wxT( "UTF-16" ), NULL },
-    { wxT( "UTF-16be" ), NULL },
-    { wxT( "UTF-16le" ), NULL },
-    { wxT( "UTF-32" ), wxT( "UCS-4" ), NULL },
-    { wxT( "UTF-32be" ), wxT( "UCS-4be" ), NULL },
-    { wxT( "UTF-32le" ), wxT( "UCS-4le" ), NULL },
-    { wxT( "euc-jp" ), wxT( "eucJP" ), wxT( "euc_jp" ), wxT( "IBM-eucJP" ), NULL },
-    { wxT( "us-ascii" ), wxT( "ascii" ), wxT("ANSI_X3.4-1968"),
-#ifdef __SOLARIS__
-      wxT("646"),
-#endif
-#ifdef __HPUX__
-      wxT("roman8"),
-#endif
-      wxT( "" ), NULL },
-    { wxT( "big5" ), NULL },
-    { wxT( "shift-jis" ), wxT( "shift_jis" ), wxT( "sjis" ), NULL },
-    { wxT( "gb2312" ), NULL },
+    { wxT( "KOI8-R" ), wxT( "KOI8-RU" ), NULL },
+    { wxT( "KOI8-U" ), NULL },
+
+    { wxT( "WINDOWS-874" ), wxT( "CP-874" ), NULL },
+    { wxT( "WINDOWS-932" ), wxT( "CP-932" ), NULL },
+    { wxT( "WINDOWS-936" ), wxT( "CP-936" ), NULL },
+    { wxT( "WINDOWS-949" ), wxT( "CP-949" ), wxT( "EUC-KR" ), wxT( "eucKR" ), wxT( "euc_kr" ), NULL },
+    { wxT( "WINDOWS-950" ), wxT( "CP-950" ), NULL },
+    { wxT( "WINDOWS-1250" ),wxT( "CP-1250" ), NULL },
+    { wxT( "WINDOWS-1251" ),wxT( "CP-1251" ), NULL },
+    { wxT( "WINDOWS-1252" ),wxT( "CP-1252" ), wxT("IBM-1252"), NULL },
+    { wxT( "WINDOWS-1253" ),wxT( "CP-1253" ), NULL },
+    { wxT( "WINDOWS-1254" ),wxT( "CP-1254" ), NULL },
+    { wxT( "WINDOWS-1255" ),wxT( "CP-1255" ), NULL },
+    { wxT( "WINDOWS-1256" ),wxT( "CP-1256" ), NULL },
+    { wxT( "WINDOWS-1257" ),wxT( "CP-1257" ), NULL },
+    { wxT( "WINDOWS-437" ), wxT( "CP-437" ), NULL },
+
+    { wxT( "UTF-7" ), wxT("utf7"), NULL },
+    { wxT( "UTF-8" ), wxT("utf8"), NULL },
+    { wxT( "UTF-16" ), wxT("UCS-2"), wxT("UCS2"), NULL },
+    { wxT( "UTF-16BE" ), wxT("UCS-2BE"), NULL },
+    { wxT( "UTF-16LE" ), wxT("UCS-2LE"), NULL },
+    { wxT( "UTF-32" ), wxT( "UCS-4" ), wxT("UCS4"), NULL },
+    { wxT( "UTF-32BE" ), wxT( "UCS-4BE" ), NULL },
+    { wxT( "UTF-32LE" ), wxT( "UCS-4LE" ), NULL },
+
+    { wxT( "EUC-JP" ), wxT( "eucJP" ), wxT( "euc_jp" ), wxT( "IBM-eucJP" ), NULL },
+
+    // 646 is for Solaris, roman8 -- for HP-UX
+    { wxT( "US-ASCII" ), wxT( "ASCII" ), wxT("C"), wxT("POSIX"), wxT("ANSI_X3.4-1968"),
+      wxT("646"), wxT("roman8"), wxT( "" ), NULL },
+
+    { wxT( "BIG5" ), wxT("big5"), NULL },
+    { wxT( "SJIS" ), wxT( "SHIFT-JIS" ), wxT( "SHIFT_JIS" ), NULL },
+    { wxT( "GB2312" ), NULL },

 };
 
 wxCOMPILE_TIME_ASSERT( WXSIZEOF(gs_encodingDescs) == WXSIZEOF(gs_encodings), EncodingsArraysNotInSync );
 };
 
 wxCOMPILE_TIME_ASSERT( WXSIZEOF(gs_encodingDescs) == WXSIZEOF(gs_encodings), EncodingsArraysNotInSync );


@@ -571,7 +573,7 @@ wxFontMapperBase::NonInteractiveCharsetToEncoding(const wxString& charset)
                 if ( *p == wxT('-') )
                     p++;
 
                 if ( *p == wxT('-') )
                     p++;
 

-                int value;
+                unsigned int value;

                 if ( wxSscanf(p, wxT("%u"), &value) == 1 )
                 {
                     if ( value >= 1250 )
                 if ( wxSscanf(p, wxT("%u"), &value) == 1 )
                 {
                     if ( value >= 1250 )


@@ -705,16 +707,11 @@ wxFontEncoding wxFontMapperBase::GetEncodingFromName(const wxString& name)
     {
         for ( const wxChar** encName = gs_encodingNames[i]; *encName; ++encName )
         {
     {
         for ( const wxChar** encName = gs_encodingNames[i]; *encName; ++encName )
         {

-            if ( name == *encName )
+            if ( name.CmpNoCase(*encName) == 0 )

                 return gs_encodings[i];
         }
     }
 
                 return gs_encodings[i];
         }
     }
 

-    if ( name == _("default") )
-    {
-        return wxFONTENCODING_DEFAULT;
-    }
-

     return wxFONTENCODING_MAX;
 }
 
     return wxFONTENCODING_MAX;
 }