[KoCo-CVS] [Commit] cjkcodecs/src _shift_jisx0213.c

[Hye-Shik C. <pe...@us...>]

perky       03/07/08 10:14:25

  Modified:    src      _shift_jisx0213.c
  Log:
  Fix Shift-JISX0213 decoder to the real one. (was Shift-JIS's :)
  
  Revision  Changes    Path
  1.2       +35 -24    cjkcodecs/src/_shift_jisx0213.c
  
  Index: _shift_jisx0213.c
  ===================================================================
  RCS file: /cvsroot/koco/cjkcodecs/src/_shift_jisx0213.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- _shift_jisx0213.c	8 Jul 2003 09:23:20 -0000	1.1
  +++ _shift_jisx0213.c	8 Jul 2003 17:14:25 -0000	1.2
  @@ -26,7 +26,7 @@
    * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
    * POSSIBILITY OF SUCH DAMAGE.
    *
  - * $Id: _shift_jisx0213.c,v 1.1 2003/07/08 09:23:20 perky Exp $
  + * $Id: _shift_jisx0213.c,v 1.2 2003/07/08 17:14:25 perky Exp $
    */
   
   #define USING_BINARY_PAIR_SEARCH
  @@ -109,7 +109,7 @@
       }
   
       c1 = code >> 8;
  -    c2 = code & 0xff - 0x21;
  +    c2 = (code & 0xff) - 0x21;
   
       if (c1 & 0x80) { /* Plane 2 */
           if (c1 >= 0xee) c1 -= 0x87;
  @@ -132,40 +132,51 @@
   DECODER(shift_jisx0213)
   {
       while (inleft > 0) {
  -        unsigned char    c = **inbuf;
  +        unsigned char    c = IN1;
   
           RESERVE_OUTBUF(1)
           JISX0201_DECODE(c, **outbuf)
  -        else if ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xea)) {
  -            unsigned char    c1, c2;
  +        else if ((c >= 0x81 && c <= 0x9f) || (c >= 0xe0 && c <= 0xfc)) {
  +            unsigned char    c1, c2 = IN2;
  +            ucs4_t           code;
   
               RESERVE_INBUF(2)
  -            c2 = (*inbuf)[1];
               if (c2 < 0x40 || (c2 > 0x7e && c2 < 0x80) || c2 > 0xfc)
                   return 2;
   
               c1 = (c < 0xe0 ? c - 0x81 : c - 0xc1);
               c2 = (c2 < 0x80 ? c2 - 0x40 : c2 - 0x41);
  -            c1 = (2 * c1 + (c2 < 0x5e ? 0 : 1) + 0x21);
  +            c1 = (2 * c1 + (c2 < 0x5e ? 0 : 1));
               c2 = (c2 < 0x5e ? c2 : c2 - 0x5e) + 0x21;
   
  -            TRYMAP_DEC(jisx0208, **outbuf, c1, c2) {
  -                NEXT(2, 1)
  -                continue;
  -            } else
  -                return 2;
  -        } else if (c >= 0xf0 && c <= 0xf9) {
  -            unsigned char    c2;
  -
  -            RESERVE_INBUF(2)
  -            c2 = (*inbuf)[1];
  -            if ((c2 >= 0x40 && c2 <= 0x7e) || (c2 >= 0x80 && c2 <= 0xfc)) {
  -                **outbuf = 0xe000 + 188 * (c - 0xf0) +
  -                       (c2 < 0x80 ? c2 - 0x40 : c2 - 0x41);
  -                NEXT(2, 1)
  -                continue;
  -            } else
  -                return 2;
  +            if (c1 < 0x5e) { /* Plane 1 */
  +                c1 += 0x21;
  +                TRYMAP_DEC(jisx0208, **outbuf, c1, c2) {
  +                    NEXT_OUT(1)
  +                } else TRYMAP_DEC(jisx0213_1_bmp, **outbuf, c1, c2) {
  +                    NEXT_OUT(1)
  +                } else TRYMAP_DEC(jisx0213_1_emp, code, c1, c2) {
  +                    PUTUCS4(EMPBASE | code)
  +                } else TRYMAP_DEC(jisx0213_pair, code, c1, c2) {
  +                    WRITE2(code >> 16, code & 0xffff)
  +                    NEXT_OUT(2)
  +                } else
  +                    return 2;
  +                NEXT_IN(2)
  +            } else { /* Plane 2 */
  +                if (c1 >= 0x67) c1 += 0x07;
  +                else if (c1 >= 0x63 || c1 == 0x5f) c1 -= 0x37;
  +                else c1 -= 0x3d;
  +
  +                TRYMAP_DEC(jisx0213_2_bmp, **outbuf, c1, c2) {
  +                    NEXT_OUT(1)
  +                } else TRYMAP_DEC(jisx0213_2_emp, code, c1, c2) {
  +                    PUTUCS4(EMPBASE | code)
  +                } else
  +                    return 2;
  +                NEXT_IN(2)
  +            }
  +            continue;
           } else
               return 2;