| af1d4f84b8730781cc6dca61748cae66c237ca57 |
|
16-Oct-2014 |
Leon Scroggins III <scroggo@google.com> |
Qualify the return value of SkImageDecoder::decode
Cherry-pick of https://codereview.chromium.org/658343003/ in Skia.
Add a new enum to differentiate between a complete decode and a
partial decode (with the third value being failure). Return this
value from SkImageDecoder::onDecode (in all subclasses, plus
SkImageDecoder_empty) and ::decode.
For convenience, if the enum is treated as a boolean, success and
partial success are both considered true.
Note that the static helper functions (DecodeFile etc) still return
true and false (for one thing, this allows us to continue to use
SkImageDecoder::DecodeMemory as an SkPicture::InstallPixelRefProc in
SkPicture::CreateFromStream).
Also correctly report failure in SkASTCImageDecoder::onDecode when
SkTextureCompressor::DecompressBufferFromFormat fails.
BUG=skia:3037
BUG:17419670
Conflicts:
src/images/SkImageDecoder_astc.cpp
src/images/SkImageDecoder_ktx.cpp
src/images/SkImageDecoder_libjpeg.cpp
src/images/SkImageDecoder_pkm.cpp
Change-Id: I33e6940e247b74b20361ae041f8d36eb600df49f
/external/skia/include/core/SkImageDecoder.h
|
| c3b3266b7db2f1a41d41ecac010c766b7ad8eebc |
|
17-Jun-2014 |
reed <reed@google.com> |
hide SkBitmap::Config entirely (behind a flag)
patch from issue 339463002
TBR=
I think the NoGPU failure is unrelated, so ignoring
NOTRY=True
Author: reed@google.com
Review URL: https://codereview.chromium.org/340533002
/external/skia/include/core/SkImageDecoder.h
|
| 885f2ea46e9c1dcd656287bb57a7f92548184896 |
|
16-Jun-2014 |
reed <reed@google.com> |
fix legacy code path for SK_SUPPORT_LEGACY_IMAGEDECODER_CONFIG
BUG=skia:
R=scroggo@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/332223002
/external/skia/include/core/SkImageDecoder.h
|
| bfefc7c95fc0e8ebd5000c68f6d16e1a3ea0e71e |
|
13-Jun-2014 |
reed <reed@chromium.org> |
hide Config in SkImageDecoder -- use SkColorType instead
patch from issue 334613003
TBR=scroggo
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/334793002
/external/skia/include/core/SkImageDecoder.h
|
| 2f785a24eba5b59da30f5ffa0c53cc731e4c3078 |
|
12-Jun-2014 |
reed <reed@google.com> |
remove GetDeviceConfig/SetDeviceConfig
BUG=skia:
R=scroggo@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/332453002
/external/skia/include/core/SkImageDecoder.h
|
| 5926b86b90c68bffefbdc8639e41b5bc9102cec6 |
|
11-Jun-2014 |
reed <reed@google.com> |
hide SkImageDecoder::Chooser
BUG=skia:
R=scroggo@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/331433003
/external/skia/include/core/SkImageDecoder.h
|
| 6c22573edb234ad14df947278cfed010669a39a7 |
|
10-Jun-2014 |
reed <reed@chromium.org> |
hide SkBitmap::setConfig
patch from issue 325733002
TBR=scroggo
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/322963002
/external/skia/include/core/SkImageDecoder.h
|
| 99ffe24200d8940ceba20f6fbf8c460f994d3cd1 |
|
03-Jun-2014 |
krajcevski <krajcevski@google.com> |
Initial KTX file decoder
R=bsalomon@google.com, robertphillips@google.com, halcanary@google.com, reed@google.com
Author: krajcevski@google.com
Review URL: https://codereview.chromium.org/302333002
/external/skia/include/core/SkImageDecoder.h
|
| 8cf81e0f4fa2a8054ac4cea1e7490028809cb893 |
|
22-May-2014 |
robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Simple PKM image decoder.
https://codereview.chromium.org/292663011/
git-svn-id: http://skia.googlecode.com/svn/trunk@14852 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkImageDecoder.h
|
| e3beb6bd7de7fa211681abbb0be58e80b19885e0 |
|
07-Apr-2014 |
commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> |
SkNonCopyable should be used with private inheritance.
This is mostly s/public SkNoncopyable/SkNoncopyable/g.
Two classes (SkDrawLooper::Context and SkPicture::OperationList) don't actually work with SkNoncopyable because they introduce a virtual destructor. I added SkNoncopyableVirtual to make them work as intended. Sort of questionable whether they really need to be noncopyable in the first place, but I guess it doesn't hurt to keep the behavior the same.
BUG=skia:
R=reed@google.com, mtklein@google.com
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/226183018
git-svn-id: http://skia.googlecode.com/svn/trunk@14081 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkImageDecoder.h
|
| 622eda7373796084c554bcb7bbfa38ffb6cbd199 |
|
07-Apr-2014 |
commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Remove deprecated function.
We have switched Android to call decodeSubset, so this function
is no longer necessary.
R=reed@google.com
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/225413013
git-svn-id: http://skia.googlecode.com/svn/trunk@14072 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkImageDecoder.h
|
| 62f1048ada9312f48fc62f8de4f91a0a8f8f6047 |
|
15-Jan-2014 |
tfarina@chromium.org <tfarina@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Deprecate two more functions using SK_ATTR_DEPRECATED macro.
BUG=None
TEST=None
R=reed@google.com, scroggo@google.com
Review URL: https://codereview.chromium.org/136973007
git-svn-id: http://skia.googlecode.com/svn/trunk@13079 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkImageDecoder.h
|
| 29d96935ae34dfcd6e403f9beefa7436e226836e |
|
09-Dec-2013 |
halcanary@google.com <halcanary@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
SkDecodingImageGenerator now uses SkStreamRewindable
This makes sense since Android will be giving us a stream and the
decoders expect a stream. This also removes some glue code,
DecodeMemoryToTarget, that works better using a SkImageGenerator.
Motivation: This is a necessary step to move from SkImageRef to
SkDiscardablePixelRef.
SkImageDecoder::DecodeMemoryToTarget function removed.
BUG=
R=reed@google.com, scroggo@google.com
Review URL: https://codereview.chromium.org/101973005
git-svn-id: http://skia.googlecode.com/svn/trunk@12560 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkImageDecoder.h
|
| 2c7c7ee47d75e7815ea8db05e924ab55958cb402 |
|
05-Dec-2013 |
halcanary@google.com <halcanary@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Big Cleanup: SkBitmapFactory, SkLazyPixelRef, SkImageCache
Removed SkBitmapFactory since no clients were using it. New cache
selection mechanism can simply pass a SkDiscardableMemory::Factory
into the SkDiscardablePixelRef if non-default SkDiscardableMemory
should be used. Removed BitmapFactoryTest.
SkDiscardableMemory::Factory interface. Android will need this
functionality in the future inside their BitmapFactory.
Removed SkLazyPixelRef, since it's functionality is now subsumed into
SkDiscardablePixelRef. Removed LazyPixelRef test.
Modified SkDiscardablePixelRef to optionally allow it to use a
SkDiscardableMemory::Factory. This tiny change makes it a replacement
for SkLazyPixelRef. This functioanlity is also necessary for moving
Android over to SkDiscardablePixelRef from SkImageRef in a later CL.
Added a test for this.
SkDecodingImageGenerator::Install can optionally pass a factory in to
SkDiscardablePixelRef.
Removed SkImageCache, SkLruImageCache, and SkPurgeableImageCache.
This functionality can be handled much more cleanly by
SkDiscardableMemory.
New SkDiscardableMemoryPool class to replace SkLruImageCache. In a
later CL, we will replace SkImageRef_GlobalPool (used by android) as
well. This is a concrete implementation of
SkDiscardableMemory::Factory. Added a test for this.
modified gm/factory.cpp to remove dependnce on SkBitmapFactory +
SkLruImageCache. Now uses SkDecodingImageGenerator +
SkDiscardablePixelRef + SkDiscardableMemoryPool.
SkImageDecoder::Target replaces SkBitmapFactory::Target. The
DecodeMemoryToTarget function may disappear in the future.
Moved SkLazyCachingPixelRef::DecodeProc replaces
SkBitmapFactory::DecodeProc. This is a short term change, since
another CL changes SkLazyCachingPixelRef to use SkImageGenerator
instead of DecodeProc.
Modified DrawBitmapRectTest to use SkDiscardablePixelRef instead of
SkLazyPixelRef.
tools/LazyDecodeBitmap.cpp now uses SkDecodingImageGenerator +
SkDiscardablePixelRef instead of a SkBitmapFactory.
bench_pictures uses the Global SkDiscardableMemoryPool instead of a
global gLruImageCache.
R=reed@google.com, scroggo@google.com
Review URL: https://codereview.chromium.org/103033002
git-svn-id: http://skia.googlecode.com/svn/trunk@12515 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkImageDecoder.h
|
| a0b266d8170211d9f2a6f90ba9c889f0c1b6d1b6 |
|
04-Dec-2013 |
scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Remove deprecated setPrefConfigTable.
Safe once its only caller (in Android) has been updated.
BUG=skia:1874
R=reed@google.com
Review URL: https://codereview.chromium.org/99473004
git-svn-id: http://skia.googlecode.com/svn/trunk@12491 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkImageDecoder.h
|
| 5c37189ffeae51f01172b9ea27aa3940d1362e26 |
|
02-Dec-2013 |
reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
restore [6] for setPrefConfigTable, accidentally changed with A1 CL
BUG=
Review URL: https://codereview.chromium.org/99963002
git-svn-id: http://skia.googlecode.com/svn/trunk@12433 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkImageDecoder.h
|
| d6bab0238655dbab24dfe92bd0b16b464310a8c7 |
|
02-Dec-2013 |
rmistry@google.com <rmistry@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Reverting r12427
git-svn-id: http://skia.googlecode.com/svn/trunk@12428 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkImageDecoder.h
|
| 5b39f5ba9c339d1e4dae391fee9ec1396feec180 |
|
02-Dec-2013 |
skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@12427 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkImageDecoder.h
|
| 11f392ed531f05e8de6b6af6ae607f90aeb080c6 |
|
26-Nov-2013 |
commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Revert "Revert "remove kA1_Config, as it is no longer supported""
This reverts commit 36d712f2d4c5c79719280ad95523e6aaa88b068e.
BUG=
R=rmistry@google.com, mtklein@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/86483002
git-svn-id: http://skia.googlecode.com/svn/trunk@12392 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkImageDecoder.h
|
| 72e7808d62c02f0371135b1c152bd00b73f62479 |
|
25-Nov-2013 |
reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Revert "remove kA1_Config, as it is no longer supported"
This reverts commit 2d72d8b242eac6e9d30228f5b0a407236491c369.
git-svn-id: http://skia.googlecode.com/svn/trunk@12387 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkImageDecoder.h
|
| 2a1f4464d150d2dc8c3fe2f39e9fb3503b7f4f54 |
|
25-Nov-2013 |
reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
remove kA1_Config, as it is no longer supported
BUG=
R=djsollen@google.com
Review URL: https://codereview.chromium.org/83093005
git-svn-id: http://skia.googlecode.com/svn/trunk@12384 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkImageDecoder.h
|
| 2bd8b8100529c96c81c30f749f672f4caf775b04 |
|
01-Nov-2013 |
reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
move SkImage::ColorType into SkColorType
objective -- move clients over to SkImage
tasks
- use SkImageInfo instead of SkBitmap::Config
- add support for colortables to SkImage
- add drawImage to SkCanvas
- return SkImage from readPixels
This CL works towards the first task
R=robertphillips@google.com
Review URL: https://codereview.chromium.org/54363008
git-svn-id: http://skia.googlecode.com/svn/trunk@12077 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkImageDecoder.h
|
| 8d2392487cd97e68c0a71da9fd5d2b42ecac5ec8 |
|
01-Oct-2013 |
scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Add an option on SkImageDecoder to skip writing 0s.
Only implemented for PNG.
Add a getter and setter, and sets the default to false in the
constructor. Also copies the setting in copyFieldsToOther.
Fix an indpendent bug where fDitherImage was not being copied in
copyFieldsToOther.
In SkScaledBitmapSampler::begin, consolidate the settings passed in
by passing a const reference to the decoder. The decoder can be
referenced for its settings of dither, unpremultiplied, and now
skipping writing zeroes. Update callers to use the new API. In png
decoder, rather than passing around a pointer to an initial
read of getDitherImage, and potentially changing it, look at the
field on the decoder itself, and modify it directly. This is a
change in behavior - now if that same decoder is used to decode
a different image, the dither setting has changed. I think this is
okay because A) the typical use case is to use a new decoder for
each decode, B) we do not make any promises that a decode does not
change the decoder and C) it makes the code in SkScaledBitmapSampler
much cleaner.
In SkScaledBitmapScampler, add new row procs for skipping zeroes. Now
that choosing the row proc has five dimensions (src config, dst config,
dither, skip writing zeroes, unpremultiplied), use a new method: each
src/dst combination has a function for choosing the right proc depending
on the decoder.
SkScaledBitmapScampler::RowProc is now public for convenience.
Remove Sample_Gray_D8888_Unpremul, which is effectively no different
from Sample_Gray_D8888.
In cases where unpremultiplied was trivial, such as 565 and when
sampling from gray, decoding may now succeed.
Add a benchmark (currently disabled) for comparing the speed of skipping
writing zeroes versus not skipping. For this particular image, which is
mostly transparent pixels, normal decoding took about 3.6 milliseconds,
while skipping zeroes in the decode took only about 2.5 milliseconds
(this is on a Nexus 4). Presumably it would be slower on an image
with a small amount of transparency, but there will be no slowdown
for an image which reports that it has no transparency.
In SkImageRef_ashmem, always skip writing zeroes, since ashmem
memory is guaranteed to be initialized to 0.
Add a flag to skip writing zeroes in skimage.
Add a regression test for choosing the rowproc to ensure I did not
change any behavior accidentally.
BUG=skia:1661
R=reed@google.com
Review URL: https://codereview.chromium.org/24269006
git-svn-id: http://skia.googlecode.com/svn/trunk@11558 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkImageDecoder.h
|
| b5571b3324cf18629a255ec85e189447069c9b14 |
|
25-Sep-2013 |
scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Change SkImageDecoders to take an SkStreamRewindable.
Only affects factories, static functions that will use the factories,
and subset decoding, which all require rewinding. The decoders
themselves continue to take an SkStream. This is merely documentation
stating which functions will possibly rewind the passed in SkStream.
This is part of the general change to coordinate SkStreams with
Android's streams, which don't necessarily support rewinding in all
cases.
Update callers to use SkStreamRewindable.
BUG=skia:1572
R=bungeman@google.com, reed@google.com
Review URL: https://codereview.chromium.org/23477009
git-svn-id: http://skia.googlecode.com/svn/trunk@11460 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkImageDecoder.h
|
| bd6343b1d60d2a85e930f33f4b06b4502b3e8caa |
|
04-Sep-2013 |
mtklein@google.com <mtklein@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Rewrite SkTRegistry to take any trivially-copyable type.
Obviously these are all currently function pointers of type T(*)(P) for various
T and P. In bench refactoring, I'm trying to register a function pointer of
type T(*)(), which can't be done as is (passing P=void doesn't work). This
also lets us register things like primitives, which is conceivable useful.
BUG=
R=reed@google.com, scroggo@google.com
Review URL: https://codereview.chromium.org/23453031
git-svn-id: http://skia.googlecode.com/svn/trunk@11082 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkImageDecoder.h
|
| f698c8262df397a7015662e91b1a727e1134c418 |
|
18-Jul-2013 |
scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Allow decoding JPEG into A8.
If the original image is grayscale, allow decoding into A8.
Change the size of PrefConfigTable to allow for 8bit gray, a new source config.
Add a new sampler to SkScaledBitmapSampler to 'convert' to A8.
FIXME: Should there be a dithered option for gray scale?
R=reed@google.com
Review URL: https://codereview.chromium.org/18083026
git-svn-id: http://skia.googlecode.com/svn/trunk@10157 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkImageDecoder.h
|
| 468142b2f50de055f00d5684515d962777da5131 |
|
09-Jul-2013 |
scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Allow ico decoder to decode PNG sub-images.
Since Windows Vista, PNG can be embedded in an ICO file. Update
our decoder to support this.
BUG=https://code.google.com/p/skia/issues/detail?id=1398
R=djsollen@google.com
Review URL: https://codereview.chromium.org/18655007
git-svn-id: http://skia.googlecode.com/svn/trunk@9932 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkImageDecoder.h
|
| bc69ce982f8374742ca910587485f0d741350c2d |
|
09-Jul-2013 |
scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Remove bitmap reuse from SkImageDecoder.
Now that Android is using an SkBitmap::Allocator to reuse bitmap
memory, remove the unnecessary code to handle bitmap reuse inside
the decoders themselves.
Leaves in the code for bitmap reuse in decodeSubset, which still
may reuse bitmaps, and cropBitmap, which is called by decodeSubset.
R=djsollen@google.com
Review URL: https://codereview.chromium.org/17620004
git-svn-id: http://skia.googlecode.com/svn/trunk@9931 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkImageDecoder.h
|
| 2bbc2c945bb0ecf18fd6473af74ad1a2f5e727a7 |
|
14-Jun-2013 |
scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Add an option to create unpremultiplied bitmaps.
Currently they cannot be used directly by Skia, but
the pixels can be used elsewhere.
SkImageDecoder:
Add functions to require unpremultiplied output
and query the presence of the requirement
SkImageDecoder_libpng:
SkImageDecoder_libwebp:
SkImageDecoder_WIC:
Respect the requirement for unpremultiplied output.
TODO: Fix SkImageDecoder_CG.
SkScaledBitmapSampler:
Add procs to skip premultiplication and a boolean
parameter to use those procs.
ImageDecodingTest:
Test unpremultiplied bitmap decoding.
SampleUnpremul:
Add a sample which allows visually comparing between the
unpremultiplied version (copied into a premultiplied bitmap,
since drawing unpremultiplied is not currently supported)
and a premultiplied version of image files.
gm.h:
Add a getter for the resource path, so Samples can use it.
As of patch set 13, https://codereview.chromium.org/16816016/
and https://codereview.chromium.org/16983004/, which were
approved separately.
R=reed@google.com
Review URL: https://codereview.chromium.org/16410009
git-svn-id: http://skia.googlecode.com/svn/trunk@9612 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/include/core/SkImageDecoder.h
|
| 7def5e1630d47cdbfa4b58a9c86bc060693c4d79 |
|
31-May-2013 |
scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
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
/external/skia/include/core/SkImageDecoder.h
|