e6cf9cb685
- Adds miniz.c v115_r4 (latest release) to third_party.
- Merges SkDeflateWStream into SkFlate so including "miniz.c" links
without duplicating symbols.
The only interesting code change I've made is to remove the line
fImpl->fZStream.data_type = Z_BINARY;
from SkDeflateWStream::SkDeflateWStream(). miniz doesn't have Z_BINARY
defined, and as far as I can tell, both zlib and miniz ignore data_type.
We should be able to swap skflate.gyp's dependency between zlib.gyp:zlib and
zlib.gyp:miniz at will (except of course on Windows) if we're interested in
zlib itself. I've left android framework on its own zlib. I think this all
means we can stop defining SK_NO_FLATE on Windows.
I'll leave the possible cleanup of SK_NO_FLATE itself for another time. Might
be we always want to keep this dependency optional.
CQ_EXTRA_TRYBOTS=client.skia:Test-Win8-ShuttleA-HD7770-x86-Debug-Trybot
BUG=skia:
Review URL: https://codereview.chromium.org/957323003
76 lines
2.5 KiB
C++
76 lines
2.5 KiB
C++
/*
|
|
* Copyright 2015 Google Inc.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license that can be
|
|
* found in the LICENSE file.
|
|
*/
|
|
|
|
#include "SkFlate.h"
|
|
#include "SkRandom.h"
|
|
#include "Test.h"
|
|
|
|
#ifndef SK_NO_FLATE
|
|
|
|
DEF_TEST(SkDeflateWStream, r) {
|
|
SkRandom random(123456);
|
|
for (int i = 0; i < 50; ++i) {
|
|
uint32_t size = random.nextULessThan(10000);
|
|
SkAutoTMalloc<uint8_t> buffer(size);
|
|
for (uint32_t j = 0; j < size; ++j) {
|
|
buffer[j] = random.nextU() & 0xff;
|
|
}
|
|
|
|
SkDynamicMemoryWStream dynamicMemoryWStream;
|
|
{
|
|
SkDeflateWStream deflateWStream(&dynamicMemoryWStream);
|
|
uint32_t j = 0;
|
|
while (j < size) {
|
|
uint32_t writeSize =
|
|
SkTMin(size - j, random.nextRangeU(1, 400));
|
|
if (!deflateWStream.write(&buffer[j], writeSize)) {
|
|
ERRORF(r, "something went wrong.");
|
|
return;
|
|
}
|
|
j += writeSize;
|
|
}
|
|
}
|
|
SkAutoTDelete<SkStreamAsset> compressed(
|
|
dynamicMemoryWStream.detachAsStream());
|
|
|
|
SkDynamicMemoryWStream decompressedDynamicMemoryWStream;
|
|
SkAssertResult(SkFlate::Inflate(compressed,
|
|
&decompressedDynamicMemoryWStream));
|
|
|
|
SkAutoTDelete<SkStreamAsset> decompressed(
|
|
decompressedDynamicMemoryWStream.detachAsStream());
|
|
|
|
if (decompressed->getLength() != size) {
|
|
ERRORF(r, "Decompression failed to get right size [%d]."
|
|
" %u != %u", i, (unsigned)(decompressed->getLength()),
|
|
(unsigned)size);
|
|
SkString s = SkStringPrintf("/tmp/deftst_compressed_%d", i);
|
|
SkFILEWStream o(s.c_str());
|
|
o.writeStream(compressed.get(), compressed->getLength());
|
|
compressed->rewind();
|
|
|
|
s = SkStringPrintf("/tmp/deftst_input_%d", i);
|
|
SkFILEWStream o2(s.c_str());
|
|
o2.write(&buffer[0], size);
|
|
|
|
continue;
|
|
}
|
|
uint32_t minLength = SkTMin(size,
|
|
(uint32_t)(decompressed->getLength()));
|
|
for (uint32_t i = 0; i < minLength; ++i) {
|
|
uint8_t c;
|
|
SkDEBUGCODE(size_t rb =)decompressed->read(&c, sizeof(uint8_t));
|
|
SkASSERT(sizeof(uint8_t) == rb);
|
|
if (buffer[i] != c) {
|
|
ERRORF(r, "Decompression failed at byte %u.", (unsigned)i);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
#endif // SK_NO_FLATE
|