[poppler] poppler/Annot.cc

[Carlos Garcia Campos]

 poppler/Annot.cc |   22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

New commits:
commit fee5cb0eec2ddb8d596289e9a6285cf04d97632e
Author: Carlos Garcia Campos <carlosgc at gnome.org>
Date:   Fri Dec 4 13:26:42 2009 +0100

    [annots] Remove redundant flags definition

diff --git a/poppler/Annot.cc b/poppler/Annot.cc
index cb6a381..478ed21 100644
--- a/poppler/Annot.cc
+++ b/poppler/Annot.cc
@@ -61,10 +61,6 @@
 #include "DateInfo.h"
 #include <string.h>
 
-#define annotFlagHidden    0x0002
-#define annotFlagPrint     0x0004
-#define annotFlagNoView    0x0020
-
 #define fieldFlagReadOnly           0x00000001
 #define fieldFlagRequired           0x00000002
 #define fieldFlagNoExport           0x00000004
@@ -1270,9 +1266,9 @@ void Annot::draw(Gfx *gfx, GBool printing) {
   Object obj;
 
   // check the flags
-  if ((flags & annotFlagHidden) ||
-      (printing && !(flags & annotFlagPrint)) ||
-      (!printing && (flags & annotFlagNoView))) {
+  if ((flags & flagHidden) ||
+      (printing && !(flags & flagPrint)) ||
+      (!printing && (flags & flagNoView))) {
     return;
   }
 
@@ -1696,9 +1692,9 @@ void AnnotLink::draw(Gfx *gfx, GBool printing) {
   Object obj;
 
   // check the flags
-  if ((flags & annotFlagHidden) ||
-      (printing && !(flags & annotFlagPrint)) ||
-      (!printing && (flags & annotFlagNoView))) {
+  if ((flags & flagHidden) ||
+      (printing && !(flags & flagPrint)) ||
+      (!printing && (flags & flagNoView))) {
     return;
   }
 
@@ -3421,9 +3417,9 @@ void AnnotWidget::draw(Gfx *gfx, GBool printing) {
   Object obj;
 
   // check the flags
-  if ((flags & annotFlagHidden) ||
-      (printing && !(flags & annotFlagPrint)) ||
-      (!printing && (flags & annotFlagNoView))) {
+  if ((flags & flagHidden) ||
+      (printing && !(flags & flagPrint)) ||
+      (!printing && (flags & flagNoView))) {
     return;
   }