From c06f309cf52b885b1b1d98c6b045b120a09f5c54 Mon Sep 17 00:00:00 2001 From: Leon Scroggins Date: Tue, 2 May 2017 17:08:28 +0000 Subject: Revert "Add support for row-by-row jpeg encoding" This reverts commit 9b848d5749c5e34b56f927a3a3374c8ebafbd9db. Reason for revert: ASAN reports leaked memory [1]. Google3 reports a "delete size mismatch" [2], which I suspect is the same issue. [1] https://chromium-swarm.appspot.com/task?id=35e2c9fa9eac6310&refresh=10&show_raw=1 [2] https://test.corp.google.com/ui#cl=154838904&flags=CAMQBQ==&id=OCL:154838904:BASE:154839043:1493741642370:9c96115f&t=//chrome/skia/dm_wrapper:dm_wrapper Original change's description: > Add support for row-by-row jpeg encoding > > Bug: 713862 > Change-Id: I787b7c49662a00b89ae0ef35845dfbd6be3e6fb1 > Reviewed-on: https://skia-review.googlesource.com/14641 > Commit-Queue: Matt Sarett > Reviewed-by: Leon Scroggins > TBR=msarett@google.com,scroggo@google.com,reed@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Change-Id: Ic5a8d67e0d4a7733662586055ceff086a2ab335d Reviewed-on: https://skia-review.googlesource.com/15140 Reviewed-by: Leon Scroggins Commit-Queue: Leon Scroggins --- tests/EncodeTest.cpp | 56 ---------------------------------------------------- 1 file changed, 56 deletions(-) delete mode 100644 tests/EncodeTest.cpp (limited to 'tests/EncodeTest.cpp') diff --git a/tests/EncodeTest.cpp b/tests/EncodeTest.cpp deleted file mode 100644 index 9db5039d59..0000000000 --- a/tests/EncodeTest.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2017 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "Resources.h" -#include "Test.h" - -#include "SkBitmap.h" -#include "SkJpegEncoder.h" -#include "SkStream.h" - -DEF_TEST(Encode_Jpeg, r) { - SkBitmap bitmap; - bool success = GetResourceAsBitmap("mandrill_128.png", &bitmap); - if (!success) { - return; - } - - SkPixmap src; - success = bitmap.peekPixels(&src); - REPORTER_ASSERT(r, success); - if (!success) { - return; - } - - SkDynamicMemoryWStream dst0, dst1, dst2, dst3; - success = SkJpegEncoder::Encode(&dst0, src, SkJpegEncoder::Options()); - REPORTER_ASSERT(r, success); - - auto encoder1 = SkJpegEncoder::Make(&dst1, src, SkJpegEncoder::Options()); - for (int i = 0; i < src.height(); i++) { - success = encoder1->encodeRows(1); - REPORTER_ASSERT(r, success); - } - - auto encoder2 = SkJpegEncoder::Make(&dst2, src, SkJpegEncoder::Options()); - for (int i = 0; i < src.height(); i+=3) { - success = encoder2->encodeRows(3); - REPORTER_ASSERT(r, success); - } - - auto encoder3 = SkJpegEncoder::Make(&dst3, src, SkJpegEncoder::Options()); - success = encoder3->encodeRows(200); - REPORTER_ASSERT(r, success); - - sk_sp data0 = dst0.detachAsData(); - sk_sp data1 = dst1.detachAsData(); - sk_sp data2 = dst2.detachAsData(); - sk_sp data3 = dst3.detachAsData(); - REPORTER_ASSERT(r, data0->equals(data1.get())); - REPORTER_ASSERT(r, data0->equals(data2.get())); - REPORTER_ASSERT(r, data0->equals(data3.get())); -} -- cgit v1.2.3