commit 19fa111226b4e57cc33de70217bef7430790aecc
author Lei Zhang <thestig@chromium.org> Wed Oct 02 04:35:32 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Oct 02 04:35:32 2024 +0000
tree f56e42fa3ef10e212da082c5127a81f659991c96
parent 52be00c0273b45d2c8bc290562e8c80d22d9dd7c

Remove `CPDF_TextPage::CharInfo::m_Index`

This variable is never read.

Change-Id: I41b588e8fd0b22711f7322142d871065957da681
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/124734
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Tom Sepez <tsepez@google.com>

core/fpdftext/cpdf_textpage.cpp

diff --git a/core/fpdftext/cpdf_textpage.cpp b/core/fpdftext/cpdf_textpage.cpp
index 401d06f..5c4adef 100644
--- a/core/fpdftext/cpdf_textpage.cpp
+++ b/core/fpdftext/cpdf_textpage.cpp
@@ -664,11 +664,9 @@
                                              const CharInfo& info) {
   CharInfo info2 = info;
   if (IsControlChar(info2)) {
-    info2.m_Index = -1;
     m_CharList.push_back(info2);
     return;
   }
-  info2.m_Index = m_TextBuf.GetLength();
   DataVector<wchar_t> normalized;
   if (wChar >= 0xFB00 && wChar <= 0xFB06)
     normalized = GetUnicodeNormalization(wChar);
@@ -689,11 +687,9 @@
                                              const CharInfo& info) {
   CharInfo info2 = info;
   if (IsControlChar(info2)) {
-    info2.m_Index = -1;
     m_CharList.push_back(info2);
     return;
   }
-  info2.m_Index = m_TextBuf.GetLength();
   wChar = pdfium::unicode::GetMirrorChar(wChar);
   DataVector<wchar_t> normalized = GetUnicodeNormalization(wChar);
   if (normalized.empty()) {
@@ -914,7 +910,6 @@
       continue;
 
     CharInfo charinfo;
-    charinfo.m_Index = m_TextBuf.GetLength();
     charinfo.m_Unicode = wChar;
     charinfo.m_CharCode = pFont->CharCodeFromUnicode(wChar);
     charinfo.set_char_type(CPDF_TextPage::CharType::kPiece);
@@ -947,7 +942,6 @@
     auto rev = m_TempCharList.end() - 1;
     for (; fwd < rev; ++fwd, --rev) {
       std::swap(*fwd, *rev);
-      std::swap(fwd->m_Index, rev->m_Index);
     }
   }
   pdfium::span<wchar_t> temp_span = m_TempTextBuf.GetWideSpan();
@@ -1084,7 +1078,6 @@
         charinfo.m_Unicode = L' ';
         charinfo.set_char_type(CPDF_TextPage::CharType::kGenerated);
         charinfo.set_text_object(pTextObj);
-        charinfo.m_Index = m_TextBuf.GetLength();
         m_TempTextBuf.AppendChar(L' ');
         charinfo.m_CharCode = CPDF_Font::kInvalidCharCode;
         charinfo.set_origin(matrix.Transform(item.m_Origin));
@@ -1104,7 +1097,6 @@
       wstrItem += static_cast<wchar_t>(item.m_CharCode);
       bNoUnicode = true;
     }
-    charinfo.m_Index = -1;
     charinfo.m_CharCode = item.m_CharCode;
     charinfo.set_char_type(bNoUnicode ? CPDF_TextPage::CharType::kNotUnicode
                                       : CPDF_TextPage::CharType::kNormal);
@@ -1156,7 +1148,6 @@
       for (size_t nIndex = 0; nIndex < nTotal; ++nIndex) {
         charinfo.m_Unicode = wstrItem[nIndex];
         if (charinfo.m_Unicode) {
-          charinfo.m_Index = m_TextBuf.GetLength();
           m_TempTextBuf.AppendChar(charinfo.m_Unicode);
         } else {
           m_TempTextBuf.AppendChar(0xfffe);
@@ -1433,7 +1424,6 @@
     return std::nullopt;
 
   CharInfo info;
-  info.m_Index = m_TextBuf.GetLength();
   info.m_CharCode = CPDF_Font::kInvalidCharCode;
   info.m_Unicode = unicode;
   info.set_char_type(CPDF_TextPage::CharType::kGenerated);

core/fpdftext/cpdf_textpage.h

diff --git a/core/fpdftext/cpdf_textpage.h b/core/fpdftext/cpdf_textpage.h
index 4402f26..63e3c69 100644
--- a/core/fpdftext/cpdf_textpage.h
+++ b/core/fpdftext/cpdf_textpage.h
@@ -67,7 +67,6 @@
       text_object_ = text_object;
     }
 
-    int m_Index = 0;
     uint32_t m_CharCode = 0;
     wchar_t m_Unicode = 0;