DescriptionSeparate core and images project.
SkImage calls functions on SkImageDecoder and SkImageEncoder. This
is desired behavior, and it is also desired to include SkImage as
a part of core. In order to keep core from depending on images,
update SkImageDecoder_empty.cpp to implement all of SkImageDecoder
and SkImageEncoder. This file will be built by chrome (in
https://codereview.chromium.org/15960015).
Move force_linking from SkImageDecoder.cpp to its own file. It must
be called to force linking with the image decoders if desired. Call
the function in tools that need it:
sk_image
render_pictures
render_pdfs
sk_hello
filter
bench_pictures
debugger
SkImageDecoder:
Derive from SkNoncopyable, instead of duplicating its
hiding of constructors.
skhello:
Return rather than trying to write a null SkData to the stream.
Revert "Hamfistedly removed core dependence on images"
(commit 0f05f682a90bc125323677abf3476e1027d174f5) and
"Move SkImage::encode to SkImage_Codec.cpp."
(commit 83e47a954d0bf65439f3d9c0c93213063dd70da3.)
These two commits were temporary fixes that this change
cleans up.
SkSnapshot.cpp:
Check for a NULL encoder returned by SkImageEncoder::Create.
BUG=https://code.google.com/p/skia/issues/detail?id=1275
R=djsollen@google.com, robertphillips@google.com
Committed: https://code.google.com/p/skia/source/detail?r=9364
Patch Set 1 #Patch Set 2 : Fixes. #Patch Set 3 : Fixes for non-linux platforms. #Patch Set 4 : Remove SkImageDecoder.cpp from images.gyp #Patch Set 5 : Use SkImageDecoder_empty and avoid static initializations. #Patch Set 6 : Leave SkImageDecoder_iOS alone. #
Total comments: 10
Patch Set 7 : Respond to comments. #
Total comments: 3
Patch Set 8 : Just a rebase #Patch Set 9 : Change FORCE_LINKING to be more specific. #
Messages
Total messages: 8 (0 generated)
|