commit e6ff2ebfaa19421c8d932f4d275548156ae2e13c
author Tom Sepez <tsepez@chromium.org> Fri Aug 24 21:55:46 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Aug 24 21:55:46 2018 +0000
tree a549775ce9d4e999f8a23542524adba8c5ca42ea
parent 16d18d935d055b74e05f615c0325318a329a7fe1

Rename CFX_DIBSource to CFX_DIBBase.

It is not a source from which you can get CFX_DIBs, but rather a
base class from which all DIBs inherit.

Do the same thing for the CPDF_DIBSource wrapper class.
Mechanical change apart from adding a one-line comment in cfx_dibbase.h

Change-Id: Id2bde87813ca301d9fafc55ce08d703dfc6a7184
Reviewed-on: https://pdfium-review.googlesource.com/41352
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>

fpdfsdk/fpdf_editimg.cpp

diff --git a/fpdfsdk/fpdf_editimg.cpp b/fpdfsdk/fpdf_editimg.cpp
index 8235a8c..3709da7 100644
--- a/fpdfsdk/fpdf_editimg.cpp
+++ b/fpdfsdk/fpdf_editimg.cpp
@@ -14,7 +14,7 @@
 #include "core/fpdfapi/parser/cpdf_array.h"
 #include "core/fpdfapi/parser/cpdf_name.h"
 #include "core/fpdfapi/parser/cpdf_stream_acc.h"
-#include "core/fpdfapi/render/cpdf_dibsource.h"
+#include "core/fpdfapi/render/cpdf_dibbase.h"
 #include "fpdfsdk/cpdfsdk_customaccess.h"
 #include "fpdfsdk/cpdfsdk_helpers.h"
 #include "third_party/base/ptr_util.h"
@@ -170,7 +170,7 @@
   if (!pImg)
     return nullptr;
 
-  RetainPtr<CFX_DIBSource> pSource = pImg->LoadDIBSource();
+  RetainPtr<CFX_DIBBase> pSource = pImg->LoadDIBBase();
   if (!pSource)
     return nullptr;
 
@@ -313,11 +313,11 @@
   if (!pPage || !pPage->GetDocument() || !pImg->GetStream())
     return true;
 
-  auto pSource = pdfium::MakeRetain<CPDF_DIBSource>();
-  CPDF_DIBSource::LoadState ret = pSource->StartLoadDIBSource(
+  auto pSource = pdfium::MakeRetain<CPDF_DIBBase>();
+  CPDF_DIBBase::LoadState ret = pSource->StartLoadDIBBase(
       pPage->GetDocument(), pImg->GetStream(), false, nullptr,
       pPage->m_pPageResources.Get(), false, 0, false);
-  if (ret == CPDF_DIBSource::LoadState::kFail)
+  if (ret == CPDF_DIBBase::LoadState::kFail)
     return true;
 
   metadata->bits_per_pixel = pSource->GetBPP();