diff options
| author | Dan Sinclair <dsinclair@chromium.org> | 2017-09-21 14:52:41 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-21 19:22:00 +0000 |
| commit | de44d154f6c61af75f149e965a7f483f0b30dd98 (patch) | |
| tree | cb33c824a73bb017d4403fba898b1d8c4e0c1566 /core/fxcodec/jbig2/JBig2_TrdProc.cpp | |
| parent | b89669975f6156fce4ced5c8998125a845f8e7dc (diff) | |
| download | pdfium-de44d154f6c61af75f149e965a7f483f0b30dd98.tar.xz | |
Move CFX_MaybeOwned to fxcrt::MaybeOwned
This CL moves CFX_MaybeOwned into the fxcrt namespace and removes the
CFX_ prefix.
The test names for maybe owned were updated to be in the MaybeOned test
suite instead of the fxcrt suite.
Bug: pdfium:898
Change-Id: I0c07057d66c8610e7b19133094b4507fff725e76
Reviewed-on: https://pdfium-review.googlesource.com/14470
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'core/fxcodec/jbig2/JBig2_TrdProc.cpp')
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_TrdProc.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/core/fxcodec/jbig2/JBig2_TrdProc.cpp b/core/fxcodec/jbig2/JBig2_TrdProc.cpp index 3fc43c067e..d513637a9d 100644 --- a/core/fxcodec/jbig2/JBig2_TrdProc.cpp +++ b/core/fxcodec/jbig2/JBig2_TrdProc.cpp @@ -12,7 +12,7 @@ #include "core/fxcodec/jbig2/JBig2_ArithIntDecoder.h" #include "core/fxcodec/jbig2/JBig2_GrrdProc.h" #include "core/fxcodec/jbig2/JBig2_HuffmanDecoder.h" -#include "core/fxcrt/cfx_maybe_owned.h" +#include "core/fxcrt/maybe_owned.h" #include "third_party/base/ptr_util.h" CJBig2_TRDProc::CJBig2_TRDProc() {} @@ -101,7 +101,7 @@ std::unique_ptr<CJBig2_Image> CJBig2_TRDProc::decode_Huffman( if (SBREFINE != 0 && pStream->read1Bit(&RI) != 0) return nullptr; - CFX_MaybeOwned<CJBig2_Image> IBI; + MaybeOwned<CJBig2_Image> IBI; if (RI == 0) { IBI = SBSYMS[IDI]; } else { @@ -214,16 +214,16 @@ std::unique_ptr<CJBig2_Image> CJBig2_TRDProc::decode_Arith( CJBig2_ArithDecoder* pArithDecoder, JBig2ArithCtx* grContext, JBig2IntDecoderState* pIDS) { - CFX_MaybeOwned<CJBig2_ArithIntDecoder> pIADT; - CFX_MaybeOwned<CJBig2_ArithIntDecoder> pIAFS; - CFX_MaybeOwned<CJBig2_ArithIntDecoder> pIADS; - CFX_MaybeOwned<CJBig2_ArithIntDecoder> pIAIT; - CFX_MaybeOwned<CJBig2_ArithIntDecoder> pIARI; - CFX_MaybeOwned<CJBig2_ArithIntDecoder> pIARDW; - CFX_MaybeOwned<CJBig2_ArithIntDecoder> pIARDH; - CFX_MaybeOwned<CJBig2_ArithIntDecoder> pIARDX; - CFX_MaybeOwned<CJBig2_ArithIntDecoder> pIARDY; - CFX_MaybeOwned<CJBig2_ArithIaidDecoder> pIAID; + MaybeOwned<CJBig2_ArithIntDecoder> pIADT; + MaybeOwned<CJBig2_ArithIntDecoder> pIAFS; + MaybeOwned<CJBig2_ArithIntDecoder> pIADS; + MaybeOwned<CJBig2_ArithIntDecoder> pIAIT; + MaybeOwned<CJBig2_ArithIntDecoder> pIARI; + MaybeOwned<CJBig2_ArithIntDecoder> pIARDW; + MaybeOwned<CJBig2_ArithIntDecoder> pIARDH; + MaybeOwned<CJBig2_ArithIntDecoder> pIARDX; + MaybeOwned<CJBig2_ArithIntDecoder> pIARDY; + MaybeOwned<CJBig2_ArithIaidDecoder> pIAID; if (pIDS) { pIADT = pIDS->IADT; pIAFS = pIDS->IAFS; @@ -299,7 +299,7 @@ std::unique_ptr<CJBig2_Image> CJBig2_TRDProc::decode_Arith( else pIARI->decode(pArithDecoder, &RI); - CFX_MaybeOwned<CJBig2_Image> pIBI; + MaybeOwned<CJBig2_Image> pIBI; if (RI == 0) { pIBI = SBSYMS[IDI]; } else { |