diff options
Diffstat (limited to 'xfa/src/fxbarcode')
60 files changed, 645 insertions, 645 deletions
diff --git a/xfa/src/fxbarcode/BC_BarCode.cpp b/xfa/src/fxbarcode/BC_BarCode.cpp index 5b268abce6..03618e9f8a 100644 --- a/xfa/src/fxbarcode/BC_BarCode.cpp +++ b/xfa/src/fxbarcode/BC_BarCode.cpp @@ -174,17 +174,17 @@ void CBC_OneCode::SetFontColor(FX_ARGB color) { }
}
CBC_Code39::CBC_Code39() {
- m_pBCReader = (CBC_Reader*)FX_NEW(CBC_OnedCode39Reader);
- m_pBCWriter = (CBC_Writer*)FX_NEW(CBC_OnedCode39Writer);
+ m_pBCReader = (CBC_Reader*)new(CBC_OnedCode39Reader);
+ m_pBCWriter = (CBC_Writer*)new(CBC_OnedCode39Writer);
}
CBC_Code39::CBC_Code39(FX_BOOL usingCheckDigit) {
- m_pBCReader = (CBC_Reader*)FX_NEW CBC_OnedCode39Reader(usingCheckDigit);
- m_pBCWriter = (CBC_Writer*)FX_NEW CBC_OnedCode39Writer;
+ m_pBCReader = (CBC_Reader*)new CBC_OnedCode39Reader(usingCheckDigit);
+ m_pBCWriter = (CBC_Writer*)new CBC_OnedCode39Writer;
}
CBC_Code39::CBC_Code39(FX_BOOL usingCheckDigit, FX_BOOL extendedMode) {
m_pBCReader =
- (CBC_Reader*)FX_NEW CBC_OnedCode39Reader(usingCheckDigit, extendedMode);
- m_pBCWriter = (CBC_Writer*)FX_NEW CBC_OnedCode39Writer(extendedMode);
+ (CBC_Reader*)new CBC_OnedCode39Reader(usingCheckDigit, extendedMode);
+ m_pBCWriter = (CBC_Writer*)new CBC_OnedCode39Writer(extendedMode);
}
CBC_Code39::~CBC_Code39() {
if (m_pBCReader) {
@@ -267,8 +267,8 @@ FX_BOOL CBC_Code39::SetWideNarrowRatio(int32_t ratio) { return FALSE;
}
CBC_Codabar::CBC_Codabar() {
- m_pBCReader = (CBC_Reader*)FX_NEW(CBC_OnedCodaBarReader);
- m_pBCWriter = (CBC_Writer*)FX_NEW(CBC_OnedCodaBarWriter);
+ m_pBCReader = (CBC_Reader*)new(CBC_OnedCodaBarReader);
+ m_pBCWriter = (CBC_Writer*)new(CBC_OnedCodaBarWriter);
}
CBC_Codabar::~CBC_Codabar() {
if (m_pBCReader) {
@@ -358,8 +358,8 @@ CFX_WideString CBC_Codabar::Decode(CFX_DIBitmap* pBitmap, int32_t& e) { return CFX_WideString::FromUTF8(str, str.GetLength());
}
CBC_Code128::CBC_Code128(BC_TYPE type) {
- m_pBCReader = (CBC_Reader*)FX_NEW(CBC_OnedCode128Reader);
- m_pBCWriter = (CBC_Writer*)FX_NEW CBC_OnedCode128Writer(type);
+ m_pBCReader = (CBC_Reader*)new(CBC_OnedCode128Reader);
+ m_pBCWriter = (CBC_Writer*)new CBC_OnedCode128Writer(type);
}
CBC_Code128::~CBC_Code128() {
if (m_pBCReader) {
@@ -435,8 +435,8 @@ CFX_WideString CBC_Code128::Decode(CFX_DIBitmap* pBitmap, int32_t& e) { return CFX_WideString::FromUTF8(str, str.GetLength());
}
CBC_EAN8::CBC_EAN8() {
- m_pBCReader = (CBC_Reader*)FX_NEW(CBC_OnedEAN8Reader);
- m_pBCWriter = (CBC_Writer*)FX_NEW(CBC_OnedEAN8Writer);
+ m_pBCReader = (CBC_Reader*)new(CBC_OnedEAN8Reader);
+ m_pBCWriter = (CBC_Writer*)new(CBC_OnedEAN8Writer);
}
CBC_EAN8::~CBC_EAN8() {
if (m_pBCReader) {
@@ -518,8 +518,8 @@ CFX_WideString CBC_EAN8::Decode(CFX_DIBitmap* pBitmap, int32_t& e) { return CFX_WideString::FromUTF8(str, str.GetLength());
}
CBC_EAN13::CBC_EAN13() {
- m_pBCReader = (CBC_Reader*)FX_NEW(CBC_OnedEAN13Reader);
- m_pBCWriter = (CBC_Writer*)FX_NEW(CBC_OnedEAN13Writer);
+ m_pBCReader = (CBC_Reader*)new(CBC_OnedEAN13Reader);
+ m_pBCWriter = (CBC_Writer*)new(CBC_OnedEAN13Writer);
}
CBC_EAN13::~CBC_EAN13() {
if (m_pBCReader) {
@@ -602,9 +602,9 @@ CFX_WideString CBC_EAN13::Decode(CFX_DIBitmap* pBitmap, int32_t& e) { return CFX_WideString::FromUTF8(str, str.GetLength());
}
CBC_UPCA::CBC_UPCA() {
- m_pBCReader = (CBC_Reader*)FX_NEW(CBC_OnedUPCAReader);
+ m_pBCReader = (CBC_Reader*)new(CBC_OnedUPCAReader);
((CBC_OnedUPCAReader*)m_pBCReader)->Init();
- m_pBCWriter = (CBC_Writer*)FX_NEW(CBC_OnedUPCAWriter);
+ m_pBCWriter = (CBC_Writer*)new(CBC_OnedUPCAWriter);
}
CBC_UPCA::~CBC_UPCA() {
if (m_pBCReader) {
@@ -688,9 +688,9 @@ CFX_WideString CBC_UPCA::Decode(CFX_DIBitmap* pBitmap, int32_t& e) { return CFX_WideString::FromUTF8(str, str.GetLength());
}
CBC_QRCode::CBC_QRCode() {
- m_pBCReader = (CBC_Reader*)FX_NEW(CBC_QRCodeReader);
+ m_pBCReader = (CBC_Reader*)new(CBC_QRCodeReader);
((CBC_QRCodeReader*)m_pBCReader)->Init();
- m_pBCWriter = (CBC_Writer*)FX_NEW(CBC_QRCodeWriter);
+ m_pBCWriter = (CBC_Writer*)new(CBC_QRCodeWriter);
}
CBC_QRCode::~CBC_QRCode() {
if (m_pBCReader) {
@@ -762,8 +762,8 @@ CFX_WideString CBC_QRCode::Decode(CFX_DIBitmap* pBitmap, int32_t& e) { return CFX_WideString::FromUTF8(retStr, retStr.GetLength());
}
CBC_PDF417I::CBC_PDF417I() {
- m_pBCReader = (CBC_Reader*)FX_NEW(CBC_PDF417Reader);
- m_pBCWriter = (CBC_Writer*)FX_NEW(CBC_PDF417Writer);
+ m_pBCReader = (CBC_Reader*)new(CBC_PDF417Reader);
+ m_pBCWriter = (CBC_Writer*)new(CBC_PDF417Writer);
}
CBC_PDF417I::~CBC_PDF417I() {
if (m_pBCReader) {
@@ -823,9 +823,9 @@ CFX_WideString CBC_PDF417I::Decode(CFX_DIBitmap* pBitmap, int32_t& e) { return CFX_WideString::FromUTF8(bytestring, bytestring.GetLength());
}
CBC_DataMatrix::CBC_DataMatrix() {
- m_pBCReader = (CBC_Reader*)FX_NEW(CBC_DataMatrixReader);
+ m_pBCReader = (CBC_Reader*)new(CBC_DataMatrixReader);
((CBC_DataMatrixReader*)m_pBCReader)->Init();
- m_pBCWriter = (CBC_Writer*)FX_NEW(CBC_DataMatrixWriter);
+ m_pBCWriter = (CBC_Writer*)new(CBC_DataMatrixWriter);
}
CBC_DataMatrix::~CBC_DataMatrix() {
if (m_pBCReader) {
diff --git a/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp b/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp index 19f68b04e3..e626c4021c 100644 --- a/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp +++ b/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp @@ -38,7 +38,7 @@ static CFX_DIBitmap* CreateDIBSource(IFX_FileRead* fileread) { if (status != FXCODEC_STATUS_FRAME_READY) {
return NULL;
}
- bitmap = FX_NEW CFX_DIBitmap;
+ bitmap = new CFX_DIBitmap;
bitmap->Create(pImageCodec->GetWidth(), pImageCodec->GetHeight(), FXDIB_Argb);
bitmap->Clear(FXARGB_MAKE(0xFF, 0xFF, 0xFF, 0xFF));
CBC_Pause pause;
@@ -149,7 +149,7 @@ CFX_ByteArray* CBC_BufferedImageLuminanceSource::GetRow(int32_t y, return &row;
}
CFX_ByteArray* CBC_BufferedImageLuminanceSource::GetMatrix() {
- CFX_ByteArray* matirx = FX_NEW CFX_ByteArray();
+ CFX_ByteArray* matirx = new CFX_ByteArray();
matirx->SetSize(m_bytesPerLine * m_height);
int32_t* rgb = (int32_t*)m_pBitmap->GetBuffer();
int32_t y;
diff --git a/xfa/src/fxbarcode/BC_TwoDimWriter.cpp b/xfa/src/fxbarcode/BC_TwoDimWriter.cpp index eba4f1436f..9cb97f4a54 100644 --- a/xfa/src/fxbarcode/BC_TwoDimWriter.cpp +++ b/xfa/src/fxbarcode/BC_TwoDimWriter.cpp @@ -131,7 +131,7 @@ void CBC_TwoDimWriter::RenderResult(uint8_t* code, if (topPadding < 0) {
topPadding = 0;
}
- m_output = FX_NEW CBC_CommonBitMatrix;
+ m_output = new CBC_CommonBitMatrix;
m_output->Init(outputWidth, outputHeight);
for (int32_t inputY = 0, outputY = topPadding;
(inputY < inputHeight) && (outputY < outputHeight - multiY);
diff --git a/xfa/src/fxbarcode/BC_UtilRSS.cpp b/xfa/src/fxbarcode/BC_UtilRSS.cpp index d7207016bb..3316377e02 100644 --- a/xfa/src/fxbarcode/BC_UtilRSS.cpp +++ b/xfa/src/fxbarcode/BC_UtilRSS.cpp @@ -29,7 +29,7 @@ CFX_Int32Array* CBC_UtilRSS::GetRssWidths(int32_t val, int32_t elements,
int32_t maxWidth,
FX_BOOL noNarrow) {
- CFX_Int32Array* iTemp = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* iTemp = new CFX_Int32Array;
iTemp->SetSize(elements);
CBC_AutoPtr<CFX_Int32Array> widths(iTemp);
int32_t bar;
@@ -131,7 +131,7 @@ int32_t CBC_UtilRSS::Combins(int32_t n, int32_t r) { CFX_Int32Array* CBC_UtilRSS::Elements(CFX_Int32Array& eDist,
int32_t N,
int32_t K) {
- CFX_Int32Array* widths = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* widths = new CFX_Int32Array;
widths->SetSize(eDist.GetSize() + 2);
int32_t twoK = K << 1;
(*widths)[0] = 1;
diff --git a/xfa/src/fxbarcode/BC_Writer.cpp b/xfa/src/fxbarcode/BC_Writer.cpp index 80c3c6978f..e98c6f5537 100644 --- a/xfa/src/fxbarcode/BC_Writer.cpp +++ b/xfa/src/fxbarcode/BC_Writer.cpp @@ -51,7 +51,7 @@ void CBC_Writer::SetBarcodeColor(FX_ARGB foregroundColor) { }
CFX_DIBitmap* CBC_Writer::CreateDIBitmap(int32_t width, int32_t height) {
CFX_DIBitmap* pDIBitmap = NULL;
- pDIBitmap = FX_NEW CFX_DIBitmap;
+ pDIBitmap = new CFX_DIBitmap;
if (pDIBitmap != NULL) {
pDIBitmap->Create(width, height, m_colorSpace);
}
diff --git a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp index d5796d1263..0a0930d97c 100644 --- a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp @@ -108,9 +108,9 @@ CBC_CommonBitArray* CBC_CommonBitMatrix::GetRow(int32_t y, CBC_CommonBitArray* row) {
CBC_CommonBitArray* rowArray = NULL;
if (row == NULL || row->GetSize() < m_width) {
- rowArray = FX_NEW CBC_CommonBitArray(m_width);
+ rowArray = new CBC_CommonBitArray(m_width);
} else {
- rowArray = FX_NEW CBC_CommonBitArray(row);
+ rowArray = new CBC_CommonBitArray(row);
}
int32_t offset = y * m_rowSize;
int32_t x;
diff --git a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp index 498cca2dbb..50dd8fae5b 100644 --- a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp +++ b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp @@ -96,7 +96,7 @@ CBC_CommonPerspectiveTransform::SquareToQuadrilateral(FX_FLOAT x0, FX_FLOAT dy2 = y3 - y2;
FX_FLOAT dy3 = y0 - y1 + y2 - y3;
if ((dy2 == 0.0f) && (dy3 == 0.0f)) {
- return FX_NEW CBC_CommonPerspectiveTransform(x1 - x0, x2 - x1, x0, y1 - y0,
+ return new CBC_CommonPerspectiveTransform(x1 - x0, x2 - x1, x0, y1 - y0,
y2 - y1, y0, 0.0f, 0.0f, 1.0f);
} else {
FX_FLOAT dx1 = x1 - x2;
@@ -106,7 +106,7 @@ CBC_CommonPerspectiveTransform::SquareToQuadrilateral(FX_FLOAT x0, FX_FLOAT denominator = dx1 * dy2 - dx2 * dy1;
FX_FLOAT a13 = (dx3 * dy2 - dx2 * dy3) / denominator;
FX_FLOAT a23 = (dx1 * dy3 - dx3 * dy1) / denominator;
- return FX_NEW CBC_CommonPerspectiveTransform(
+ return new CBC_CommonPerspectiveTransform(
x1 - x0 + a13 * x1, x3 - x0 + a23 * x3, x0, y1 - y0 + a13 * y1,
y3 - y0 + a23 * y3, y0, a13, a23, 1.0f);
}
@@ -125,7 +125,7 @@ CBC_CommonPerspectiveTransform::QuadrilateralToSquare(FX_FLOAT x0, return temp1->BuildAdjoint();
}
CBC_CommonPerspectiveTransform* CBC_CommonPerspectiveTransform::BuildAdjoint() {
- return FX_NEW CBC_CommonPerspectiveTransform(
+ return new CBC_CommonPerspectiveTransform(
m_a22 * m_a33 - m_a23 * m_a32, m_a23 * m_a31 - m_a21 * m_a33,
m_a21 * m_a32 - m_a22 * m_a31, m_a13 * m_a32 - m_a12 * m_a33,
m_a11 * m_a33 - m_a13 * m_a31, m_a12 * m_a31 - m_a11 * m_a32,
@@ -134,7 +134,7 @@ CBC_CommonPerspectiveTransform* CBC_CommonPerspectiveTransform::BuildAdjoint() { }
CBC_CommonPerspectiveTransform* CBC_CommonPerspectiveTransform::Times(
CBC_CommonPerspectiveTransform& other) {
- return FX_NEW CBC_CommonPerspectiveTransform(
+ return new CBC_CommonPerspectiveTransform(
m_a11 * other.m_a11 + m_a21 * other.m_a12 + m_a31 * other.m_a13,
m_a11 * other.m_a21 + m_a21 * other.m_a22 + m_a31 * other.m_a23,
m_a11 * other.m_a31 + m_a21 * other.m_a32 + m_a31 * other.m_a33,
diff --git a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp index 88b0c43828..5a15c36f01 100644 --- a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp +++ b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp @@ -39,7 +39,7 @@ CBC_CommonBitArray* CBC_GlobalHistogramBinarizer::GetBlackRow( int32_t& e) {
CBC_LuminanceSource* source = GetLuminanceSource();
int32_t width = source->GetWidth();
- CBC_AutoPtr<CBC_CommonBitArray> result(FX_NEW CBC_CommonBitArray(width));
+ CBC_AutoPtr<CBC_CommonBitArray> result(new CBC_CommonBitArray(width));
InitArrays(width);
CFX_ByteArray* localLuminances = source->GetRow(y, m_luminance, e);
if (e != BCExceptionNO) {
@@ -73,7 +73,7 @@ CBC_CommonBitMatrix* CBC_GlobalHistogramBinarizer::GetBlackMatrix(int32_t& e) { CBC_LuminanceSource* source = GetLuminanceSource();
int32_t width = source->GetWidth();
int32_t height = source->GetHeight();
- CBC_CommonBitMatrix* BitMatrixTemp = FX_NEW CBC_CommonBitMatrix();
+ CBC_CommonBitMatrix* BitMatrixTemp = new CBC_CommonBitMatrix();
BitMatrixTemp->Init(width, height);
CBC_AutoPtr<CBC_CommonBitMatrix> matrix(BitMatrixTemp);
InitArrays(width);
diff --git a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp index 251eb5919c..368a12efd7 100644 --- a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp +++ b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp @@ -196,7 +196,7 @@ CBC_ResultPoint* CBC_WhiteRectangleDetector::GetBlackPointOnSegment( int32_t x = Round(aX + i * xStep);
int32_t y = Round(aY + i * yStep);
if (m_image->Get(x, y)) {
- return FX_NEW CBC_ResultPoint((FX_FLOAT)x, (FX_FLOAT)y);
+ return new CBC_ResultPoint((FX_FLOAT)x, (FX_FLOAT)y);
}
}
return NULL;
@@ -222,20 +222,20 @@ CFX_PtrArray* CBC_WhiteRectangleDetector::CenterEdges(CBC_ResultPoint* y, float ti = t->GetX();
float tj = t->GetY();
if (yi < m_width / 2) {
- CFX_PtrArray* result = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* result = new CFX_PtrArray;
result->SetSize(4);
- (*result)[0] = FX_NEW CBC_ResultPoint(ti - CORR, tj + CORR);
- (*result)[1] = FX_NEW CBC_ResultPoint(zi + CORR, zj + CORR);
- (*result)[2] = FX_NEW CBC_ResultPoint(xi - CORR, xj - CORR);
- (*result)[3] = FX_NEW CBC_ResultPoint(yi + CORR, yj - CORR);
+ (*result)[0] = new CBC_ResultPoint(ti - CORR, tj + CORR);
+ (*result)[1] = new CBC_ResultPoint(zi + CORR, zj + CORR);
+ (*result)[2] = new CBC_ResultPoint(xi - CORR, xj - CORR);
+ (*result)[3] = new CBC_ResultPoint(yi + CORR, yj - CORR);
return result;
} else {
- CFX_PtrArray* result = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* result = new CFX_PtrArray;
result->SetSize(4);
- (*result)[0] = FX_NEW CBC_ResultPoint(ti + CORR, tj + CORR);
- (*result)[1] = FX_NEW CBC_ResultPoint(zi + CORR, zj - CORR);
- (*result)[2] = FX_NEW CBC_ResultPoint(xi - CORR, xj + CORR);
- (*result)[3] = FX_NEW CBC_ResultPoint(yi - CORR, yj - CORR);
+ (*result)[0] = new CBC_ResultPoint(ti + CORR, tj + CORR);
+ (*result)[1] = new CBC_ResultPoint(zi + CORR, zj - CORR);
+ (*result)[2] = new CBC_ResultPoint(xi - CORR, xj + CORR);
+ (*result)[3] = new CBC_ResultPoint(yi - CORR, yj - CORR);
return result;
}
}
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp index 286906d152..c2ddd0f69f 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp @@ -28,7 +28,7 @@ CBC_ReedSolomonEncoder::CBC_ReedSolomonEncoder(CBC_ReedSolomonGF256* field) { m_field = field;
}
void CBC_ReedSolomonEncoder::Init() {
- m_cachedGenerators.Add(FX_NEW CBC_ReedSolomonGF256Poly(m_field, 1));
+ m_cachedGenerators.Add(new CBC_ReedSolomonGF256Poly(m_field, 1));
}
CBC_ReedSolomonGF256Poly* CBC_ReedSolomonEncoder::BuildGenerator(int32_t degree,
int32_t& e) {
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp index d57efe1408..b072309a86 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp @@ -178,7 +178,7 @@ CFX_PtrArray* CBC_ReedSolomonDecoder::RunEuclideanAlgorithm( CBC_ReedSolomonGF256Poly* rsg14 = r->Multiply(inverse, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
CBC_AutoPtr<CBC_ReedSolomonGF256Poly> omega(rsg14);
- CFX_PtrArray* temp = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* temp = new CFX_PtrArray;
temp->Add(sigma.release());
temp->Add(omega.release());
return temp;
@@ -188,11 +188,11 @@ CFX_Int32Array* CBC_ReedSolomonDecoder::FindErrorLocations( int32_t& e) {
int32_t numErrors = errorLocator->GetDegree();
if (numErrors == 1) {
- CBC_AutoPtr<CFX_Int32Array> temp(FX_NEW CFX_Int32Array);
+ CBC_AutoPtr<CFX_Int32Array> temp(new CFX_Int32Array);
temp->Add(errorLocator->GetCoefficients(1));
return temp.release();
}
- CFX_Int32Array* tempT = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* tempT = new CFX_Int32Array;
tempT->SetSize(numErrors);
CBC_AutoPtr<CFX_Int32Array> result(tempT);
int32_t ie = 0;
@@ -215,7 +215,7 @@ CFX_Int32Array* CBC_ReedSolomonDecoder::FindErrorMagnitudes( FX_BOOL dataMatrix,
int32_t& e) {
int32_t s = errorLocations->GetSize();
- CFX_Int32Array* temp = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* temp = new CFX_Int32Array;
temp->SetSize(s);
CBC_AutoPtr<CFX_Int32Array> result(temp);
for (int32_t i = 0; i < s; i++) {
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp index 43c8c82a4d..d862e9a931 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp @@ -26,9 +26,9 @@ CBC_ReedSolomonGF256* CBC_ReedSolomonGF256::QRCodeFild = NULL;
CBC_ReedSolomonGF256* CBC_ReedSolomonGF256::DataMatrixField = NULL;
void CBC_ReedSolomonGF256::Initialize() {
- QRCodeFild = FX_NEW CBC_ReedSolomonGF256(0x011D);
+ QRCodeFild = new CBC_ReedSolomonGF256(0x011D);
QRCodeFild->Init();
- DataMatrixField = FX_NEW CBC_ReedSolomonGF256(0x012D);
+ DataMatrixField = new CBC_ReedSolomonGF256(0x012D);
DataMatrixField->Init();
}
void CBC_ReedSolomonGF256::Finalize() {
@@ -56,8 +56,8 @@ CBC_ReedSolomonGF256::CBC_ReedSolomonGF256(int32_t primitive) { m_logTable[0] = 0;
}
void CBC_ReedSolomonGF256::Init() {
- m_zero = FX_NEW CBC_ReedSolomonGF256Poly(this, 0);
- m_one = FX_NEW CBC_ReedSolomonGF256Poly(this, 1);
+ m_zero = new CBC_ReedSolomonGF256Poly(this, 0);
+ m_one = new CBC_ReedSolomonGF256Poly(this, 1);
}
CBC_ReedSolomonGF256::~CBC_ReedSolomonGF256() {
if (m_zero != NULL) {
@@ -91,7 +91,7 @@ CBC_ReedSolomonGF256Poly* CBC_ReedSolomonGF256::BuildMonomial( CFX_Int32Array coefficients;
coefficients.SetSize(degree + 1);
coefficients[0] = coefficient;
- CBC_ReedSolomonGF256Poly* temp = FX_NEW CBC_ReedSolomonGF256Poly();
+ CBC_ReedSolomonGF256Poly* temp = new CBC_ReedSolomonGF256Poly();
temp->Init(this, &coefficients, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return temp;
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp index 1ab42eb831..127a20b4f9 100644 --- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp +++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp @@ -93,7 +93,7 @@ int32_t CBC_ReedSolomonGF256Poly::EvaluateAt(int32_t a) { return result;
}
CBC_ReedSolomonGF256Poly* CBC_ReedSolomonGF256Poly::Clone(int32_t& e) {
- CBC_ReedSolomonGF256Poly* temp = FX_NEW CBC_ReedSolomonGF256Poly();
+ CBC_ReedSolomonGF256Poly* temp = new CBC_ReedSolomonGF256Poly();
temp->Init(m_field, &m_coefficients, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return temp;
@@ -130,7 +130,7 @@ CBC_ReedSolomonGF256Poly* CBC_ReedSolomonGF256Poly::AddOrSubtract( sumDiff[j] = (CBC_ReedSolomonGF256::AddOrSubtract(
smallerCoefficients[j - lengthDiff], largerCoefficients[j]));
}
- CBC_ReedSolomonGF256Poly* temp = FX_NEW CBC_ReedSolomonGF256Poly();
+ CBC_ReedSolomonGF256Poly* temp = new CBC_ReedSolomonGF256Poly();
temp->Init(m_field, &sumDiff, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return temp;
@@ -159,7 +159,7 @@ CBC_ReedSolomonGF256Poly* CBC_ReedSolomonGF256Poly::Multiply( m_field->Multiply(aCoeff, other->GetCoefficients()->operator[](j)));
}
}
- CBC_ReedSolomonGF256Poly* temp = FX_NEW CBC_ReedSolomonGF256Poly();
+ CBC_ReedSolomonGF256Poly* temp = new CBC_ReedSolomonGF256Poly();
temp->Init(m_field, &product, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return temp;
@@ -181,7 +181,7 @@ CBC_ReedSolomonGF256Poly* CBC_ReedSolomonGF256Poly::Multiply(int32_t scalar, for (int32_t i = 0; i < size; i++) {
product[i] = m_field->Multiply(m_coefficients[i], scalar);
}
- CBC_ReedSolomonGF256Poly* temp = FX_NEW CBC_ReedSolomonGF256Poly();
+ CBC_ReedSolomonGF256Poly* temp = new CBC_ReedSolomonGF256Poly();
temp->Init(m_field, &product, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return temp;
@@ -205,7 +205,7 @@ CBC_ReedSolomonGF256Poly* CBC_ReedSolomonGF256Poly::MultiplyByMonomial( for (int32_t i = 0; i < size; i++) {
product[i] = (m_field->Multiply(m_coefficients[i], coefficient));
}
- CBC_ReedSolomonGF256Poly* temp = FX_NEW CBC_ReedSolomonGF256Poly();
+ CBC_ReedSolomonGF256Poly* temp = new CBC_ReedSolomonGF256Poly();
temp->Init(m_field, &product, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return temp;
@@ -250,7 +250,7 @@ CFX_PtrArray* CBC_ReedSolomonGF256Poly::Divide(CBC_ReedSolomonGF256Poly* other, CBC_AutoPtr<CBC_ReedSolomonGF256Poly> temp1(rsg6);
remainder = temp1;
}
- CFX_PtrArray* tempPtrA = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* tempPtrA = new CFX_PtrArray;
tempPtrA->Add(quotient.release());
tempPtrA->Add(remainder.release());
return tempPtrA;
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp index 16275a0c55..52738a1527 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp @@ -40,7 +40,7 @@ void CBC_DataMatrixBitMatrixParser::Init(CBC_CommonBitMatrix* bitMatrix, BC_EXCEPTION_CHECK_ReturnVoid(e);
m_mappingBitMatrix = ExtractDataRegion(bitMatrix, e);
BC_EXCEPTION_CHECK_ReturnVoid(e);
- m_readMappingMatrix = FX_NEW CBC_CommonBitMatrix();
+ m_readMappingMatrix = new CBC_CommonBitMatrix();
m_readMappingMatrix->Init(m_mappingBitMatrix->GetWidth(),
m_mappingBitMatrix->GetHeight());
}
@@ -68,7 +68,7 @@ CBC_DataMatrixVersion* CBC_DataMatrixBitMatrixParser::ReadVersion( return temp;
}
CFX_ByteArray* CBC_DataMatrixBitMatrixParser::ReadCodewords(int32_t& e) {
- CBC_AutoPtr<CFX_ByteArray> result(FX_NEW CFX_ByteArray());
+ CBC_AutoPtr<CFX_ByteArray> result(new CFX_ByteArray());
result->SetSize(m_version->GetTotalCodewords());
int32_t resultOffset = 0;
int32_t row = 4;
@@ -350,7 +350,7 @@ CBC_CommonBitMatrix* CBC_DataMatrixBitMatrixParser::ExtractDataRegion( int32_t numDataRegionsColumn = symbolSizeColumns / dataRegionSizeColumns;
int32_t sizeDataRegionRow = numDataRegionsRow * dataRegionSizeRows;
int32_t sizeDataRegionColumn = numDataRegionsColumn * dataRegionSizeColumns;
- CBC_CommonBitMatrix* bitMatrixWithoutAlignment = FX_NEW CBC_CommonBitMatrix();
+ CBC_CommonBitMatrix* bitMatrixWithoutAlignment = new CBC_CommonBitMatrix();
bitMatrixWithoutAlignment->Init(sizeDataRegionColumn, sizeDataRegionRow);
int32_t dataRegionRow;
for (dataRegionRow = 0; dataRegionRow < numDataRegionsRow; ++dataRegionRow) {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp index f9d991b32f..ef9f5582b6 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp @@ -40,7 +40,7 @@ CFX_PtrArray* CBC_DataMatrixDataBlock::GetDataBlocks( for (i = 0; i < ecBlockArray.GetSize(); i++) {
totalBlocks += ((ECB*)ecBlockArray[i])->GetCount();
}
- CBC_AutoPtr<CFX_PtrArray> result(FX_NEW CFX_PtrArray());
+ CBC_AutoPtr<CFX_PtrArray> result(new CFX_PtrArray());
result->SetSize(totalBlocks);
int32_t numResultBlocks = 0;
int32_t j;
@@ -51,7 +51,7 @@ CFX_PtrArray* CBC_DataMatrixDataBlock::GetDataBlocks( CFX_ByteArray codewords;
codewords.SetSize(numBlockCodewords);
(*result)[numResultBlocks++] =
- FX_NEW CBC_DataMatrixDataBlock(numDataCodewords, &codewords);
+ new CBC_DataMatrixDataBlock(numDataCodewords, &codewords);
codewords.SetSize(0);
}
}
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp index 86a93d13ee..8ac6468b3a 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp @@ -93,7 +93,7 @@ CBC_CommonDecoderResult* CBC_DataMatrixDecodedBitStreamParser::Decode( if (resultTrailer.GetLength() > 0) {
result += resultTrailer;
}
- CBC_CommonDecoderResult* tempCp = FX_NEW CBC_CommonDecoderResult();
+ CBC_CommonDecoderResult* tempCp = new CBC_CommonDecoderResult();
tempCp->Init(bytes, result,
(byteSegments.GetSize() <= 0) ? CFX_Int32Array() : byteSegments,
NULL, e);
@@ -457,7 +457,7 @@ void CBC_DataMatrixDecodedBitStreamParser::DecodeBase256Segment( e = BCExceptionFormatException;
return;
}
- CFX_ByteArray* bytes = FX_NEW CFX_ByteArray();
+ CFX_ByteArray* bytes = new CFX_ByteArray();
bytes->SetSize(count);
int32_t i;
for (i = 0; i < count; i++) {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp index d0fe37f167..5767c95555 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp @@ -34,7 +34,7 @@ CBC_DataMatrixDecoder::CBC_DataMatrixDecoder() { }
void CBC_DataMatrixDecoder::Init() {
m_rsDecoder =
- FX_NEW CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256::DataMatrixField);
+ new CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256::DataMatrixField);
}
CBC_DataMatrixDecoder::~CBC_DataMatrixDecoder() {
if (m_rsDecoder != NULL) {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp index 2dce972f9e..641d2761bb 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp @@ -32,7 +32,7 @@ const int32_t CBC_DataMatrixDetector::INTEGERS[5] = {0, 1, 2, 3, 4}; CBC_DataMatrixDetector::CBC_DataMatrixDetector(CBC_CommonBitMatrix* image)
: m_image(image), m_rectangleDetector(NULL) {}
void CBC_DataMatrixDetector::Init(int32_t& e) {
- m_rectangleDetector = FX_NEW CBC_WhiteRectangleDetector(m_image);
+ m_rectangleDetector = new CBC_WhiteRectangleDetector(m_image);
m_rectangleDetector->Init(e);
BC_EXCEPTION_CHECK_ReturnVoid(e);
}
@@ -191,13 +191,13 @@ CBC_QRDetectorResult* CBC_DataMatrixDetector::Detect(int32_t& e) { dimensionCorrected, dimensionCorrected, e));
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
}
- CFX_PtrArray* result = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* result = new CFX_PtrArray;
result->SetSize(4);
result->Add(topLeft);
result->Add(bottomLeft);
result->Add(bottomRight);
result->Add(correctedTopRight.release());
- return FX_NEW CBC_QRDetectorResult(bits.release(), result);
+ return new CBC_QRDetectorResult(bits.release(), result);
}
CBC_ResultPoint* CBC_DataMatrixDetector::CorrectTopRightRectangular(
CBC_ResultPoint* bottomLeft,
@@ -210,13 +210,13 @@ CBC_ResultPoint* CBC_DataMatrixDetector::CorrectTopRightRectangular( int32_t norm = Distance(topLeft, topRight);
FX_FLOAT cos = (topRight->GetX() - topLeft->GetX()) / norm;
FX_FLOAT sin = (topRight->GetY() - topLeft->GetY()) / norm;
- CBC_AutoPtr<CBC_ResultPoint> c1(FX_NEW CBC_ResultPoint(
+ CBC_AutoPtr<CBC_ResultPoint> c1(new CBC_ResultPoint(
topRight->GetX() + corr * cos, topRight->GetY() + corr * sin));
corr = Distance(bottomLeft, topLeft) / (FX_FLOAT)dimensionRight;
norm = Distance(bottomRight, topRight);
cos = (topRight->GetX() - bottomRight->GetX()) / norm;
sin = (topRight->GetY() - bottomRight->GetY()) / norm;
- CBC_AutoPtr<CBC_ResultPoint> c2(FX_NEW CBC_ResultPoint(
+ CBC_AutoPtr<CBC_ResultPoint> c2(new CBC_ResultPoint(
topRight->GetX() + corr * cos, topRight->GetY() + corr * sin));
if (!IsValid(c1.get())) {
if (IsValid(c2.get())) {
@@ -257,13 +257,13 @@ CBC_ResultPoint* CBC_DataMatrixDetector::CorrectTopRight( int32_t norm = Distance(topLeft, topRight);
FX_FLOAT cos = (topRight->GetX() - topLeft->GetX()) / norm;
FX_FLOAT sin = (topRight->GetY() - topLeft->GetY()) / norm;
- CBC_AutoPtr<CBC_ResultPoint> c1(FX_NEW CBC_ResultPoint(
+ CBC_AutoPtr<CBC_ResultPoint> c1(new CBC_ResultPoint(
topRight->GetX() + corr * cos, topRight->GetY() + corr * sin));
corr = Distance(bottomLeft, bottomRight) / (FX_FLOAT)dimension;
norm = Distance(bottomRight, topRight);
cos = (topRight->GetX() - bottomRight->GetX()) / norm;
sin = (topRight->GetY() - bottomRight->GetY()) / norm;
- CBC_AutoPtr<CBC_ResultPoint> c2(FX_NEW CBC_ResultPoint(
+ CBC_AutoPtr<CBC_ResultPoint> c2(new CBC_ResultPoint(
topRight->GetX() + corr * cos, topRight->GetY() + corr * sin));
if (!IsValid(c1.get())) {
if (IsValid(c2.get())) {
@@ -367,7 +367,7 @@ CBC_ResultPointsAndTransitions* CBC_DataMatrixDetector::TransitionsBetween( error -= dx;
}
}
- return FX_NEW CBC_ResultPointsAndTransitions(from, to, transitions);
+ return new CBC_ResultPointsAndTransitions(from, to, transitions);
}
void CBC_DataMatrixDetector::OrderBestPatterns(CFX_PtrArray* patterns) {
FX_FLOAT abDistance = (FX_FLOAT)Distance((CBC_ResultPoint*)(*patterns)[0],
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp index 7e1777fa7b..4c4be46176 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp @@ -32,7 +32,7 @@ CBC_DataMatrixReader::CBC_DataMatrixReader() { m_decoder = NULL;
}
void CBC_DataMatrixReader::Init() {
- m_decoder = FX_NEW CBC_DataMatrixDecoder;
+ m_decoder = new CBC_DataMatrixDecoder;
m_decoder->Init();
}
CBC_DataMatrixReader::~CBC_DataMatrixReader() {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp index 55b3c8d557..e642478571 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp @@ -24,7 +24,7 @@ #include "BC_DataMatrixVersion.h"
CFX_PtrArray* CBC_DataMatrixVersion::VERSIONS = NULL;
void CBC_DataMatrixVersion::Initialize() {
- VERSIONS = FX_NEW CFX_PtrArray();
+ VERSIONS = new CFX_PtrArray();
}
void CBC_DataMatrixVersion::Finalize() {
for (int32_t i = 0; i < VERSIONS->GetSize(); i++) {
@@ -96,67 +96,67 @@ CBC_DataMatrixVersion* CBC_DataMatrixVersion::GetVersionForDimensions( return NULL;
}
if (VERSIONS->GetSize() == 0) {
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 1, 10, 10, 8, 8, FX_NEW ECBlocks(5, FX_NEW ECB(1, 3))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 2, 12, 12, 10, 10, FX_NEW ECBlocks(7, FX_NEW ECB(1, 5))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 3, 14, 14, 12, 12, FX_NEW ECBlocks(10, FX_NEW ECB(1, 8))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 4, 16, 16, 14, 14, FX_NEW ECBlocks(12, FX_NEW ECB(1, 12))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 5, 18, 18, 16, 16, FX_NEW ECBlocks(14, FX_NEW ECB(1, 18))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 6, 20, 20, 18, 18, FX_NEW ECBlocks(18, FX_NEW ECB(1, 22))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 7, 22, 22, 20, 20, FX_NEW ECBlocks(20, FX_NEW ECB(1, 30))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 8, 24, 24, 22, 22, FX_NEW ECBlocks(24, FX_NEW ECB(1, 36))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 9, 26, 26, 24, 24, FX_NEW ECBlocks(28, FX_NEW ECB(1, 44))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 10, 32, 32, 14, 14, FX_NEW ECBlocks(36, FX_NEW ECB(1, 62))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 11, 36, 36, 16, 16, FX_NEW ECBlocks(42, FX_NEW ECB(1, 86))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 12, 40, 40, 18, 18, FX_NEW ECBlocks(48, FX_NEW ECB(1, 114))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 13, 44, 44, 20, 20, FX_NEW ECBlocks(56, FX_NEW ECB(1, 144))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 14, 48, 48, 22, 22, FX_NEW ECBlocks(68, FX_NEW ECB(1, 174))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 15, 52, 52, 24, 24, FX_NEW ECBlocks(42, FX_NEW ECB(2, 102))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 16, 64, 64, 14, 14, FX_NEW ECBlocks(56, FX_NEW ECB(2, 140))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 17, 72, 72, 16, 16, FX_NEW ECBlocks(36, FX_NEW ECB(4, 92))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 18, 80, 80, 18, 18, FX_NEW ECBlocks(48, FX_NEW ECB(4, 114))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 19, 88, 88, 20, 20, FX_NEW ECBlocks(56, FX_NEW ECB(4, 144))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 20, 96, 96, 22, 22, FX_NEW ECBlocks(68, FX_NEW ECB(4, 174))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 21, 104, 104, 24, 24, FX_NEW ECBlocks(56, FX_NEW ECB(6, 136))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 22, 120, 120, 18, 18, FX_NEW ECBlocks(68, FX_NEW ECB(6, 175))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 23, 132, 132, 20, 20, FX_NEW ECBlocks(62, FX_NEW ECB(8, 163))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 1, 10, 10, 8, 8, new ECBlocks(5, new ECB(1, 3))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 2, 12, 12, 10, 10, new ECBlocks(7, new ECB(1, 5))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 3, 14, 14, 12, 12, new ECBlocks(10, new ECB(1, 8))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 4, 16, 16, 14, 14, new ECBlocks(12, new ECB(1, 12))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 5, 18, 18, 16, 16, new ECBlocks(14, new ECB(1, 18))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 6, 20, 20, 18, 18, new ECBlocks(18, new ECB(1, 22))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 7, 22, 22, 20, 20, new ECBlocks(20, new ECB(1, 30))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 8, 24, 24, 22, 22, new ECBlocks(24, new ECB(1, 36))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 9, 26, 26, 24, 24, new ECBlocks(28, new ECB(1, 44))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 10, 32, 32, 14, 14, new ECBlocks(36, new ECB(1, 62))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 11, 36, 36, 16, 16, new ECBlocks(42, new ECB(1, 86))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 12, 40, 40, 18, 18, new ECBlocks(48, new ECB(1, 114))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 13, 44, 44, 20, 20, new ECBlocks(56, new ECB(1, 144))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 14, 48, 48, 22, 22, new ECBlocks(68, new ECB(1, 174))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 15, 52, 52, 24, 24, new ECBlocks(42, new ECB(2, 102))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 16, 64, 64, 14, 14, new ECBlocks(56, new ECB(2, 140))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 17, 72, 72, 16, 16, new ECBlocks(36, new ECB(4, 92))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 18, 80, 80, 18, 18, new ECBlocks(48, new ECB(4, 114))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 19, 88, 88, 20, 20, new ECBlocks(56, new ECB(4, 144))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 20, 96, 96, 22, 22, new ECBlocks(68, new ECB(4, 174))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 21, 104, 104, 24, 24, new ECBlocks(56, new ECB(6, 136))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 22, 120, 120, 18, 18, new ECBlocks(68, new ECB(6, 175))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 23, 132, 132, 20, 20, new ECBlocks(62, new ECB(8, 163))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
24, 144, 144, 22, 22,
- FX_NEW ECBlocks(62, FX_NEW ECB(8, 156), FX_NEW ECB(2, 155))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 25, 8, 18, 6, 16, FX_NEW ECBlocks(7, FX_NEW ECB(1, 5))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 26, 8, 32, 6, 14, FX_NEW ECBlocks(11, FX_NEW ECB(1, 10))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 27, 12, 26, 10, 24, FX_NEW ECBlocks(14, FX_NEW ECB(1, 16))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 28, 12, 36, 10, 16, FX_NEW ECBlocks(18, FX_NEW ECB(1, 22))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 29, 16, 36, 14, 16, FX_NEW ECBlocks(24, FX_NEW ECB(1, 32))));
- VERSIONS->Add(FX_NEW CBC_DataMatrixVersion(
- 30, 16, 48, 14, 22, FX_NEW ECBlocks(28, FX_NEW ECB(1, 49))));
+ new ECBlocks(62, new ECB(8, 156), new ECB(2, 155))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 25, 8, 18, 6, 16, new ECBlocks(7, new ECB(1, 5))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 26, 8, 32, 6, 14, new ECBlocks(11, new ECB(1, 10))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 27, 12, 26, 10, 24, new ECBlocks(14, new ECB(1, 16))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 28, 12, 36, 10, 16, new ECBlocks(18, new ECB(1, 22))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 29, 16, 36, 14, 16, new ECBlocks(24, new ECB(1, 32))));
+ VERSIONS->Add(new CBC_DataMatrixVersion(
+ 30, 16, 48, 14, 22, new ECBlocks(28, new ECB(1, 49))));
}
int32_t numVersions = VERSIONS->GetSize();
for (int32_t i = 0; i < numVersions; ++i) {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp index 539572f5da..20eaa4c223 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp @@ -72,7 +72,7 @@ uint8_t* CBC_DataMatrixWriter::Encode(const CFX_WideString& contents, CBC_ErrorCorrection::encodeECC200(encoded, symbolInfo, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
CBC_DefaultPlacement* placement =
- FX_NEW CBC_DefaultPlacement(codewords, symbolInfo->getSymbolDataWidth(e),
+ new CBC_DefaultPlacement(codewords, symbolInfo->getSymbolDataWidth(e),
symbolInfo->getSymbolDataHeight(e));
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
placement->place();
@@ -109,7 +109,7 @@ CBC_CommonByteMatrix* CBC_DataMatrixWriter::encodeLowLevel( BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
int32_t symbolHeight = symbolInfo->getSymbolDataHeight(e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
- CBC_CommonByteMatrix* matrix = FX_NEW CBC_CommonByteMatrix(
+ CBC_CommonByteMatrix* matrix = new CBC_CommonByteMatrix(
symbolInfo->getSymbolWidth(e), symbolInfo->getSymbolHeight(e));
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
matrix->Init();
diff --git a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp index 986d6b2a7f..4a0e09528b 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp @@ -87,12 +87,12 @@ CFX_WideString CBC_HighLevelEncoder::encodeHighLevel(CFX_WideString msg, context.m_pos += 6;
}
CFX_PtrArray encoders;
- encoders.Add(FX_NEW CBC_ASCIIEncoder());
- encoders.Add(FX_NEW CBC_C40Encoder());
- encoders.Add(FX_NEW CBC_TextEncoder());
- encoders.Add(FX_NEW CBC_X12Encoder());
- encoders.Add(FX_NEW CBC_EdifactEncoder());
- encoders.Add(FX_NEW CBC_Base256Encoder());
+ encoders.Add(new CBC_ASCIIEncoder());
+ encoders.Add(new CBC_C40Encoder());
+ encoders.Add(new CBC_TextEncoder());
+ encoders.Add(new CBC_X12Encoder());
+ encoders.Add(new CBC_EdifactEncoder());
+ encoders.Add(new CBC_Base256Encoder());
int32_t encodingMode = ASCII_ENCODATION;
while (context.hasMoreCharacters()) {
((CBC_Encoder*)encoders.GetAt(encodingMode))->Encode(context, e);
diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp index 2ed4ee0003..68b5b4c674 100644 --- a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp +++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp @@ -37,45 +37,45 @@ CBC_SymbolInfo* CBC_SymbolInfo::m_symbols[30] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
void CBC_SymbolInfo::Initialize() {
- m_PROD_SYMBOLS[0] = FX_NEW CBC_SymbolInfo(FALSE, 3, 5, 8, 8, 1);
- m_PROD_SYMBOLS[1] = FX_NEW CBC_SymbolInfo(FALSE, 5, 7, 10, 10, 1);
- m_PROD_SYMBOLS[2] = FX_NEW CBC_SymbolInfo(TRUE, 5, 7, 16, 6, 1);
- m_PROD_SYMBOLS[3] = FX_NEW CBC_SymbolInfo(FALSE, 8, 10, 12, 12, 1);
- m_PROD_SYMBOLS[4] = FX_NEW CBC_SymbolInfo(TRUE, 10, 11, 14, 6, 2);
- m_PROD_SYMBOLS[5] = FX_NEW CBC_SymbolInfo(FALSE, 12, 12, 14, 14, 1);
- m_PROD_SYMBOLS[6] = FX_NEW CBC_SymbolInfo(TRUE, 16, 14, 24, 10, 1);
- m_PROD_SYMBOLS[7] = FX_NEW CBC_SymbolInfo(FALSE, 18, 14, 16, 16, 1);
- m_PROD_SYMBOLS[8] = FX_NEW CBC_SymbolInfo(FALSE, 22, 18, 18, 18, 1);
- m_PROD_SYMBOLS[9] = FX_NEW CBC_SymbolInfo(TRUE, 22, 18, 16, 10, 2);
- m_PROD_SYMBOLS[10] = FX_NEW CBC_SymbolInfo(FALSE, 30, 20, 20, 20, 1);
- m_PROD_SYMBOLS[11] = FX_NEW CBC_SymbolInfo(TRUE, 32, 24, 16, 14, 2);
- m_PROD_SYMBOLS[12] = FX_NEW CBC_SymbolInfo(FALSE, 36, 24, 22, 22, 1);
- m_PROD_SYMBOLS[13] = FX_NEW CBC_SymbolInfo(FALSE, 44, 28, 24, 24, 1);
- m_PROD_SYMBOLS[14] = FX_NEW CBC_SymbolInfo(TRUE, 49, 28, 22, 14, 2);
- m_PROD_SYMBOLS[15] = FX_NEW CBC_SymbolInfo(FALSE, 62, 36, 14, 14, 4);
- m_PROD_SYMBOLS[16] = FX_NEW CBC_SymbolInfo(FALSE, 86, 42, 16, 16, 4);
- m_PROD_SYMBOLS[17] = FX_NEW CBC_SymbolInfo(FALSE, 114, 48, 18, 18, 4);
- m_PROD_SYMBOLS[18] = FX_NEW CBC_SymbolInfo(FALSE, 144, 56, 20, 20, 4);
- m_PROD_SYMBOLS[19] = FX_NEW CBC_SymbolInfo(FALSE, 174, 68, 22, 22, 4);
+ m_PROD_SYMBOLS[0] = new CBC_SymbolInfo(FALSE, 3, 5, 8, 8, 1);
+ m_PROD_SYMBOLS[1] = new CBC_SymbolInfo(FALSE, 5, 7, 10, 10, 1);
+ m_PROD_SYMBOLS[2] = new CBC_SymbolInfo(TRUE, 5, 7, 16, 6, 1);
+ m_PROD_SYMBOLS[3] = new CBC_SymbolInfo(FALSE, 8, 10, 12, 12, 1);
+ m_PROD_SYMBOLS[4] = new CBC_SymbolInfo(TRUE, 10, 11, 14, 6, 2);
+ m_PROD_SYMBOLS[5] = new CBC_SymbolInfo(FALSE, 12, 12, 14, 14, 1);
+ m_PROD_SYMBOLS[6] = new CBC_SymbolInfo(TRUE, 16, 14, 24, 10, 1);
+ m_PROD_SYMBOLS[7] = new CBC_SymbolInfo(FALSE, 18, 14, 16, 16, 1);
+ m_PROD_SYMBOLS[8] = new CBC_SymbolInfo(FALSE, 22, 18, 18, 18, 1);
+ m_PROD_SYMBOLS[9] = new CBC_SymbolInfo(TRUE, 22, 18, 16, 10, 2);
+ m_PROD_SYMBOLS[10] = new CBC_SymbolInfo(FALSE, 30, 20, 20, 20, 1);
+ m_PROD_SYMBOLS[11] = new CBC_SymbolInfo(TRUE, 32, 24, 16, 14, 2);
+ m_PROD_SYMBOLS[12] = new CBC_SymbolInfo(FALSE, 36, 24, 22, 22, 1);
+ m_PROD_SYMBOLS[13] = new CBC_SymbolInfo(FALSE, 44, 28, 24, 24, 1);
+ m_PROD_SYMBOLS[14] = new CBC_SymbolInfo(TRUE, 49, 28, 22, 14, 2);
+ m_PROD_SYMBOLS[15] = new CBC_SymbolInfo(FALSE, 62, 36, 14, 14, 4);
+ m_PROD_SYMBOLS[16] = new CBC_SymbolInfo(FALSE, 86, 42, 16, 16, 4);
+ m_PROD_SYMBOLS[17] = new CBC_SymbolInfo(FALSE, 114, 48, 18, 18, 4);
+ m_PROD_SYMBOLS[18] = new CBC_SymbolInfo(FALSE, 144, 56, 20, 20, 4);
+ m_PROD_SYMBOLS[19] = new CBC_SymbolInfo(FALSE, 174, 68, 22, 22, 4);
m_PROD_SYMBOLS[20] =
- FX_NEW CBC_SymbolInfo(FALSE, 204, 84, 24, 24, 4, 102, 42);
+ new CBC_SymbolInfo(FALSE, 204, 84, 24, 24, 4, 102, 42);
m_PROD_SYMBOLS[21] =
- FX_NEW CBC_SymbolInfo(FALSE, 280, 112, 14, 14, 16, 140, 56);
+ new CBC_SymbolInfo(FALSE, 280, 112, 14, 14, 16, 140, 56);
m_PROD_SYMBOLS[22] =
- FX_NEW CBC_SymbolInfo(FALSE, 368, 144, 16, 16, 16, 92, 36);
+ new CBC_SymbolInfo(FALSE, 368, 144, 16, 16, 16, 92, 36);
m_PROD_SYMBOLS[23] =
- FX_NEW CBC_SymbolInfo(FALSE, 456, 192, 18, 18, 16, 114, 48);
+ new CBC_SymbolInfo(FALSE, 456, 192, 18, 18, 16, 114, 48);
m_PROD_SYMBOLS[24] =
- FX_NEW CBC_SymbolInfo(FALSE, 576, 224, 20, 20, 16, 144, 56);
+ new CBC_SymbolInfo(FALSE, 576, 224, 20, 20, 16, 144, 56);
m_PROD_SYMBOLS[25] =
- FX_NEW CBC_SymbolInfo(FALSE, 696, 272, 22, 22, 16, 174, 68);
+ new CBC_SymbolInfo(FALSE, 696, 272, 22, 22, 16, 174, 68);
m_PROD_SYMBOLS[26] =
- FX_NEW CBC_SymbolInfo(FALSE, 816, 336, 24, 24, 16, 136, 56);
+ new CBC_SymbolInfo(FALSE, 816, 336, 24, 24, 16, 136, 56);
m_PROD_SYMBOLS[27] =
- FX_NEW CBC_SymbolInfo(FALSE, 1050, 408, 18, 18, 36, 175, 68);
+ new CBC_SymbolInfo(FALSE, 1050, 408, 18, 18, 36, 175, 68);
m_PROD_SYMBOLS[28] =
- FX_NEW CBC_SymbolInfo(FALSE, 1304, 496, 20, 20, 36, 163, 62);
- m_PROD_SYMBOLS[29] = FX_NEW CBC_DataMatrixSymbolInfo144();
+ new CBC_SymbolInfo(FALSE, 1304, 496, 20, 20, 36, 163, 62);
+ m_PROD_SYMBOLS[29] = new CBC_DataMatrixSymbolInfo144();
for (int32_t i = 0; i < SYMBOLS_COUNT; i++) {
m_symbols[i] = m_PROD_SYMBOLS[i];
}
diff --git a/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp index b0ad088637..77c34802b5 100644 --- a/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp @@ -167,7 +167,7 @@ CFX_Int32Array* CBC_OneDimReader::FindGuardPattern(CBC_CommonBitArray* row, if (counterPosition == patternLength - 1) {
if (PatternMatchVariance(&counters, &(*pattern)[0],
MAX_INDIVIDUAL_VARIANCE) < MAX_AVG_VARIANCE) {
- CFX_Int32Array* result = FX_NEW CFX_Int32Array();
+ CFX_Int32Array* result = new CFX_Int32Array();
result->SetSize(2);
(*result)[0] = patternStart;
(*result)[1] = x;
diff --git a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp index 06b7d759cd..aaab954380 100644 --- a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp +++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp @@ -424,7 +424,7 @@ void CBC_OneDimWriter::RenderResult(const CFX_WideStringC& contents, if (!isDevice) {
m_barWidth = codeLength * m_multiple;
}
- m_output = FX_NEW CBC_CommonBitMatrix;
+ m_output = new CBC_CommonBitMatrix;
m_output->Init(outputWidth, outputHeight);
int32_t outputX = leftPadding * m_multiple;
for (int32_t inputX = 0; inputX < codeOldLength; inputX++) {
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp index ed12f676b4..010406be8d 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp @@ -144,7 +144,7 @@ CFX_Int32Array* CBC_OnedCodaBarReader::FindAsteriskPattern( patternStart, FALSE, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
if (btemp3) {
- CFX_Int32Array* result = FX_NEW CFX_Int32Array();
+ CFX_Int32Array* result = new CFX_Int32Array();
result->SetSize(2);
(*result)[0] = patternStart;
(*result)[1] = i;
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp index 4cffe9d78f..c1f74c8a61 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp @@ -119,7 +119,7 @@ CFX_Int32Array* CBC_OnedCode128Reader::FindStartPattern(CBC_CommonBitArray* row, patternStart, FALSE, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
if (btemp2) {
- CFX_Int32Array* result = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* result = new CFX_Int32Array;
result->SetSize(3);
(*result)[0] = patternStart;
(*result)[1] = i;
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp index 3678260033..9caa0cb43a 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp @@ -150,7 +150,7 @@ CFX_Int32Array* CBC_OnedCode39Reader::FindAsteriskPattern( patternStart, FALSE, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
if (bT1) {
- CFX_Int32Array* result = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* result = new CFX_Int32Array;
result->SetSize(2);
(*result)[0] = patternStart;
(*result)[1] = i;
diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp index fd427eae64..d02e2a2966 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp @@ -30,7 +30,7 @@ CBC_OnedUPCAReader::CBC_OnedUPCAReader() { m_ean13Reader = NULL;
}
void CBC_OnedUPCAReader::Init() {
- m_ean13Reader = FX_NEW CBC_OnedEAN13Reader;
+ m_ean13Reader = new CBC_OnedEAN13Reader;
}
CBC_OnedUPCAReader::~CBC_OnedUPCAReader() {
if (m_ean13Reader != NULL) {
diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp index 66c7c2a798..da15a06d1a 100644 --- a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp +++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp @@ -31,7 +31,7 @@ CBC_OnedUPCAWriter::CBC_OnedUPCAWriter() { m_bRightPadding = TRUE;
}
void CBC_OnedUPCAWriter::Init() {
- m_subWriter = FX_NEW CBC_OnedEAN13Writer;
+ m_subWriter = new CBC_OnedEAN13Writer;
}
CBC_OnedUPCAWriter::~CBC_OnedUPCAWriter() {
if (m_subWriter != NULL) {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp index c31ebf61e1..f38758f4bc 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp @@ -445,7 +445,7 @@ void CBC_PDF417::generateBarcodeLogic(CFX_WideString msg, dataCodewords, errorCorrectionLevel, e);
BC_EXCEPTION_CHECK_ReturnVoid(e);
CFX_WideString fullCodewords = dataCodewords + ec;
- m_barcodeMatrix = FX_NEW CBC_BarcodeMatrix(rows, cols);
+ m_barcodeMatrix = new CBC_BarcodeMatrix(rows, cols);
encodeLowLevel(fullCodewords, cols, rows, errorCorrectionLevel,
m_barcodeMatrix);
}
@@ -561,7 +561,7 @@ CFX_Int32Array* CBC_PDF417::determineDimensions( if (dimension) {
delete dimension;
}
- dimension = FX_NEW CFX_Int32Array;
+ dimension = new CFX_Int32Array;
dimension->Add(cols);
dimension->Add(rows);
}
@@ -569,11 +569,11 @@ CFX_Int32Array* CBC_PDF417::determineDimensions( int32_t rows = calculateNumberOfRows(sourceCodeWords,
errorCorrectionCodeWords, m_minCols);
if (rows < m_minRows) {
- dimension = FX_NEW CFX_Int32Array;
+ dimension = new CFX_Int32Array;
dimension->Add(m_minCols);
dimension->Add(m_minRows);
} else if (rows >= 3 && rows <= 90) {
- dimension = FX_NEW CFX_Int32Array;
+ dimension = new CFX_Int32Array;
dimension->Add(m_minCols);
dimension->Add(rows);
}
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp index 583a86e596..2386ba4e2e 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp @@ -27,7 +27,7 @@ CBC_BarcodeMatrix::CBC_BarcodeMatrix(int32_t height, int32_t width) { m_matrix.SetSize(height + 2);
for (int32_t i = 0, matrixLength = m_matrix.GetSize(); i < matrixLength;
i++) {
- m_matrix[i] = FX_NEW CBC_BarcodeRow((width + 4) * 17 + 1);
+ m_matrix[i] = new CBC_BarcodeRow((width + 4) * 17 + 1);
}
m_width = width * 17;
m_height = height + 2;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp index 5397c4f36f..2bb3c45a18 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp @@ -40,7 +40,7 @@ void CBC_BarcodeValue::setValue(int32_t value) { }
CFX_Int32Array* CBC_BarcodeValue::getValue() {
int32_t maxConfidence = -1;
- CFX_Int32Array* result = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* result = new CFX_Int32Array;
for (int32_t i = 0; i < m_keys.GetSize(); i++) {
if (m_values.GetAt(i) > maxConfidence) {
maxConfidence = m_values.GetAt(i);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp index 0801bbcd11..8aef43f989 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp @@ -61,14 +61,14 @@ CBC_BoundingBox* CBC_BoundingBox::merge(CBC_BoundingBox* leftBox, int32_t& e) {
CBC_BoundingBox* boundingBox = NULL;
if (leftBox == NULL) {
- boundingBox = FX_NEW CBC_BoundingBox(rightBox);
+ boundingBox = new CBC_BoundingBox(rightBox);
return boundingBox;
}
if (rightBox == NULL) {
- boundingBox = FX_NEW CBC_BoundingBox(leftBox);
+ boundingBox = new CBC_BoundingBox(leftBox);
return boundingBox;
}
- boundingBox = FX_NEW CBC_BoundingBox(
+ boundingBox = new CBC_BoundingBox(
leftBox->m_image, leftBox->m_topLeft, leftBox->m_bottomLeft,
rightBox->m_topRight, rightBox->m_bottomRight, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
@@ -90,7 +90,7 @@ CBC_BoundingBox* CBC_BoundingBox::addMissingRows(int32_t missingStartRows, if (newMinY < 0) {
newMinY = 0;
}
- newTop = FX_NEW CBC_ResultPoint((FX_FLOAT)top->GetX(), (FX_FLOAT)newMinY);
+ newTop = new CBC_ResultPoint((FX_FLOAT)top->GetX(), (FX_FLOAT)newMinY);
if (isLeft) {
newTopLeft = newTop;
} else {
@@ -104,7 +104,7 @@ CBC_BoundingBox* CBC_BoundingBox::addMissingRows(int32_t missingStartRows, newMaxY = m_image->GetHeight() - 1;
}
newBottom =
- FX_NEW CBC_ResultPoint((FX_FLOAT)bottom->GetX(), (FX_FLOAT)newMaxY);
+ new CBC_ResultPoint((FX_FLOAT)bottom->GetX(), (FX_FLOAT)newMaxY);
if (isLeft) {
newBottomLeft = newBottom;
} else {
@@ -112,7 +112,7 @@ CBC_BoundingBox* CBC_BoundingBox::addMissingRows(int32_t missingStartRows, }
}
calculateMinMaxValues();
- CBC_BoundingBox* boundingBox = FX_NEW CBC_BoundingBox(
+ CBC_BoundingBox* boundingBox = new CBC_BoundingBox(
m_image, newTopLeft, newBottomLeft, newTopRight, newBottomRight, e);
delete newTop;
delete newBottom;
@@ -123,7 +123,7 @@ void CBC_BoundingBox::setTopRight(CBC_ResultPoint topRight) { if (m_topRight) {
delete m_topRight;
}
- m_topRight = FX_NEW CBC_ResultPoint(topRight.GetX(), topRight.GetY());
+ m_topRight = new CBC_ResultPoint(topRight.GetX(), topRight.GetY());
calculateMinMaxValues();
}
void CBC_BoundingBox::setBottomRight(CBC_ResultPoint bottomRight) {
@@ -131,7 +131,7 @@ void CBC_BoundingBox::setBottomRight(CBC_ResultPoint bottomRight) { delete m_bottomRight;
}
m_bottomRight =
- FX_NEW CBC_ResultPoint(bottomRight.GetX(), bottomRight.GetY());
+ new CBC_ResultPoint(bottomRight.GetX(), bottomRight.GetY());
calculateMinMaxValues();
}
int32_t CBC_BoundingBox::getMinX() {
@@ -169,29 +169,29 @@ void CBC_BoundingBox::init(CBC_CommonBitMatrix* image, m_bottomRight = NULL;
m_image = image;
if (topLeft) {
- m_topLeft = FX_NEW CBC_ResultPoint(topLeft->GetX(), topLeft->GetY());
+ m_topLeft = new CBC_ResultPoint(topLeft->GetX(), topLeft->GetY());
}
if (bottomLeft) {
m_bottomLeft =
- FX_NEW CBC_ResultPoint(bottomLeft->GetX(), bottomLeft->GetY());
+ new CBC_ResultPoint(bottomLeft->GetX(), bottomLeft->GetY());
}
if (topRight) {
- m_topRight = FX_NEW CBC_ResultPoint(topRight->GetX(), topRight->GetY());
+ m_topRight = new CBC_ResultPoint(topRight->GetX(), topRight->GetY());
}
if (bottomRight) {
m_bottomRight =
- FX_NEW CBC_ResultPoint(bottomRight->GetX(), bottomRight->GetY());
+ new CBC_ResultPoint(bottomRight->GetX(), bottomRight->GetY());
}
calculateMinMaxValues();
}
void CBC_BoundingBox::calculateMinMaxValues() {
if (m_topLeft == NULL) {
- m_topLeft = FX_NEW CBC_ResultPoint(0, m_topRight->GetY());
- m_bottomLeft = FX_NEW CBC_ResultPoint(0, m_bottomRight->GetY());
+ m_topLeft = new CBC_ResultPoint(0, m_topRight->GetY());
+ m_bottomLeft = new CBC_ResultPoint(0, m_bottomRight->GetY());
} else if (m_topRight == NULL) {
- m_topRight = FX_NEW CBC_ResultPoint((FX_FLOAT)m_image->GetWidth() - 1,
+ m_topRight = new CBC_ResultPoint((FX_FLOAT)m_image->GetWidth() - 1,
(FX_FLOAT)m_topLeft->GetY());
- m_bottomRight = FX_NEW CBC_ResultPoint((FX_FLOAT)m_image->GetWidth() - 1,
+ m_bottomRight = new CBC_ResultPoint((FX_FLOAT)m_image->GetWidth() - 1,
(FX_FLOAT)m_bottomLeft->GetY());
}
m_minX = (int32_t)(m_topLeft->GetX() < m_bottomLeft->GetX()
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp index 6e7d26b4af..d70dbb12e4 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp @@ -59,7 +59,7 @@ CFX_Int32Array* CBC_PDF417CodewordDecoder::sampleBitCounts( CFX_Int32Array& moduleBitCount) {
FX_FLOAT bitCountSum =
(FX_FLOAT)CBC_PDF417Common::getBitCountSum(moduleBitCount);
- CFX_Int32Array* bitCount = FX_NEW CFX_Int32Array();
+ CFX_Int32Array* bitCount = new CFX_Int32Array();
bitCount->SetSize(CBC_PDF417Common::BARS_IN_MODULE);
int32_t bitCountIndex = 0;
int32_t sumPreviousBits = 0;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp index 5002a991fd..e14b2b37c4 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp @@ -64,7 +64,7 @@ CBC_CommonDecoderResult* CBC_DecodedBitStreamPaser::decode( int32_t codeIndex = 1;
int32_t code = codewords.GetAt(codeIndex);
codeIndex++;
- CBC_PDF417ResultMetadata* resultMetadata = FX_NEW CBC_PDF417ResultMetadata;
+ CBC_PDF417ResultMetadata* resultMetadata = new CBC_PDF417ResultMetadata;
while (codeIndex < codewords[0]) {
switch (code) {
case TEXT_COMPACTION_MODE_LATCH:
@@ -110,7 +110,7 @@ CBC_CommonDecoderResult* CBC_DecodedBitStreamPaser::decode( }
CFX_ByteArray rawBytes;
CFX_PtrArray byteSegments;
- CBC_CommonDecoderResult* tempCd = FX_NEW CBC_CommonDecoderResult();
+ CBC_CommonDecoderResult* tempCd = new CBC_CommonDecoderResult();
tempCd->Init(rawBytes, result, byteSegments, ecLevel, e);
if (e != BCExceptionNO) {
delete resultMetadata;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp index d58220fa3a..9252c33011 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp @@ -28,7 +28,7 @@ int32_t CBC_DetectionResultColumn::MAX_NEARBY_DISTANCE = 5; CBC_DetectionResultColumn::CBC_DetectionResultColumn(
CBC_BoundingBox* boundingBox) {
m_boundingBox = boundingBox;
- m_codewords = FX_NEW CFX_PtrArray;
+ m_codewords = new CFX_PtrArray;
m_codewords->SetSize(boundingBox->getMaxY() - boundingBox->getMinY() + 1);
}
CBC_DetectionResultColumn::~CBC_DetectionResultColumn() {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp index 843e8a90a5..bc3fb4c9bd 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp @@ -113,7 +113,7 @@ CFX_Int32Array* CBC_DetectionResultRowIndicatorColumn::getRowHeights( return NULL;
}
adjustIncompleteIndicatorColumnRowNumbers(*barcodeMetadata);
- CFX_Int32Array* result = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* result = new CFX_Int32Array;
result->SetSize(barcodeMetadata->getRowCount());
for (int32_t i = 0; i < getCodewords()->GetSize(); i++) {
CBC_Codeword* codeword = (CBC_Codeword*)getCodewords()->GetAt(i);
@@ -209,7 +209,7 @@ CBC_DetectionResultRowIndicatorColumn::getBarcodeMetadata() { return NULL;
}
CBC_BarcodeMetadata* barcodeMetadata =
- FX_NEW CBC_BarcodeMetadata(barcodeColumnCount.getValue()->GetAt(0),
+ new CBC_BarcodeMetadata(barcodeColumnCount.getValue()->GetAt(0),
barcodeRowCountUpperPart.getValue()->GetAt(0),
barcodeRowCountLowerPart.getValue()->GetAt(0),
barcodeECLevel.getValue()->GetAt(0));
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp index 24ef935430..7f3940d101 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp @@ -62,15 +62,15 @@ CBC_PDF417DetectorResult* CBC_Detector::detect(CBC_BinaryBitmap* image, BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
}
CBC_PDF417DetectorResult* detectorResult =
- FX_NEW CBC_PDF417DetectorResult(bitMatrix, barcodeCoordinates);
+ new CBC_PDF417DetectorResult(bitMatrix, barcodeCoordinates);
return detectorResult;
}
void CBC_Detector::rotate180(CBC_CommonBitMatrix* bitMatrix) {
int32_t width = bitMatrix->GetWidth();
int32_t height = bitMatrix->GetHeight();
- CBC_CommonBitArray* firstRowBitArray = FX_NEW CBC_CommonBitArray(width);
- CBC_CommonBitArray* secondRowBitArray = FX_NEW CBC_CommonBitArray(width);
- CBC_CommonBitArray* tmpBitArray = FX_NEW CBC_CommonBitArray(width);
+ CBC_CommonBitArray* firstRowBitArray = new CBC_CommonBitArray(width);
+ CBC_CommonBitArray* secondRowBitArray = new CBC_CommonBitArray(width);
+ CBC_CommonBitArray* tmpBitArray = new CBC_CommonBitArray(width);
for (int32_t y = 0; y<(height + 1)>> 1; y++) {
CBC_CommonBitArray* temp =
bitMatrix->GetRow(height - 1 - y, secondRowBitArray);
@@ -91,7 +91,7 @@ void CBC_Detector::rotate180(CBC_CommonBitMatrix* bitMatrix) { }
CBC_CommonBitArray* CBC_Detector::mirror(CBC_CommonBitArray* input,
CBC_CommonBitArray* result) {
- CBC_CommonBitArray* array = FX_NEW CBC_CommonBitArray(result->GetSize());
+ CBC_CommonBitArray* array = new CBC_CommonBitArray(result->GetSize());
array->Clear();
int32_t size = input->GetSize();
for (int32_t i = 0; i < size; i++) {
@@ -103,7 +103,7 @@ CBC_CommonBitArray* CBC_Detector::mirror(CBC_CommonBitArray* input, }
CFX_PtrArray* CBC_Detector::detect(FX_BOOL multiple,
CBC_CommonBitMatrix* bitMatrix) {
- CFX_PtrArray* barcodeCoordinates = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* barcodeCoordinates = new CFX_PtrArray;
int32_t row = 0;
int32_t column = 0;
FX_BOOL foundBarcodeInRow = FALSE;
@@ -154,7 +154,7 @@ CFX_PtrArray* CBC_Detector::findVertices(CBC_CommonBitMatrix* matrix, int32_t startColumn) {
int32_t height = matrix->GetHeight();
int32_t width = matrix->GetWidth();
- CFX_PtrArray* result = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* result = new CFX_PtrArray;
result->SetSize(8);
CFX_PtrArray* startptr = findRowsWithPattern(
matrix, height, width, startRow, startColumn, START_PATTERN,
@@ -192,7 +192,7 @@ CFX_PtrArray* CBC_Detector::findRowsWithPattern(CBC_CommonBitMatrix* matrix, int32_t startColumn,
int32_t* pattern,
int32_t patternLength) {
- CFX_PtrArray* result = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* result = new CFX_PtrArray;
result->SetSize(4);
FX_BOOL found = FALSE;
CFX_Int32Array counters;
@@ -214,9 +214,9 @@ CFX_PtrArray* CBC_Detector::findRowsWithPattern(CBC_CommonBitMatrix* matrix, break;
}
}
- result->SetAt(0, FX_NEW CBC_ResultPoint((FX_FLOAT)loc->GetAt(0),
+ result->SetAt(0, new CBC_ResultPoint((FX_FLOAT)loc->GetAt(0),
(FX_FLOAT)startRow));
- result->SetAt(1, FX_NEW CBC_ResultPoint((FX_FLOAT)loc->GetAt(1),
+ result->SetAt(1, new CBC_ResultPoint((FX_FLOAT)loc->GetAt(1),
(FX_FLOAT)startRow));
found = TRUE;
delete loc;
@@ -249,9 +249,9 @@ CFX_PtrArray* CBC_Detector::findRowsWithPattern(CBC_CommonBitMatrix* matrix, delete loc;
}
stopRow -= skippedRowCount + 1;
- result->SetAt(2, FX_NEW CBC_ResultPoint((FX_FLOAT)previousRowLoc.GetAt(0),
+ result->SetAt(2, new CBC_ResultPoint((FX_FLOAT)previousRowLoc.GetAt(0),
(FX_FLOAT)stopRow));
- result->SetAt(3, FX_NEW CBC_ResultPoint((FX_FLOAT)previousRowLoc.GetAt(1),
+ result->SetAt(3, new CBC_ResultPoint((FX_FLOAT)previousRowLoc.GetAt(1),
(FX_FLOAT)stopRow));
}
if (stopRow - startRow < BARCODE_MIN_HEIGHT) {
@@ -275,7 +275,7 @@ CFX_Int32Array* CBC_Detector::findGuardPattern(CBC_CommonBitMatrix* matrix, FX_BOOL isWhite = whiteFirst;
int32_t patternStart = column;
int32_t pixelDrift = 0;
- CFX_Int32Array* intarray = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* intarray = new CFX_Int32Array;
while (matrix->Get(patternStart, row) && patternStart > 0 &&
pixelDrift++ < MAX_PIXEL_DRIFT) {
patternStart--;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp index 344e4b8d5b..a0d8b697d0 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp @@ -28,7 +28,7 @@ CBC_PDF417ECModulusGF* CBC_PDF417ECErrorCorrection::m_field = NULL;
void CBC_PDF417ECErrorCorrection::Initialize(int32_t& e) {
m_field =
- FX_NEW CBC_PDF417ECModulusGF(CBC_PDF417Common::NUMBER_OF_CODEWORDS, 3, e);
+ new CBC_PDF417ECModulusGF(CBC_PDF417Common::NUMBER_OF_CODEWORDS, 3, e);
}
void CBC_PDF417ECErrorCorrection::Finalize() {
delete m_field;
@@ -55,7 +55,7 @@ int32_t CBC_PDF417ECErrorCorrection::decode(CFX_Int32Array& received, return 0;
}
CBC_PDF417ECModulusPoly* syndrome =
- FX_NEW CBC_PDF417ECModulusPoly(m_field, S, e);
+ new CBC_PDF417ECModulusPoly(m_field, S, e);
BC_EXCEPTION_CHECK_ReturnValue(e, -1);
CBC_PDF417ECModulusPoly* buildmonomial =
m_field->buildMonomial(numECCodewords, 1, e);
@@ -321,7 +321,7 @@ CFX_PtrArray* CBC_PDF417ECErrorCorrection::runEuclideanAlgorithm( delete rtemp;
}
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
- CFX_PtrArray* modulusPoly = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* modulusPoly = new CFX_PtrArray;
modulusPoly->Add(sigma);
modulusPoly->Add(omega);
return modulusPoly;
@@ -330,7 +330,7 @@ CFX_Int32Array* CBC_PDF417ECErrorCorrection::findErrorLocations( CBC_PDF417ECModulusPoly* errorLocator,
int32_t& e) {
int32_t numErrors = errorLocator->getDegree();
- CFX_Int32Array* result = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* result = new CFX_Int32Array;
result->SetSize(numErrors);
int32_t ee = 0;
for (int32_t i = 1; i < m_field->getSize() && ee < numErrors; i++) {
@@ -366,7 +366,7 @@ CFX_Int32Array* CBC_PDF417ECErrorCorrection::findErrorMagnitudes( formalDerivativeCoefficients, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
int32_t s = errorLocations.GetSize();
- CFX_Int32Array* result = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* result = new CFX_Int32Array;
result->SetSize(s);
for (int32_t i = 0; i < s; i++) {
int32_t xiInverse = m_field->inverse(errorLocations[i], e);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp index 029a5e5946..6f3462cb1c 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp @@ -27,7 +27,7 @@ CBC_PDF417ECModulusGF* CBC_PDF417ECModulusGF::PDF417_GF = NULL;
void CBC_PDF417ECModulusGF::Initialize(int32_t& e) {
PDF417_GF =
- FX_NEW CBC_PDF417ECModulusGF(CBC_PDF417Common::NUMBER_OF_CODEWORDS, 3, e);
+ new CBC_PDF417ECModulusGF(CBC_PDF417Common::NUMBER_OF_CODEWORDS, 3, e);
}
void CBC_PDF417ECModulusGF::Finalize() {
delete PDF417_GF;
@@ -48,10 +48,10 @@ CBC_PDF417ECModulusGF::CBC_PDF417ECModulusGF(int32_t modulus, }
CFX_Int32Array zero;
zero.Add(0);
- m_zero = FX_NEW CBC_PDF417ECModulusPoly(this, zero, e);
+ m_zero = new CBC_PDF417ECModulusPoly(this, zero, e);
CFX_Int32Array one;
one.Add(1);
- m_one = FX_NEW CBC_PDF417ECModulusPoly(this, one, e);
+ m_one = new CBC_PDF417ECModulusPoly(this, one, e);
}
CBC_PDF417ECModulusGF::~CBC_PDF417ECModulusGF() {
delete m_zero;
@@ -73,7 +73,7 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusGF::buildMonomial( }
CBC_PDF417ECModulusPoly* modulusPoly = NULL;
if (coefficient == 0) {
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(m_zero->getField(),
+ modulusPoly = new CBC_PDF417ECModulusPoly(m_zero->getField(),
m_zero->getCoefficients(), e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
@@ -81,7 +81,7 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusGF::buildMonomial( CFX_Int32Array coefficients;
coefficients.SetSize(degree + 1);
coefficients[0] = coefficient;
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(this, coefficients, e);
+ modulusPoly = new CBC_PDF417ECModulusPoly(this, coefficients, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp index f05a4a05fc..423a70029e 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp @@ -93,13 +93,13 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::add( int32_t& e) {
CBC_PDF417ECModulusPoly* modulusPoly = NULL;
if (isZero()) {
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(other->getField(),
+ modulusPoly = new CBC_PDF417ECModulusPoly(other->getField(),
other->getCoefficients(), e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
if (other->isZero()) {
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(m_field, m_coefficients, e);
+ modulusPoly = new CBC_PDF417ECModulusPoly(m_field, m_coefficients, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
@@ -124,7 +124,7 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::add( sumDiff[i] = m_field->add(smallerCoefficients[i - lengthDiff],
largerCoefficients[i]);
}
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(m_field, sumDiff, e);
+ modulusPoly = new CBC_PDF417ECModulusPoly(m_field, sumDiff, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
@@ -133,7 +133,7 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::subtract( int32_t& e) {
CBC_PDF417ECModulusPoly* modulusPoly = NULL;
if (other->isZero()) {
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(m_field, m_coefficients, e);
+ modulusPoly = new CBC_PDF417ECModulusPoly(m_field, m_coefficients, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
@@ -149,7 +149,7 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::multiply( int32_t& e) {
CBC_PDF417ECModulusPoly* modulusPoly = NULL;
if (isZero() || other->isZero()) {
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(
+ modulusPoly = new CBC_PDF417ECModulusPoly(
m_field->getZero()->getField(), m_field->getZero()->getCoefficients(),
e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
@@ -170,7 +170,7 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::multiply( product[i + j], m_field->multiply(aCoeff, bCoefficients[j]));
}
}
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(m_field, product, e);
+ modulusPoly = new CBC_PDF417ECModulusPoly(m_field, product, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
@@ -182,7 +182,7 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::negative(int32_t& e) { negativeCoefficients[i] = m_field->subtract(0, m_coefficients[i]);
}
CBC_PDF417ECModulusPoly* modulusPoly =
- FX_NEW CBC_PDF417ECModulusPoly(m_field, negativeCoefficients, e);
+ new CBC_PDF417ECModulusPoly(m_field, negativeCoefficients, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
@@ -190,14 +190,14 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::multiply(int32_t scalar, int32_t& e) {
CBC_PDF417ECModulusPoly* modulusPoly = NULL;
if (scalar == 0) {
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(
+ modulusPoly = new CBC_PDF417ECModulusPoly(
m_field->getZero()->getField(), m_field->getZero()->getCoefficients(),
e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
if (scalar == 1) {
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(m_field, m_coefficients, e);
+ modulusPoly = new CBC_PDF417ECModulusPoly(m_field, m_coefficients, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
@@ -207,7 +207,7 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::multiply(int32_t scalar, for (int32_t i = 0; i < size; i++) {
product[i] = m_field->multiply(m_coefficients[i], scalar);
}
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(m_field, product, e);
+ modulusPoly = new CBC_PDF417ECModulusPoly(m_field, product, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
@@ -221,7 +221,7 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::multiplyByMonomial( }
CBC_PDF417ECModulusPoly* modulusPoly = NULL;
if (coefficient == 0) {
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(
+ modulusPoly = new CBC_PDF417ECModulusPoly(
m_field->getZero()->m_field, m_field->getZero()->m_coefficients, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
@@ -232,7 +232,7 @@ CBC_PDF417ECModulusPoly* CBC_PDF417ECModulusPoly::multiplyByMonomial( for (int32_t i = 0; i < size; i++) {
product[i] = m_field->multiply(m_coefficients[i], coefficient);
}
- modulusPoly = FX_NEW CBC_PDF417ECModulusPoly(m_field, product, e);
+ modulusPoly = new CBC_PDF417ECModulusPoly(m_field, product, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return modulusPoly;
}
@@ -242,11 +242,11 @@ CFX_PtrArray* CBC_PDF417ECModulusPoly::divide(CBC_PDF417ECModulusPoly* other, e = BCExceptionDivideByZero;
return NULL;
}
- CBC_PDF417ECModulusPoly* quotient = FX_NEW CBC_PDF417ECModulusPoly(
+ CBC_PDF417ECModulusPoly* quotient = new CBC_PDF417ECModulusPoly(
m_field->getZero()->m_field, m_field->getZero()->m_coefficients, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
CBC_PDF417ECModulusPoly* remainder =
- FX_NEW CBC_PDF417ECModulusPoly(m_field, m_coefficients, e);
+ new CBC_PDF417ECModulusPoly(m_field, m_coefficients, e);
if (e != BCExceptionNO) {
delete quotient;
return NULL;
@@ -296,7 +296,7 @@ CFX_PtrArray* CBC_PDF417ECModulusPoly::divide(CBC_PDF417ECModulusPoly* other, return NULL;
}
}
- CFX_PtrArray* modulusPoly = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* modulusPoly = new CFX_PtrArray;
modulusPoly->Add(quotient);
modulusPoly->Add(remainder);
return modulusPoly;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp index 781fdb81d0..7427b311c9 100644 --- a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp +++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp @@ -47,7 +47,7 @@ CBC_PDF417ECErrorCorrection* CBC_PDF417ScanningDecoder::errorCorrection = NULL; CBC_PDF417ScanningDecoder::CBC_PDF417ScanningDecoder() {}
CBC_PDF417ScanningDecoder::~CBC_PDF417ScanningDecoder() {}
void CBC_PDF417ScanningDecoder::Initialize() {
- errorCorrection = FX_NEW CBC_PDF417ECErrorCorrection;
+ errorCorrection = new CBC_PDF417ECErrorCorrection;
}
void CBC_PDF417ScanningDecoder::Finalize() {
delete errorCorrection;
@@ -61,7 +61,7 @@ CBC_CommonDecoderResult* CBC_PDF417ScanningDecoder::decode( int32_t minCodewordWidth,
int32_t maxCodewordWidth,
int32_t& e) {
- CBC_BoundingBox* boundingBox = FX_NEW CBC_BoundingBox(
+ CBC_BoundingBox* boundingBox = new CBC_BoundingBox(
image, imageTopLeft, imageBottomLeft, imageTopRight, imageBottomRight, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
CBC_DetectionResultRowIndicatorColumn* leftRowIndicatorColumn = NULL;
@@ -111,10 +111,10 @@ CBC_CommonDecoderResult* CBC_PDF417ScanningDecoder::decode( }
CBC_DetectionResultColumn* detectionResultColumn = NULL;
if (barcodeColumn == 0 || barcodeColumn == maxBarcodeColumn) {
- detectionResultColumn = FX_NEW CBC_DetectionResultRowIndicatorColumn(
+ detectionResultColumn = new CBC_DetectionResultRowIndicatorColumn(
boundingBox, barcodeColumn == 0);
} else {
- detectionResultColumn = FX_NEW CBC_DetectionResultColumn(boundingBox);
+ detectionResultColumn = new CBC_DetectionResultColumn(boundingBox);
}
detectionResult->setDetectionResultColumn(barcodeColumn,
detectionResultColumn);
@@ -207,7 +207,7 @@ CBC_DetectionResult* CBC_PDF417ScanningDecoder::merge( return NULL;
}
CBC_DetectionResult* detectionresult =
- FX_NEW CBC_DetectionResult(barcodeMetadata, boundingBox);
+ new CBC_DetectionResult(barcodeMetadata, boundingBox);
return detectionresult;
}
CBC_BoundingBox* CBC_PDF417ScanningDecoder::adjustBoundingBox(
@@ -297,7 +297,7 @@ CBC_PDF417ScanningDecoder::getRowIndicatorColumn(CBC_CommonBitMatrix* image, int32_t minCodewordWidth,
int32_t maxCodewordWidth) {
CBC_DetectionResultRowIndicatorColumn* rowIndicatorColumn =
- FX_NEW CBC_DetectionResultRowIndicatorColumn(boundingBox, leftToRight);
+ new CBC_DetectionResultRowIndicatorColumn(boundingBox, leftToRight);
for (int32_t i = 0; i < 2; i++) {
int32_t increment = i == 0 ? 1 : -1;
int32_t startColumn = (int32_t)startPoint.GetX();
@@ -459,16 +459,16 @@ CBC_PDF417ScanningDecoder::createDecoderResultFromAmbiguousValues( }
CFX_PtrArray* CBC_PDF417ScanningDecoder::createBarcodeMatrix(
CBC_DetectionResult* detectionResult) {
- CFX_PtrArray* barcodeMatrix = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* barcodeMatrix = new CFX_PtrArray;
barcodeMatrix->SetSize(detectionResult->getBarcodeRowCount());
CFX_PtrArray* temp = NULL;
int32_t colume = 0;
for (int32_t row = 0; row < barcodeMatrix->GetSize(); row++) {
- temp = FX_NEW CFX_PtrArray;
+ temp = new CFX_PtrArray;
temp->SetSize(detectionResult->getBarcodeColumnCount() + 2);
for (colume = 0; colume < detectionResult->getBarcodeColumnCount() + 2;
colume++) {
- temp->SetAt(colume, FX_NEW CBC_BarcodeValue());
+ temp->SetAt(colume, new CBC_BarcodeValue());
}
barcodeMatrix->SetAt(row, temp);
}
@@ -590,7 +590,7 @@ CBC_Codeword* CBC_PDF417ScanningDecoder::detectCodeword( if (codeword == -1) {
return NULL;
}
- return FX_NEW CBC_Codeword(startColumn, endColumn,
+ return new CBC_Codeword(startColumn, endColumn,
getCodewordBucketNumber(decodedValue), codeword);
}
CFX_Int32Array* CBC_PDF417ScanningDecoder::getModuleBitCount(
@@ -601,7 +601,7 @@ CFX_Int32Array* CBC_PDF417ScanningDecoder::getModuleBitCount( int32_t startColumn,
int32_t imageRow) {
int32_t imageColumn = startColumn;
- CFX_Int32Array* moduleBitCount = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* moduleBitCount = new CFX_Int32Array;
moduleBitCount->SetSize(8);
int32_t moduleNumber = 0;
int32_t increment = leftToRight ? 1 : -1;
@@ -721,7 +721,7 @@ void CBC_PDF417ScanningDecoder::verifyCodewordCount(CFX_Int32Array& codewords, }
CFX_Int32Array* CBC_PDF417ScanningDecoder::getBitCountForCodeword(
int32_t codeword) {
- CFX_Int32Array* result = FX_NEW CFX_Int32Array;
+ CFX_Int32Array* result = new CFX_Int32Array;
result->SetSize(8);
int32_t previousValue = 0;
int32_t i = result->GetSize() - 1;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp index 72738cd8d9..79066fe83e 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp @@ -45,5 +45,5 @@ FX_BOOL CBC_QRAlignmentPattern::AboutEquals(FX_FLOAT moduleSize, return FALSE;
}
CBC_QRAlignmentPattern* CBC_QRAlignmentPattern::Clone() {
- return FX_NEW CBC_QRAlignmentPattern(m_x, m_y, m_moduleSize);
+ return new CBC_QRAlignmentPattern(m_x, m_y, m_moduleSize);
}
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp index 6c08f42b07..f8af90b106 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp @@ -192,12 +192,12 @@ CBC_QRAlignmentPattern* CBC_QRAlignmentPatternFinder::HandlePossibleCenter( CBC_QRAlignmentPattern* center =
(CBC_QRAlignmentPattern*)(m_possibleCenters[index]);
if (center->AboutEquals(estimatedModuleSize, centerI, centerJ)) {
- return FX_NEW CBC_QRAlignmentPattern(centerJ, centerI,
+ return new CBC_QRAlignmentPattern(centerJ, centerI,
estimatedModuleSize);
}
}
m_possibleCenters.Add(
- FX_NEW CBC_QRAlignmentPattern(centerJ, centerI, estimatedModuleSize));
+ new CBC_QRAlignmentPattern(centerJ, centerI, estimatedModuleSize));
}
return NULL;
}
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp index f0e03e656d..ad8bd566bf 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp @@ -147,7 +147,7 @@ CFX_ByteArray* CBC_QRBitMatrixParser::ReadCodewords(int32_t& e) { BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
CBC_AutoPtr<CBC_CommonBitMatrix> functionPattern(cbm);
FX_BOOL readingUp = TRUE;
- CFX_ByteArray* temp = FX_NEW CFX_ByteArray;
+ CFX_ByteArray* temp = new CFX_ByteArray;
temp->SetSize(version->GetTotalCodeWords());
CBC_AutoPtr<CFX_ByteArray> result(temp);
int32_t resultOffset = 0;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp index f3ea7eab7d..05635917bd 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp @@ -42,7 +42,7 @@ #include "BC_QRCoderVersion.h"
CBC_QRCodeReader::CBC_QRCodeReader() : m_decoder(NULL) {}
void CBC_QRCodeReader::Init() {
- m_decoder = FX_NEW CBC_QRCoderDecoder;
+ m_decoder = new CBC_QRCoderDecoder;
m_decoder->Init();
}
CBC_QRCodeReader::~CBC_QRCodeReader() {
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp index f03adf5030..e78d266277 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp @@ -36,7 +36,7 @@ CBC_QRCoderDecoder::CBC_QRCoderDecoder() { }
void CBC_QRCoderDecoder::Init() {
- m_rsDecoder = FX_NEW CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256::QRCodeFild);
+ m_rsDecoder = new CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256::QRCodeFild);
}
CBC_QRCoderDecoder::~CBC_QRCoderDecoder() {
if (m_rsDecoder != NULL) {
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp index 8263640f31..f084660d8a 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp @@ -146,7 +146,7 @@ void CBC_QRCoderEncoder::SplitString(const CFX_ByteString& content, index += 2;
}
if (index != flag) {
- result.Add(FX_NEW Make_Pair(CBC_QRCoderMode::sGBK,
+ result.Add(new Make_Pair(CBC_QRCoderMode::sGBK,
content.Mid(flag, index - flag)));
}
flag = index;
@@ -170,7 +170,7 @@ void CBC_QRCoderEncoder::SplitString(const CFX_ByteString& content, }
}
if (index != flag) {
- result.Add(FX_NEW Make_Pair(CBC_QRCoderMode::sBYTE,
+ result.Add(new Make_Pair(CBC_QRCoderMode::sBYTE,
content.Mid(flag, index - flag)));
}
flag = index;
@@ -182,7 +182,7 @@ void CBC_QRCoderEncoder::SplitString(const CFX_ByteString& content, index++;
}
if (index != flag) {
- result.Add(FX_NEW Make_Pair(CBC_QRCoderMode::sNUMERIC,
+ result.Add(new Make_Pair(CBC_QRCoderMode::sNUMERIC,
content.Mid(flag, index - flag)));
}
flag = index;
@@ -194,7 +194,7 @@ void CBC_QRCoderEncoder::SplitString(const CFX_ByteString& content, index++;
}
if (index != flag) {
- result.Add(FX_NEW Make_Pair(CBC_QRCoderMode::sALPHANUMERIC,
+ result.Add(new Make_Pair(CBC_QRCoderMode::sALPHANUMERIC,
content.Mid(flag, index - flag)));
}
flag = index;
@@ -405,7 +405,7 @@ void CBC_QRCoderEncoder::EncodeWithSpecifyVersion( qrCode->GetNumDataBytes(), qrCode->GetNumRSBlocks(),
&finalBits, e);
BC_EXCEPTION_CHECK_ReturnVoid(e);
- CBC_CommonByteMatrix* pDecoder = FX_NEW CBC_CommonByteMatrix(
+ CBC_CommonByteMatrix* pDecoder = new CBC_CommonByteMatrix(
qrCode->GetMatrixWidth(), qrCode->GetMatrixWidth());
pDecoder->Init();
CBC_AutoPtr<CBC_CommonByteMatrix> matrix(pDecoder);
@@ -496,7 +496,7 @@ catchException: qrCode->GetNumDataBytes(), qrCode->GetNumRSBlocks(),
&finalBits, e);
BC_EXCEPTION_CHECK_ReturnVoid(e);
- CBC_CommonByteMatrix* pDecoder = FX_NEW CBC_CommonByteMatrix(
+ CBC_CommonByteMatrix* pDecoder = new CBC_CommonByteMatrix(
qrCode->GetMatrixWidth(), qrCode->GetMatrixWidth());
pDecoder->Init();
CBC_AutoPtr<CBC_CommonByteMatrix> matrix(pDecoder);
@@ -547,7 +547,7 @@ void CBC_QRCoderEncoder::Encode(const CFX_WideString& content, qrCode->GetNumDataBytes(), qrCode->GetNumRSBlocks(),
&finalBits, e);
BC_EXCEPTION_CHECK_ReturnVoid(e);
- CBC_CommonByteMatrix* pDecoder = FX_NEW CBC_CommonByteMatrix(
+ CBC_CommonByteMatrix* pDecoder = new CBC_CommonByteMatrix(
qrCode->GetMatrixWidth(), qrCode->GetMatrixWidth());
pDecoder->Init();
CBC_AutoPtr<CBC_CommonByteMatrix> matrix(pDecoder);
@@ -870,12 +870,12 @@ void CBC_QRCoderEncoder::InterleaveWithECBytes(CBC_QRCoderBitVector* bits, GetNumDataBytesAndNumECBytesForBlockID(numTotalBytes, numDataBytes,
numRSBlocks, i, numDataBytesInBlock,
numEcBytesInBlosk);
- CBC_CommonByteArray* dataBytes = FX_NEW CBC_CommonByteArray;
+ CBC_CommonByteArray* dataBytes = new CBC_CommonByteArray;
dataBytes->Set(bits->GetArray(), dataBytesOffset, numDataBytesInBlock);
CBC_CommonByteArray* ecBytes =
GenerateECBytes(dataBytes, numEcBytesInBlosk, e);
BC_EXCEPTION_CHECK_ReturnVoid(e);
- blocks.Add(FX_NEW CBC_QRCoderBlockPair(dataBytes, ecBytes));
+ blocks.Add(new CBC_QRCoderBlockPair(dataBytes, ecBytes));
maxNumDataBytes = FX_MAX(maxNumDataBytes, dataBytes->Size());
maxNumEcBytes = FX_MAX(maxNumEcBytes, ecBytes->Size());
dataBytesOffset += numDataBytesInBlock;
@@ -952,7 +952,7 @@ CBC_CommonByteArray* CBC_QRCoderEncoder::GenerateECBytes( encode.Init();
encode.Encode(&toEncode, numEcBytesInBlock, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
- CBC_CommonByteArray* ecBytes = FX_NEW CBC_CommonByteArray(numEcBytesInBlock);
+ CBC_CommonByteArray* ecBytes = new CBC_CommonByteArray(numEcBytesInBlock);
for (int32_t j = 0; j < numEcBytesInBlock; j++) {
ecBytes->Set(j, toEncode[numDataBytes + j]);
}
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp index 0f43ab2939..52265000c1 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp @@ -36,10 +36,10 @@ CBC_QRCoderErrorCorrectionLevel::CBC_QRCoderErrorCorrectionLevel( }
CBC_QRCoderErrorCorrectionLevel::~CBC_QRCoderErrorCorrectionLevel() {}
void CBC_QRCoderErrorCorrectionLevel::Initialize() {
- L = FX_NEW CBC_QRCoderErrorCorrectionLevel(0, 0x01, (FX_CHAR*)"L");
- M = FX_NEW CBC_QRCoderErrorCorrectionLevel(1, 0x00, (FX_CHAR*)"M");
- Q = FX_NEW CBC_QRCoderErrorCorrectionLevel(2, 0x03, (FX_CHAR*)"Q");
- H = FX_NEW CBC_QRCoderErrorCorrectionLevel(3, 0x02, (FX_CHAR*)"H");
+ L = new CBC_QRCoderErrorCorrectionLevel(0, 0x01, (FX_CHAR*)"L");
+ M = new CBC_QRCoderErrorCorrectionLevel(1, 0x00, (FX_CHAR*)"M");
+ Q = new CBC_QRCoderErrorCorrectionLevel(2, 0x03, (FX_CHAR*)"Q");
+ H = new CBC_QRCoderErrorCorrectionLevel(3, 0x02, (FX_CHAR*)"H");
}
void CBC_QRCoderErrorCorrectionLevel::Finalize() {
delete L;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp index 07d8d7187a..7f605c3ea5 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp @@ -79,7 +79,7 @@ CBC_QRCoderFormatInformation::DoDecodeFormatInformation( int32_t const* decodeInfo = &FORMAT_INFO_DECODE_LOOKUP[i][0];
int32_t targetInfo = decodeInfo[0];
if (targetInfo == maskedFormatInfo) {
- return FX_NEW CBC_QRCoderFormatInformation(decodeInfo[1]);
+ return new CBC_QRCoderFormatInformation(decodeInfo[1]);
}
int32_t bitsDifference = NumBitsDiffering(maskedFormatInfo, targetInfo);
if (bitsDifference < bestDifference) {
@@ -88,7 +88,7 @@ CBC_QRCoderFormatInformation::DoDecodeFormatInformation( }
}
if (bestDifference <= 3) {
- return FX_NEW CBC_QRCoderFormatInformation(bestFormatInfo);
+ return new CBC_QRCoderFormatInformation(bestFormatInfo);
}
return NULL;
}
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp index 542c8dad00..e910c3fb6c 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp @@ -54,22 +54,22 @@ CBC_QRCoderMode::~CBC_QRCoderMode() { }
}
void CBC_QRCoderMode::Initialize() {
- sBYTE = FX_NEW CBC_QRCoderMode(FX_Alloc(int32_t, 3), 8, 16, 16, 0x4, "BYTE");
- sALPHANUMERIC = FX_NEW CBC_QRCoderMode(FX_Alloc(int32_t, 3), 9, 11, 13, 0x2,
+ sBYTE = new CBC_QRCoderMode(FX_Alloc(int32_t, 3), 8, 16, 16, 0x4, "BYTE");
+ sALPHANUMERIC = new CBC_QRCoderMode(FX_Alloc(int32_t, 3), 9, 11, 13, 0x2,
"ALPHANUMERIC");
- sECI = FX_NEW CBC_QRCoderMode(NULL, 0, 0, 0, 0x7, "ECI");
+ sECI = new CBC_QRCoderMode(NULL, 0, 0, 0, 0x7, "ECI");
sKANJI =
- FX_NEW CBC_QRCoderMode(FX_Alloc(int32_t, 3), 8, 10, 12, 0x8, "KANJI");
+ new CBC_QRCoderMode(FX_Alloc(int32_t, 3), 8, 10, 12, 0x8, "KANJI");
sNUMERIC =
- FX_NEW CBC_QRCoderMode(FX_Alloc(int32_t, 3), 10, 12, 14, 0x1, "NUMERIC");
- sGBK = FX_NEW CBC_QRCoderMode(FX_Alloc(int32_t, 3), 8, 10, 12, 0x0D, "GBK");
+ new CBC_QRCoderMode(FX_Alloc(int32_t, 3), 10, 12, 14, 0x1, "NUMERIC");
+ sGBK = new CBC_QRCoderMode(FX_Alloc(int32_t, 3), 8, 10, 12, 0x0D, "GBK");
sTERMINATOR =
- FX_NEW CBC_QRCoderMode(FX_Alloc(int32_t, 3), 0, 0, 0, 0x00, "TERMINATOR");
+ new CBC_QRCoderMode(FX_Alloc(int32_t, 3), 0, 0, 0, 0x00, "TERMINATOR");
sFNC1_FIRST_POSITION =
- FX_NEW CBC_QRCoderMode(NULL, 0, 0, 0, 0x05, "FNC1_FIRST_POSITION");
+ new CBC_QRCoderMode(NULL, 0, 0, 0, 0x05, "FNC1_FIRST_POSITION");
sFNC1_SECOND_POSITION =
- FX_NEW CBC_QRCoderMode(NULL, 0, 0, 0, 0x09, "FNC1_SECOND_POSITION");
- sSTRUCTURED_APPEND = FX_NEW CBC_QRCoderMode(FX_Alloc(int32_t, 3), 0, 0, 0,
+ new CBC_QRCoderMode(NULL, 0, 0, 0, 0x09, "FNC1_SECOND_POSITION");
+ sSTRUCTURED_APPEND = new CBC_QRCoderMode(FX_Alloc(int32_t, 3), 0, 0, 0,
0x03, "STRUCTURED_APPEND");
}
void CBC_QRCoderMode::Finalize() {
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp index 6a3f122ce0..a357bf71a4 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp @@ -37,7 +37,7 @@ const int32_t CBC_QRCoderVersion::VERSION_DECODE_INFO[] = { 0x2379F, 0x24B0B, 0x2542E, 0x26A64, 0x27541, 0x28C69};
CFX_PtrArray* CBC_QRCoderVersion::VERSION = NULL;
void CBC_QRCoderVersion::Initialize() {
- VERSION = FX_NEW CFX_PtrArray();
+ VERSION = new CFX_PtrArray();
}
void CBC_QRCoderVersion::Finalize() {
for (int32_t i = 0; i < VERSION->GetSize(); i++) {
@@ -390,7 +390,7 @@ CBC_QRCoderVersion* CBC_QRCoderVersion::DecodeVersionInformation( }
CBC_CommonBitMatrix* CBC_QRCoderVersion::BuildFunctionPattern(int32_t& e) {
int32_t dimension = GetDimensionForVersion();
- CBC_CommonBitMatrix* bitMatrix = FX_NEW CBC_CommonBitMatrix();
+ CBC_CommonBitMatrix* bitMatrix = new CBC_CommonBitMatrix();
bitMatrix->Init(dimension);
bitMatrix->SetRegion(0, 0, 9, 9, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
@@ -425,334 +425,334 @@ CBC_QRCoderVersion* CBC_QRCoderVersion::GetVersionForNumber( int32_t versionNumber,
int32_t& e) {
if (VERSION->GetSize() == 0) {
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 1, FX_NEW CBC_QRCoderECBlocks(7, FX_NEW CBC_QRCoderECB(1, 19)),
- FX_NEW CBC_QRCoderECBlocks(10, FX_NEW CBC_QRCoderECB(1, 16)),
- FX_NEW CBC_QRCoderECBlocks(13, FX_NEW CBC_QRCoderECB(1, 13)),
- FX_NEW CBC_QRCoderECBlocks(17, FX_NEW CBC_QRCoderECB(1, 9))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 2, FX_NEW CBC_QRCoderECBlocks(10, FX_NEW CBC_QRCoderECB(1, 34)),
- FX_NEW CBC_QRCoderECBlocks(16, FX_NEW CBC_QRCoderECB(1, 28)),
- FX_NEW CBC_QRCoderECBlocks(22, FX_NEW CBC_QRCoderECB(1, 22)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(1, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 3, FX_NEW CBC_QRCoderECBlocks(15, FX_NEW CBC_QRCoderECB(1, 55)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(1, 44)),
- FX_NEW CBC_QRCoderECBlocks(18, FX_NEW CBC_QRCoderECB(2, 17)),
- FX_NEW CBC_QRCoderECBlocks(22, FX_NEW CBC_QRCoderECB(2, 13))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 4, FX_NEW CBC_QRCoderECBlocks(20, FX_NEW CBC_QRCoderECB(1, 80)),
- FX_NEW CBC_QRCoderECBlocks(18, FX_NEW CBC_QRCoderECB(2, 32)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(2, 24)),
- FX_NEW CBC_QRCoderECBlocks(16, FX_NEW CBC_QRCoderECB(4, 9))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 5, FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(1, 108)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(2, 43)),
- FX_NEW CBC_QRCoderECBlocks(18, FX_NEW CBC_QRCoderECB(2, 15),
- FX_NEW CBC_QRCoderECB(2, 16)),
- FX_NEW CBC_QRCoderECBlocks(22, FX_NEW CBC_QRCoderECB(2, 11),
- FX_NEW CBC_QRCoderECB(2, 12))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 6, FX_NEW CBC_QRCoderECBlocks(18, FX_NEW CBC_QRCoderECB(2, 68)),
- FX_NEW CBC_QRCoderECBlocks(16, FX_NEW CBC_QRCoderECB(4, 27)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(4, 19)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(4, 15))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 7, FX_NEW CBC_QRCoderECBlocks(20, FX_NEW CBC_QRCoderECB(2, 78)),
- FX_NEW CBC_QRCoderECBlocks(18, FX_NEW CBC_QRCoderECB(4, 31)),
- FX_NEW CBC_QRCoderECBlocks(18, FX_NEW CBC_QRCoderECB(2, 14),
- FX_NEW CBC_QRCoderECB(4, 15)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(4, 13),
- FX_NEW CBC_QRCoderECB(1, 14))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 8, FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(2, 97)),
- FX_NEW CBC_QRCoderECBlocks(22, FX_NEW CBC_QRCoderECB(2, 38),
- FX_NEW CBC_QRCoderECB(2, 39)),
- FX_NEW CBC_QRCoderECBlocks(22, FX_NEW CBC_QRCoderECB(4, 18),
- FX_NEW CBC_QRCoderECB(2, 19)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(4, 14),
- FX_NEW CBC_QRCoderECB(2, 15))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 9, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(2, 116)),
- FX_NEW CBC_QRCoderECBlocks(22, FX_NEW CBC_QRCoderECB(3, 36),
- FX_NEW CBC_QRCoderECB(2, 37)),
- FX_NEW CBC_QRCoderECBlocks(20, FX_NEW CBC_QRCoderECB(4, 16),
- FX_NEW CBC_QRCoderECB(4, 17)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(4, 12),
- FX_NEW CBC_QRCoderECB(4, 13))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 10, FX_NEW CBC_QRCoderECBlocks(18, FX_NEW CBC_QRCoderECB(2, 68),
- FX_NEW CBC_QRCoderECB(2, 69)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(4, 43),
- FX_NEW CBC_QRCoderECB(1, 44)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(6, 19),
- FX_NEW CBC_QRCoderECB(2, 20)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(6, 15),
- FX_NEW CBC_QRCoderECB(2, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 11, FX_NEW CBC_QRCoderECBlocks(20, FX_NEW CBC_QRCoderECB(4, 81)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(1, 50),
- FX_NEW CBC_QRCoderECB(4, 51)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(4, 22),
- FX_NEW CBC_QRCoderECB(4, 23)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(3, 12),
- FX_NEW CBC_QRCoderECB(8, 13))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 12, FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(2, 92),
- FX_NEW CBC_QRCoderECB(2, 93)),
- FX_NEW CBC_QRCoderECBlocks(22, FX_NEW CBC_QRCoderECB(6, 36),
- FX_NEW CBC_QRCoderECB(2, 37)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(4, 20),
- FX_NEW CBC_QRCoderECB(6, 21)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(7, 14),
- FX_NEW CBC_QRCoderECB(4, 15))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 13, FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(4, 107)),
- FX_NEW CBC_QRCoderECBlocks(22, FX_NEW CBC_QRCoderECB(8, 37),
- FX_NEW CBC_QRCoderECB(1, 38)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(8, 20),
- FX_NEW CBC_QRCoderECB(4, 21)),
- FX_NEW CBC_QRCoderECBlocks(22, FX_NEW CBC_QRCoderECB(12, 11),
- FX_NEW CBC_QRCoderECB(4, 12))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 14, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(3, 115),
- FX_NEW CBC_QRCoderECB(1, 116)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(4, 40),
- FX_NEW CBC_QRCoderECB(5, 41)),
- FX_NEW CBC_QRCoderECBlocks(20, FX_NEW CBC_QRCoderECB(11, 16),
- FX_NEW CBC_QRCoderECB(5, 17)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(11, 12),
- FX_NEW CBC_QRCoderECB(5, 13))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 15, FX_NEW CBC_QRCoderECBlocks(22, FX_NEW CBC_QRCoderECB(5, 87),
- FX_NEW CBC_QRCoderECB(1, 88)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(5, 41),
- FX_NEW CBC_QRCoderECB(5, 42)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(5, 24),
- FX_NEW CBC_QRCoderECB(7, 25)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(11, 12),
- FX_NEW CBC_QRCoderECB(7, 13))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 16, FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(5, 98),
- FX_NEW CBC_QRCoderECB(1, 99)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(7, 45),
- FX_NEW CBC_QRCoderECB(3, 46)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(15, 19),
- FX_NEW CBC_QRCoderECB(2, 20)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(3, 15),
- FX_NEW CBC_QRCoderECB(13, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 17, FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(1, 107),
- FX_NEW CBC_QRCoderECB(5, 108)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(10, 46),
- FX_NEW CBC_QRCoderECB(1, 47)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(1, 22),
- FX_NEW CBC_QRCoderECB(15, 23)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(2, 14),
- FX_NEW CBC_QRCoderECB(17, 15))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 18, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(5, 120),
- FX_NEW CBC_QRCoderECB(1, 121)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(9, 43),
- FX_NEW CBC_QRCoderECB(4, 44)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(17, 22),
- FX_NEW CBC_QRCoderECB(1, 23)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(2, 14),
- FX_NEW CBC_QRCoderECB(19, 15))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 19, FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(3, 113),
- FX_NEW CBC_QRCoderECB(4, 114)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(3, 44),
- FX_NEW CBC_QRCoderECB(11, 45)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(17, 21),
- FX_NEW CBC_QRCoderECB(4, 22)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(9, 13),
- FX_NEW CBC_QRCoderECB(16, 14))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 20, FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(3, 107),
- FX_NEW CBC_QRCoderECB(5, 108)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(3, 41),
- FX_NEW CBC_QRCoderECB(13, 42)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(15, 24),
- FX_NEW CBC_QRCoderECB(5, 25)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(15, 15),
- FX_NEW CBC_QRCoderECB(10, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 21, FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(4, 116),
- FX_NEW CBC_QRCoderECB(4, 117)),
- FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(17, 42)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(17, 22),
- FX_NEW CBC_QRCoderECB(6, 23)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(19, 16),
- FX_NEW CBC_QRCoderECB(6, 17))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 22, FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(2, 111),
- FX_NEW CBC_QRCoderECB(7, 112)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(17, 46)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(7, 24),
- FX_NEW CBC_QRCoderECB(16, 25)),
- FX_NEW CBC_QRCoderECBlocks(24, FX_NEW CBC_QRCoderECB(34, 13))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 23, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(4, 121),
- FX_NEW CBC_QRCoderECB(5, 122)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(4, 47),
- FX_NEW CBC_QRCoderECB(14, 48)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(11, 24),
- FX_NEW CBC_QRCoderECB(14, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(16, 15),
- FX_NEW CBC_QRCoderECB(14, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 24, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(6, 117),
- FX_NEW CBC_QRCoderECB(4, 118)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(6, 45),
- FX_NEW CBC_QRCoderECB(14, 46)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(11, 24),
- FX_NEW CBC_QRCoderECB(16, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(30, 16),
- FX_NEW CBC_QRCoderECB(2, 17))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 25, FX_NEW CBC_QRCoderECBlocks(26, FX_NEW CBC_QRCoderECB(8, 106),
- FX_NEW CBC_QRCoderECB(4, 107)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(8, 47),
- FX_NEW CBC_QRCoderECB(13, 48)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(7, 24),
- FX_NEW CBC_QRCoderECB(22, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(22, 15),
- FX_NEW CBC_QRCoderECB(13, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 26, FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(10, 114),
- FX_NEW CBC_QRCoderECB(2, 115)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(19, 46),
- FX_NEW CBC_QRCoderECB(4, 47)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(28, 22),
- FX_NEW CBC_QRCoderECB(6, 23)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(33, 16),
- FX_NEW CBC_QRCoderECB(4, 17))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 27, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(8, 122),
- FX_NEW CBC_QRCoderECB(4, 123)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(22, 45),
- FX_NEW CBC_QRCoderECB(3, 46)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(8, 23),
- FX_NEW CBC_QRCoderECB(26, 24)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(12, 15),
- FX_NEW CBC_QRCoderECB(28, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 28, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(3, 117),
- FX_NEW CBC_QRCoderECB(10, 118)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(3, 45),
- FX_NEW CBC_QRCoderECB(23, 46)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(4, 24),
- FX_NEW CBC_QRCoderECB(31, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(11, 15),
- FX_NEW CBC_QRCoderECB(31, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 29, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(7, 116),
- FX_NEW CBC_QRCoderECB(7, 117)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(21, 45),
- FX_NEW CBC_QRCoderECB(7, 46)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(1, 23),
- FX_NEW CBC_QRCoderECB(37, 24)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(19, 15),
- FX_NEW CBC_QRCoderECB(26, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 30, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(5, 115),
- FX_NEW CBC_QRCoderECB(10, 116)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(19, 47),
- FX_NEW CBC_QRCoderECB(10, 48)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(15, 24),
- FX_NEW CBC_QRCoderECB(25, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(23, 15),
- FX_NEW CBC_QRCoderECB(25, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 31, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(13, 115),
- FX_NEW CBC_QRCoderECB(3, 116)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(2, 46),
- FX_NEW CBC_QRCoderECB(29, 47)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(42, 24),
- FX_NEW CBC_QRCoderECB(1, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(23, 15),
- FX_NEW CBC_QRCoderECB(28, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 32, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(17, 115)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(10, 46),
- FX_NEW CBC_QRCoderECB(23, 47)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(10, 24),
- FX_NEW CBC_QRCoderECB(35, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(19, 15),
- FX_NEW CBC_QRCoderECB(35, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 33, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(17, 115),
- FX_NEW CBC_QRCoderECB(1, 116)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(14, 46),
- FX_NEW CBC_QRCoderECB(21, 47)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(29, 24),
- FX_NEW CBC_QRCoderECB(19, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(11, 15),
- FX_NEW CBC_QRCoderECB(46, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 34, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(13, 115),
- FX_NEW CBC_QRCoderECB(6, 116)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(14, 46),
- FX_NEW CBC_QRCoderECB(23, 47)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(44, 24),
- FX_NEW CBC_QRCoderECB(7, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(59, 16),
- FX_NEW CBC_QRCoderECB(1, 17))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 35, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(12, 121),
- FX_NEW CBC_QRCoderECB(7, 122)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(12, 47),
- FX_NEW CBC_QRCoderECB(26, 48)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(39, 24),
- FX_NEW CBC_QRCoderECB(14, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(22, 15),
- FX_NEW CBC_QRCoderECB(41, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 36, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(6, 121),
- FX_NEW CBC_QRCoderECB(14, 122)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(6, 47),
- FX_NEW CBC_QRCoderECB(34, 48)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(46, 24),
- FX_NEW CBC_QRCoderECB(10, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(2, 15),
- FX_NEW CBC_QRCoderECB(64, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 37, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(17, 122),
- FX_NEW CBC_QRCoderECB(4, 123)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(29, 46),
- FX_NEW CBC_QRCoderECB(14, 47)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(49, 24),
- FX_NEW CBC_QRCoderECB(10, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(24, 15),
- FX_NEW CBC_QRCoderECB(46, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 38, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(4, 122),
- FX_NEW CBC_QRCoderECB(18, 123)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(13, 46),
- FX_NEW CBC_QRCoderECB(32, 47)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(48, 24),
- FX_NEW CBC_QRCoderECB(14, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(42, 15),
- FX_NEW CBC_QRCoderECB(32, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 39, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(20, 117),
- FX_NEW CBC_QRCoderECB(4, 118)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(40, 47),
- FX_NEW CBC_QRCoderECB(7, 48)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(43, 24),
- FX_NEW CBC_QRCoderECB(22, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(10, 15),
- FX_NEW CBC_QRCoderECB(67, 16))));
- VERSION->Add(FX_NEW CBC_QRCoderVersion(
- 40, FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(19, 118),
- FX_NEW CBC_QRCoderECB(6, 119)),
- FX_NEW CBC_QRCoderECBlocks(28, FX_NEW CBC_QRCoderECB(18, 47),
- FX_NEW CBC_QRCoderECB(31, 48)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(34, 24),
- FX_NEW CBC_QRCoderECB(34, 25)),
- FX_NEW CBC_QRCoderECBlocks(30, FX_NEW CBC_QRCoderECB(20, 15),
- FX_NEW CBC_QRCoderECB(61, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 1, new CBC_QRCoderECBlocks(7, new CBC_QRCoderECB(1, 19)),
+ new CBC_QRCoderECBlocks(10, new CBC_QRCoderECB(1, 16)),
+ new CBC_QRCoderECBlocks(13, new CBC_QRCoderECB(1, 13)),
+ new CBC_QRCoderECBlocks(17, new CBC_QRCoderECB(1, 9))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 2, new CBC_QRCoderECBlocks(10, new CBC_QRCoderECB(1, 34)),
+ new CBC_QRCoderECBlocks(16, new CBC_QRCoderECB(1, 28)),
+ new CBC_QRCoderECBlocks(22, new CBC_QRCoderECB(1, 22)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(1, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 3, new CBC_QRCoderECBlocks(15, new CBC_QRCoderECB(1, 55)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(1, 44)),
+ new CBC_QRCoderECBlocks(18, new CBC_QRCoderECB(2, 17)),
+ new CBC_QRCoderECBlocks(22, new CBC_QRCoderECB(2, 13))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 4, new CBC_QRCoderECBlocks(20, new CBC_QRCoderECB(1, 80)),
+ new CBC_QRCoderECBlocks(18, new CBC_QRCoderECB(2, 32)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(2, 24)),
+ new CBC_QRCoderECBlocks(16, new CBC_QRCoderECB(4, 9))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 5, new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(1, 108)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(2, 43)),
+ new CBC_QRCoderECBlocks(18, new CBC_QRCoderECB(2, 15),
+ new CBC_QRCoderECB(2, 16)),
+ new CBC_QRCoderECBlocks(22, new CBC_QRCoderECB(2, 11),
+ new CBC_QRCoderECB(2, 12))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 6, new CBC_QRCoderECBlocks(18, new CBC_QRCoderECB(2, 68)),
+ new CBC_QRCoderECBlocks(16, new CBC_QRCoderECB(4, 27)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(4, 19)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(4, 15))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 7, new CBC_QRCoderECBlocks(20, new CBC_QRCoderECB(2, 78)),
+ new CBC_QRCoderECBlocks(18, new CBC_QRCoderECB(4, 31)),
+ new CBC_QRCoderECBlocks(18, new CBC_QRCoderECB(2, 14),
+ new CBC_QRCoderECB(4, 15)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(4, 13),
+ new CBC_QRCoderECB(1, 14))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 8, new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(2, 97)),
+ new CBC_QRCoderECBlocks(22, new CBC_QRCoderECB(2, 38),
+ new CBC_QRCoderECB(2, 39)),
+ new CBC_QRCoderECBlocks(22, new CBC_QRCoderECB(4, 18),
+ new CBC_QRCoderECB(2, 19)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(4, 14),
+ new CBC_QRCoderECB(2, 15))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 9, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(2, 116)),
+ new CBC_QRCoderECBlocks(22, new CBC_QRCoderECB(3, 36),
+ new CBC_QRCoderECB(2, 37)),
+ new CBC_QRCoderECBlocks(20, new CBC_QRCoderECB(4, 16),
+ new CBC_QRCoderECB(4, 17)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(4, 12),
+ new CBC_QRCoderECB(4, 13))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 10, new CBC_QRCoderECBlocks(18, new CBC_QRCoderECB(2, 68),
+ new CBC_QRCoderECB(2, 69)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(4, 43),
+ new CBC_QRCoderECB(1, 44)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(6, 19),
+ new CBC_QRCoderECB(2, 20)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(6, 15),
+ new CBC_QRCoderECB(2, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 11, new CBC_QRCoderECBlocks(20, new CBC_QRCoderECB(4, 81)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(1, 50),
+ new CBC_QRCoderECB(4, 51)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(4, 22),
+ new CBC_QRCoderECB(4, 23)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(3, 12),
+ new CBC_QRCoderECB(8, 13))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 12, new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(2, 92),
+ new CBC_QRCoderECB(2, 93)),
+ new CBC_QRCoderECBlocks(22, new CBC_QRCoderECB(6, 36),
+ new CBC_QRCoderECB(2, 37)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(4, 20),
+ new CBC_QRCoderECB(6, 21)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(7, 14),
+ new CBC_QRCoderECB(4, 15))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 13, new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(4, 107)),
+ new CBC_QRCoderECBlocks(22, new CBC_QRCoderECB(8, 37),
+ new CBC_QRCoderECB(1, 38)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(8, 20),
+ new CBC_QRCoderECB(4, 21)),
+ new CBC_QRCoderECBlocks(22, new CBC_QRCoderECB(12, 11),
+ new CBC_QRCoderECB(4, 12))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 14, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(3, 115),
+ new CBC_QRCoderECB(1, 116)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(4, 40),
+ new CBC_QRCoderECB(5, 41)),
+ new CBC_QRCoderECBlocks(20, new CBC_QRCoderECB(11, 16),
+ new CBC_QRCoderECB(5, 17)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(11, 12),
+ new CBC_QRCoderECB(5, 13))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 15, new CBC_QRCoderECBlocks(22, new CBC_QRCoderECB(5, 87),
+ new CBC_QRCoderECB(1, 88)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(5, 41),
+ new CBC_QRCoderECB(5, 42)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(5, 24),
+ new CBC_QRCoderECB(7, 25)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(11, 12),
+ new CBC_QRCoderECB(7, 13))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 16, new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(5, 98),
+ new CBC_QRCoderECB(1, 99)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(7, 45),
+ new CBC_QRCoderECB(3, 46)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(15, 19),
+ new CBC_QRCoderECB(2, 20)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(3, 15),
+ new CBC_QRCoderECB(13, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 17, new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(1, 107),
+ new CBC_QRCoderECB(5, 108)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(10, 46),
+ new CBC_QRCoderECB(1, 47)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(1, 22),
+ new CBC_QRCoderECB(15, 23)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(2, 14),
+ new CBC_QRCoderECB(17, 15))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 18, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(5, 120),
+ new CBC_QRCoderECB(1, 121)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(9, 43),
+ new CBC_QRCoderECB(4, 44)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(17, 22),
+ new CBC_QRCoderECB(1, 23)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(2, 14),
+ new CBC_QRCoderECB(19, 15))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 19, new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(3, 113),
+ new CBC_QRCoderECB(4, 114)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(3, 44),
+ new CBC_QRCoderECB(11, 45)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(17, 21),
+ new CBC_QRCoderECB(4, 22)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(9, 13),
+ new CBC_QRCoderECB(16, 14))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 20, new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(3, 107),
+ new CBC_QRCoderECB(5, 108)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(3, 41),
+ new CBC_QRCoderECB(13, 42)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(15, 24),
+ new CBC_QRCoderECB(5, 25)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(15, 15),
+ new CBC_QRCoderECB(10, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 21, new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(4, 116),
+ new CBC_QRCoderECB(4, 117)),
+ new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(17, 42)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(17, 22),
+ new CBC_QRCoderECB(6, 23)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(19, 16),
+ new CBC_QRCoderECB(6, 17))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 22, new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(2, 111),
+ new CBC_QRCoderECB(7, 112)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(17, 46)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(7, 24),
+ new CBC_QRCoderECB(16, 25)),
+ new CBC_QRCoderECBlocks(24, new CBC_QRCoderECB(34, 13))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 23, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(4, 121),
+ new CBC_QRCoderECB(5, 122)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(4, 47),
+ new CBC_QRCoderECB(14, 48)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(11, 24),
+ new CBC_QRCoderECB(14, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(16, 15),
+ new CBC_QRCoderECB(14, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 24, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(6, 117),
+ new CBC_QRCoderECB(4, 118)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(6, 45),
+ new CBC_QRCoderECB(14, 46)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(11, 24),
+ new CBC_QRCoderECB(16, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(30, 16),
+ new CBC_QRCoderECB(2, 17))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 25, new CBC_QRCoderECBlocks(26, new CBC_QRCoderECB(8, 106),
+ new CBC_QRCoderECB(4, 107)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(8, 47),
+ new CBC_QRCoderECB(13, 48)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(7, 24),
+ new CBC_QRCoderECB(22, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(22, 15),
+ new CBC_QRCoderECB(13, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 26, new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(10, 114),
+ new CBC_QRCoderECB(2, 115)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(19, 46),
+ new CBC_QRCoderECB(4, 47)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(28, 22),
+ new CBC_QRCoderECB(6, 23)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(33, 16),
+ new CBC_QRCoderECB(4, 17))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 27, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(8, 122),
+ new CBC_QRCoderECB(4, 123)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(22, 45),
+ new CBC_QRCoderECB(3, 46)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(8, 23),
+ new CBC_QRCoderECB(26, 24)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(12, 15),
+ new CBC_QRCoderECB(28, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 28, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(3, 117),
+ new CBC_QRCoderECB(10, 118)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(3, 45),
+ new CBC_QRCoderECB(23, 46)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(4, 24),
+ new CBC_QRCoderECB(31, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(11, 15),
+ new CBC_QRCoderECB(31, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 29, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(7, 116),
+ new CBC_QRCoderECB(7, 117)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(21, 45),
+ new CBC_QRCoderECB(7, 46)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(1, 23),
+ new CBC_QRCoderECB(37, 24)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(19, 15),
+ new CBC_QRCoderECB(26, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 30, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(5, 115),
+ new CBC_QRCoderECB(10, 116)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(19, 47),
+ new CBC_QRCoderECB(10, 48)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(15, 24),
+ new CBC_QRCoderECB(25, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(23, 15),
+ new CBC_QRCoderECB(25, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 31, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(13, 115),
+ new CBC_QRCoderECB(3, 116)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(2, 46),
+ new CBC_QRCoderECB(29, 47)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(42, 24),
+ new CBC_QRCoderECB(1, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(23, 15),
+ new CBC_QRCoderECB(28, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 32, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(17, 115)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(10, 46),
+ new CBC_QRCoderECB(23, 47)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(10, 24),
+ new CBC_QRCoderECB(35, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(19, 15),
+ new CBC_QRCoderECB(35, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 33, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(17, 115),
+ new CBC_QRCoderECB(1, 116)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(14, 46),
+ new CBC_QRCoderECB(21, 47)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(29, 24),
+ new CBC_QRCoderECB(19, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(11, 15),
+ new CBC_QRCoderECB(46, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 34, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(13, 115),
+ new CBC_QRCoderECB(6, 116)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(14, 46),
+ new CBC_QRCoderECB(23, 47)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(44, 24),
+ new CBC_QRCoderECB(7, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(59, 16),
+ new CBC_QRCoderECB(1, 17))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 35, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(12, 121),
+ new CBC_QRCoderECB(7, 122)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(12, 47),
+ new CBC_QRCoderECB(26, 48)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(39, 24),
+ new CBC_QRCoderECB(14, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(22, 15),
+ new CBC_QRCoderECB(41, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 36, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(6, 121),
+ new CBC_QRCoderECB(14, 122)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(6, 47),
+ new CBC_QRCoderECB(34, 48)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(46, 24),
+ new CBC_QRCoderECB(10, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(2, 15),
+ new CBC_QRCoderECB(64, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 37, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(17, 122),
+ new CBC_QRCoderECB(4, 123)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(29, 46),
+ new CBC_QRCoderECB(14, 47)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(49, 24),
+ new CBC_QRCoderECB(10, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(24, 15),
+ new CBC_QRCoderECB(46, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 38, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(4, 122),
+ new CBC_QRCoderECB(18, 123)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(13, 46),
+ new CBC_QRCoderECB(32, 47)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(48, 24),
+ new CBC_QRCoderECB(14, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(42, 15),
+ new CBC_QRCoderECB(32, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 39, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(20, 117),
+ new CBC_QRCoderECB(4, 118)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(40, 47),
+ new CBC_QRCoderECB(7, 48)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(43, 24),
+ new CBC_QRCoderECB(22, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(10, 15),
+ new CBC_QRCoderECB(67, 16))));
+ VERSION->Add(new CBC_QRCoderVersion(
+ 40, new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(19, 118),
+ new CBC_QRCoderECB(6, 119)),
+ new CBC_QRCoderECBlocks(28, new CBC_QRCoderECB(18, 47),
+ new CBC_QRCoderECB(31, 48)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(34, 24),
+ new CBC_QRCoderECB(34, 25)),
+ new CBC_QRCoderECBlocks(30, new CBC_QRCoderECB(20, 15),
+ new CBC_QRCoderECB(61, 16))));
}
if (versionNumber < 1 || versionNumber > 40) {
e = BCExceptionIllegalArgument;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp index c045552155..0a265c9d04 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp @@ -56,7 +56,7 @@ CFX_PtrArray* CBC_QRDataBlock::GetDataBlocks( for (i = 0; i < ecBlockArray->GetSize(); i++) {
totalBlocks += ((CBC_QRCoderECB*)(*ecBlockArray)[i])->GetCount();
}
- CFX_PtrArray* datablock = FX_NEW CFX_PtrArray();
+ CFX_PtrArray* datablock = new CFX_PtrArray();
datablock->SetSize(totalBlocks);
CBC_AutoPtr<CFX_PtrArray> result(datablock);
int32_t numResultBlocks = 0;
@@ -66,10 +66,10 @@ CFX_PtrArray* CBC_QRDataBlock::GetDataBlocks( int32_t numDataCodewords = ecBlock->GetDataCodeWords();
int32_t numBlockCodewords =
ecBlocks->GetECCodeWordsPerBlock() + numDataCodewords;
- CFX_ByteArray* bytearray = FX_NEW CFX_ByteArray();
+ CFX_ByteArray* bytearray = new CFX_ByteArray();
bytearray->SetSize(numBlockCodewords);
(*result)[numResultBlocks++] =
- FX_NEW CBC_QRDataBlock(numDataCodewords, bytearray);
+ new CBC_QRDataBlock(numDataCodewords, bytearray);
}
}
int32_t shorterBlocksTotalCodewords =
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp index a42b67b29b..79b6db39a9 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp @@ -26,7 +26,7 @@ static int32_t N_DATA_MASKS = 0;
CFX_PtrArray* CBC_QRDataMask::DATA_MASKS = NULL;
void CBC_QRDataMask::Initialize() {
- DATA_MASKS = FX_NEW CFX_PtrArray();
+ DATA_MASKS = new CFX_PtrArray();
N_DATA_MASKS = BuildDataMasks();
}
void CBC_QRDataMask::Finalize() {
@@ -102,14 +102,14 @@ class DataMask111 : public CBC_QRDataMask { }
};
int32_t CBC_QRDataMask::BuildDataMasks() {
- DATA_MASKS->Add(FX_NEW DataMask000);
- DATA_MASKS->Add(FX_NEW DataMask001);
- DATA_MASKS->Add(FX_NEW DataMask010);
- DATA_MASKS->Add(FX_NEW DataMask011);
- DATA_MASKS->Add(FX_NEW DataMask100);
- DATA_MASKS->Add(FX_NEW DataMask101);
- DATA_MASKS->Add(FX_NEW DataMask110);
- DATA_MASKS->Add(FX_NEW DataMask111);
+ DATA_MASKS->Add(new DataMask000);
+ DATA_MASKS->Add(new DataMask001);
+ DATA_MASKS->Add(new DataMask010);
+ DATA_MASKS->Add(new DataMask011);
+ DATA_MASKS->Add(new DataMask100);
+ DATA_MASKS->Add(new DataMask101);
+ DATA_MASKS->Add(new DataMask110);
+ DATA_MASKS->Add(new DataMask111);
return DATA_MASKS->GetSize();
}
CBC_QRDataMask::CBC_QRDataMask() {}
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp index 73f7c30208..643b15bdfd 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp @@ -104,7 +104,7 @@ CBC_CommonDecoderResult* CBC_QRDecodedBitStreamParser::Decode( }
}
} while (!(mode == CBC_QRCoderMode::sTERMINATOR));
- CBC_CommonDecoderResult* tempCd = FX_NEW CBC_CommonDecoderResult();
+ CBC_CommonDecoderResult* tempCd = new CBC_CommonDecoderResult();
tempCd->Init(*bytes, result, byteSegments, ecLevel, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
return tempCd;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp index 0a95ddc1be..70edfeff40 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp @@ -87,7 +87,7 @@ CBC_QRDetectorResult* CBC_QRDetector::ProcessFinderPatternInfo( SampleGrid(m_image, topLeft.get(), topRight.get(), bottomLeft.get(),
(CBC_ResultPoint*)(alignmentPattern), dimension, e);
BC_EXCEPTION_CHECK_ReturnValue(e, NULL);
- CFX_PtrArray* points = FX_NEW CFX_PtrArray;
+ CFX_PtrArray* points = new CFX_PtrArray;
if (alignmentPattern == NULL) {
points->Add(bottomLeft.release());
points->Add(topLeft.release());
@@ -98,7 +98,7 @@ CBC_QRDetectorResult* CBC_QRDetector::ProcessFinderPatternInfo( points->Add(topRight.release());
points->Add(alignmentPattern);
}
- return FX_NEW CBC_QRDetectorResult(bits, points);
+ return new CBC_QRDetectorResult(bits, points);
}
CBC_CommonBitMatrix* CBC_QRDetector::SampleGrid(
CBC_CommonBitMatrix* image,
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp index 80ec34f6cf..f9fdfbd2cf 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp @@ -37,7 +37,7 @@ CBC_QRFinderPattern::~CBC_QRFinderPattern() { }
CBC_QRFinderPattern* CBC_QRFinderPattern::Clone() {
CBC_QRFinderPattern* temp =
- FX_NEW CBC_QRFinderPattern(m_x, m_y, m_estimatedModuleSize);
+ new CBC_QRFinderPattern(m_x, m_y, m_estimatedModuleSize);
temp->m_count = m_count;
return temp;
}
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp index 17579f4ec2..fc82584370 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp @@ -380,7 +380,7 @@ FX_BOOL CBC_QRFinderPatternFinder::HandlePossibleCenter( }
if (!found) {
m_possibleCenters.Add(
- FX_NEW CBC_QRFinderPattern(centerJ, centerI, estimatedModuleSize));
+ new CBC_QRFinderPattern(centerJ, centerI, estimatedModuleSize));
}
return TRUE;
}
@@ -463,7 +463,7 @@ CFX_PtrArray* CBC_QRFinderPatternFinder::SelectBestpatterns(int32_t& e) { if (m_possibleCenters.GetSize() > 3) {
BC_FX_PtrArray_Sort(m_possibleCenters, centerComparator);
}
- CFX_PtrArray* vec = FX_NEW CFX_PtrArray();
+ CFX_PtrArray* vec = new CFX_PtrArray();
vec->SetSize(3);
(*vec)[0] = ((CBC_QRFinderPattern*)m_possibleCenters[0])->Clone();
(*vec)[1] = ((CBC_QRFinderPattern*)m_possibleCenters[1])->Clone();
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp index 50ffa104e8..1bc85f1a12 100644 --- a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp +++ b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp @@ -109,7 +109,7 @@ CBC_CommonBitMatrix* CBC_QRGridSampler::SampleGrid(CBC_CommonBitMatrix* image, CBC_CommonPerspectiveTransform::QuadrilateralToQuadrilateral(
p1ToX, p1ToY, p2ToX, p2ToY, p3ToX, p3ToY, p4ToX, p4ToY, p1FromX,
p1FromY, p2FromX, p2FromY, p3FromX, p3FromY, p4FromX, p4FromY));
- CBC_CommonBitMatrix* tempBitM = FX_NEW CBC_CommonBitMatrix();
+ CBC_CommonBitMatrix* tempBitM = new CBC_CommonBitMatrix();
tempBitM->Init(dimensionX, dimensionY);
CBC_AutoPtr<CBC_CommonBitMatrix> bits(tempBitM);
CFX_FloatArray points;
|