commit 26fd142a3608283fd41e07b54067a51a9db76e93
author Fabio D'Urso <fabiodurso@hotmail.it> Sat Apr 21 18:16:46 2012 +0200
committer Albert Astals Cid <aacid@kde.org> Mon Apr 23 21:14:56 2012 +0200
tree 916cbadbdb804c32f70041d1f62f12c77eff48f4
parent 7b10014c1fe9ef1cba57fd6b01c63129ac31386a

Preserve z-index after annotation removal

poppler/Annot.cc

diff --git a/poppler/Annot.cc b/poppler/Annot.cc
index b3bc97d..24ef57d 100644
--- a/poppler/Annot.cc
+++ b/poppler/Annot.cc
@@ -6446,7 +6446,7 @@
 
 GBool Annots::removeAnnot(Annot *annot) {
   int idx = -1;
-  // Search annot and remove it by swapping with last element
+  // Search annot and determine its index
   for (int i = 0; idx == -1 && i < nAnnots; i++) {
     if (annots[i] == annot) {
       idx = i;
@@ -6455,7 +6455,8 @@
   if (idx == -1) {
     return gFalse;
   } else {
-    annots[idx] = annots[--nAnnots];
+    --nAnnots;
+    memmove( annots + idx, annots + idx + 1, sizeof(annots[0]) * (nAnnots - idx) );
     annot->decRefCnt();
     return gTrue;
   }