commit 5610fc71fcd6b4c54e805470259ed95547aa2328
author Oliver Sander <oliver.sander@tu-dresden.de> Fri Nov 30 21:44:58 2018 +0100
committer Albert Astals Cid <tsdgeos@yahoo.es> Thu Mar 21 22:28:12 2019 +0000
tree 20050ad1353947c2bc0a84438a52bd40eaba2d2f
parent fda9a2a2fcb0d12add4812c84f7d39684d2ca6d7

pdfdetach: Replace GooList by std::vector

utils/pdfdetach.cc

diff --git a/utils/pdfdetach.cc b/utils/pdfdetach.cc
index 802632a..3ec155c 100644
--- a/utils/pdfdetach.cc
+++ b/utils/pdfdetach.cc
@@ -91,7 +91,7 @@
   char *p;
   bool ok;
   int exitCode;
-  GooList *embeddedFiles = nullptr;
+  std::vector<FileSpec*> embeddedFiles;
   int nFiles, nPages, n, i, j;
   FileSpec *fileSpec;
   Page *page;
@@ -160,9 +160,8 @@
     goto err2;
   }
 
-  embeddedFiles = new GooList();
   for (i = 0; i < doc->getCatalog()->numEmbeddedFiles(); ++i)
-    embeddedFiles->push_back(doc->getCatalog()->embeddedFile(i));
+    embeddedFiles.push_back(doc->getCatalog()->embeddedFile(i));
 
   nPages = doc->getCatalog()->getNumPages();
   for (i = 0; i < nPages; ++i) {
@@ -177,17 +176,17 @@
       annot = annots->getAnnot(j);
       if (annot->getType() != Annot::typeFileAttachment)
         continue;
-      embeddedFiles->push_back(new FileSpec(static_cast<AnnotFileAttachment *>(annot)->getFile()));
+      embeddedFiles.push_back(new FileSpec(static_cast<AnnotFileAttachment *>(annot)->getFile()));
     }
   }
 
-  nFiles = embeddedFiles->size();
+  nFiles = embeddedFiles.size();
 
   // list embedded files
   if (doList) {
     printf("%d embedded files\n", nFiles);
     for (i = 0; i < nFiles; ++i) {
-      fileSpec = static_cast<FileSpec *>(embeddedFiles->get(i));
+      fileSpec = embeddedFiles[i];
       printf("%d: ", i+1);
       s1 = fileSpec->getFileName();
       if (!s1) {
@@ -218,7 +217,7 @@
   // save all embedded files
   } else if (saveAll) {
     for (i = 0; i < nFiles; ++i) {
-      fileSpec = static_cast<FileSpec *>(embeddedFiles->get(i));
+      fileSpec = embeddedFiles[i];
       if (savePath[0]) {
 	n = strlen(savePath);
 	if (n > (int)sizeof(path) - 2) {
@@ -277,7 +276,7 @@
       goto err2;
     }
 
-    fileSpec = static_cast<FileSpec *>(embeddedFiles->get(saveNum - 1));
+    fileSpec = embeddedFiles[saveNum - 1];
     if (savePath[0]) {
       p = savePath;
     } else {
@@ -328,8 +327,8 @@
 
   // clean up
  err2:
-  if (embeddedFiles)
-    deleteGooList<FileSpec>(embeddedFiles);
+  for (auto& file : embeddedFiles)
+    delete file;
   uMap->decRefCnt();
   delete doc;
  err1: