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

Side by Side Diff: xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp

Issue 1726373002: Remove foo != NULL checks in xfa/src/fxbarcode. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: rebase Created 4 years, 10 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
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 2013 ZXing authors 8 * Copyright 2013 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 15 matching lines...) Expand all
26 #include "xfa/src/fxbarcode/utils.h" 26 #include "xfa/src/fxbarcode/utils.h"
27 27
28 CBC_BoundingBox::CBC_BoundingBox(CBC_CommonBitMatrix* image, 28 CBC_BoundingBox::CBC_BoundingBox(CBC_CommonBitMatrix* image,
29 CBC_ResultPoint* topLeft, 29 CBC_ResultPoint* topLeft,
30 CBC_ResultPoint* bottomLeft, 30 CBC_ResultPoint* bottomLeft,
31 CBC_ResultPoint* topRight, 31 CBC_ResultPoint* topRight,
32 CBC_ResultPoint* bottomRight, 32 CBC_ResultPoint* bottomRight,
33 int32_t& e) { 33 int32_t& e) {
34 if ((topLeft == NULL && topRight == NULL) || 34 if ((topLeft == NULL && topRight == NULL) ||
35 (bottomLeft == NULL && bottomRight == NULL) || 35 (bottomLeft == NULL && bottomRight == NULL) ||
36 (topLeft != NULL && bottomLeft == NULL) || 36 (topLeft && bottomLeft == NULL) || (topRight && bottomRight == NULL)) {
37 (topRight != NULL && bottomRight == NULL)) {
38 e = BCExceptionNotFoundInstance; 37 e = BCExceptionNotFoundInstance;
39 } 38 }
40 init(image, topLeft, bottomLeft, topRight, bottomRight); 39 init(image, topLeft, bottomLeft, topRight, bottomRight);
41 } 40 }
42 CBC_BoundingBox::CBC_BoundingBox(CBC_BoundingBox* boundingBox) { 41 CBC_BoundingBox::CBC_BoundingBox(CBC_BoundingBox* boundingBox) {
43 init(boundingBox->m_image, boundingBox->m_topLeft, boundingBox->m_bottomLeft, 42 init(boundingBox->m_image, boundingBox->m_topLeft, boundingBox->m_bottomLeft,
44 boundingBox->m_topRight, boundingBox->m_bottomRight); 43 boundingBox->m_topRight, boundingBox->m_bottomRight);
45 } 44 }
46 CBC_BoundingBox::~CBC_BoundingBox() { 45 CBC_BoundingBox::~CBC_BoundingBox() {
47 if (m_topLeft) { 46 if (m_topLeft) {
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 m_maxX = (int32_t)(m_topRight->GetX() > m_bottomRight->GetX() 198 m_maxX = (int32_t)(m_topRight->GetX() > m_bottomRight->GetX()
200 ? m_topRight->GetX() 199 ? m_topRight->GetX()
201 : m_bottomRight->GetX()); 200 : m_bottomRight->GetX());
202 m_minY = 201 m_minY =
203 (int32_t)(m_topLeft->GetY() < m_topRight->GetY() ? m_topLeft->GetY() 202 (int32_t)(m_topLeft->GetY() < m_topRight->GetY() ? m_topLeft->GetY()
204 : m_topRight->GetY()); 203 : m_topRight->GetY());
205 m_maxY = (int32_t)(m_bottomLeft->GetY() > m_bottomRight->GetY() 204 m_maxY = (int32_t)(m_bottomLeft->GetY() > m_bottomRight->GetY()
206 ? m_bottomLeft->GetY() 205 ? m_bottomLeft->GetY()
207 : m_bottomRight->GetY()); 206 : m_bottomRight->GetY());
208 } 207 }
OLDNEW
« no previous file with comments | « xfa/src/fxbarcode/pdf417/BC_PDF417.cpp ('k') | xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698