From 10789f6936dc7fd8ac67e4e69d45208ff73c0d70 Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 6 Feb 2018 22:33:34 +0100 Subject: [PATCH] android: fix issue loading some image files --- panda/src/android/pnmFileTypeAndroid.cxx | 5 ++++- panda/src/android/pnmFileTypeAndroidReader.cxx | 1 + panda/src/pnmimagetypes/pnmFileTypeStbImage.cxx | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/panda/src/android/pnmFileTypeAndroid.cxx b/panda/src/android/pnmFileTypeAndroid.cxx index fae5d147c4..c661c6b3b0 100644 --- a/panda/src/android/pnmFileTypeAndroid.cxx +++ b/panda/src/android/pnmFileTypeAndroid.cxx @@ -21,7 +21,10 @@ #include "bamReader.h" static const char * const extensions_android[] = { - "jpg", "jpeg", "gif", "png",//"webp" (android 4.0+) + "jpg", "jpeg", "gif", "png", +#if __ANDROID_API__ >= 14 + "webp" +#endif }; static const int num_extensions_android = sizeof(extensions_android) / sizeof(const char *); diff --git a/panda/src/android/pnmFileTypeAndroidReader.cxx b/panda/src/android/pnmFileTypeAndroidReader.cxx index ac95ce98fd..e18ebcbaea 100644 --- a/panda/src/android/pnmFileTypeAndroidReader.cxx +++ b/panda/src/android/pnmFileTypeAndroidReader.cxx @@ -87,6 +87,7 @@ Reader(PNMFileType *type, istream *file, bool owns_file, string magic_number) : jobject opts = _env->CallStaticObjectMethod(jni_PandaActivity, jni_PandaActivity_readBitmapSize, (jlong) _file); + _file->clear(); _file->seekg(pos); if (_file->tellg() != pos) { android_cat.error() diff --git a/panda/src/pnmimagetypes/pnmFileTypeStbImage.cxx b/panda/src/pnmimagetypes/pnmFileTypeStbImage.cxx index a87aae11f6..e17e0e9df8 100644 --- a/panda/src/pnmimagetypes/pnmFileTypeStbImage.cxx +++ b/panda/src/pnmimagetypes/pnmFileTypeStbImage.cxx @@ -62,7 +62,7 @@ static const char *const stb_extensions[] = { // Expose the extensions that we don't already expose through other loaders. -#ifndef HAVE_JPEG +#if !defined(HAVE_JPEG) && !defined(ANDROID) "jpg", "jpeg", #endif #ifndef HAVE_PNG