Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(313)

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

Issue 2048983002: Get rid of NULLs in xfa/fxbarcode/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: nits Created 4 years, 6 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 | « no previous file | xfa/fxbarcode/BC_TwoDimWriter.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 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 // Original code is licensed as follows: 6 // Original code is licensed as follows:
7 /* 7 /*
8 * Copyright 2009 ZXing authors 8 * Copyright 2009 ZXing authors
9 * 9 *
10 * Licensed under the Apache License, Version 2.0 (the "License"); 10 * Licensed under the Apache License, Version 2.0 (the "License");
(...skipping 10 matching lines...) Expand all
21 */ 21 */
22 22
23 #include "xfa/fxbarcode/BC_Binarizer.h" 23 #include "xfa/fxbarcode/BC_Binarizer.h"
24 #include "xfa/fxbarcode/BC_BinaryBitmap.h" 24 #include "xfa/fxbarcode/BC_BinaryBitmap.h"
25 #include "xfa/fxbarcode/BC_LuminanceSource.h" 25 #include "xfa/fxbarcode/BC_LuminanceSource.h"
26 #include "xfa/fxbarcode/common/BC_CommonBitArray.h" 26 #include "xfa/fxbarcode/common/BC_CommonBitArray.h"
27 #include "xfa/fxbarcode/common/BC_CommonBitMatrix.h" 27 #include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
28 #include "xfa/fxbarcode/utils.h" 28 #include "xfa/fxbarcode/utils.h"
29 29
30 CBC_BinaryBitmap::CBC_BinaryBitmap(CBC_Binarizer* binarizer) 30 CBC_BinaryBitmap::CBC_BinaryBitmap(CBC_Binarizer* binarizer)
31 : m_binarizer(binarizer), m_matrix(NULL) {} 31 : m_binarizer(binarizer), m_matrix(nullptr) {}
32 CBC_BinaryBitmap::~CBC_BinaryBitmap() { 32 CBC_BinaryBitmap::~CBC_BinaryBitmap() {
33 delete m_matrix; 33 delete m_matrix;
34 } 34 }
35 int32_t CBC_BinaryBitmap::GetHeight() { 35 int32_t CBC_BinaryBitmap::GetHeight() {
36 return m_binarizer->GetLuminanceSource()->GetHeight(); 36 return m_binarizer->GetLuminanceSource()->GetHeight();
37 } 37 }
38 int32_t CBC_BinaryBitmap::GetWidth() { 38 int32_t CBC_BinaryBitmap::GetWidth() {
39 return m_binarizer->GetLuminanceSource()->GetWidth(); 39 return m_binarizer->GetLuminanceSource()->GetWidth();
40 } 40 }
41 CBC_CommonBitMatrix* CBC_BinaryBitmap::GetMatrix(int32_t& e) { 41 CBC_CommonBitMatrix* CBC_BinaryBitmap::GetMatrix(int32_t& e) {
42 if (m_matrix == NULL) { 42 if (!m_matrix) {
43 m_matrix = m_binarizer->GetBlackMatrix(e); 43 m_matrix = m_binarizer->GetBlackMatrix(e);
44 BC_EXCEPTION_CHECK_ReturnValue(e, NULL); 44 BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
45 } 45 }
46 return m_matrix; 46 return m_matrix;
47 } 47 }
48 CBC_CommonBitArray* CBC_BinaryBitmap::GetBlackRow(int32_t y, 48 CBC_CommonBitArray* CBC_BinaryBitmap::GetBlackRow(int32_t y,
49 CBC_CommonBitArray* row, 49 CBC_CommonBitArray* row,
50 int32_t& e) { 50 int32_t& e) {
51 CBC_CommonBitArray* temp = m_binarizer->GetBlackRow(y, row, e); 51 CBC_CommonBitArray* temp = m_binarizer->GetBlackRow(y, row, e);
52 BC_EXCEPTION_CHECK_ReturnValue(e, NULL); 52 BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
53 return temp; 53 return temp;
54 } 54 }
55 CBC_CommonBitMatrix* CBC_BinaryBitmap::GetBlackMatrix(int32_t& e) { 55 CBC_CommonBitMatrix* CBC_BinaryBitmap::GetBlackMatrix(int32_t& e) {
56 if (m_matrix == NULL) { 56 if (!m_matrix) {
57 m_matrix = m_binarizer->GetBlackMatrix(e); 57 m_matrix = m_binarizer->GetBlackMatrix(e);
58 BC_EXCEPTION_CHECK_ReturnValue(e, NULL); 58 BC_EXCEPTION_CHECK_ReturnValue(e, nullptr);
59 } 59 }
60 return m_matrix; 60 return m_matrix;
61 } 61 }
OLDNEW
« no previous file with comments | « no previous file | xfa/fxbarcode/BC_TwoDimWriter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698