mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-09-20 21:47:32 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed an extra memcpy and made getMatrix() pure virtual.

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1556 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
dswitkin@google.com 2010-08-24 18:59:26 +00:00
parent 8f1401656a
commit 3d9063dd17
4 changed files with 4 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cpp/core/src/zxing/LuminanceSource.cpp
View file

@ -28,19 +28,6 @@ LuminanceSource::LuminanceSource() {
LuminanceSource::~LuminanceSource() {
}
unsigned char* LuminanceSource::getMatrix() {
int width = getWidth();
int height = getHeight();
unsigned char* matrix = new unsigned char[width * height];
unsigned char* row = new unsigned char[width];
for (int y = 0; y < height; y++) {
row = getRow(y, row);
memcpy(&matrix[y * width], row, width);
}
delete [] row;
return matrix;
}
bool LuminanceSource::isCropSupported() const {
return false;
}

2
cpp/core/src/zxing/LuminanceSource.h
View file

@ -34,7 +34,7 @@ public:
// Callers take ownership of the returned memory and must call delete [] on it themselves.
virtual unsigned char* getRow(int y, unsigned char* row) = 0;
virtual unsigned char* getMatrix();
virtual unsigned char* getMatrix() = 0;
virtual bool isCropSupported() const;
virtual Ref<LuminanceSource> crop(int left, int top, int width, int height);

3
cpp/core/src/zxing/ResultPointCallback.cpp
View file

@ -2,8 +2,7 @@
* ResultPointCallback.cpp
* zxing
*
* Created by Christian Brunschen on 13/05/2008.
* Copyright 2008 ZXing authors All rights reserved.
* Copyright 2010 ZXing authors All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

7
cpp/core/src/zxing/common/GreyscaleRotatedLuminanceSource.cpp
View file

@ -42,7 +42,6 @@ unsigned char* GreyscaleRotatedLuminanceSource::getRow(int y, unsigned char* row
throw IllegalArgumentException("Requested row is outside the image: " + y);
}
int width = getWidth();
// TODO(flyashi): determine if row has enough size.
if (row == NULL) {
row = new unsigned char[width];
}
@ -56,12 +55,10 @@ unsigned char* GreyscaleRotatedLuminanceSource::getRow(int y, unsigned char* row
unsigned char* GreyscaleRotatedLuminanceSource::getMatrix() {
unsigned char* result = new unsigned char[width_ * height_];
unsigned char* row = new unsigned char[width_];
// This depends on getRow() honoring its second parameter.
for (int y = 0; y < height_; y++) {
row = getRow(y, row);
memcpy(result + y * width_, row, width_);
getRow(y, &result[y * width_]);
}
delete [] row;
return result;
}