Move core/src/ up to core/.

core/fpdfapi/fpdf_render/fpdf_render_loadimage.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 "core/src/fpdfapi/fpdf_render/render_int.h"
+#include "core/fpdfapi/fpdf_render/render_int.h"
 
 #include <algorithm>
 #include <memory>
 #include <vector>
 
+#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/include/fpdfapi/cpdf_array.h"
 #include "core/include/fpdfapi/cpdf_dictionary.h"
 #include "core/include/fpdfapi/cpdf_document.h"
 #include "core/include/fpdfapi/fpdf_module.h"
 #include "core/include/fpdfapi/fpdf_pageobj.h"
 #include "core/include/fpdfapi/fpdf_render.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxcrt/fx_safe_types.h"
 #include "core/include/fxge/fx_ge.h"
-#include "core/src/fpdfapi/fpdf_page/pageint.h"
 
 namespace {
 
 unsigned int GetBits8(const uint8_t* pData, uint64_t bitpos, size_t nbits) {
   ASSERT(nbits == 1 || nbits == 2 || nbits == 4 || nbits == 8 || nbits == 16);
   ASSERT((bitpos & (nbits - 1)) == 0);
   unsigned int byte = pData[bitpos / 8];
   if (nbits == 8) {
     return byte;
   } else if (nbits == 16) {
@@ skipping 31 matching lines @@
   value = std::max<T>(0, value);
   return value;
 }
 
 // Wrapper class to use with std::unique_ptr for CJPX_Decoder.
 class JpxBitMapContext {
  public:
   explicit JpxBitMapContext(ICodec_JpxModule* jpx_module)
       : jpx_module_(jpx_module), decoder_(nullptr) {}
 
-  ~JpxBitMapContext() {
-    jpx_module_->DestroyDecoder(decoder_);
-  }
+  ~JpxBitMapContext() { jpx_module_->DestroyDecoder(decoder_); }
 
   // Takes ownership of |decoder|.
   void set_decoder(CJPX_Decoder* decoder) { decoder_ = decoder; }
 
   CJPX_Decoder* decoder() { return decoder_; }
 
  private:
   ICodec_JpxModule* const jpx_module_;  // Weak pointer.
   CJPX_Decoder* decoder_;               // Decoder, owned.
 
@@ skipping 1560 matching lines @@
                                    IFX_Pause* pPause) {
   return LoadHandle->Continue(pPause);
 }
 
 CPDF_ImageLoader::~CPDF_ImageLoader() {
   if (!m_bCached) {
     delete m_pBitmap;
     delete m_pMask;
   }
 }