[Cpri-develop] cpri/src drv_html.c,1.4,1.5 width.c,1.2,1.3

[<ch...@us...>]

Update of /cvsroot/cpri/cpri/src
In directory sc8-pr-cvs1:/tmp/cvs-serv6833/src

Modified Files:
	drv_html.c width.c 
Log Message:
Bugs 731191 "Bug in html driver" and 731192 "Bug in widht calculation" are fixed.

Index: drv_html.c
===================================================================
RCS file: /cvsroot/cpri/cpri/src/drv_html.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** drv_html.c	22 Mar 2003 18:26:24 -0000	1.4
--- drv_html.c	2 May 2003 07:31:28 -0000	1.5
***************
*** 279,282 ****
--- 279,284 ----
              case EPC_LANDSCAPE:
              case EPC_RESET:
+             case EPC_MANUAL_FEED:
+             case EPC_CASSETTE_FEED:
                 break;
                 /* unimplemented commands that contains 1 parameter */
***************
*** 360,365 ****
              }
              break;
-          case EPC_MANUAL_FEED:            
-          case EPC_CASSETTE_FEED:
           case '\14':
           case '\15':
--- 362,365 ----
***************
*** 380,382 ****
  t_cpri_vtable html_vtable = {HtmlInit, HtmlClose, HtmlDriver};
  struct t_cpri_vtable *_cpri_html_vtable = &html_vtable;
- 
--- 380,381 ----

Index: width.c
===================================================================
RCS file: /cvsroot/cpri/cpri/src/width.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** width.c	22 Mar 2003 18:26:24 -0000	1.2
--- width.c	2 May 2003 07:31:28 -0000	1.3
***************
*** 53,61 ****
     case COURIER:
     case GOTHIC:
!       for (; *s; s++) {
           x += 254;
!       }
!       return x;
!       break;
     case SCRIPT:
        i = 8;
--- 53,59 ----
     case COURIER:
     case GOTHIC:
!       for (; *s; s++)
           x += 254;
!       return x/10;
     case SCRIPT:
        i = 8;