Merge to XFA: War on #defines, part 1.

core/src/fpdfapi/fpdf_page/fpdf_page_image.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 "pageint.h"
 
 #include "core/include/fpdfapi/fpdf_page.h"
 #include "core/include/fpdfapi/fpdf_pageobj.h"
 
-CPDF_ImageObject::CPDF_ImageObject() {
-  m_pImage = NULL;
-  m_Type = PDFPAGE_IMAGE;
-}
+CPDF_ImageObject::CPDF_ImageObject()
+    : CPDF_PageObject(IMAGE), m_pImage(nullptr) {}
 CPDF_ImageObject::~CPDF_ImageObject() {
   if (!m_pImage) {
     return;
   }
   if (m_pImage->IsInline() ||
       (m_pImage->GetStream() && m_pImage->GetStream()->GetObjNum() == 0)) {
     delete m_pImage;
   } else {
     m_pImage->GetDocument()->GetPageData()->ReleaseImage(m_pImage->GetStream());
   }
@@ skipping 62 matching lines @@
   if (m_bInline) {
     m_pInlineDict = ToDictionary(pDict->Clone());
   }
   m_pOC = pDict->GetDict("OC");
   m_bIsMask = !pDict->KeyExist("ColorSpace") || pDict->GetInteger("ImageMask");
   m_bInterpolate = pDict->GetInteger("Interpolate");
   m_Height = pDict->GetInteger("Height");
   m_Width = pDict->GetInteger("Width");
   return TRUE;
 }