[poppler] Branch 'poppler-0.12' - poppler/OptionalContent.cc

[Albert Astals Cid]

 poppler/OptionalContent.cc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ef7339eb26d76714250ed25bd826d737283cc1a4
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Feb 16 23:31:05 2010 +0000

    Only assume the OC is not visible if it exists and is set to no
    
    Fixes bug 26532 and a small line that was not drawn in 15899

diff --git a/poppler/OptionalContent.cc b/poppler/OptionalContent.cc
index f59b16a..9568694 100644
--- a/poppler/OptionalContent.cc
+++ b/poppler/OptionalContent.cc
@@ -5,7 +5,7 @@
 // Copyright 2007 Brad Hards <bradh at kde.org>
 // Copyright 2008 Pino Toscano <pino at kde.org>
 // Copyright 2008 Carlos Garcia Campos <carlosgc at gnome.org>
-// Copyright 2008 Albert Astals Cid <aacid at kde.org>
+// Copyright 2008, 2010 Albert Astals Cid <aacid at kde.org>
 // Copyright 2008 Mark Kaplan <mkaplan at finjan.com>
 //
 // Released under the GPL (version 2, or later, at your option)
@@ -199,7 +199,7 @@ bool OCGs::optContentIsVisible( Object *dictRef )
       }
     } else if (ocg.isRef()) {
       OptionalContentGroup* oc = findOcgByRef( ocg.getRef() );      
-      if ( !oc || oc->getState() == OptionalContentGroup::Off ) {
+      if ( oc && oc->getState() == OptionalContentGroup::Off ) {
 	result = false;
       } else {
 	result = true ;