[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c branches/PHP_5_3/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c trunk/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c

[Moriyoshi Koizumi]

moriyoshi                                Sun, 28 Feb 2010 09:33:05 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=295576

Log:
- Merge from upstream (note: this is no behavioral change, so need not to be
  merged to 5.3.2 branch)

Changed paths:
    U   
php/php-src/branches/PHP_5_2/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c
    U   
php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c
    U   php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c

Modified: 
php/php-src/branches/PHP_5_2/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c
===================================================================
--- 
php/php-src/branches/PHP_5_2/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c 
    2010-02-28 07:49:36 UTC (rev 295575)
+++ 
php/php-src/branches/PHP_5_2/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c 
    2010-02-28 09:33:05 UTC (rev 295576)
@@ -327,8 +327,10 @@
                        c1 = 0;
                        c2 = cp932ext1_ucs_table_max - cp932ext1_ucs_table_min;
                        while (c1 < c2) {               /* CP932 vendor ext1 
(13ku) */
+                               const int oh = cp932ext1_ucs_table_min / 94;
+
                                if (c == cp932ext1_ucs_table[c1]) {
-                                       s1 = ((c1/94 + 0x2d) << 8) + (c1%94 + 
0x21);
+                                       s1 = ((c1 / 94 + oh + 0x21) << 8) + (c1 
% 94 + 0x21);
                                        break;
                                }
                                c1++;

Modified: 
php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c
===================================================================
--- 
php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c 
    2010-02-28 07:49:36 UTC (rev 295575)
+++ 
php/php-src/branches/PHP_5_3/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c 
    2010-02-28 09:33:05 UTC (rev 295576)
@@ -327,8 +327,10 @@
                        c1 = 0;
                        c2 = cp932ext1_ucs_table_max - cp932ext1_ucs_table_min;
                        while (c1 < c2) {               /* CP932 vendor ext1 
(13ku) */
+                               const int oh = cp932ext1_ucs_table_min / 94;
+
                                if (c == cp932ext1_ucs_table[c1]) {
-                                       s1 = ((c1/94 + 0x2d) << 8) + (c1%94 + 
0x21);
+                                       s1 = ((c1 / 94 + oh + 0x21) << 8) + (c1 
% 94 + 0x21);
                                        break;
                                }
                                c1++;

Modified: php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c
===================================================================
--- php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c        
2010-02-28 07:49:36 UTC (rev 295575)
+++ php/php-src/trunk/ext/mbstring/libmbfl/filters/mbfilter_euc_jp_win.c        
2010-02-28 09:33:05 UTC (rev 295576)
@@ -327,8 +327,10 @@
                        c1 = 0;
                        c2 = cp932ext1_ucs_table_max - cp932ext1_ucs_table_min;
                        while (c1 < c2) {               /* CP932 vendor ext1 
(13ku) */
+                               const int oh = cp932ext1_ucs_table_min / 94;
+
                                if (c == cp932ext1_ucs_table[c1]) {
-                                       s1 = ((c1/94 + 0x2d) << 8) + (c1%94 + 
0x21);
+                                       s1 = ((c1 / 94 + oh + 0x21) << 8) + (c1 
% 94 + 0x21);
                                        break;
                                }
                                c1++;


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php