aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar msarett <msarett@google.com>2015-07-30 11:36:40 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-07-30 11:36:40 -0700
commitb46e5e2033e4ef25c515adf780a4e0d007da0d20 (patch)
tree51bf67d2ed8ab845937b223c655f78fc11bf24d6
parent4358f13ac614d572c137e95748c6dc2ca0d66784 (diff)
Rename SkCodec_libbmp to SkBmpCodec
-rw-r--r--gyp/codec.gyp2
-rw-r--r--src/codec/SkBmpCodec.cpp (renamed from src/codec/SkCodec_libbmp.cpp)2
-rw-r--r--src/codec/SkBmpCodec.h (renamed from src/codec/SkCodec_libbmp.h)0
-rw-r--r--src/codec/SkCodec.cpp2
-rw-r--r--src/codec/SkCodec_libico.cpp2
5 files changed, 4 insertions, 4 deletions
diff --git a/gyp/codec.gyp b/gyp/codec.gyp
index ce305731f2..5a368af821 100644
--- a/gyp/codec.gyp
+++ b/gyp/codec.gyp
@@ -32,8 +32,8 @@
'../src/core',
],
'sources': [
+ '../src/codec/SkBmpCodec.cpp',
'../src/codec/SkCodec.cpp',
- '../src/codec/SkCodec_libbmp.cpp',
'../src/codec/SkCodec_libgif.cpp',
'../src/codec/SkCodec_libico.cpp',
'../src/codec/SkCodec_libpng.cpp',
diff --git a/src/codec/SkCodec_libbmp.cpp b/src/codec/SkBmpCodec.cpp
index 13a6f3e405..a1f15691a5 100644
--- a/src/codec/SkCodec_libbmp.cpp
+++ b/src/codec/SkBmpCodec.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "SkCodec_libbmp.h"
+#include "SkBmpCodec.h"
#include "SkCodecPriv.h"
#include "SkColorPriv.h"
#include "SkStream.h"
diff --git a/src/codec/SkCodec_libbmp.h b/src/codec/SkBmpCodec.h
index 9909945c51..9909945c51 100644
--- a/src/codec/SkCodec_libbmp.h
+++ b/src/codec/SkBmpCodec.h
diff --git a/src/codec/SkCodec.cpp b/src/codec/SkCodec.cpp
index a80b490274..1f83680ef6 100644
--- a/src/codec/SkCodec.cpp
+++ b/src/codec/SkCodec.cpp
@@ -5,9 +5,9 @@
* found in the LICENSE file.
*/
+#include "SkBmpCodec.h"
#include "SkCodec.h"
#include "SkData.h"
-#include "SkCodec_libbmp.h"
#include "SkCodec_libgif.h"
#include "SkCodec_libico.h"
#include "SkCodec_libpng.h"
diff --git a/src/codec/SkCodec_libico.cpp b/src/codec/SkCodec_libico.cpp
index 7df4879442..ea00f65df0 100644
--- a/src/codec/SkCodec_libico.cpp
+++ b/src/codec/SkCodec_libico.cpp
@@ -5,7 +5,7 @@
* found in the LICENSE file.
*/
-#include "SkCodec_libbmp.h"
+#include "SkBmpCodec.h"
#include "SkCodec_libico.h"
#include "SkCodec_libpng.h"
#include "SkCodecPriv.h"