am fdd8551f: Merge "Fix build"

* commit 'fdd8551fe83754846cb91e2d7325ef90d2e0fb28':
  Fix build
This commit is contained in:
Andrew Hsieh 2012-12-16 16:35:31 -08:00 committed by Android Git Automerger
commit 8d9f011892

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,