a5fdde9d15fbdf1aaeb61e1cf0c128af3aeb7b67 |
|
15-Apr-2016 |
Winson <winsonc@google.com> |
Take app screenshots in 565. - Or to be specific, SurfaceFlinger can’t easily take 565 screenshots, so convert them when creating the ashmem bitmap. Bug: 28151300 Change-Id: Ic7586659a41cc19c322136f77a1c52ef68c22707
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
562cfef1d5f179d1ca6b1672825f3533874d4650 |
|
31-Mar-2016 |
John Reck <jreck@google.com> |
Remove warning Fixes: 25760687 The recommendation floating around is to ignore this even though it's unquestionably an app bug so just remove it. Change-Id: I7075de5d2864874d786a0aab0c945be96de172e3
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
dccca44ffda4836b56a21da95a046c9708ffd49c |
|
21-Mar-2016 |
sergeyv <sergeyv@google.com> |
Reland: Move text logic from jni to hwui level Initial CL: https://googleplex-android-review.git.corp.google.com/#/c/886854/ Change-Id: I9dfd85fe1d2a2c44f4360c8a29fd58d80e6f31c8
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
afbd0f1fef46ef0ddf633dfde0de724db3da1405 |
|
21-Mar-2016 |
Sergei Vasilinetc <sergeyv@google.com> |
Revert "Move text logic from jni to hwui level" This reverts commit a7f6bba1a3565c19715e878dfe7f0e01022944ff. Change-Id: If4f36f87a85411b6128fd92d391313803ccaf9dd
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
a7f6bba1a3565c19715e878dfe7f0e01022944ff |
|
16-Mar-2016 |
sergeyv <sergeyv@google.com> |
Move text logic from jni to hwui level bug:25865834 Change-Id: I2d8c9c9544afcb5ce1784f732aed3e54e0eda372
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
66ce1c3b1a7b5ed3d4d5a9a05a7c133998c9a73e |
|
02-Feb-2016 |
Leon Scroggins III <scroggo@google.com> |
Lock SkBitmap before accessing color table This only affects kIndex_8 Bitmaps, which can only be created by decoding particular images (e.g. GIF). Without locking the SkBitmap, colorTable() always returns NULL. Lock it so we can write the color table to the Parcel. BUG:26527976 Change-Id: Ifc54b06ca08db26ba6455a3830b7e671b64f37c4
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
775873a66a946fae2b0535abb51df9817bd1b20c |
|
29-Dec-2015 |
Richard Uhler <ruhler@google.com> |
Use NativeAllocationRegistry for Paint, Canvas, and Bitmap Bug: 23130675 Change-Id: I3fbd84ba417ac63df75f87ee2c56e3e7f3c9eb46
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
fa17e612911a131a356dd80cd4be801bdc6b39dd |
|
16-Nov-2015 |
Erik Wolsheimer <ewol@google.com> |
Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e am: 529893f84c am: 7698dd970f am: ae4ab3501a * commit 'ae4ab3501a0400940ace2d0bfdf0d7021c740603': Log errno when dup fd cannot be allocated BUG: 25165471
|
211abad3b92b70dd094949c79f67e686c940fa0c |
|
13-Nov-2015 |
Erik Wolsheimer <ewol@google.com> |
Log errno when dup fd cannot be allocated BUG: 25165471 Change-Id: I7342e2b4c566325fc2e15643a7c7b6ba989ee8c7
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
87455c7397605fba4bf3ad04af8df3c599a7a6ba |
|
03-Nov-2015 |
Ian Pedowitz <ijpedowitz@google.com> |
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6 am: 95fc53b029 am: d6f3e38738 * commit 'd6f3e38738c88821b28b2571d034fc1b189a35de': Limit persistent ashmem backed fds to a minimum of 128kB.
|
8cee7c17119b204be88860feb812f2374d0de732 |
|
02-Nov-2015 |
Riley Andrews <riandrews@android.com> |
Limit persistent ashmem backed fds to a minimum of 128kB. Bug 25256717 Change-Id: Ieb356006df0a6545b89de44d3d8fd4b46312b3b8 Signed-off-by: Riley Andrews <riandrews@google.com>
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
b57dd722f1dc0663417da37d3a82f8283ad3c982 |
|
24-Sep-2015 |
Elliott Hughes <enh@google.com> |
resolved conflicts for a884d81e to stage-aosp-master Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
|
76f6a86de25e1bf74717e047e55fd44b089673f3 |
|
19-Sep-2015 |
Daniel Micay <danielmicay@gmail.com> |
constify JNINativeMethod function pointer tables Change-Id: I4036c924958221cbc644724f8eb01c5de3cd7954
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
01a0af31d7d418f400ce5d3f752eba6a35aa00e2 |
|
31-Jul-2015 |
John Reck <jreck@google.com> |
Yell loudly about undefined behind in Bitmap, but work anyway Bug: 22214367 Previous releases would let the getters on a recycle()'d bitmap to still work despite being firmly in undefined behavior per the documentation on Bitmap#recycle(). As there are apps relying on this, yell very loudly about this behavior in the log and give them a bit of time to fix it Change-Id: I857be7e74cb217877973d9c6f03eb761d12fd056
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
6260b22501996d2e7a0323b493ae6c4badb93c28 |
|
25-Jul-2015 |
Chris Craik <ccraik@google.com> |
Fix bitmap get/set pixels for ALPHA_8 bug:22724734 Change-Id: If8307854f6bad6fac9ee0b394bf0b044c61183e5
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
a316c5dfbc6355f536d765959cacb06bbfed76ad |
|
06-Jun-2015 |
Jeff Brown <jeffbrown@google.com> |
Fix Bitmap parceling through ashmem. Fixes a bug where the Bitmap parceling code was unable to deal with sending bitmaps through Parcels that disallow file descriptors. Uses extended functionality of the Parcel blob interface to pass buffers around more efficiently while adapting to whether FDs are allowed. Bug: 21428802 Change-Id: If24926f4388d29aa2aac627000436beb015edcb9
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
0781a2f116be045ff1a3aca721c47f9fef980bea |
|
28-May-2015 |
John Reck <jreck@google.com> |
Fix reconfigure & setPremult alpha handling Bug: 20948129 Change-Id: Ifba35e5d87772a304fd3655e4a2363b293a6d8ac
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
721ae5fec5f1fd4f93aa2a361a0ac298e15ce353 |
|
12-May-2015 |
Riley Andrews <riandrews@google.com> |
Add internal bitmap api for creating immutable ashmem backed bitmaps. Bug 21037890 Change-Id: I827e83dd75e301e7d93ead5efdd744f0d8435ae5
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
39d7f30ebe490c1d6aee76b0b61e3e67dec13e34 |
|
14-Nov-2014 |
Riley Andrews <riandrews@google.com> |
Use ashmem to optimize all bitmap copies. Bug 21037890 Change-Id: Ie32ca3a0c527755f1a1b77db7548cb9629e2001b
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
2a94a10bec186d832c2b95675cb6dc27b012c2d0 |
|
07-May-2015 |
Derek Sollenberger <djsollen@google.com> |
Update the rowBytes when reconfiguring to match the new imageInfo. bug: 20872840 Change-Id: Ic98a9d16e095c27ddcc193a18641732c1ee4bad0
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
ae2e8b4891491e8e89bed5f2c9626415adee09cb |
|
06-May-2015 |
John Reck <jreck@google.com> |
Add warning if an in-use Bitmap is reconfigured Bug: 18928352 Also fix an issue around re-configure not properly handling mPinnedCount in android::Bitmap Change-Id: I1815b121f1474ad931060771bb1d52ef31d2aac7
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
f29ed28c7b878ef28058bc730715d0d32445bc57 |
|
07-Apr-2015 |
John Reck <jreck@google.com> |
Attempt to solve the double-GC problem Fix the issue where Bitmap requires two GC passes to release its byte[] by using some questionable ref-counting hacks to manage whether or not native has a strong or weak ref to the byte[] Change-Id: Ia90a883579f61c0b1904b5549a66bd0ef34b32c5
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
c6e2e8ff474ae44bab5b9eb665851118abd27b68 |
|
15-Apr-2015 |
John Reck <jreck@google.com> |
Move AssetAtlas off of SkBitmap* Switched to SkPixelRef* Change-Id: I4a1d9dc6c55c1ebcce6b0b8c585e69559e523898
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
7809f835cae637c12eebdc92103ad88890228d97 |
|
17-Apr-2015 |
John Reck <jreck@google.com> |
Revert "Move AssetAtlas off of SkBitmap*" This reverts commit 87ffb63d90fb6dd2689fe72dcb24fda9a6156220. Change-Id: I92adfcee454a0a19020cdd9e96a134be0ee529aa
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
87ffb63d90fb6dd2689fe72dcb24fda9a6156220 |
|
15-Apr-2015 |
John Reck <jreck@google.com> |
Move AssetAtlas off of SkBitmap* Switched to SkPixelRef* Change-Id: I4a1d9dc6c55c1ebcce6b0b8c585e69559e523898
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
ec419e0b731d2aa32f7f570e4021fe18b8be228d |
|
11-Mar-2015 |
Leon Scroggins III <scroggo@google.com> |
Make Bitmap_createFromParcel check the color count. When reading from the parcel, if the number of colors is invalid, early exit. Add two more checks: setInfo must return true, and Parcel::readInplace must return non-NULL. The former ensures that the previously read values (width, height, etc) were valid, and the latter checks that the Parcel had enough data even if the number of colors was reasonable. Also use an auto-deleter to handle deletion of the SkBitmap. BUG=19666945 Change-Id: Icbd562d6d1f131a723724883fd31822d337cf5a6
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
3d4eed7f1aa99401dabe2e45b82f98fb4fc2d754 |
|
04-Dec-2014 |
Derek Sollenberger <djsollen@google.com> |
Update HWUI to store its own SkBitmap objects This enables us to... 1) simplify the lifecycle/ownership between Java and HWUI 2) remove DisplayListRenderer::drawBitmapData and associated logic 3) track pixel lifecycle using standard SkPixelRef refcounting 4) Remove uncessary calls to ref/unref the bitmap's pixels and colorTable Change-Id: I3c95078da20995444f6388a029414280fd654318
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
71487eb0ceb2b7dea02649e78d99bb5952f5eaef |
|
19-Nov-2014 |
Mike Reed <reed@google.com> |
Merge frameworks/base changes from master-skia to master. Adaptations to changes in Skia upstream since Oct 2014. (https://code.google.com/p/skia/issues/detail?id=2377) cbb922d use new roundOut signature 77082de Call SkColorTable::readColors(). 5456ab1 Handle the result of SkMatrix::asAffine. 25cfc78 Remove dependence on SK_LEGACY_PICTURE_SIZE_API. BUG:18468293 Change-Id: I5a4d274e854298843891410b1ffd5e24f038b88a
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
a2732a2bf98f7dbd063f4e5679f5b8bfcbec2698 |
|
18-Dec-2014 |
John Reck <jreck@google.com> |
Stop pretending USE_OPENGL_RENDERER is a thing Change-Id: I732b490431fe90eafa00a00f3b5429f0d3a067e6
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
7d13d9db1ef90063cb542ccd6554042a6a3263b7 |
|
21-Nov-2014 |
Andreas Gampe <agampe@google.com> |
resolved conflicts for merge of 3fc5e3ca to lmp-mr1-dev-plus-aosp Change-Id: Id8286e5a4381315a6060251a8055b0f1d1a96019
|
ed6b9dff563c5e22f040ff37e12c0d771e0478ae |
|
21-Nov-2014 |
Andreas Gampe <agampe@google.com> |
Frameworks/base: Consistency in core/jni Make consistent use of core_jni_helpers for registration. Translate some #ifdefs into const bools. Change-Id: I37639aa053dd50f003a552cbd8550dddecc811c5
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
3a091b79978caa9b5d58ae19f693279e5a717c2a |
|
21-Nov-2014 |
Dan Albert <danalbert@google.com> |
resolved conflicts for merge of 8e0cfe7c to lmp-mr1-dev-plus-aosp Change-Id: I068d2a0fb118d4e2b4c1e546bebfcbc2cb120d36
|
46d8444631b4b1253a76bfcc78a29d26014d022f |
|
19-Nov-2014 |
Dan Albert <danalbert@google.com> |
Fix clang warnings in core/jni. There are a few bugs in here too (mostly people expecting + to concatenate C strings) :( Change-Id: I0a243c05c4ea8b56e84896f37814d0fbea4c39d5
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
a35778c799e8073a42b9e22191bde9d838327ab7 |
|
06-Nov-2014 |
John Reck <jreck@google.com> |
Yank ResourceCache out of Caches Bug: 17947547 Pull the ResourceCache (aka, ref-counting side channel) out of Caches so that DisplayListRenderer doesn't use Caches, avoiding the risk of instantiating Caches on the wrong thread or without a GL context Change-Id: I7d63b70b3b0a0163308c5dedd6ef255eadebe8fd
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
f23f5de1731be798f03a7808cf205457522e5d2e |
|
22-Jul-2014 |
Chris Craik <ccraik@google.com> |
Merge "[Bitmap] Add null pointer protection in Bitmap_sameAs()" into lmp-dev
|
53001ca3a629c0069f4fdac44f7711ad4a0c395a |
|
03-Jul-2014 |
henry.uh_chen <henry.uh_chen@htc.com> |
[Bitmap] Add null pointer protection in Bitmap_sameAs() Symptom: SkBitmap::getAddr(int, int) may return NULL due to unrecognized config (ex: kRLE_Index8_Config). This will cause memcmp method to crash. Since bm0 and bm1 both have pixel data() (have passed NULL == getPixels() check), those 2 bitmaps should be valid (only unrecognized), we return JNI_FALSE to warn user those 2 unrecognized config bitmaps may be different. Cherry-pick of 3a1bffa835f279628e50385af3c85789bc737f64 from AOSP Change-Id: I6970c27de412110a3035d0a783112c4cd3ebc35b
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
6ba30b85ddfbe37c338ee8dde3dd33322eb38d47 |
|
15-Jul-2014 |
Behdad Esfahbod <behdad@google.com> |
Add android.Paint that inherits SkPaint The idea is that extra paint parameters that only affect text layout (not rendering) will go in android.Paint instead of going into SkPaintOptionsAndroid. We will eventually move those out of SkPaint too. This is currently implemented in PaintImpl.cpp. Will be renamed when current Paint.cpp that has JNI bits is moved to android_graphics_Paint.cpp. Change-Id: Iba66c34dea5da503a13b9c864cb9f2211ac4ba7d
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
1103b3255945d2eb2fa9c191e84e2270b343cca9 |
|
08-Jul-2014 |
Mike Reed <reed@google.com> |
SkBitmap::Config is deprecated, use SkColorType Change-Id: Ic953741325607bf85598c097bb3ab648d4a08996
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
57ee620ced8caed1eb8651717f6a6d2d5f1f9a5b |
|
05-Jun-2014 |
Leon Scroggins III <scroggo@google.com> |
Read premultiplied status from the SkBitmap. Replace the Java variable with mRequestPremultiplied, to better reflect what it represents. In both native and Java, the SkBitmap is used as the decision maker of whether a Bitmap is premultiplied. When changing other settings, mRequestedPremultiplied is used to determine whether it should be premultiplied (if the new config/ hasAlpha-ness etc supports it). ChooseFromColorProc now reads both the colortype (instead of the deprecated Config) and alphatype on the SkBitmap. Same with ChooseToColorProc. In the process, this caught a bug, where the wrong procs were being used for Index8. Replace instances of SkBitmap::Config with SkColorType where I was already changing code. Use the new versions of setConfig/allocPixels that take an SkImageInfo as a parameter. Document isPremultiplied's return value for ALPHA_8. BUG:13618134 Change-Id: I91fc1f1e46e9294364b1af0ab4bdb37c68d7058e
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
b933055cf3f7f8ea89bfd3bc9c37a3891ff7310a |
|
16-Jun-2014 |
Mike Reed <reed@google.com> |
stop using (deprecated) SkBitmap::Config Change-Id: Ic75b5fc6996578e9d95bd3a220439ec1541d7c3b
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
17a8bfc38a565ae96f43d36b223779be840bb50c |
|
03-Jun-2014 |
Leon Scroggins III <scroggo@google.com> |
In Bitmap.reconfigure, update the pixelref's info. This fixes CTS tests which are crashing on an SkASSERT due to a mismatch of SkImageInfo between the SkPixelRef and SkBitmap. Also directly call ref() and unref() instead of SkSafeRef/SkSafeUnref, since we would already crash if the SkPixelRef in question was NULL. Also if the user attempts to reconfigure to 4444, use 8888 instead. Change-Id: I473ef225c6cd1c92d67ae103c53c6cff0dad92de
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
32054b0b3edb350a5444c47753b2982312dd7ffd |
|
09-May-2014 |
Chris Craik <ccraik@google.com> |
Fix Bitmap.cpp line endings Change-Id: Icc0b067437fffaa599c92841518ad0d526112f59
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
cc11f15f76a62ded3e403cb2bc818c6aa5bf261c |
|
31-Mar-2014 |
Leon Scroggins <scroggo@google.com> |
Update to call new Skia APIs. I816129d49c0118453222916f3c818eccac33663d merges a new version of Skia that updates various APIs. Call the new ones. SkBitmap::copyTo now takes an SkColorType instead of an SkBitmap::Config, so do the conversion with SkBitmapConfigToColorType or use the enum when it makes sense. Call SkImageDecoder::decodeSubset instead of (deprecated) SkImageDecoder::decodeRegion. Override SkCanvas::ClipVisitor::clipRRect in ClipCopier. In Canvas::clip calls, call SkCanvas::isClipEmpty(), which was previously called inside the clip call, to determine the return value. For various SkPaint effects, call the new factories (as the constructors have been made protected). Implement SkJavaOutputStream::bytesWritten(), overriding a new pure virtual function on SkWStream. Update Matrix calls to always return true (since SkMatrix calls no longer return a value). Depends on I816129d49c0118453222916f3c818eccac33663d (skia). Change-Id: I5cdcea827ebff587df0bbddc0965e3e0fbf48002
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
2d5cf4f6db75d00285306b2d53bc6c0c6532d86e |
|
20-Feb-2014 |
Derek Sollenberger <djsollen@google.com> |
Update framework to enable Skia to run in debug mode. Change-Id: I8ba605cfae61b584dad27e3245c4482c8dfdff2e
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
73c04711ca13c99f29a84de8cfc6c780811a8f63 |
|
13-Feb-2014 |
Leon Scroggins <scroggo@google.com> |
Remove call to setIsOpaque (again). The call was removed in I1b36b0b0ce7126031eb7b769b563c17dcd4b306a, since setIsOpaque was deprecated in Skia. It was accidentally reintroduced in Id5793fa0ebc17ee8b1eecf4b3f327977fdccff71. This line is redundant with the lines above it (which call the replacement for setIsOpaque, setAlphaType). Change-Id: I6520f796d639721987418ec0ecae82b3674dcbfd
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
36bef0bf30d6bae48cf3837df351075ca4fce654 |
|
20-Jan-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Make graphics classes 64-bit compatible This a merger of two commits submitted to AOSP by the following authors: ashok.bhat@arm.com, david.butcher@arm.coma craig.barber@arm.com, kevin.petit@arm.com and marcus.oakland@arm.com Due to the very large number of internal conflicts, I have chosen to cherry-pick this change instead of letting it merge through AOSP because the merge conflict resolution would be very hard to review. Commit messages below: ================================================ AArch64: Make graphics classes 64-bit compatible Changes in this patch include [x] Long is used to store native pointers as they can be 64-bit. [x] Some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) [x] AssetAtlasManager is not completely 64-bit compatible yet. Specifically mAtlasMap member has to be converted to hold native pointer using long. Added a TODO to AssetAtlasManager.java to indicate the change required. Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: KĂ©vin PETIT <kevin.petit@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> ================================================================== AArch64: Use long for pointers in graphics/Camera For storing pointers, long is used in android/graphics/Camera class, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> =================================================================== Change-Id: Id5793fa0ebc17ee8b1eecf4b3f327977fdccff71
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
7023df08f14ec5dee76ac54c03e870f84e297636 |
|
27-Jan-2014 |
Narayan Kamath <narayan@google.com> |
Revert "AArch64: Make graphics classes 64-bit compatible" This reverts commit 18b4cbeedef21c1fa666a110a157bab66edff976. Change-Id: I0c52983a3ab1ace3ff743de546a43eca28e5cb0e
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
18b4cbeedef21c1fa666a110a157bab66edff976 |
|
20-Jan-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Make graphics classes 64-bit compatible This a merger of two commits submitted to AOSP by the following authors: ashok.bhat@arm.com, david.butcher@arm.coma craig.barber@arm.com, kevin.petit@arm.com and marcus.oakland@arm.com Due to the very large number of internal conflicts, I have chosen to cherry-pick this change instead of letting it merge through AOSP because the merge conflict resolution would be very hard to review. Commit messages below: ================================================ AArch64: Make graphics classes 64-bit compatible Changes in this patch include [x] Long is used to store native pointers as they can be 64-bit. [x] Some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) [x] AssetAtlasManager is not completely 64-bit compatible yet. Specifically mAtlasMap member has to be converted to hold native pointer using long. Added a TODO to AssetAtlasManager.java to indicate the change required. Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: KĂ©vin PETIT <kevin.petit@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> ================================================================== AArch64: Use long for pointers in graphics/Camera For storing pointers, long is used in android/graphics/Camera class, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> =================================================================== Change-Id: Ib3eab85ed97ea3e3c227617c20f8d213f17d4ba0
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
8790be6de3644e332ec6a17c855da89ffc13a9bf |
|
03-Dec-2013 |
Leon Scroggins III <scroggo@google.com> |
Remove calls to deprecated SkBitmap::setIsOpaque() setIsOpaque() has been removed from ToT Skia. Update setters for mIsPremultiplied and hasAlpha to take the other into consideration. Change-Id: I1b36b0b0ce7126031eb7b769b563c17dcd4b306a
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
4b9a19a8f865970e0079f431c8c2c2a8e4333ae9 |
|
03-Dec-2013 |
Leon Scroggins III <scroggo@google.com> |
Call SkBitmap::config() instead of ::getConfig() getConfig() has been deprecated. Change-Id: I32066256ab82ac4760c752c80856d1b56d291fae
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
ed79ff0026a44741237a6eb5e3810dbf5d765154 |
|
20-Nov-2013 |
Derek Sollenberger <djsollen@google.com> |
framework changes needed to support Skia at r12108. Change-Id: I231e187e7d2db84fa06bd6783c9b49abba5b4e70
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
ca32021b43f326af7d3f4ae041f8db297f98a518 |
|
20-Aug-2013 |
Leon Scroggins III <scroggo@google.com> |
Replace stream wrap-function w/ more specific ones The current stream wrapper returns a potentially incorrect value for a call to getLength(), is typically copied into another stream (not always in the same way), and doesn't always take advantage of its underlying data (like when it is an Asset). The overall goal of this CL is to provide the caller with something that is ready to use, depending on what is asked for. If a copy is desired, the copy is made before being returned to the caller. core/jni/android/graphics/Bitmap.cpp: Include SkStream.h, since it is no longer included by CreateJavaOutputStreamAdaptor's header file. core/jni/android/graphics/BitmapFactory.cpp: Pass an SkStreamRewindable to decoding functions, as Skia decoders will be updated to only take an SkStreamRewindable (which makes more sense because they require rewinding). Call the more specific GetRewindableStream to get a rewindable stream. Remove copyAssetToStream which has been moved to Utils. In nativeDecodeAsset, pass forcePurgeable as allowPurgeable in doDecode. Technically the old code worked, but it checked the BitmapOptions again. Remove getFDSize, which is no longer used. core/jni/android/graphics/BitmapRegionDecoder.cpp: Remove redundant buildSkMemoryStream. nativeNewInstanceFromStream now calls CopyJavaInputStream, which handles the copy. Copy the Asset directly, using common code, rather than creating an AssetStreamAdaptor to copy. core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp: core/jni/android/graphics/CreateJavaOutputStreamAdaptor.h: Provide new interfaces to access data from a Java InputStream. The new interfaces are more specific about what type of stream is desired. Use forward declarations where possible. Remove doSize, which gives a misleading answer to the question of how long the entire stream is. TODO: Only call FindClass etc once. core/jni/android/graphics/Movie.cpp: Check for an asset stream, and use it if possible. Then call GetRewindableStream if there is not an asset. Remove the memory leak. Call DeleteLocalRef to delete the allocated memory. core/jni/android/graphics/Picture.cpp: Call the new interface. core/jni/android/graphics/Utils.cpp: core/jni/android/graphics/Utils.h: Make AssetStreamAdaptor inherit from SkStreamRewindable so it can be passed to Skia decoding functions once they require it. Add CopyAssetToStream (moved from BitmapFactory.cpp) so it can be used by multiple files. graphics/java/android/graphics/BitmapFactory.java: Remove the call to mark, which is now done natively. Remove the BufferedInputStream. Mark/reset is now handled by native code. Allow decodeStream to handle a FileInputStream by using the FileDescriptor, if it is seekable. In decodeFileDescriptor, call nativeDecodeStream instead of decodeStream so this new functionality will not loop. Call setDensityFromOptions in decodeFileDescriptor. graphics/java/android/graphics/BitmapRegionDecoder.java: Remove the BufferedInputStream. Mark/reset is now handled by native code. TODO: ADD TESTS! Requires https://googleplex-android-review.googlesource.com/#/c/344317/ BUG=https://b.corp.google.com/issue?id=8432093 Change-Id: I4419b70b3482325c98ecc673dbfc4613f1b18581
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
1abf5d62429e5a9329520b2f7c2b5a5e7a8e72ec |
|
16-Aug-2013 |
Chris Craik <ccraik@google.com> |
Add inPremutiplied option to BitmapFactory.Options, functionality in Bitmap bug:2248948 Change-Id: I8fdd649332667598504a1076d5a447572bd53086
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
3ed72781a0b155a88e52c8d295f50daab8cfb9ae |
|
15-Aug-2013 |
Romain Guy <romainguy@google.com> |
Convert 4444 bitmaps to 8888 Bug #10206452 Change-Id: I928c9189b0d80741490b01a739959d8c2d5312a7 (cherry picked from commit a2cdb59b186d0ee51f110c1a7d358911573d48bf)
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
c84d203da21c3ae3ded94c79c035d41b27809b3b |
|
13-Jul-2013 |
Chris Craik <ccraik@google.com> |
Add reconfigure method to Bitmap bug:9797004 Grants a means to reuse a bitmap's allocation for different width/height/Config without going through BitmapFactoryOptions.inBitmap Change-Id: Ib62319f3bd96c451fc1636288adf06a8275b4e3d
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
547e66531d521eb1eadac87edb0f79f8c2f1bbe0 |
|
23-Oct-2012 |
Chet Haase <chet@google.com> |
Don't null the reference to Bitmap pixels until we're really ready A change in the VM triggers a native memory error more aggressively than before, showing that there's a bug in the logic of recycling bitmaps. Since the pixel memory is allocated on the Java heap, nulling out the reference to that memory in the Java level Bitmap object can cause that memory to get collected at any time. Meanwhile, we may have a reference to that memory at the native level for rendering purposes, causing an error if/when we access that memory after it has been collected by the VM. The fix is to avoid setting the reference to the pixels to null unless we are not referring to it in native code. This is determined at the time we call recycle() - we return a boolean to indicate whether the native code is still using the memory. if not, the Java code can null out the reference and allow the VM to collect it. Otherwise, it will get collected later when the encompassing Bitmap object is collected. Issue #7339156 HTML5 tests crash the app (Vellamo) Change-Id: I3a0d6b9a6c5dd3b86cc2b0ff7719007e774b5e3c
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
713e1bb9df6bdfc21bd5c40d1a6ecf6c822a4be5 |
|
17-Oct-2012 |
Romain Guy <romainguy@google.com> |
Add API to enable mipmaps on Bitmap Bug #7353771 This API can be used when scaling large images down to a small size to get nicer looking results. Change-Id: If09087eed36077eee5355f6047a3ca67747d7d9e
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
038953da05c641f6551134f710ac0e4f46b624b7 |
|
12-Oct-2012 |
Keun young Park <keunyoung@google.com> |
fix wrong read size in ToColor_S4444_Opaque - S4444 takes 16bits, not 32bits - This caused sporadic failure in CTS BitmapFactoryTest#testDecodeStream4 Bug: 7179389 Change-Id: Ib36a3a569b3149d74f36ae67a069a7b65a72e895
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
35ef567140e42f354be4a98cce6a7666ac085c13 |
|
08-Jul-2012 |
Michal Stawinski <michal.stawinski@sonymobile.com> |
Fix SkBitmap::fPixels not being locked correctly In some cases bitmap's pixels where freed during encoding, which caused a null pointer dereference. This fix makes sure that underlaying buffer is locked for the whole process of compression. Change-Id: I0ac56821f5d333072271dc2670fa30f1562adfa3
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
ec4a50428d5f26a22df3edaf7e5b08f41d5cb54b |
|
04-Apr-2012 |
Amith Yamasani <yamasani@google.com> |
Embed layout padding in nine patch images - Added a new custom PNG chunk that carries the layout padding ints. - Extract the padding ticks from .9.png images and store in the chunk. - Load the padding information at runtime into Bitmap and NinePatchDrawable. - The new chunk is ordered first so that it doesn't cause a problem in older versions of the platform. Bug: 6087201 Change-Id: I5de46167a1d44b3ec21065b0c165e594b1dc8399
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
d84e1ce0b535128f03416145554fb405f9fade3e |
|
07-Mar-2012 |
Jeff Sharkey <jsharkey@android.com> |
Split Parcel JNI details away from Binder. This is purely a refactoring, with no change to the underlying functionality. Change-Id: I41b59f14e57d1cc144274a01f77658d99a1bfe02
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
2c183fa5bf666c5f6b2221fd04db8ee3c738d1fd |
|
19-Oct-2011 |
Romain Guy <romainguy@google.com> |
Notify a Bitmap is has changed when calling copyPixelFromBuffer Change-Id: Ibff1a162edfe11473c5c167e764405bf83ec5822
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
6579a9d6fe2302fa149452f66c4062ebc60c2523 |
|
24-Sep-2011 |
Jeff Brown <jeffbrown@google.com> |
Transfer large bitmaps using ashmem. Bug: 5224703 Change-Id: If385a66adf4c6179a0bb49c0e6d09a9567e23808
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
b6377170960d40e66858d8b4d335a95eac773762 |
|
25-Sep-2011 |
Bart Sears <bsears@google.com> |
Revert "Transfer large bitmaps using ashmem. Bug: 5224703" This reverts commit 56c58f66b97d22fe7e7de1f7d9548bcbe1973029 This CL was causing the browser to crash when adding bookmarks, visiting the bookmarks page, and sharing pages (see bug http://b/issue?id=5369231
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
56c58f66b97d22fe7e7de1f7d9548bcbe1973029 |
|
24-Sep-2011 |
Jeff Brown <jeffbrown@google.com> |
Transfer large bitmaps using ashmem. Bug: 5224703 Change-Id: Ic7481dd9f173986f085a8bbdcc59bbe9830d7a44
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
a2c8a7b5739c1febf8ffbf9461334343bdadab16 |
|
27-Jun-2011 |
Jean-Baptiste Queru <jbq@google.com> |
am ec5039b3: am 99c070d8: am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression." * commit 'ec5039b3720ee9b92fb2a2c6dd9f468d2dcd7172': Add WEBP to the list of Image formats that support Compression.
|
ec5039b3720ee9b92fb2a2c6dd9f468d2dcd7172 |
|
24-Jun-2011 |
Jean-Baptiste Queru <jbq@google.com> |
am 99c070d8: am 4fea5373: Merge "Add WEBP to the list of Image formats that support Compression." * commit '99c070d8eb9f1ff9ea5c38991f15f091040226c2': Add WEBP to the list of Image formats that support Compression.
|
2305ac9e4a262ed09fd034ae417e9b1dda4c0ccb |
|
23-Jun-2011 |
Vikas Arora <vikasa@google.com> |
Add WEBP to the list of Image formats that support Compression. Note: The integrator of this change to Android internal code-repo will have to run one extra step 'make update-api' to update 'api/current.txt' file corresponding to approved API. The AOSP branch didn't have this file, hence I could not add the same to this change. The updated file 'api/current.txt' has to be submitted along with this change. Change-Id: I29909e907a2e82d801e16654322190a808c5bda9
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
c9e22e9affec97a8c68f838de29dc7f685d9247b |
|
12-May-2011 |
Jean-Baptiste Queru <jbq@google.com> |
Switch to SkSafeUnref for better portability Change-Id: Ia146a4728b5eb92626462effe42521ca73454a7d
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
4cb1753ec6e90d7e747880c599dc1c164a568cf3 |
|
13-Apr-2011 |
Elliott Hughes <enh@google.com> |
Remove useless forward declarations. Change-Id: I8f191367acb18ea9a3f807e791099e0485b1b249
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
1a81aea8144b92ebaf807af9de69a0ab3415a5aa |
|
21-Mar-2011 |
Romain Guy <romainguy@google.com> |
Update GL textures when changing a Bitmap's pixels Bug #4146495 Change-Id: I4fe3f8501373b86b164af11ae51642b140035bb8
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
447ee77431ddd68634bd49508de8573ab6c7065a |
|
24-Feb-2011 |
Eric Hassold <hassold@google.com> |
Merge "Detect out of memory in extractAlpha"
|
ef7be262e5859efdf805d1b9612bc2b250d5971e |
|
24-Feb-2011 |
Eric Hassold <hassold@google.com> |
Detect out of memory in extractAlpha When extractAlpha() native method in Skia fails to allocate pixels, it resets target bitmap. This change detects when such empty bitmap is returned, and throws a OutOfMemory Java exception. Depends on https://android-git.corp.google.com/g/97793 Bug: 3418381 Change-Id: I65a84998be089c49ed5005f6995bdc4f4d1669bc
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
6062c5912dc79704b489fc8c289b78a400ed05ee |
|
22-Feb-2011 |
Derek Sollenberger <djsollen@google.com> |
Skia Merge (revision 808) This is a companion CL to the one found in /external/skia Change-Id: If81748545435cab20a5d8479329ab333cb973e16
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
e4ac2d6b5723c95e648c489b187ddde449452c13 |
|
01-Dec-2010 |
Patrick Dubroy <dubroy@google.com> |
Allocate bitmap backing buffers in the Java heap. Change-Id: I60f6ccff13357c1c518e9d56b02fe0171637edd1
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
dee4cb07a3652457e18a0bf4be57d2cedeca7359 |
|
13-Dec-2010 |
Jack Palevich <jackpal@google.com> |
Avoid SIGSEGV in Bitmap_writeToParcel. SkBitmap::getPixels() can return NULL. The rest of the JNI Bitmap code treats this NULL as if the SkBitmap has transparent black pixels. Bitmap_writeToParcel now does the same. Change-Id: I5e70b42b3d22a8aea898ce342e590000325bd0f9
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
27f0b17d853d8bef918c3d869044e50cf3904ee3 |
|
22-Oct-2010 |
Chet Haase <chet@google.com> |
Fix native resource leak when OpenGL renderer is not being used. Native resources (bitmaps, matrices, paints, shaders) are shared when display lists are used, and a refcounting system is in place to take care of disposing when all clients are finished with them. But the cache where these refcounts are tracked is not enabled when the Open GL renderer is not being used. This results in the native destructors not being called, and the resources are leaked. Change-Id: Ic7aeb55e4636dcad229846601407e596160346e6
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
5c13d89c1332fcc499379b9064b891187b75ca32 |
|
08-Oct-2010 |
Chet Haase <chet@google.com> |
Optimizing display lists by referencing pointers to resources instead of copying them Change-Id: I81ad3551d74aa1e5bb64d69e33d2eb29a6c1eb6a
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
a2341a9f6addcd79723965ec5b1a1c5ae0f8bd65 |
|
09-Sep-2010 |
Romain Guy <romainguy@google.com> |
Purge Skia objects from GL caches as needed. Change-Id: I754c671cf790ad5ae8bf047ad328034217da4ecc
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
9aaa8269a3e7291aab84d01c3fc9c744d8f2d2f4 |
|
09-Sep-2010 |
Romain Guy <romainguy@google.com> |
Fix possible infinite loop when purging textures. Change-Id: Ib05b398ae03e734da2dab0496df416fed4570b1c
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
0bbae0836426ba2704e38e7f90a9d0ca502ab71d |
|
16-Jun-2010 |
Romain Guy <romainguy@google.com> |
Add new API to check whether a Bitmap was modified. Bitmap.getGenerationId() can be used by caches to find out if a Bitmap has been modified. This simply exposes an existing Skia API. This change also adds a small test app for Canvas hardware acceleration. The new Bitmap API is required to implement a texture cache. Change-Id: I8547b146cd14c8afe1a2327fcd6d71b1b1cb68fc
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
76d1e01d5e65c4631c827831e98ad4e300d99eab |
|
05-Mar-2010 |
Mike Reed <reed@google.com> |
hidden api sameAs() to compare the pixels of 2 bitmaps for equality
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
a78b0a2d9ebb38b86ed802b3d86de07d0b301262 |
|
07-Oct-2009 |
Mike Reed <reed@google.com> |
add (hidden) setHasAlpha() to allow clients like the view's cache to hint that a bitmap is opaque. Knowing that a 32bit bitmap is opaque is a performance boost for some blits.
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
de0dfb7b65a02d4dd74c271b558adee0973fc267 |
|
23-Sep-2009 |
Dianne Hackborn <hackbod@google.com> |
Fix issue #2125720 Weather Forecast Widget - graphics do not scale I forgot to add the new density field to the Bitmaps' parcelable data. Change-Id: I77cf3e93e356297e0caed6fc71b62b5cd8f79124
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
c634fdd8035cc06c34663b77ab199d29697273b4 |
|
18-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 09a903ab: Merge change 7696 into donut Merge commit '09a903ab5b8d940605783ae4ee591c0f090a31d1' * commit '09a903ab5b8d940605783ae4ee591c0f090a31d1': add hidden Options field for native allocations
|
1b22b979256cf163ab9bbfd4fcfa16a8ce862ed1 |
|
17-Jul-2009 |
Mike Reed <reed@google.com> |
add hidden Options field for native allocations
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
ce1311a3a0806d39dc675a3c702eebbfe741dec8 |
|
22-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 766d7236: Merge change 4737 into donut Merge commit '766d7236c84f636b816d71189e309e67db1f593a' * commit '766d7236c84f636b816d71189e309e67db1f593a': Add prepareToDraw() to Bitmap for fixing http://b/issue?id=1907995.
|
8cdcb12752b716d0407733fecefcf1d9e926310a |
|
18-Jun-2009 |
Wei-Ta Chen <weita@google.com> |
Add prepareToDraw() to Bitmap for fixing http://b/issue?id=1907995. The function is used to rebuild any caches associated with the bitmap. In the case of purgeable bitmaps, this call ensures that the pixels are decoded for drawing, and therefore prefetching techniques implemented by callers can be leveraged.
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
0795272aa226f4e965968a03daddc53ce30b7cda |
|
20-May-2009 |
Mathias Agopian <mathias@google.com> |
move libbinder's header files under includes/binder
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
9066cfe9886ac131c34d59ed0e2d287b0e3c0087 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
f1e484acb594a726fb57ad0ae4cfe902c7f35858 |
|
22-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@127436
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
b798689749c64baba81f02e10cf2157c747d6b46 |
|
10-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@125939
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
f013e1afd1e68af5e3b868c26a653bbfb39538f8 |
|
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|
54b6cfa9a9e5b861a9930af873580d6dc20f773c |
|
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
/frameworks/base/core/jni/android/graphics/Bitmap.cpp
|