From 9ca27f39ddf7dafdc8ce97dba0fc9c4d1f07b7ed Mon Sep 17 00:00:00 2001 From: msarett Date: Tue, 23 Feb 2016 08:21:21 -0800 Subject: [PATCH] Remove unnecessary GOOGLE3 ifdefs from SkRawCodec These should be fine now that SkJpegCodec is building in GOOGLE3. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1718343002 Review URL: https://codereview.chromium.org/1718343002 --- src/codec/SkRawCodec.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/codec/SkRawCodec.cpp b/src/codec/SkRawCodec.cpp index 655d14e..a006e50 100644 --- a/src/codec/SkRawCodec.cpp +++ b/src/codec/SkRawCodec.cpp @@ -9,9 +9,7 @@ #include "SkCodecPriv.h" #include "SkColorPriv.h" #include "SkData.h" -#if !defined(GOOGLE3) #include "SkJpegCodec.h" -#endif #include "SkRawCodec.h" #include "SkRefCnt.h" #include "SkStream.h" @@ -573,16 +571,12 @@ SkCodec* SkRawCodec::NewFromStream(SkStream* stream) { ::piex::Error error = ::piex::GetPreviewImageData(&piexStream, &imageData); if (error == ::piex::Error::kOk && imageData.preview.length > 0) { -#if !defined(GOOGLE3) // transferBuffer() is destructive to the rawStream. Abandon the rawStream after this // function call. // FIXME: one may avoid the copy of memoryStream and use the buffered rawStream. SkMemoryStream* memoryStream = rawStream->transferBuffer(imageData.preview.offset, imageData.preview.length); return memoryStream ? SkJpegCodec::NewFromStream(memoryStream) : nullptr; -#else - return nullptr; -#endif } else if (error == ::piex::Error::kFail) { return nullptr; } -- 2.7.4