Ignore:
Timestamp:
Dec 21, 2008, 8:03:13 AM (13 years ago)
Author:
Eugene Romanenko
Message:

PDF plugin: Poppler library updated to version 0.10.2

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/poppler/mypoppler/poppler/Annot.cc

    r257 r261  
    958958  }
    959959  obj1.free();
    960  
    961   if (dict->lookup("OC", &obj1)->isDict()) {
    962     optionalContent = new OCGs(&obj1, xrefA);
    963   } else {
    964     optionalContent = NULL;
    965   }
    966   obj1.free();
     960
     961  optContentConfig = catalog ? catalog->getOptContentConfig() : NULL;
     962  dict->lookupNF("OC", &oc);
     963  if (!oc.isRef() && !oc.isNull()) {
     964    error (-1, "Annotation OC value not null or dict: %i", oc.getType());
     965  }
    967966}
    968967
     
    10141013    delete color;
    10151014
    1016   if (optionalContent)
    1017     delete optionalContent;
     1015  oc.free();
    10181016}
    10191017
     
    11481146      (!printing && (flags & annotFlagNoView))) {
    11491147    return;
     1148  }
     1149
     1150  // check the OC
     1151  if (optContentConfig && oc.isRef()) {
     1152    if (! optContentConfig->optContentIsVisible(&oc))
     1153      return;
    11501154  }
    11511155
Note: See TracChangeset for help on using the changeset viewer.