From dd340146f1fe7414702d6fea251da989d425691e Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Tue, 17 Oct 2017 14:29:36 +0000 Subject: Revert "Revert "Revert "apply codec origin in generator""" This reverts commit 82269abfec798621c8dbbc6bd48996c0b2686f41. Reason for revert: ios build needs include path for SkCodec.h Original change's description: > Revert "Revert "apply codec origin in generator"" > > This reverts commit 363dd988a55c2ed3fa92e2368c1c889101425734. > > Reason for revert: pdfium fix landed > > Original change's description: > > Revert "apply codec origin in generator" > > > > This reverts commit fa15877f487333bec876e7315cf584c0d598d098. > > > > Reason for revert: Appears to break PDFium. > > > > Original change's description: > > > apply codec origin in generator > > > > > > Bug: skia: > > > Change-Id: I383dacb49b1e3c88467ccdbf3288764bb1bbf01a > > > Reviewed-on: https://skia-review.googlesource.com/58600 > > > Reviewed-by: Leon Scroggins > > > Commit-Queue: Mike Reed > > > > TBR=scroggo@google.com,reed@google.com > > > > Change-Id: Id97137d6ec39ca638c941928bae6510814b1c499 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Bug: skia: > > Reviewed-on: https://skia-review.googlesource.com/60041 > > Reviewed-by: Ben Wagner > > Commit-Queue: Ben Wagner > > TBR=benjaminwagner@google.com,scroggo@google.com,reed@google.com > > Change-Id: I1b54a6e6e6cbda07f346ffbbc4977f9db705abcd > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: skia: > Reviewed-on: https://skia-review.googlesource.com/60320 > Reviewed-by: Mike Reed > Commit-Queue: Mike Reed TBR=benjaminwagner@google.com,scroggo@google.com,reed@google.com Change-Id: I4c2d310521d1a678b407d30b9fe3c261c49d67bc No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: skia: Reviewed-on: https://skia-review.googlesource.com/60560 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- gm/encode.cpp | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'gm/encode.cpp') diff --git a/gm/encode.cpp b/gm/encode.cpp index 88e7724930..bf13d3dc09 100644 --- a/gm/encode.cpp +++ b/gm/encode.cpp @@ -48,29 +48,3 @@ private: DEF_GM( return new EncodeGM; ) } - -/////////// - -#if 0 -DEF_SIMPLE_GM(jpeg_orientation, canvas, 1000, 1000) { - static sk_sp imgs[8]; - if (!imgs[0]) { - for (int i = 0; i < 8; ++i) { - SkString path; - path.printf("/skia/orientation/Landscape_%d.jpg", i + 1); - auto stream = SkStream::MakeFromFile(path.c_str()); - auto data = SkData::MakeFromStream(stream.get(), stream->getLength()); - imgs[i] = SkImage::MakeFromEncoded(data, nullptr); - } - } - canvas->scale(0.25, 0.25); - for (int i = 0; i < 8; ++i) { - SkImage* img = imgs[i].get(); - canvas->drawImage(img, 0, 0, nullptr); - canvas->translate(0, img->height()); - if (i == 3) { - canvas->translate(img->width(), -4*img->height()); - } - } -} -#endif -- cgit v1.2.3