# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: gm.domato@gmail.com-20110930213328-ua9k1f7o6eu3ca7c
# target_branch: bzr://bzr.savannah.gnu.org/pdf/libgnupdf/trunk/
# testament_sha1: 8288d209618c35039554dc2ea11ced09cbfc0949
# timestamp: 2011-09-30 18:34:01 -0300
# base_revision_id: jemarch@gnu.org-20110918081107-tsjgtd82mvbswe89
# 
# Begin patch
=== modified file 'utils/pdf-filter.c'
--- utils/pdf-filter.c	2011-09-01 13:32:22 +0000
+++ utils/pdf-filter.c	2011-09-30 21:33:28 +0000
@@ -117,6 +117,8 @@
 };
 
 /* name filter args here */
+
+#ifdef HAVE_LIBJBIG2DEC
 #define IS_FILTER_ARG(arg)                  \
   ((arg) == PRED_COLORS_ARG              || \
    (arg) == PRED_BITSPERCOMPONENT_ARG    || \
@@ -126,7 +128,15 @@
    (arg) == JBIG2DEC_PAGE_SIZE           || \
    (arg) == LZW_EARLYCHANGE_ARG          || \
    (arg) == KEY_ARG)
-
+#else
+#define IS_FILTER_ARG(arg)                  \
+  ((arg) == PRED_COLORS_ARG              || \
+   (arg) == PRED_BITSPERCOMPONENT_ARG    || \
+   (arg) == PRED_COLUMNS_ARG             || \
+   (arg) == PRED_PREDICTOR_ARG           || \
+   (arg) == LZW_EARLYCHANGE_ARG          || \
+   (arg) == KEY_ARG)
+#endif /* HAVE_LIBJBIG2DEC */
 
 static const struct option GNU_longOptions[] =
   {

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbVrQL4AAa7fgEGxWHP/93//
37S//9/0UAPOljTvNbhu97W3hlCMpk9RmgmGiU/Q1EAAwh6mgNlB6JsoJKTFNiaaCAIJtT1NB6gZ
AAAAZNAGRT0KZHqnplDT9UHqaANA0AA0AAAAxRpU2k9T1PKfpR5TQzU9QaAAAAAAABKKniamp6ZT
0mnqMmhoDT1NAaAMmjIZoh6gLAc67CZO/aK9FXwB7NNU+YXqZAQH6VKYNLVQzgEeQiJgXkiWnrzY
xSR8+8e7SIUBJp2TPfVjg041tUMISA5EK38e3fRwQpAH91z1TUJvkKUEPAfcg+VBTp/ZOME93dlC
wHAuD8MK4NYy+nEygu21KuPAmQnvA2aA7Nqp54ScCQpMyBDPekKQUWCE4cGLo0veIFwIeLE4t0zy
OjfVkZNFnNtcc9Kk5gjObuOy+RNUSMtCEak43YRutsF5SEzoT+qebfqU7uKA1mtktNZo7YrptMNS
FI0llAH1vkx7rtmQTr2ByETMhtGqwUnVQSqSqGpNMSRaCsUWhOWEsFFk0E4fmrLVrDB3PuXnnCYp
VBEuh+ykTgLW5eosJzXeFOuROtFuDVGKtFg0kK+ELBSIsMhrT1l43rErQ8pi5DnW8VxfbcQpBjL7
2UDARUG5evUQpGbEVpVUDoUuiIXVRVuzsrswBQ5SjIweED1lvWF5BOLUikmYo8Sa9d2UTdnTFSBi
qEtYFMY7GQJ9MKG2RyErocg9DLRoM3R8kI8CMqz4YzOR8pnHFSZI/MhljjpadHrz2rNTN05LbAhW
iKCQ0hjbQxtJGOZCU1IVrIaImxSi7CzJS0cMu251DJvMFCc8BOvEDh3Zv5OHowxLxHcAYm/2VVOf
bgaCPAlSQ/XcOkXOXF6xKn3u8D8h0EfdIQEMYI+z55gbxeBfFFtttL6USEzKYHPaGXRmEuyCwwVs
NIpCO9i7yhAlJYuyRf1Edm5HLJUHjkYatepLBSluUDQMbK1W4RyvZIjt1YUJqla7mQngkYQ7inYJ
igz1FtiU36sLhuBiAYVQZ8iFy6LAdgxtnrHOG4t2yNpIftzqoeVbjTTNZBK6GUzCti/kQsJasoWw
g1a4XZDcUL8femPzbWGVLOnMTDPw8oOp4dGLcobg37W8ukXDrMb2gCq6wGzLCUA4DFdMEWNWFUbb
QRuTvQOwSklJmNhYAT12hjszCWoXuCIKHzAJOrJnxYiZFMKls4aY9YTUmkeJ54taXPyJVWBviSDm
C1d1qx1V5MkQ4MCOD7WVCEpyXgWTABrHiQYl4EL6nIt0sroMjgdZZBpjLdrAUh9kLykEZCIm7Ral
uicWl05lyRVfDHgpQcBYEwa+1NUGBpwwE8VWyuP12QV0lIPQM8YiLtaypvMgU5HBfAjw44ceX/F3
JFOFCQtWtAvg
