Merge to XFA: Tidy public fpdfview.h and fpdf_flatten.h.

fpdfsdk/src/fpdf_flatten.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 "../../public/fpdf_flatten.h"
 #include "../include/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_page.h"
@@ skipping 70 matching lines @@
         
         if (IsValiableRect(rect, pPageDic->GetRect("MediaBox")))
                 pRectArray->Add(rect);
         
         pObjectArray->Add(pStream);
 }
 
 
 int ParserAnnots( CPDF_Document* pSourceDoc, CPDF_Dictionary * pPageDic, CPDF_RectArray * pRectArray, CPDF_ObjectArray * pObjectArray, int nUsage)
 {
-        if (!pSourceDoc || !pPageDic) return FLATTEN_FAIL;
-        
-        GetContentsRect( pSourceDoc, pPageDic, pRectArray );
-        CPDF_Array* pAnnots = pPageDic->GetArray("Annots");
-        if (pAnnots)
-        {
-                FX_DWORD dwSize = pAnnots->GetCount();
-                
-                for (int i = 0; i < (int)dwSize; i++)
-                {
-                        CPDF_Object* pObj = pAnnots->GetElementValue(i);
-                        
-                        if (!pObj)continue;
-                        
-                        if (pObj->GetType() == PDFOBJ_DICTIONARY)
-                        {
-                                CPDF_Dictionary* pAnnotDic = (CPDF_Dictionary*)pObj;
-                                CFX_ByteString sSubtype = pAnnotDic->GetString("Subtype");
-                                if (sSubtype == "Popup")continue;
+    if (!pSourceDoc || !pPageDic)
+        return FLATTEN_FAIL;
 
-                                int nAnnotFlag = pAnnotDic->GetInteger("F");
+    GetContentsRect( pSourceDoc, pPageDic, pRectArray );
+    CPDF_Array* pAnnots = pPageDic->GetArray("Annots");
+    if (!pAnnots)
+        return FLATTEN_NOTHINGTODO;
 
-                                if(nAnnotFlag & ANNOTFLAG_HIDDEN) 
-                                        continue;
-                                if(nUsage == FLAT_NORMALDISPLAY)
-                                {
-                                        if(nAnnotFlag & ANNOTFLAG_INVISIBLE)
-                                                continue;
-                                        ParserStream( pPageDic, pAnnotDic, pRectArray, pObjectArray );          
-                                }
-                                else
-                                {
-                                        if(nAnnotFlag & ANNOTFLAG_PRINT)
-                                                ParserStream( pPageDic, pAnnotDic, pRectArray, pObjectArray );
-                                }                       
-                        }
-                }
-                return FLATTEN_SUCCESS;
-        }else{
-                return FLATTEN_NOTINGTODO;
-        }
+    FX_DWORD dwSize = pAnnots->GetCount();
+    for (int i = 0; i < (int)dwSize; i++)
+    {
+        CPDF_Object* pObj = pAnnots->GetElementValue(i);
+        if (!pObj || pObj->GetType() != PDFOBJ_DICTIONARY)
+            continue;
+
+        CPDF_Dictionary* pAnnotDic = (CPDF_Dictionary*)pObj;
+        CFX_ByteString sSubtype = pAnnotDic->GetString("Subtype");
+        if (sSubtype == "Popup")
+            continue;
+
+        int nAnnotFlag = pAnnotDic->GetInteger("F");
+        if (nAnnotFlag & ANNOTFLAG_HIDDEN)
+            continue;
+
+        if(nUsage == FLAT_NORMALDISPLAY)
+        {
+            if (nAnnotFlag & ANNOTFLAG_INVISIBLE)
+                continue;
+
+            ParserStream( pPageDic, pAnnotDic, pRectArray, pObjectArray );
+        }
+        else
+        {
+            if (nAnnotFlag & ANNOTFLAG_PRINT)
+                ParserStream( pPageDic, pAnnotDic, pRectArray, pObjectArray );
+        }
+    }
+    return FLATTEN_SUCCESS;
 }
 
 
 FX_FLOAT GetMinMaxValue( CPDF_RectArray& array, FPDF_TYPE type, FPDF_VALUE value)
 {
         int nRects = array.GetSize();
         FX_FLOAT fRet = 0.0f;
         
         if (nRects <= 0)return 0.0f;
         
@@ skipping 202 matching lines @@
         if ( !pDocument || !pPageDict )
         {
                 return FLATTEN_FAIL;
         }
 
         CPDF_ObjectArray ObjectArray;
         CPDF_RectArray  RectArray;
 
         int iRet = FLATTEN_FAIL;
         iRet = ParserAnnots( pDocument, pPageDict, &RectArray, &ObjectArray, nFlag);
-        if (iRet == FLATTEN_NOTINGTODO)
-        {
-                return FLATTEN_NOTINGTODO;
-        }else if (iRet == FLATTEN_FAIL)
-        {
-                return FLATTEN_FAIL;
-        }
-        
+        if (iRet == FLATTEN_NOTHINGTODO || iRet == FLATTEN_FAIL)
+                return iRet;
+
         CPDF_Rect rcOriginalCB;
         CPDF_Rect rcMerger = CalculateRect( &RectArray );
         CPDF_Rect rcOriginalMB = pPageDict->GetRect("MediaBox");
 
         if (pPageDict->KeyExist("CropBox"))
                 rcOriginalMB = pPageDict->GetRect("CropBox");
         
         if (rcOriginalMB.IsEmpty())     
         {
                 rcOriginalMB = CPDF_Rect(0.0f, 0.0f, 612.0f, 792.0f);
@@ skipping 185 matching lines @@
 
                 pNewXObject->SetData((FX_LPCBYTE)sStream, sStream.GetLength(), FALSE, FALSE);
         }
         pPageDict->RemoveAt( "Annots" );
 
         ObjectArray.RemoveAll();
         RectArray.RemoveAll();
 
         return FLATTEN_SUCCESS;
 }