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

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

Issue 1925363002: Do not check pointers before deleting them. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: rebase Created 4 years, 7 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/pdf417/BC_PDF417.cpp ('k') | xfa/fxbarcode/pdf417/BC_PDF417Detector.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 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 24 matching lines...) Expand all
35 (bottomLeft == NULL && bottomRight == NULL) || 35 (bottomLeft == NULL && bottomRight == NULL) ||
36 (topLeft && bottomLeft == NULL) || (topRight && bottomRight == NULL)) { 36 (topLeft && bottomLeft == NULL) || (topRight && bottomRight == NULL)) {
37 e = BCExceptionNotFoundInstance; 37 e = BCExceptionNotFoundInstance;
38 } 38 }
39 init(image, topLeft, bottomLeft, topRight, bottomRight); 39 init(image, topLeft, bottomLeft, topRight, bottomRight);
40 } 40 }
41 CBC_BoundingBox::CBC_BoundingBox(CBC_BoundingBox* boundingBox) { 41 CBC_BoundingBox::CBC_BoundingBox(CBC_BoundingBox* boundingBox) {
42 init(boundingBox->m_image, boundingBox->m_topLeft, boundingBox->m_bottomLeft, 42 init(boundingBox->m_image, boundingBox->m_topLeft, boundingBox->m_bottomLeft,
43 boundingBox->m_topRight, boundingBox->m_bottomRight); 43 boundingBox->m_topRight, boundingBox->m_bottomRight);
44 } 44 }
45
45 CBC_BoundingBox::~CBC_BoundingBox() { 46 CBC_BoundingBox::~CBC_BoundingBox() {
46 if (m_topLeft) { 47 delete m_topLeft;
47 delete m_topLeft; 48 delete m_bottomLeft;
48 } 49 delete m_topRight;
49 if (m_bottomLeft) { 50 delete m_bottomRight;
50 delete m_bottomLeft;
51 }
52 if (m_topRight) {
53 delete m_topRight;
54 }
55 if (m_bottomRight) {
56 delete m_bottomRight;
57 }
58 } 51 }
52
59 CBC_BoundingBox* CBC_BoundingBox::merge(CBC_BoundingBox* leftBox, 53 CBC_BoundingBox* CBC_BoundingBox::merge(CBC_BoundingBox* leftBox,
60 CBC_BoundingBox* rightBox, 54 CBC_BoundingBox* rightBox,
61 int32_t& e) { 55 int32_t& e) {
62 CBC_BoundingBox* boundingBox = NULL; 56 CBC_BoundingBox* boundingBox = NULL;
63 if (leftBox == NULL) { 57 if (leftBox == NULL) {
64 boundingBox = new CBC_BoundingBox(rightBox); 58 boundingBox = new CBC_BoundingBox(rightBox);
65 return boundingBox; 59 return boundingBox;
66 } 60 }
67 if (rightBox == NULL) { 61 if (rightBox == NULL) {
68 boundingBox = new CBC_BoundingBox(leftBox); 62 boundingBox = new CBC_BoundingBox(leftBox);
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 m_maxX = (int32_t)(m_topRight->GetX() > m_bottomRight->GetX() 192 m_maxX = (int32_t)(m_topRight->GetX() > m_bottomRight->GetX()
199 ? m_topRight->GetX() 193 ? m_topRight->GetX()
200 : m_bottomRight->GetX()); 194 : m_bottomRight->GetX());
201 m_minY = 195 m_minY =
202 (int32_t)(m_topLeft->GetY() < m_topRight->GetY() ? m_topLeft->GetY() 196 (int32_t)(m_topLeft->GetY() < m_topRight->GetY() ? m_topLeft->GetY()
203 : m_topRight->GetY()); 197 : m_topRight->GetY());
204 m_maxY = (int32_t)(m_bottomLeft->GetY() > m_bottomRight->GetY() 198 m_maxY = (int32_t)(m_bottomLeft->GetY() > m_bottomRight->GetY()
205 ? m_bottomLeft->GetY() 199 ? m_bottomLeft->GetY()
206 : m_bottomRight->GetY()); 200 : m_bottomRight->GetY());
207 } 201 }
OLDNEW
« no previous file with comments | « xfa/fxbarcode/pdf417/BC_PDF417.cpp ('k') | xfa/fxbarcode/pdf417/BC_PDF417Detector.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698