# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: address@hidden # nxcykqdi05du9b52 # target_branch: bzr://bzr.sv.gnu.org/pdf/libgnupdf/trunk/ # testament_sha1: aaec341d767494c852016e4dba57ac52a86bd3bc # timestamp: 2011-08-28 11:07:31 +0200 # base_revision_id: address@hidden # # Begin patch === modified file 'utils/pdf-filter.c' --- utils/pdf-filter.c 2011-08-04 13:49:13 +0000 +++ utils/pdf-filter.c 2011-08-28 09:07:00 +0000 @@ -96,7 +96,6 @@ #ifdef HAVE_LIBJBIG2DEC JBIG2DEC_FILTER_ARG, JBIG2DEC_GLOBAL_SEGMENTS_ARG, - JBIG2DEC_PAGE_SIZE, JBIG2DEC_FILTER_INSTALL, #endif /* HAVE_LIBJBIG2DEC */ LZWENC_FILTER_ARG, @@ -123,7 +122,6 @@ (arg) == PRED_COLUMNS_ARG || \ (arg) == PRED_PREDICTOR_ARG || \ (arg) == JBIG2DEC_GLOBAL_SEGMENTS_ARG || \ - (arg) == JBIG2DEC_PAGE_SIZE || \ (arg) == LZW_EARLYCHANGE_ARG || \ (arg) == KEY_ARG) @@ -1091,7 +1089,7 @@ if (!pdf_hash_add_size (filter_params, "GlobalStreamsSize", - strlen (jbig2dec_global_segments) + 1, + jbig2dec_global_segments_size, &error)) { pdf_error (pdf_error_get_status (error), # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSdO1OwAAYNfgAAQVGf/91KA AAC////wUAN88eqq4NLdYElBJpgpsp4mUbT1T1NigyNAPUMBoDQAAaaDQDQBoEoTQlH6BPRRjRAA ADQBpqTTKMT0AmgBo0ZGgBoEkRDEAUzVPDU00R6gA2oGdViN8YlmmmQuMCLNBAZQ159anzkR926k gE32p5WydURhkjYVsOc+Ljhc7q9zwnaWEVkRVUyOlh4BRCVCiWT90PAIikbw+5pw/GIqi3TklE1X qlel/A0unjjEDfQTw6CiOG5hD4DQHGIEXCswFVI47Cqs8RygiYmNZp1DWqGWCgy7bVF9ziKjubZ6 FBFrxkPCdahT01Apt+EXhbQvPNo7+y06zApguTkVGGx1W9hEC47jlOZlrDkJ7886godJ1lNsbbZE wUq3FBrlEe9GmWBfWeqDGhssSgPZUI25FCzdKvAKrwro0wi5MI1DLJF4+UHbdy52WCtbPczDrPKB eXcDG/dLGuCSHS0RlNJZyGCbJEnSMSyC27LBhgyFxcT4FRTK6FrK+2YrwiOZlj33S3wVILzCRuzc OjINtJ4NZhDF3zgz6kGIsiyVyYTmp30sy3SdlbmGHu7MKkmkjBh8thPwmfQxHlLc9zMnhx22F9eu GjqJp6wmwpifDzCVETTuGY8DSBAXhTiU9N9+3kBszh4HiLNabrtzapt94d8bJuYpJZ8G7JFURJsj 1uspSxiwD9EwjxFHnyxE3zsbXCHq8eW4y8psNjMm7ZAdpbHyocaXUys1hhH2Zsb1aaBJkaq1q/rU qrVZdSDh6T+XlQuAtDSSjQ0+Wx1v2Liw/vbt+axt2MV6GYlTojqZjIp+dwaw1Dml5C4hJYqkrRYH AlrFFvoTNkZfenMBhcaP+Ao130uqDIMZ3Hj0NdoXFlgR/grgcJvcMvMOvmeqZufECPh1AssRQCYS VlWVZnlFzXGxYiqaNJQhVrUTes0IKFAZHE1344VOVoHJYawCDaAUR5K1pHa5EpnpJSxVilhrgIKM RqCXy1sIDB0wQJbbjYSBPkLNMnRWud342TSBvjPxC8taHIGOkl8JFYYtK/qzdR73fBUaQ0MemtpY BpQLUzRrcM5AOHDIWQDa+OiXxSpdv52qgdyY+ERfQIKUzix6C4+6asrD2F3JFOFCQJ07U7A=