From c85a9fde77f91979afea0efa38f63d8efceb4138 Mon Sep 17 00:00:00 2001 From: msarett Date: Mon, 25 Jan 2016 06:05:19 -0800 Subject: Revert of Prototype of RAW decoding in Skia. (patchset #32 id:610001 of https://codereview.chromium.org/1520403003/ ) Reason for revert: A few build failures on Chrome OS/Android. Original issue's description: > Add RAW decoding into Skia. > > TBR=reed@google.com > > BUG=skia: > > (Based on the work from ebrauer in https://codereview.chromium.org/1459473007) > (Based on the work from adaubert in https://codereview.chromium.org/1494003003) > GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1520403003 > > Committed: https://skia.googlesource.com/skia/+/6bd8639f8c142eedf543f4e5f3b02d2bf11df308 TBR=scroggo@google.com,adaubert@google.com,yujieqin@google.com # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/1635443002 --- dm/DM.cpp | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'dm') diff --git a/dm/DM.cpp b/dm/DM.cpp index 12ce23c6a1..5124442a20 100644 --- a/dm/DM.cpp +++ b/dm/DM.cpp @@ -520,20 +520,6 @@ static bool brd_supported(const char* ext) { return false; } -static bool is_raw(const SkString& file) { - static const char* const exts[] = { - "arw", "cr2", "dng", "nef", "nrw", "orf", "raf", "rw2", "pef", "srw", - "ARW", "CR2", "DNG", "NEF", "NRW", "ORF", "RAF", "RW2", "PEF", "SRW", - }; - - for (uint32_t i = 0; i < SK_ARRAY_COUNT(exts); i++) { - if (file.endsWith(exts[i])) { - return true; - } - } - return false; -} - static void gather_srcs() { for (const skiagm::GMRegistry* r = skiagm::GMRegistry::Head(); r; r = r->next()) { push_src("gm", "", new GMSrc(r->factory())); @@ -552,8 +538,6 @@ static void gather_srcs() { static const char* const exts[] = { "bmp", "gif", "jpg", "jpeg", "png", "webp", "ktx", "astc", "wbmp", "ico", "BMP", "GIF", "JPG", "JPEG", "PNG", "WEBP", "KTX", "ASTC", "WBMP", "ICO", - "arw", "cr2", "dng", "nef", "nrw", "orf", "raf", "rw2", "pef", "srw", - "ARW", "CR2", "DNG", "NEF", "NRW", "ORF", "RAF", "RW2", "PEF", "SRW", }; for (int i = 0; i < FLAGS_images.count(); i++) { const char* flag = FLAGS_images[i]; @@ -562,9 +546,7 @@ static void gather_srcs() { SkOSFile::Iter it(flag, exts[j]); for (SkString file; it.next(&file); ) { SkString path = SkOSPath::Join(flag, file.c_str()); - if (!is_raw(file)) { - push_src("image", "decode", new ImageSrc(path)); // Decode entire image - } + push_src("image", "decode", new ImageSrc(path)); // Decode entire image push_codec_srcs(path); if (brd_supported(exts[j])) { push_brd_srcs(path); @@ -573,9 +555,7 @@ static void gather_srcs() { } } else if (sk_exists(flag)) { // assume that FLAGS_images[i] is a valid image if it is a file. - if (!is_raw(SkString(flag))) { - push_src("image", "decode", new ImageSrc(flag)); // Decode entire image. - } + push_src("image", "decode", new ImageSrc(flag)); // Decode entire image. push_codec_srcs(flag); push_brd_srcs(flag); } -- cgit v1.2.3