commit 27631bd5936e03fcfe854a8aa4e55c8b959a10b3
author scroggo <scroggo@chromium.org> Mon Jun 15 09:10:03 2015 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jun 15 09:10:03 2015 -0700
tree 44763860851d52f50b78e7619b344259114c7591
parent ce9d11189a5924b47c3629063b72bae9d466c2c7

Revert "Remove ambiguity of SkJpegUtility name."

TBR=mtklein

This reverts commit 93858b49a9f3bd3037d61822c095ef59199870af.

This revert should fix the Android framework build.

NOTREECHECKS=True
NOTRY=True

Review URL: https://codereview.chromium.org/1187463005

gyp/images.gyp

diff --git a/gyp/images.gyp b/gyp/images.gyp
index 8ecf65f..d40626d 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -31,7 +31,7 @@
       'sources': [
         '../include/images/SkDecodingImageGenerator.h',
         '../include/images/SkForceLinking.h',
-        '../src/images/SkJpegUtility_images.h',
+        '../src/images/SkJpegUtility.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_images.cpp',
+        '../src/images/SkJpegUtility.cpp',
         '../src/images/SkMovie.cpp',
         '../src/images/SkMovie_gif.cpp',
         '../src/images/SkPageFlipper.cpp',

src/images/SkImageDecoder_libjpeg.cpp

diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp
index f868de4..8e92dd8 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_images.h"
+#include "SkJpegUtility.h"
 #include "SkColorPriv.h"
 #include "SkDither.h"
 #include "SkScaledBitmapSampler.h"

src/images/SkJpegUtility.cpp

diff --git a/src/images/SkJpegUtility_images.cpp b/src/images/SkJpegUtility.cpp
similarity index 98%
rename from src/images/SkJpegUtility_images.cpp
rename to src/images/SkJpegUtility.cpp
index 985ad21..937c5ec 100644
--- a/src/images/SkJpegUtility_images.cpp
+++ b/src/images/SkJpegUtility.cpp
@@ -6,7 +6,7 @@
  */
 
 
-#include "SkJpegUtility_images.h"
+#include "SkJpegUtility.h"
 
 /////////////////////////////////////////////////////////////////////
 static void sk_init_source(j_decompress_ptr cinfo) {

src/images/SkJpegUtility.h

diff --git a/src/images/SkJpegUtility_images.h b/src/images/SkJpegUtility.h
similarity index 100%
rename from src/images/SkJpegUtility_images.h
rename to src/images/SkJpegUtility.h