strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DeltaBitmapRow: make members private

Browse source
This commit is contained in:
Miklos Vajna 2018-11-08 09:16:50 +01:00
parent a0f83bd9b9
commit df0b3835c5
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
kit/Delta.hpp
View file

@ -22,15 +22,27 @@
class DeltaGenerator { class DeltaGenerator {
struct DeltaBitmapRow { struct DeltaBitmapRow {
private:
uint64_t _crc; uint64_t _crc;
std::vector<uint32_t> _pixels; std::vector<uint32_t> _pixels;
public:
bool identical(const DeltaBitmapRow &other) const bool identical(const DeltaBitmapRow &other) const
{ {
if (_crc != other._crc) if (_crc != other._crc)
return false; return false;
return _pixels == other._pixels; return _pixels == other._pixels;
} }
const std::vector<uint32_t>& getPixels() const
{
return _pixels;
}
std::vector<uint32_t>& getPixels()
{
return _pixels;
}
}; };
struct DeltaData { struct DeltaData {
@ -153,14 +165,14 @@ class DeltaGenerator {
{ {
int same; int same;
for (same = 0; same + x < prev.getWidth() && for (same = 0; same + x < prev.getWidth() &&
prevRow._pixels[x+same] == curRow._pixels[x+same];) prevRow.getPixels()[x+same] == curRow.getPixels()[x+same];)
++same; ++same;
x += same; x += same;
int diff; int diff;
for (diff = 0; diff + x < prev.getWidth() && for (diff = 0; diff + x < prev.getWidth() &&
(prevRow._pixels[x+diff] == curRow._pixels[x+diff] || diff < 2) && (prevRow.getPixels()[x+diff] == curRow.getPixels()[x+diff] || diff < 2) &&
diff < 254;) diff < 254;)
++diff; ++diff;
if (diff > 0) if (diff > 0)
@ -172,7 +184,7 @@ class DeltaGenerator {
size_t dest = output.size(); size_t dest = output.size();
output.resize(dest + diff * 4); output.resize(dest + diff * 4);
memcpy(&output[dest], &curRow._pixels[x], diff * 4); memcpy(&output[dest], &curRow.getPixels()[x], diff * 4);
LOG_TRC("different " << diff << "pixels"); LOG_TRC("different " << diff << "pixels");
x += diff; x += diff;
@ -212,11 +224,11 @@ class DeltaGenerator {
// We get the hash ~for free as we copy - with a cheap hash. // We get the hash ~for free as we copy - with a cheap hash.
uint64_t crc = 0x7fffffff - 1; uint64_t crc = 0x7fffffff - 1;
row._pixels.resize(width); row.getPixels().resize(width);
for (int x = 0; x < width; ++x) for (int x = 0; x < width; ++x)
{ {
crc = (crc << 7) + crc + src[x]; crc = (crc << 7) + crc + src[x];
row._pixels[x] = src[x]; row.getPixels()[x] = src[x];
} }
} }