[PDF] Only output the Dests dictionary if it isn't epmpty

src/pdf/SkPDFDocument.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkPDFCatalog.h"
@@ skipping 94 matching lines @@
         /* TODO(vandebo): output intent
         SkAutoTUnref<SkPDFDict> outputIntent = new SkPDFDict("OutputIntent");
         outputIntent->insert("S", new SkPDFName("GTS_PDFA1"))->unref();
         outputIntent->insert("OutputConditionIdentifier",
                              new SkPDFString("sRGB"))->unref();
         SkAutoTUnref<SkPDFArray> intentArray = new SkPDFArray;
         intentArray->append(outputIntent.get());
         fDocCatalog->insert("OutputIntent", intentArray.get());
         */
 
-        SkPDFDict* dests = SkNEW(SkPDFDict);  // fPageResources owns reference
-        fCatalog->addObject(dests, true /* onFirstPage */);
-        fFirstPageResources->add(dests);
+        SkAutoTUnref<SkPDFDict> dests(SkNEW(SkPDFDict));
 
         bool firstPage = true;
         /* The references returned in newResources are transfered to
          * fFirstPageResources or fOtherPageResources depending on firstPage and
          * knownResources doesn't have a reference but just relies on the other
          * two sets to maintain a reference.
          */
         SkTSet<SkPDFObject*> knownResources;
 
         // mergeInto returns the number of duplicates.
@@ skipping 16 matching lines @@
                 SkDEBUGCODE(duplicates =) fOtherPageResources->mergeInto(newResources);
             }
             SkASSERT(duplicates == 0);
 
             SkDEBUGCODE(duplicates =) knownResources.mergeInto(newResources);
             SkASSERT(duplicates == 0);
 
             fPages[i]->appendDestinations(dests);
         }
 
-        fDocCatalog->insert("Dests", SkNEW_ARGS(SkPDFObjRef, (dests)))->unref();
+        if (dests->size() > 0) {
+            SkPDFDict* raw_dests = dests.get();
+            fFirstPageResources->add(dests.detach());  // Transfer ownership.
+            fCatalog->addObject(raw_dests, true /* onFirstPage */);
+            fDocCatalog->insert("Dests", SkNEW_ARGS(SkPDFObjRef, (raw_dests)))->unref();
+        }
 
         // Build font subsetting info before proceeding.
         perform_font_subsetting(fCatalog.get(), fPages, &fSubstitutes);
 
         // Figure out the size of things and inform the catalog of file offsets.
         off_t fileOffset = headerSize();
         fileOffset += fCatalog->setFileOffset(fDocCatalog, fileOffset);
         fileOffset += fCatalog->setFileOffset(fPages[0], fileOffset);
         fileOffset += fPages[0]->getPageSize(fCatalog.get(),
                 (size_t) fileOffset);
@@ skipping 132 matching lines @@
         fTrailerDict->insertInt("Size", int(objCount));
         fTrailerDict->insert("Root", new SkPDFObjRef(fDocCatalog))->unref();
     }
 
     stream->writeText("trailer\n");
     fTrailerDict->emitObject(stream, fCatalog.get(), false);
     stream->writeText("\nstartxref\n");
     stream->writeBigDecAsText(fXRefFileOffset);
     stream->writeText("\n%%EOF");
 }