ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

am 8d9f0118: am fdd8551f: Merge "Fix build"

Browse Source 
* commit '8d9f0118926d54b5a5fc1508a7c43aa661839f1f':
  Fix build
This commit is contained in:
Andrew Hsieh 2012-12-16 16:36:43 -08:00 committed by Android Git Automerger
commit 44615b8818
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/android/bitmap.h
View File

@ -24,11 +24,14 @@
extern "C" { extern "C" {
#endif #endif
#define ANDROID_BITMAP_RESUT_SUCCESS 0 #define ANDROID_BITMAP_RESULT_SUCCESS 0
#define ANDROID_BITMAP_RESULT_BAD_PARAMETER -1 #define ANDROID_BITMAP_RESULT_BAD_PARAMETER -1
#define ANDROID_BITMAP_RESULT_JNI_EXCEPTION -2 #define ANDROID_BITMAP_RESULT_JNI_EXCEPTION -2
#define ANDROID_BITMAP_RESULT_ALLOCATION_FAILED -3 #define ANDROID_BITMAP_RESULT_ALLOCATION_FAILED -3
/* Backward compatibility: this macro used to be misspelled. */
#define ANDROID_BITMAP_RESUT_SUCCESS ANDROID_BITMAP_RESULT_SUCCESS
enum AndroidBitmapFormat { enum AndroidBitmapFormat {
ANDROID_BITMAP_FORMAT_NONE = 0, ANDROID_BITMAP_FORMAT_NONE = 0,
ANDROID_BITMAP_FORMAT_RGBA_8888 = 1, ANDROID_BITMAP_FORMAT_RGBA_8888 = 1,