kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix JNI JPEG and PNG file loading

Browse Source
This commit is contained in:
Joshua Granick
2015-02-04 14:07:21 -08:00
parent d6f6e92663
commit 8f9591365a
5 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
project/include/utils/FileIO.h
View File

@@ -15,6 +15,7 @@ namespace lime {
FILE* getFile ();
int getLength ();
bool isFile ();
};

7
project/src/backend/sdl/SDLFileIO.cpp
View File

@@ -38,6 +38,13 @@ namespace lime {
}
bool FILE_HANDLE::isFile () {
return ((SDL_RWops*)handle)->type == SDL_RWOPS_STDFILE;
}
int fclose (FILE_HANDLE *stream) {
if (stream) {

2
project/src/graphics/format/JPEG.cpp
View File

@@ -211,7 +211,7 @@ namespace lime {
file = lime::fopen (resource->path, "rb");
if (file->getFile ()) {
if (file->isFile ()) {
jpeg_stdio_src (&cinfo, file->getFile ());

2
project/src/graphics/format/PNG.cpp
View File

@@ -136,7 +136,7 @@ namespace lime {
if (file) {
if (file->getFile ()) {
if (file->isFile ()) {
png_init_io (png_ptr, file->getFile ());
png_set_sig_bytes (png_ptr, PNG_SIG_SIZE);

7
project/src/utils/FileIO.cpp
View File

@@ -22,6 +22,13 @@ namespace lime {
}
bool FILE_HANDLE::isFile () {
return true;
}
int fclose (FILE_HANDLE *stream) {
if (stream) {