diff options
| author |  msarett <msarett@google.com> | 2016-03-25 08:58:55 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-25 08:58:55 -0700 |
| commit | c1d0312b227328bee7240d1df4ceee55cf6e1858 (patch) | |
| tree | 97e1e19854530f9481bbac3fb59e54075083d779 /src/codec | |
| parent | 587ea71a522cd05601b401d17ad207c01f0ee0d6 (diff) | |
Rename encoders to Sk*ImageEncoder
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1836493002
CQ_EXTRA_TRYBOTS=client.skia.compile:Build-Ubuntu-GCC-x86_64-Release-CMake-Trybot,Build-Mac-Clang-x86_64-Release-CMake-Trybot
Review URL: https://codereview.chromium.org/1836493002
Diffstat (limited to 'src/codec')
| -rw-r--r-- | src/codec/SkJpegCodec.cpp | 2 | ||||
| -rw-r--r-- | src/codec/SkJpegDecoderMgr.cpp | 3 | ||||
| -rw-r--r-- | src/codec/SkJpegDecoderMgr.h | 4 | ||||
| -rw-r--r-- | src/codec/SkJpegUtility.cpp (renamed from src/codec/SkJpegUtility_codec.cpp) | 3 | ||||
| -rw-r--r-- | src/codec/SkJpegUtility.h (renamed from src/codec/SkJpegUtility_codec.h) | 0 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/codec/SkJpegCodec.cpp b/src/codec/SkJpegCodec.cpp index 2005d1d694..76d2ee8572 100644 --- a/src/codec/SkJpegCodec.cpp +++ b/src/codec/SkJpegCodec.cpp @@ -9,7 +9,6 @@ #include "SkMSAN.h" #include "SkJpegCodec.h" #include "SkJpegDecoderMgr.h" -#include "SkJpegUtility_codec.h" #include "SkCodecPriv.h" #include "SkColorPriv.h" #include "SkStream.h" @@ -18,6 +17,7 @@ // stdio is needed for libjpeg-turbo #include <stdio.h> +#include "SkJpegUtility.h" extern "C" { #include "jerror.h" diff --git a/src/codec/SkJpegDecoderMgr.cpp b/src/codec/SkJpegDecoderMgr.cpp index cc44f3c421..63228bb585 100644 --- a/src/codec/SkJpegDecoderMgr.cpp +++ b/src/codec/SkJpegDecoderMgr.cpp @@ -6,7 +6,8 @@ */ #include "SkJpegDecoderMgr.h" -#include "SkJpegUtility_codec.h" + +#include "SkJpegUtility.h" /* * Print information, warning, and error messages diff --git a/src/codec/SkJpegDecoderMgr.h b/src/codec/SkJpegDecoderMgr.h index 7d34b67a0c..e1127bad34 100644 --- a/src/codec/SkJpegDecoderMgr.h +++ b/src/codec/SkJpegDecoderMgr.h @@ -10,10 +10,8 @@ #include "SkCodec.h" #include "SkCodecPriv.h" -#include "SkJpegUtility_codec.h" - -// stdio is needed for jpeglib #include <stdio.h> +#include "SkJpegUtility.h" extern "C" { #include "jpeglib.h" diff --git a/src/codec/SkJpegUtility_codec.cpp b/src/codec/SkJpegUtility.cpp index 19ece5e6ad..2cf36bacf1 100644 --- a/src/codec/SkJpegUtility_codec.cpp +++ b/src/codec/SkJpegUtility.cpp @@ -5,8 +5,9 @@ * found in the LICENSE file. */ +#include "SkJpegUtility.h" + #include "SkCodecPriv.h" -#include "SkJpegUtility_codec.h" /* * Initialize the source manager diff --git a/src/codec/SkJpegUtility_codec.h b/src/codec/SkJpegUtility.h index 43391017b5..43391017b5 100644 --- a/src/codec/SkJpegUtility_codec.h +++ b/src/codec/SkJpegUtility.h |