| 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/src/ports/SkImageDecoder_empty.cpp
|
| 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/src/ports/SkImageDecoder_empty.cpp
|
| 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/src/ports/SkImageDecoder_empty.cpp
|
| f0419e96b4b52b85fafd0d589c56944841dcda06 |
|
11-Jun-2014 |
scroggo <scroggo@google.com> |
Hide chooseFromOneChoice along with Chooser.
Fixes chrome canary.
R=reed@android.com
TBR=reed
NOTRY=true
Author: scroggo@google.com
Review URL: https://codereview.chromium.org/329113003
/external/skia/src/ports/SkImageDecoder_empty.cpp
|
| 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/src/ports/SkImageDecoder_empty.cpp
|
| 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/src/ports/SkImageDecoder_empty.cpp
|
| 479bb6062229a6ed5ed590cd6d727fa4b1ae6b9d |
|
04-Jun-2014 |
Hal Canary <halcanary@google.com> |
Remove SkImageRef and related functionality.
From here on out, use SkDecodingImageGenerator+SkDiscardablePixelRef.
R=scroggo@google.com
Review URL: https://codereview.chromium.org/100183002
/external/skia/src/ports/SkImageDecoder_empty.cpp
|
| 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/src/ports/SkImageDecoder_empty.cpp
|
| dbba5a4e979407c87e8d5bb7ef269ef9c39b2f74 |
|
05-Dec-2013 |
halcanary@google.com <halcanary@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Fix change src/ports/SkImageDecoder_empty.cpp missed in 103033002
BUG=
R=robertphillips@google.com
Review URL: https://codereview.chromium.org/107123002
git-svn-id: http://skia.googlecode.com/svn/trunk@12519 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/ports/SkImageDecoder_empty.cpp
|
| 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/src/ports/SkImageDecoder_empty.cpp
|
| e5c9c4960cbbb7aa26ba906439ed620d55879dad |
|
01-Oct-2013 |
scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Empty implementations for SkImageDecoder.
Add constructor and destructor, so SkScaledBitmapSampler's
DummyDecoder has no unresolved symbols in Chrome.
Fixes our Chrome canary.
Unreviewed.
Review URL: https://codereview.chromium.org/25536004
git-svn-id: http://skia.googlecode.com/svn/trunk@11566 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/ports/SkImageDecoder_empty.cpp
|
| 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/src/ports/SkImageDecoder_empty.cpp
|
| 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/src/ports/SkImageDecoder_empty.cpp
|
| 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/src/ports/SkImageDecoder_empty.cpp
|
| 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/src/ports/SkImageDecoder_empty.cpp
|
| 7ed0447762ac988838a191b465a90057bada12a1 |
|
29-May-2013 |
scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Use updated signature for decode in empty decoder.
This allows chromium to build SkImageDecoder_empty.cpp
(https://codereview.chromium.org/15960015/) until Skia
has https://codereview.chromium.org/15806010/ (which
is a superset of this change).
R=robertphillips@google.com
Review URL: https://codereview.chromium.org/15742029
git-svn-id: http://skia.googlecode.com/svn/trunk@9321 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/ports/SkImageDecoder_empty.cpp
|
| 5a7c6be72b940dde8ff6ad2485a09aecd56a2660 |
|
04-Oct-2012 |
scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Add the ability to provide function pointers to SkPicture serialization
and deserialization for encoding and decoding bitmaps.
Remove kForceFlattenBitmapPixels_Flag, which is no longer used.
When an SkOrderedReadBuffer needs to read a bitmap, if it does not
have an image decoder, use a dummy bitmap.
In GM, add a tolerance option for color differences, used when
testing picture serialization, so it can assume two images are the
same even though PNG encoding/decoding may have resulted in small
differences.
Create dummy implementations for SkImageDecoder and SkImageEncoder
functions in SkImageDecoder_empty so that a project that does not
want to include the images project it can still build.
Allow ports to build without images project.
In Mac's image encoder, copy 4444 to 8888 before encoding.
Add SkWriter32::reservePad, to provide a pointer to write non 4 byte
aligned data, padded with zeroes.
In bench_ and render_ pictures, pass decode function to SkPicture
creation from a stream.
BUG=https://code.google.com/p/skia/issues/detail?id=842
Review URL: https://codereview.appspot.com/6551071
git-svn-id: http://skia.googlecode.com/svn/trunk@5818 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/ports/SkImageDecoder_empty.cpp
|
| ec3ed6a5ebf6f2c406d7bcf94b6bc34fcaeb976e |
|
28-Jul-2011 |
epoger@google.com <epoger@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Automatic update of all copyright notices to reflect new license terms.
I have manually examined all of these diffs and restored a few files that
seem to require manual adjustment.
The following files still need to be modified manually, in a separate CL:
android_sample/SampleApp/AndroidManifest.xml
android_sample/SampleApp/res/layout/layout.xml
android_sample/SampleApp/res/menu/sample.xml
android_sample/SampleApp/res/values/strings.xml
android_sample/SampleApp/src/com/skia/sampleapp/SampleApp.java
android_sample/SampleApp/src/com/skia/sampleapp/SampleView.java
experimental/CiCarbonSampleMain.c
experimental/CocoaDebugger/main.m
experimental/FileReaderApp/main.m
experimental/SimpleCocoaApp/main.m
experimental/iOSSampleApp/Shared/SkAlertPrompt.h
experimental/iOSSampleApp/Shared/SkAlertPrompt.m
experimental/iOSSampleApp/SkiOSSampleApp-Base.xcconfig
experimental/iOSSampleApp/SkiOSSampleApp-Debug.xcconfig
experimental/iOSSampleApp/SkiOSSampleApp-Release.xcconfig
gpu/src/android/GrGLDefaultInterface_android.cpp
gyp/common.gypi
gyp_skia
include/ports/SkHarfBuzzFont.h
include/views/SkOSWindow_wxwidgets.h
make.bat
make.py
src/opts/memset.arm.S
src/opts/memset16_neon.S
src/opts/memset32_neon.S
src/opts/opts_check_arm.cpp
src/ports/SkDebug_brew.cpp
src/ports/SkMemory_brew.cpp
src/ports/SkOSFile_brew.cpp
src/ports/SkXMLParser_empty.cpp
src/utils/ios/SkImageDecoder_iOS.mm
src/utils/ios/SkOSFile_iOS.mm
src/utils/ios/SkStream_NSData.mm
tests/FillPathTest.cpp
Review URL: http://codereview.appspot.com/4816058
git-svn-id: http://skia.googlecode.com/svn/trunk@1982 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/ports/SkImageDecoder_empty.cpp
|
| b08eb2b3bce45411494fe00258e4c91248ccd15e |
|
06-Jan-2009 |
reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
separate image encode and decode
remove obsolete build-flag for encode
git-svn-id: http://skia.googlecode.com/svn/trunk@56 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/ports/SkImageDecoder_empty.cpp
|
| 6efdc47afc8bb24603fc0d15146ada609b728f2f |
|
19-Dec-2008 |
reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
first cut at event-based test app
git-svn-id: http://skia.googlecode.com/svn/trunk@37 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/ports/SkImageDecoder_empty.cpp
|