Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 32c32b9

Browse files
Mike KleinSkia Commit-Bot
authored andcommitted
unguard SkFooEncoder.cpp
We used to define SkFooEncoder::Encode() either here or as failing stubs in SkImageEncoder.cpp. Now that we're not defining them in SkImageEncoder.cpp, we can lift these guards here. Change-Id: Id916811225450e4c3a84f1e7f38ae510be1d6268 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/214004 Reviewed-by: Leon Scroggins <[email protected]> Commit-Queue: Mike Klein <[email protected]>
1 parent 8ad0cbd commit 32c32b9

3 files changed

Lines changed: 0 additions & 12 deletions

File tree

src/images/SkJpegEncoder.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
#include "src/images/SkImageEncoderPriv.h"
99

10-
#ifdef SK_HAS_JPEG_LIBRARY
11-
1210
#include "include/core/SkStream.h"
1311
#include "include/encode/SkJpegEncoder.h"
1412
#include "include/private/SkColorData.h"
@@ -241,5 +239,3 @@ bool SkJpegEncoder::Encode(SkWStream* dst, const SkPixmap& src, const Options& o
241239
auto encoder = SkJpegEncoder::Make(dst, src, options);
242240
return encoder.get() && encoder->encodeRows(src.height());
243241
}
244-
245-
#endif

src/images/SkPngEncoder.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
#include "src/images/SkImageEncoderPriv.h"
99

10-
#ifdef SK_HAS_PNG_LIBRARY
11-
1210
#include "include/core/SkStream.h"
1311
#include "include/core/SkString.h"
1412
#include "include/encode/SkPngEncoder.h"
@@ -436,5 +434,3 @@ bool SkPngEncoder::Encode(SkWStream* dst, const SkPixmap& src, const Options& op
436434
auto encoder = SkPngEncoder::Make(dst, src, options);
437435
return encoder.get() && encoder->encodeRows(src.height());
438436
}
439-
440-
#endif

src/images/SkWebpEncoder.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
#include "src/images/SkImageEncoderPriv.h"
1818

19-
#ifdef SK_HAS_WEBP_LIBRARY
20-
2119
#include "include/core/SkBitmap.h"
2220
#include "include/core/SkStream.h"
2321
#include "include/core/SkUnPreMultiply.h"
@@ -215,5 +213,3 @@ bool SkWebpEncoder::Encode(SkWStream* stream, const SkPixmap& pixmap, const Opti
215213

216214
return true;
217215
}
218-
219-
#endif

0 commit comments

Comments
 (0)