xfa/fxbarcode/cbc_datamatrix.cpp - Issue 1861183002: Make CFX_WideString::FromUTF8() take a CFX_ByteStringC argument.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: xfa/fxbarcode/cbc_datamatrix.cpp

Issue 1861183002: Make CFX_WideString::FromUTF8() take a CFX_ByteStringC argument. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Rebase, combine delcs with initialization. Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « xfa/fxbarcode/cbc_code39.cpp ('k') | xfa/fxbarcode/cbc_ean13.cpp » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2016 PDFium Authors. All rights reserved.	1 // Copyright 2016 PDFium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com	5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com

6 /*	6 /*

7 * Copyright 2011 ZXing authors	7 * Copyright 2011 ZXing authors

8 *	8 *

9 * Licensed under the Apache License, Version 2.0 (the "License");	9 * Licensed under the Apache License, Version 2.0 (the "License");

10 * you may not use this file except in compliance with the License.	10 * you may not use this file except in compliance with the License.

(...skipping 61 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
72 CFX_WideString str;	72 CFX_WideString str;

73 return str;	73 return str;

74 }	74 }

75	75

76 CFX_WideString CBC_DataMatrix::Decode(CFX_DIBitmap* pBitmap, int32_t& e) {	76 CFX_WideString CBC_DataMatrix::Decode(CFX_DIBitmap* pBitmap, int32_t& e) {

77 CBC_BufferedImageLuminanceSource source(pBitmap);	77 CBC_BufferedImageLuminanceSource source(pBitmap);

78 CBC_GlobalHistogramBinarizer binarizer(&source);	78 CBC_GlobalHistogramBinarizer binarizer(&source);

79 CBC_BinaryBitmap bitmap(&binarizer);	79 CBC_BinaryBitmap bitmap(&binarizer);

80 CFX_ByteString retStr = m_pBCReader->Decode(&bitmap, 0, e);	80 CFX_ByteString retStr = m_pBCReader->Decode(&bitmap, 0, e);

81 BC_EXCEPTION_CHECK_ReturnValue(e, FX_WSTRC(L""));	81 BC_EXCEPTION_CHECK_ReturnValue(e, FX_WSTRC(L""));

82 return CFX_WideString::FromUTF8(retStr, retStr.GetLength());	82 return CFX_WideString::FromUTF8(retStr.AsByteStringC());

83 }	83 }

OLD	NEW