diff options
| author |  scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-31 14:00:10 +0000 |
|---|---|---|
| committer | scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-05-31 14:00:10 +0000 |
| commit | 7def5e1630d47cdbfa4b58a9c86bc060693c4d79 (patch) | |
| tree | 548101df35f6b8bc30a73784c26b3f20527b34a4 /gyp | |
| parent | f865be37868430ab75e3c787afc2869ba18216c3 (diff) | |
Separate 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
Review URL: https://codereview.chromium.org/15806010
git-svn-id: http://skia.googlecode.com/svn/trunk@9364 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/core.gypi | 4 | ||||
| -rw-r--r-- | gyp/gmslides.gypi | 1 | ||||
| -rw-r--r-- | gyp/images.gyp | 6 | ||||
| -rw-r--r-- | gyp/tools.gyp | 1 |
4 files changed, 6 insertions, 6 deletions
diff --git a/gyp/core.gypi b/gyp/core.gypi index ab73ede52b..534c8884d4 100644 --- a/gyp/core.gypi +++ b/gyp/core.gypi @@ -189,7 +189,7 @@ '<(skia_src_path)/image/SkDataPixelRef.cpp', '<(skia_src_path)/image/SkImage.cpp', '<(skia_src_path)/image/SkImagePriv.cpp', -# '<(skia_src_path)/image/SkImage_Codec.cpp', + '<(skia_src_path)/image/SkImage_Codec.cpp', # '<(skia_src_path)/image/SkImage_Gpu.cpp', '<(skia_src_path)/image/SkImage_Picture.cpp', '<(skia_src_path)/image/SkImage_Raster.cpp', @@ -232,6 +232,8 @@ '<(skia_include_path)/core/SkFontHost.h', '<(skia_include_path)/core/SkGeometry.h', '<(skia_include_path)/core/SkGraphics.h', + '<(skia_include_path)/core/SkImageDecoder.h', + '<(skia_include_path)/core/SkImageEncoder.h', '<(skia_include_path)/core/SkImageFilter.h', '<(skia_include_path)/core/SkImageFilterUtils.h', '<(skia_include_path)/core/SkInstCnt.h', diff --git a/gyp/gmslides.gypi b/gyp/gmslides.gypi index b37154c628..ca833a5b08 100644 --- a/gyp/gmslides.gypi +++ b/gyp/gmslides.gypi @@ -54,7 +54,6 @@ '../gm/imagemagnifier.cpp', '../gm/lerpmode.cpp', '../gm/lighting.cpp', - '../src/image/SkImage_Codec.cpp', '../gm/image.cpp', '../gm/imagefiltersbase.cpp', '../gm/imagefiltersgraph.cpp', diff --git a/gyp/images.gyp b/gyp/images.gyp index d63a59433c..44f944cc36 100644 --- a/gyp/images.gyp +++ b/gyp/images.gyp @@ -25,8 +25,7 @@ '../src/image/', ], 'sources': [ - '../include/images/SkImageDecoder.h', - '../include/images/SkImageEncoder.h', + '../include/images/SkForceLinking.h', '../include/images/SkImageRef.h', '../include/images/SkImageRef_GlobalPool.h', '../src/images/SkJpegUtility.h', @@ -38,11 +37,12 @@ '../src/images/SkBitmapRegionDecoder.cpp', + '../src/images/SkForceLinking.cpp', '../src/images/SkImageDecoder.cpp', '../src/images/SkImageDecoder_FactoryDefault.cpp', '../src/images/SkImageDecoder_FactoryRegistrar.cpp', # If decoders are added/removed to/from (all/individual) - # platform(s), be sure to update SkImageDecoder.cpp:force_linking + # platform(s), be sure to update SkForceLinking.cpp # so the right decoders will be forced to link. '../src/images/SkImageDecoder_libbmp.cpp', '../src/images/SkImageDecoder_libgif.cpp', diff --git a/gyp/tools.gyp b/gyp/tools.gyp index 7e0a03b63b..ede028a0d7 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -65,7 +65,6 @@ 'type': 'executable', 'sources': [ '../tools/skhello.cpp', - '../src/image/SkImage_Codec.cpp', ], 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', |