diff src/ccl.c @ 107635:a5eeeb631d8a

Merge from mainline.

--- a/src/ccl.c	Sat Feb 13 12:41:13 2010 -0500
+++ b/src/ccl.c	Sat Feb 20 05:25:57 2010 -0500
@@ -43,7 +43,7 @@
 /* Alist of fontname patterns vs corresponding CCL program.  */
 Lisp_Object Vfont_ccl_encoder_alist;
 
-/* This symbol is a property which assocates with ccl program vector.
+/* This symbol is a property which associates with ccl program vector.
    Ex: (get 'ccl-big5-encoder 'ccl-program) returns ccl program vector.  */
 Lisp_Object Qccl_program;
 
@@ -883,9 +883,6 @@
   int eof_ic = ccl->eof_ic;
   int eof_hit = 0;
 
-  if (ic >= eof_ic)
-    ic = CCL_HEADER_MAIN;
-
   if (ccl->buf_magnification == 0) /* We can't read/produce any bytes.  */
     dst = NULL;