| 2880df2609eba09b555ca37be04b6ad89290c765 |
|
29-Oct-2015 |
Tom Hudson <tomhudson@google.com> |
Revert "Revert "Merge remote-tracking branch 'goog/master-skia' into goog/master""
When I broke android yesterday we reverted this merge to fix the breakage.
Undoing that revert so we can pull in the fix from Skia.
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|
| f7834221ac5342a3446b9b299398ea3ff7976946 |
|
28-Oct-2015 |
Tom Hudson <tomhudson@google.com> |
Revert "Merge remote-tracking branch 'goog/master-skia' into goog/master"
This reverts commit 0efb99a7c27bb2c4fc1a89993da5948a4e971823.
Change-Id: I971811435410091088a932f79ddbe254fd80e79d
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|
| 96fcdcc219d2a0d3579719b84b28bede76efba64 |
|
27-Aug-2015 |
halcanary <halcanary@google.com> |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|
| 385fe4d4b62d7d1dd76116dd570df3290a2f487b |
|
26-Aug-2015 |
halcanary <halcanary@google.com> |
Style Change: SkNEW->new; SkDELETE->delete
DOCS_PREVIEW= https://skia.org/?cl=1316123003
Review URL: https://codereview.chromium.org/1316123003
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|
| 567ff2f6143ecb993dbedede402a43feb71c420a |
|
27-Apr-2015 |
tfarina <tfarina@chromium.org> |
Cleanup: Remove unnecessary double-semicolons.
The entries were found by the following command line:
$ find . -regex ".*\.[cChH]\(pp\)?" | xargs git grep -e ';;' --and --not
-e 'for *(.*;;'
Which is a combination of http://stackoverflow.com/a/3858879 and
http://gitster.livejournal.com/27674.html
BUG=None
R=mtklein@google.com
Review URL: https://codereview.chromium.org/1088763005
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|
| 36352bf5e38f45a70ee4f4fc132a38048d38206d |
|
26-Mar-2015 |
mtklein <mtklein@chromium.org> |
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true
BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1037793002
Review URL: https://codereview.chromium.org/1037793002
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|
| 72c9faab45124e08c85f70ca38536914862d947c |
|
09-Jan-2015 |
mtklein <mtklein@chromium.org> |
Fix up all the easy virtual ... SK_OVERRIDE cases.
This fixes every case where virtual and SK_OVERRIDE were on the same line,
which should be the bulk of cases. We'll have to manually clean up the rest
over time unless I level up in regexes.
for f in (find . -type f); perl -p -i -e 's/virtual (.*)SK_OVERRIDE/\1SK_OVERRIDE/g' $f; end
BUG=skia:
Review URL: https://codereview.chromium.org/806653007
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|
| 2a1208017dd676f94a53bbb228197c3978dbdd8a |
|
22-Oct-2014 |
scroggo <scroggo@google.com> |
Qualify the return value of SkImageDecoder::decode
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:b/17419670
Review URL: https://codereview.chromium.org/647023006
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|
| c5e15a1afab2621e860a251c3fcf5917867ad49f |
|
29-Sep-2014 |
reed <reed@google.com> |
remove alphatype from colortable
the owning bitmap is (already) responsible for knowing the alphatype
BUG=skia:
R=djsollen@google.com
Author: reed@google.com
Review URL: https://codereview.chromium.org/611093002
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|
| 56a6b6ba9dcb85700c0fd11c1d097e06dc9e1a6b |
|
08-Jul-2014 |
Derek Sollenberger <djsollen@google.com> |
fix WBMP image will get null color table when draw in RGB565 Canvas
Symptom: draw Index8 to RGB565 will using SkColorTable::lock16BitCache and return a null array.
Root Cause:lock16BitCache return null pointer because default type is kPremul_SkAlphaType
Solution: WBMP color table should be kOpaque_SkAlphaType
Reproduce steps: draw a WBMP with a matrix that apply rotate and transform
This patch was proposed by arthur_hung at htc.com to the AOSP project.
R=reed@google.com, scroggo@google.com
Review URL: https://codereview.chromium.org/377443007
/external/skia/src/images/SkImageDecoder_wbmp.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/images/SkImageDecoder_wbmp.cpp
|
| 383a697692cf46951fd451f6f4c3d03634a6a1cb |
|
21-Oct-2013 |
reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
store SkAlphaType inside SkBitmap, on road to support unpremul
BUG=
R=bsalomon@google.com, scroggo@google.com
Review URL: https://codereview.chromium.org/25275004
git-svn-id: http://skia.googlecode.com/svn/trunk@11877 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/images/SkImageDecoder_wbmp.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/images/SkImageDecoder_wbmp.cpp
|
| 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/src/images/SkImageDecoder_wbmp.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/images/SkImageDecoder_wbmp.cpp
|
| 39edf4cd94e6fbeb8c1187a588b314e9795c81e4 |
|
25-Apr-2013 |
scroggo@google.com <scroggo@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Updates to skimage tool to use it for testing.
skimage_main.cpp:
More changes in the interest of testing our decoders.
force_all_opaque before writing PNG files.
Test reencoding the image to its original type (if possible), and
then test redecoding it (to make sure the encoding was successful).
Add an option to turn off this behavior.
Merge decodeFileAndWrite with decodeFile.
SkImageDecoder:
Add kUnknown_Type to SkImageEncoder::Types.
Add a static function to get the Format of an SkStream.
In getFormatName(), remove an incorrect assert.
When calling the flavor of DecodeStream that returns the Format,
check the stream if the decoder returns kUnknown_Format.
BUG=https://code.google.com/p/skia/issues/detail?id=1241
Review URL: https://codereview.chromium.org/14363003
git-svn-id: http://skia.googlecode.com/svn/trunk@8862 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|
| c49cabfe5cddc1691a00f713ae1b077d9409389f |
|
15-Mar-2013 |
skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@8168 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|
| a936e37cc76614868f5b489395bceeb340cc04cd |
|
14-Mar-2013 |
commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Upstream Android modifications to the image encoders/decoders.
This CL does not update the libjpeg as that change is large enough
to warrant its own CL.
Author: djsollen@google.com
Reviewed By: reed@google.com,robertphillips@google.com,scroggo@google.com
Review URL: https://chromiumcodereview.appspot.com/12604006
git-svn-id: http://skia.googlecode.com/svn/trunk@8155 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|
| e16efc1882ab34a0bb3ae361a2d37f840044cf87 |
|
26-Jan-2013 |
skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Sanitizing source files in Skia_Periodic_House_Keeping
git-svn-id: http://skia.googlecode.com/svn/trunk@7406 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|
| d6176b0dcacb124539e0cfd051e6d93a9782f020 |
|
23-Aug-2012 |
rmistry@google.com <rmistry@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/)
This CL is part II of IV (I broke down the 1280 files into 4 CLs).
Review URL: https://codereview.appspot.com/6474054
git-svn-id: http://skia.googlecode.com/svn/trunk@5263 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|
| e4e75dca21c559cc8889ed8d61ba028b023b064f |
|
27-Jun-2012 |
reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
remove duplicate definition of SkAlign8()
git-svn-id: http://skia.googlecode.com/svn/trunk@4363 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|
| 2a2cc2057347553f07d933b021876ba5502e55cd |
|
06-Jun-2012 |
caryclark@google.com <caryclark@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
fix warnings on Mac in src/images
Fix these class of warnings:
- unused functions
- unused locals
- sign mismatch
- missing function prototypes
- missing newline at end of file
- 64 to 32 bit truncation
The changes prefer to link in dead code in the debug build
with 'if (false)' than to comment it out, but trivial cases
are commented out or sometimes deleted if it appears to be
a copy/paste error.
Review URL: https://codereview.appspot.com/6299048
git-svn-id: http://skia.googlecode.com/svn/trunk@4179 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|
| ec51cb863409e238b40c5beef458669d9a824481 |
|
23-Mar-2012 |
robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Improved codec link-forcing system by adding Encoder/Decoder creation entry points
http://codereview.appspot.com/5881055/
git-svn-id: http://skia.googlecode.com/svn/trunk@3481 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|
| 8570b5c8695052378491b0c61e745d736fe85c8d |
|
20-Mar-2012 |
robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Adding CMYK jpeg changes w/o .gyp alterations
http://codereview.appspot.com/5785054/
git-svn-id: http://skia.googlecode.com/svn/trunk@3442 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|
| 0a89c90d18ab5082f2fde5076ce422aac493bb00 |
|
20-Mar-2012 |
robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
reverting to 3437
git-svn-id: http://skia.googlecode.com/svn/trunk@3439 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|
| d5c9e996dff7169cd6bfbf5c6d1543fca512c1a5 |
|
20-Mar-2012 |
robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
Fix for CMYK jpeg decoding issue (69 - unable to read some jpeg files on android)
http://codereview.appspot.com/5785054/
git-svn-id: http://skia.googlecode.com/svn/trunk@3438 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/images/SkImageDecoder_wbmp.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/images/SkImageDecoder_wbmp.cpp
|
| 3f1f06a26bdb2022a5c72f93ae623a57b6659464 |
|
03-Mar-2010 |
reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
add optional pref-config table to codecs
git-svn-id: http://skia.googlecode.com/svn/trunk@519 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|
| 00bf85a98675c9d0c3150bbeb0a3d7198ad8f21f |
|
22-Jan-2009 |
reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
pull from android: use registry to build up list of image codecs
git-svn-id: http://skia.googlecode.com/svn/trunk@76 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|
| 8a1c16ff38322f0210116fa7293eb8817c7e477e |
|
17-Dec-2008 |
reed@android.com <reed@android.com@2bbb7eff-a529-9590-31e7-b0007b416f81> |
grab from latest android
git-svn-id: http://skia.googlecode.com/svn/trunk@27 2bbb7eff-a529-9590-31e7-b0007b416f81
/external/skia/src/images/SkImageDecoder_wbmp.cpp
|