# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: gm.domato@gmail.com-20111001160548-94wi15t5cx0hf89y
# target_branch: bzr://bzr.savannah.gnu.org/pdf/libgnupdf/trunk/
# testament_sha1: 48415e0c6daafb1d69a0e8970dbf6881eaa9f546
# timestamp: 2011-10-01 13:06:03 -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-10-01 16:05:48 +0000
@@ -58,7 +58,7 @@
  * Command line options management
  */
 
-enum
+enum filter_arg
 {
   FILTER_INSTALL_NONE,
   HELP_ARG,
@@ -117,16 +117,21 @@
 };
 
 /* name filter args here */
-#define IS_FILTER_ARG(arg)                  \
-  ((arg) == PRED_COLORS_ARG              || \
-   (arg) == PRED_BITSPERCOMPONENT_ARG    || \
-   (arg) == PRED_COLUMNS_ARG             || \
-   (arg) == PRED_PREDICTOR_ARG           || \
-   (arg) == JBIG2DEC_GLOBAL_SEGMENTS_ARG || \
-   (arg) == JBIG2DEC_PAGE_SIZE           || \
-   (arg) == LZW_EARLYCHANGE_ARG          || \
-   (arg) == KEY_ARG)
 
+static pdf_bool_t
+is_filter_arg(enum filter_arg arg)
+{
+  return (arg) == PRED_COLORS_ARG 
+    || (arg) == PRED_BITSPERCOMPONENT_ARG    
+    || (arg) == PRED_COLUMNS_ARG
+    || (arg) == PRED_PREDICTOR_ARG
+#ifdef HAVE_LIBJBIG2DEC
+    || (arg) == JBIG2DEC_GLOBAL_SEGMENTS_ARG
+    || (arg) == JBIG2DEC_PAGE_SIZE
+#endif /* HAVE_LIBJBIG2DEC */
+    || (arg) == LZW_EARLYCHANGE_ARG
+    || (arg) == KEY_ARG;
+}
 
 static const struct option GNU_longOptions[] =
   {
@@ -1314,7 +1319,7 @@
         }
 
       /* next arg is a new filter and current filter is with args */
-      if (!IS_FILTER_ARG(next_ci) && filter_to_install != FILTER_INSTALL_NONE)
+      if (!is_filter_arg(next_ci) && filter_to_install != FILTER_INSTALL_NONE)
         {
           /* do extra loop installing current filter */
           ci = filter_to_install;

# Begin bundle
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
