Move core/src/ up to core/.

core/fxcodec/jbig2/JBig2_GrdProc.cpp

Index: core/fxcodec/jbig2/JBig2_GrdProc.cpp
diff --git a/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp b/core/fxcodec/jbig2/JBig2_GrdProc.cpp
similarity index 98%
rename from core/src/fxcodec/jbig2/JBig2_GrdProc.cpp
rename to core/fxcodec/jbig2/JBig2_GrdProc.cpp
index cf0f60405c5bc0f9a07d39e98c7e117773c0e518..a3fc33c2bed3d06d7173a4062d0af66eb9ffe97c 100644
--- a/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp
+++ b/core/fxcodec/jbig2/JBig2_GrdProc.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/src/fxcodec/jbig2/JBig2_GrdProc.h"
+#include "core/fxcodec/jbig2/JBig2_GrdProc.h"
 
 #include <memory>
 
+#include "core/fxcodec/jbig2/JBig2_ArithDecoder.h"
+#include "core/fxcodec/jbig2/JBig2_BitStream.h"
+#include "core/fxcodec/jbig2/JBig2_Image.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h"
-#include "core/src/fxcodec/jbig2/JBig2_BitStream.h"
-#include "core/src/fxcodec/jbig2/JBig2_Image.h"
 
 CJBig2_GRDProc::CJBig2_GRDProc()
     : m_loopIndex(0),
@@ -68,7 +68,7 @@ CJBig2_Image* CJBig2_GRDProc::decode_Arith_Template0_opt3(
   FX_BOOL LTP, SLTP, bVal;
   FX_DWORD CONTEXT;
   FX_DWORD line1, line2;
-  uint8_t* pLine, *pLine1, *pLine2, cVal;
+  uint8_t *pLine, *pLine1, *pLine2, cVal;
   int32_t nStride, nStride2, k;
   int32_t nLineBytes, nBitsLeft, cc;
   LTP = 0;
@@ -206,7 +206,7 @@ CJBig2_Image* CJBig2_GRDProc::decode_Arith_Template1_opt3(
   FX_BOOL LTP, SLTP, bVal;
   FX_DWORD CONTEXT;
   FX_DWORD line1, line2;
-  uint8_t* pLine, *pLine1, *pLine2, cVal;
+  uint8_t *pLine, *pLine1, *pLine2, cVal;
   int32_t nStride, nStride2, k;
   int32_t nLineBytes, nBitsLeft, cc;
   LTP = 0;
@@ -340,7 +340,7 @@ CJBig2_Image* CJBig2_GRDProc::decode_Arith_Template2_opt3(
   FX_BOOL LTP, SLTP, bVal;
   FX_DWORD CONTEXT;
   FX_DWORD line1, line2;
-  uint8_t* pLine, *pLine1, *pLine2, cVal;
+  uint8_t *pLine, *pLine1, *pLine2, cVal;
   int32_t nStride, nStride2, k;
   int32_t nLineBytes, nBitsLeft, cc;
   LTP = 0;
@@ -473,7 +473,7 @@ CJBig2_Image* CJBig2_GRDProc::decode_Arith_Template3_opt3(
   FX_BOOL LTP, SLTP, bVal;
   FX_DWORD CONTEXT;
   FX_DWORD line1;
-  uint8_t* pLine, *pLine1, cVal;
+  uint8_t *pLine, *pLine1, cVal;
   int32_t nStride, k;
   int32_t nLineBytes, nBitsLeft, cc;
   LTP = 0;
@@ -700,7 +700,7 @@ FXCODEC_STATUS CJBig2_GRDProc::decode_Arith_Template0_opt3(
   FX_BOOL SLTP, bVal;
   FX_DWORD CONTEXT;
   FX_DWORD line1, line2;
-  uint8_t* pLine1, *pLine2, cVal;
+  uint8_t *pLine1, *pLine2, cVal;
   int32_t nStride, nStride2, k;
   int32_t nLineBytes, nBitsLeft, cc;
   if (!m_pLine) {
@@ -850,7 +850,7 @@ FXCODEC_STATUS CJBig2_GRDProc::decode_Arith_Template1_opt3(
   FX_BOOL SLTP, bVal;
   FX_DWORD CONTEXT;
   FX_DWORD line1, line2;
-  uint8_t* pLine1, *pLine2, cVal;
+  uint8_t *pLine1, *pLine2, cVal;
   int32_t nStride, nStride2, k;
   int32_t nLineBytes, nBitsLeft, cc;
   if (!m_pLine) {
@@ -995,7 +995,7 @@ FXCODEC_STATUS CJBig2_GRDProc::decode_Arith_Template2_opt3(
   FX_BOOL SLTP, bVal;
   FX_DWORD CONTEXT;
   FX_DWORD line1, line2;
-  uint8_t* pLine1, *pLine2, cVal;
+  uint8_t *pLine1, *pLine2, cVal;
   int32_t nStride, nStride2, k;
   int32_t nLineBytes, nBitsLeft, cc;
   if (!m_pLine) {
@@ -1140,7 +1140,7 @@ FXCODEC_STATUS CJBig2_GRDProc::decode_Arith_Template3_opt3(
   FX_BOOL SLTP, bVal;
   FX_DWORD CONTEXT;
   FX_DWORD line1;
-  uint8_t* pLine1, cVal;
+  uint8_t *pLine1, cVal;
   int32_t nStride, k;
   int32_t nLineBytes, nBitsLeft, cc;
   if (!m_pLine) {