Cleanup parts of CPDFSDK_AnnotIterator and CPDFSDK_PageView.

fpdfsdk/src/fsdk_baseform.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../third_party/base/nonstd_unique_ptr.h"
 #include "../include/fsdk_define.h"
 #include "../include/fsdk_mgr.h"
 #include "../include/fsdk_baseannot.h"
@@ skipping 2443 matching lines @@
   if (rcAnnot1.top > rcAnnot2.top)
     return 1;
   return 0;
 }
 
 void CBA_AnnotIterator::GenerateResults() {
   ASSERT(m_pPageView != NULL);
 
   switch (m_nTabs) {
     case BAI_STRUCTURE: {
-      for (int i = 0, sz = m_pPageView->CountAnnots(); i < sz; i++) {
+      for (size_t i = 0; i < m_pPageView->CountAnnots(); ++i) {
         CPDFSDK_Annot* pAnnot = m_pPageView->GetAnnot(i);
         ASSERT(pAnnot != NULL);
 
         if (pAnnot->GetType() == m_sType && pAnnot->GetSubType() == m_sSubType)
           m_Annots.Add(pAnnot);
       }
     } break;
     case BAI_ROW: {
       CPDFSDK_SortAnnots sa;
 
       {
-        for (int i = 0, sz = m_pPageView->CountAnnots(); i < sz; i++) {
+        for (size_t i = 0; i < m_pPageView->CountAnnots(); ++i) {
           CPDFSDK_Annot* pAnnot = m_pPageView->GetAnnot(i);
           ASSERT(pAnnot != NULL);
 
           if (pAnnot->GetType() == m_sType &&
               pAnnot->GetSubType() == m_sSubType)
             sa.Add(pAnnot);
         }
       }
 
       if (sa.GetSize() > 0) {
@@ skipping 58 matching lines @@
 
           aSelect.RemoveAll();
         }
       }
       sa.RemoveAll();
     } break;
     case BAI_COLUMN: {
       CPDFSDK_SortAnnots sa;
 
       {
-        for (int i = 0, sz = m_pPageView->CountAnnots(); i < sz; i++) {
+        for (size_t i = 0; i < m_pPageView->CountAnnots(); ++i) {
           CPDFSDK_Annot* pAnnot = m_pPageView->GetAnnot(i);
           ASSERT(pAnnot != NULL);
 
           if (pAnnot->GetType() == m_sType &&
               pAnnot->GetSubType() == m_sSubType)
             sa.Add(pAnnot);
         }
       }
 
       if (sa.GetSize() > 0) {
@@ skipping 71 matching lines @@
   ASSERT(pAnnot != NULL);
 
   CPDF_Annot* pPDFAnnot = pAnnot->GetPDFAnnot();
   ASSERT(pPDFAnnot != NULL);
 
   CPDF_Rect rcAnnot;
   pPDFAnnot->GetRect(rcAnnot);
 
   return rcAnnot;
 }