OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
02319a6
253f2c2
)
Merge "Linear blending, step 1"
author
Romain Guy
<romainguy@google.com>
Wed, 12 Oct 2016 15:52:12 +0000
(15:52 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 12 Oct 2016 15:52:14 +0000
(15:52 +0000)
1
2
core/jni/android/graphics/Bitmap.cpp
patch
|
diff1
|
diff2
|
blob
|
history
core/jni/android/graphics/GraphicsJNI.h
patch
|
diff1
|
diff2
|
blob
|
history
libs/hwui/Android.mk
patch
|
diff1
|
diff2
|
blob
|
history
services/core/jni/Android.mk
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/jni/android/graphics/Bitmap.cpp
Simple merge
diff --cc
core/jni/android/graphics/GraphicsJNI.h
index
4c6a384
,
34c4efb
..
e5af525
---
1
/
core/jni/android/graphics/GraphicsJNI.h
---
2
/
core/jni/android/graphics/GraphicsJNI.h
+++ b/
core/jni/android/graphics/GraphicsJNI.h
@@@
-10,9
-10,9
+10,10
@@@
#include "SkMallocPixelRef.h"
#include "SkPoint.h"
#include "SkRect.h"
+ #include "SkColorSpace.h"
#include <jni.h>
#include <hwui/Canvas.h>
+#include <hwui/PixelRef.h>
class SkBitmapRegionDecoder;
class SkCanvas;
diff --cc
libs/hwui/Android.mk
Simple merge
diff --cc
services/core/jni/Android.mk
Simple merge