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

Side by Side Diff: xfa/src/fxbarcode/qrcode/BC_QRDetector.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 2007 ZXing authors 8 * Copyright 2007 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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 CBC_ResultPoint* topRight, 108 CBC_ResultPoint* topRight,
109 CBC_ResultPoint* bottomLeft, 109 CBC_ResultPoint* bottomLeft,
110 CBC_ResultPoint* alignmentPattern, 110 CBC_ResultPoint* alignmentPattern,
111 int32_t dimension, 111 int32_t dimension,
112 int32_t& e) { 112 int32_t& e) {
113 FX_FLOAT dimMinusThree = (FX_FLOAT)dimension - 3.5f; 113 FX_FLOAT dimMinusThree = (FX_FLOAT)dimension - 3.5f;
114 FX_FLOAT bottomRightX; 114 FX_FLOAT bottomRightX;
115 FX_FLOAT bottomRightY; 115 FX_FLOAT bottomRightY;
116 FX_FLOAT sourceBottomRightX; 116 FX_FLOAT sourceBottomRightX;
117 FX_FLOAT sourceBottomRightY; 117 FX_FLOAT sourceBottomRightY;
118 if (alignmentPattern != NULL) { 118 if (alignmentPattern) {
119 bottomRightX = alignmentPattern->GetX(); 119 bottomRightX = alignmentPattern->GetX();
120 bottomRightY = alignmentPattern->GetY(); 120 bottomRightY = alignmentPattern->GetY();
121 sourceBottomRightX = sourceBottomRightY = dimMinusThree - 3.0f; 121 sourceBottomRightX = sourceBottomRightY = dimMinusThree - 3.0f;
122 } else { 122 } else {
123 bottomRightX = (topRight->GetX() - topLeft->GetX()) + bottomLeft->GetX(); 123 bottomRightX = (topRight->GetX() - topLeft->GetX()) + bottomLeft->GetX();
124 bottomRightY = (topRight->GetY() - topLeft->GetY()) + bottomLeft->GetY(); 124 bottomRightY = (topRight->GetY() - topLeft->GetY()) + bottomLeft->GetY();
125 sourceBottomRightX = sourceBottomRightY = dimMinusThree; 125 sourceBottomRightX = sourceBottomRightY = dimMinusThree;
126 } 126 }
127 CBC_QRGridSampler& sampler = CBC_QRGridSampler::GetInstance(); 127 CBC_QRGridSampler& sampler = CBC_QRGridSampler::GetInstance();
128 CBC_CommonBitMatrix* cbm = sampler.SampleGrid( 128 CBC_CommonBitMatrix* cbm = sampler.SampleGrid(
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 int32_t alignmentAreaBottomY = 268 int32_t alignmentAreaBottomY =
269 std::min(m_image->GetHeight() - 1, estAlignmentY + allowance); 269 std::min(m_image->GetHeight() - 1, estAlignmentY + allowance);
270 CBC_QRAlignmentPatternFinder alignmentFinder( 270 CBC_QRAlignmentPatternFinder alignmentFinder(
271 m_image, alignmentAreaLeftX, alignmentAreaTopY, 271 m_image, alignmentAreaLeftX, alignmentAreaTopY,
272 alignmentAreaRightX - alignmentAreaLeftX, 272 alignmentAreaRightX - alignmentAreaLeftX,
273 alignmentAreaBottomY - alignmentAreaTopY, overallEstModuleSize); 273 alignmentAreaBottomY - alignmentAreaTopY, overallEstModuleSize);
274 CBC_QRAlignmentPattern* qap = alignmentFinder.Find(e); 274 CBC_QRAlignmentPattern* qap = alignmentFinder.Find(e);
275 BC_EXCEPTION_CHECK_ReturnValue(e, NULL); 275 BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
276 return qap; 276 return qap;
277 } 277 }
OLDNEW
« no previous file with comments | « xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp ('k') | xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698