diff options
| author | Leon Scroggins III <scroggo@google.com> | 2014-01-14 15:14:57 -0500 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2014-03-07 11:28:44 -0500 |
| commit | 278250dafb5ebb0f9b66c46b32e7dd1251cdb6ff (patch) | |
| tree | 9f89158aebe44e0a41f7cc063e4e93ccc50aaa9d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a3ea4be5425fc2a561290c08a9f5f31f374afc31 (diff) | |
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2
BUG:13191516
Original CLs below:
In nativeDecodeFileDescriptor, use fdopen.
Instead of attempting to mmap the entire file, create an
SkFILEStream from a FILE.
BUG:11669944
BUG:11028218
Cherry-pick from: If67da91484acc79f9f3dde6d05201409c0c75e41
-------------------------------------------------------------------------
Decode file descriptor from the correct offset.
Fix a few bugs in nativeDecodeFileDescriptor:
1. Restore the FD's offset when exiting the function.
2. Copy the data when potentially using an SkImageRef.
The old behavior would have continued to modify the
file descriptor's offset each time a new decode was
required. The copy ensures that the file descriptor
remains unchanged.
3. Buffer the file stream.
Prior to this change, if the image was not a PNG,
the stream would be rewound to the beginning of the
file, even if the file descriptor was passed in with
an offset. Thanks to the buffer, the stream is only
rewound to the original offset.
Depends on https://googleplex-android-review.googlesource.com/#/c/415821/1
in external/skia
BUG:12807677
BUG:12895876
Cherry-pick from: I38b8cf5d210dbbc0107e6562e3884867de57fc4b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions