Browse code

Some flag fixes for pdf.

Török Edvin authored on 2010/07/30 23:13:46
Showing 1 changed files
... ...
@@ -691,7 +691,7 @@ static struct pdfname_action pdfname_actions[] = {
691 691
     {"OpenAction", OBJ_OPENACTION, STATE_ANY, STATE_OPENACTION}
692 692
 };
693 693
 
694
-#define KNOWN_FILTERS ((1 << OBJ_FILTER_AH) | (1 << OBJ_FILTER_A85) | (1 << OBJ_FILTER_FLATE) | (1 << OBJ_FILTER_LZW) | (1 << OBJ_FILTER_FAX) | (1 << OBJ_FILTER_DCT) | (1 << OBJ_FILTER_JPX) | (1 << OBJ_FILTER_CRYPT))
694
+#define KNOWN_FILTERS ((1 << OBJ_FILTER_AH) | (1 << OBJ_FILTER_RL) | (1 << OBJ_FILTER_A85) | (1 << OBJ_FILTER_FLATE) | (1 << OBJ_FILTER_LZW) | (1 << OBJ_FILTER_FAX) | (1 << OBJ_FILTER_DCT) | (1 << OBJ_FILTER_JPX) | (1 << OBJ_FILTER_CRYPT))
695 695
 
696 696
 static void handle_pdfname(struct pdf_struct *pdf, struct pdf_obj *obj,
697 697
 			   const char *pdfname, int escapes,
... ...
@@ -978,7 +978,7 @@ int cli_pdf(const char *dir, cli_ctx *ctx, off_t offset)
978 978
     }
979 979
 
980 980
     if (pdf.flags & (1 << ENCRYPTED_PDF))
981
-	pdf.flags &= ~ (1 << BAD_FLATESTART);
981
+	pdf.flags &= ~ (1 << BAD_FLATESTART) | (1 << BAD_STREAMSTART);
982 982
 
983 983
     if (pdf.flags) {
984 984
 	cli_dbgmsg("cli_pdf: flags 0x%02x\n", pdf.flags);
... ...
@@ -990,7 +990,7 @@ int cli_pdf(const char *dir, cli_ctx *ctx, off_t offset)
990 990
 #if 0
991 991
 	if (pdf.flags &
992 992
 	    ((1 << BAD_PDF_TOOMANYOBJS) | (1 << BAD_STREAM_FILTERS) |
993
-	    (1<<BAD_FLATE) | (1<<BAD_STREAMSTART)|(1<<BAD_ASCIIDECODE)|
993
+	    (1<<BAD_FLATE) | (1<<BAD_ASCIIDECODE)|
994 994
 	    (1<<UNTERMINATED_OBJ_DICT) | (1<<UNKNOWN_FILTER))) {
995 995
 	    rc = CL_EUNPACK;
996 996
 	}