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
diff --git a/src/codec/SkJpegCodec.cpp b/src/codec/SkJpegCodec.cpp
index 2005d1d..76d2ee8 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 cc44f3c..63228bb 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 7d34b67..e1127ba 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
similarity index 98%
rename from src/codec/SkJpegUtility_codec.cpp
rename to src/codec/SkJpegUtility.cpp
index 19ece5e..2cf36ba 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
similarity index 100%
rename from src/codec/SkJpegUtility_codec.h
rename to src/codec/SkJpegUtility.h