aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/images
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-06-12 08:43:30 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-06-12 08:43:30 -0700
commit93858b49a9f3bd3037d61822c095ef59199870af (patch)
tree64f765acbdb97cae5a9be31fd9f145e247a116f2 /src/images
parenta0f1a18b9d6cd60753502be95e2f0e3d13c0ae04 (diff)
Remove ambiguity of SkJpegUtility name.
We have two, one in images/, the other in codec/. As codec's the new hotness, I left it's name vanilla and suffixed the old one. BUG=skia: Review URL: https://codereview.chromium.org/1185733002
Diffstat (limited to 'src/images')
-rw-r--r--src/images/SkImageDecoder_libjpeg.cpp2
-rw-r--r--src/images/SkJpegUtility_images.cpp (renamed from src/images/SkJpegUtility.cpp)2
-rw-r--r--src/images/SkJpegUtility_images.h (renamed from src/images/SkJpegUtility.h)0
3 files changed, 2 insertions, 2 deletions
diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp
index 8e92dd874e..f868de4b43 100644
--- a/src/images/SkImageDecoder_libjpeg.cpp
+++ b/src/images/SkImageDecoder_libjpeg.cpp
@@ -8,7 +8,7 @@
#include "SkImageDecoder.h"
#include "SkImageEncoder.h"
-#include "SkJpegUtility.h"
+#include "SkJpegUtility_images.h"
#include "SkColorPriv.h"
#include "SkDither.h"
#include "SkScaledBitmapSampler.h"
diff --git a/src/images/SkJpegUtility.cpp b/src/images/SkJpegUtility_images.cpp
index 937c5ec6f6..985ad215a9 100644
--- a/src/images/SkJpegUtility.cpp
+++ b/src/images/SkJpegUtility_images.cpp
@@ -6,7 +6,7 @@
*/
-#include "SkJpegUtility.h"
+#include "SkJpegUtility_images.h"
/////////////////////////////////////////////////////////////////////
static void sk_init_source(j_decompress_ptr cinfo) {
diff --git a/src/images/SkJpegUtility.h b/src/images/SkJpegUtility_images.h
index 1a763f843c..1a763f843c 100644
--- a/src/images/SkJpegUtility.h
+++ b/src/images/SkJpegUtility_images.h