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

diff --git a/gyp/images.gyp b/gyp/images.gyp
index d40626d..8ecf65f 100644 (file)
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -31,7 +31,7 @@
       'sources': [
         '../include/images/SkDecodingImageGenerator.h',
         '../include/images/SkForceLinking.h',
-        '../src/images/SkJpegUtility.h',
+        '../src/images/SkJpegUtility_images.h',
         '../include/images/SkMovie.h',
         '../include/images/SkPageFlipper.h',
 
@@ -69,7 +69,7 @@
         '../src/images/SkImageEncoder.cpp',
         '../src/images/SkImageEncoder_Factory.cpp',
         '../src/images/SkImageEncoder_argb.cpp',
-        '../src/images/SkJpegUtility.cpp',
+        '../src/images/SkJpegUtility_images.cpp',
         '../src/images/SkMovie.cpp',
         '../src/images/SkMovie_gif.cpp',
         '../src/images/SkPageFlipper.cpp',

diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp
index 8e92dd8..f868de4 100644 (file)
--- 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
similarity index 99%
rename from src/images/SkJpegUtility.cpp
rename to src/images/SkJpegUtility_images.cpp
index 937c5ec..985ad21 100644 (file)
--- 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
similarity index 100%
rename from src/images/SkJpegUtility.h
rename to src/images/SkJpegUtility_images.h