[KoCo-CVS] [Commit] cjkcodecs/src _euc_jisx0213.c codeccommon.h

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

perky       03/07/07 21:40:44

  Modified:    src      _euc_jisx0213.c codeccommon.h
  Log:
  Fix wrong indata counting on UCS2 mode.
  
  Revision  Changes    Path
  1.3       +9 -3      cjkcodecs/src/_euc_jisx0213.c
  
  Index: _euc_jisx0213.c
  ===================================================================
  RCS file: /cvsroot/koco/cjkcodecs/src/_euc_jisx0213.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- _euc_jisx0213.c	7 Jul 2003 08:37:10 -0000	1.2
  +++ _euc_jisx0213.c	8 Jul 2003 04:40:43 -0000	1.3
  @@ -26,9 +26,10 @@
    * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
    * POSSIBILITY OF SUCH DAMAGE.
    *
  - * $Id: _euc_jisx0213.c,v 1.2 2003/07/07 08:37:10 perky Exp $
  + * $Id: _euc_jisx0213.c,v 1.3 2003/07/08 04:40:43 perky Exp $
    */
   
  +#define USING_BINARY_PAIR_SEARCH
   #include "codeccommon.h"
   #include "maps/map_jisx0213_pairs.h"
   
  @@ -105,8 +106,14 @@
                   code = 0x2140;
               else
                   return 1;
  -        } else TRYMAP_ENC(jisx0213_emp, code, c & 0xffff);
  +        } else TRYMAP_ENC(jisx0213_emp, code, c & 0xffff)
  +#if Py_UNICODE_SIZE == 2
  +            insize = 2;
  +        else return 2;
  +#else
  +            ;
           else return 1;
  +#endif
   
           if (code & 0x8000) {
               /* Codeset 2 */
  @@ -195,7 +202,6 @@
       return 0;
   }
   
  -#define USING_BINARY_PAIR_SEARCH
   #include "codecentry.h"
   BEGIN_CODEC_REGISTRY(euc_jisx0213)
       MAPOPEN(ja_JP)
  
  
  
  1.19      +5 -3      cjkcodecs/src/codeccommon.h
  
  Index: codeccommon.h
  ===================================================================
  RCS file: /cvsroot/koco/cjkcodecs/src/codeccommon.h,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- codeccommon.h	7 Jul 2003 08:37:10 -0000	1.18
  +++ codeccommon.h	8 Jul 2003 04:40:44 -0000	1.19
  @@ -26,7 +26,7 @@
    * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
    * POSSIBILITY OF SUCH DAMAGE.
    *
  - * $Id: codeccommon.h,v 1.18 2003/07/07 08:37:10 perky Exp $
  + * $Id: codeccommon.h,v 1.19 2003/07/08 04:40:44 perky Exp $
    */
   
   #include "Python.h"
  @@ -125,7 +125,7 @@
           (val)<= (m)->top && ((assi) = (m)->map[(val) -      \
               (m)->bottom]) != NOCHAR)  
   #define TRYMAP_ENC(charset, assi, uni)                      \
  -    _TRYMAP_ENC(&charset##encmap[uni >> 8], assi, uni & 0xff)
  +    _TRYMAP_ENC(&charset##encmap[(uni) >> 8], assi, (uni) & 0xff)
   #define _TRYMAP_DEC(m, assi, val)                           \
       if ((m)->map != NULL && (val) >= (m)->bottom &&         \
           (val)<= (m)->top && ((assi) = (m)->map[(val) -      \
  @@ -133,7 +133,9 @@
   #define TRYMAP_DEC(charset, assi, c1, c2)                   \
       _TRYMAP_DEC(&charset##decmap[c1], assi, c2)
   
  -extern DBCHAR find_pairencmap(ucs2_t, ucs2_t, struct pair_encodemap *, int);
  +#ifdef USING_BINARY_PAIR_SEARCH
  +static DBCHAR find_pairencmap(ucs2_t , ucs2_t, struct pair_encodemap *, int);
  +#endif
   
   /*
    * ex: ts=8 sts=4 et