From ac8c3b6ddc4ea3e5c0f365db6951a4c9bb406a57 Mon Sep 17 00:00:00 2001 From: Jun Fang Date: Thu, 10 Dec 2015 22:10:20 -0800 Subject: Fix compiling warnings on Linux (part2) BUG=pdfium:261 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1500313002 . --- xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp | 15 --------------- xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h | 11 ----------- xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp | 19 ------------------- xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h | 12 ------------ 4 files changed, 57 deletions(-) (limited to 'xfa/src/fxbarcode') diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp index 408a5980ff..25438f389a 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp @@ -86,21 +86,6 @@ uint8_t* CBC_DataMatrixWriter::Encode(const CFX_WideString& contents, delete placement; return result; } -uint8_t* CBC_DataMatrixWriter::Encode(const CFX_ByteString& contents, - BCFORMAT format, - int32_t& outWidth, - int32_t& outHeight, - int32_t& e) { - return NULL; -} -uint8_t* CBC_DataMatrixWriter::Encode(const CFX_ByteString& contents, - BCFORMAT format, - int32_t& outWidth, - int32_t& outHeight, - int32_t hints, - int32_t& e) { - return NULL; -} CBC_CommonByteMatrix* CBC_DataMatrixWriter::encodeLowLevel( CBC_DefaultPlacement* placement, CBC_SymbolInfo* symbolInfo, diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h index 808e35f11f..4c74205f2c 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h @@ -21,17 +21,6 @@ class CBC_DataMatrixWriter : public CBC_TwoDimWriter { int32_t& outWidth, int32_t& outHeight, int32_t& e); - uint8_t* Encode(const CFX_ByteString& contents, - BCFORMAT format, - int32_t& outWidth, - int32_t& outHeight, - int32_t& e); - uint8_t* Encode(const CFX_ByteString& contents, - BCFORMAT format, - int32_t& outWidth, - int32_t& outHeight, - int32_t hints, - int32_t& e); FX_BOOL SetErrorCorrectionLevel(int32_t level); private: diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp index b3263f5559..457b30b750 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp @@ -44,25 +44,6 @@ FX_BOOL CBC_PDF417Writer::SetErrorCorrectionLevel(int32_t level) { void CBC_PDF417Writer::SetTruncated(FX_BOOL truncated) { m_bTruncated = truncated; } -uint8_t* CBC_PDF417Writer::Encode(const CFX_ByteString& contents, - BCFORMAT format, - int32_t& outWidth, - int32_t& outHeight, - int32_t& e) { - if (format != BCFORMAT_PDF_417) { - return NULL; - } - CFX_WideString encodeContents = contents.UTF8Decode(); - return Encode(encodeContents, outWidth, outHeight, e); -} -uint8_t* CBC_PDF417Writer::Encode(const CFX_ByteString& contents, - BCFORMAT format, - int32_t& outWidth, - int32_t& outHeight, - int32_t hints, - int32_t& e) { - return NULL; -} uint8_t* CBC_PDF417Writer::Encode(const CFX_WideString& contents, int32_t& outWidth, int32_t& outHeight, diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h index 9ec5bcda98..8e5cb432c8 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h @@ -16,18 +16,6 @@ class CBC_PDF417Writer : public CBC_TwoDimWriter { int32_t& outWidth, int32_t& outHeight, int32_t& e); - - uint8_t* Encode(const CFX_ByteString& contents, - BCFORMAT format, - int32_t& outWidth, - int32_t& outHeight, - int32_t& e); - uint8_t* Encode(const CFX_ByteString& contents, - BCFORMAT format, - int32_t& outWidth, - int32_t& outHeight, - int32_t hints, - int32_t& e); FX_BOOL SetErrorCorrectionLevel(int32_t level); void SetTruncated(FX_BOOL truncated); -- cgit v1.2.3