Index: core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp |
diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp |
similarity index 99% |
rename from core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp |
rename to core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp |
index 93b867005cc4b3a935b25008a46757725f4b91c9..f1a06c4fc72801cf7789fba42b111a528e8a11d4 100644 |
--- a/core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp |
+++ b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp |
@@ -4,12 +4,13 @@ |
// 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" |
@@ -19,7 +20,6 @@ |
#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 { |
@@ -71,9 +71,7 @@ class JpxBitMapContext { |
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; } |