diff --git a/engine/split/3rd_aseprite.h b/engine/split/3rd_aseprite.h index 05cef65..477d78a 100644 --- a/engine/split/3rd_aseprite.h +++ b/engine/split/3rd_aseprite.h @@ -937,7 +937,10 @@ ase_t* cute_aseprite_load_from_memory(const void* memory, int size, void* mem_ct s_skip(s, sizeof(uint32_t)); // File size. int magic = (int)s_read_uint16(s); - if (magic != 0xA5E0) return CUTE_ASEPRITE_FREE(ase, mem_ctx), 0; // CUTE_ASEPRITE_ASSERT(magic == 0xA5E0); //< r-lyeh: soft abort + if (magic != 0xA5E0) { + CUTE_ASEPRITE_FREE(ase, mem_ctx); // CUTE_ASEPRITE_ASSERT(magic == 0xA5E0); //< r-lyeh: soft abort + return NULL; + } ase->frame_count = (int)s_read_uint16(s); ase->w = s_read_uint16(s); diff --git a/engine/split/v4k_system.c b/engine/split/v4k_system.c index 7319f94..84ac771 100644 --- a/engine/split/v4k_system.c +++ b/engine/split/v4k_system.c @@ -109,13 +109,7 @@ const char * app_exec( const char *cmd ) { // pick the fastest code path per platform #if is(osx) - for( FILE *fp = popen( cmd, "r" ); fp; rc = pclose(fp), fp = 0) { - // while( fgets(buf, 4096 - 1, fp) ) {} - } - // if( rc != 0 ) { - // char *r = strrchr(buf, '\r'); if(r) *r = 0; - // char *n = strrchr(buf, '\n'); if(n) *n = 0; - // } + rc = system(cmd); #elif is(win32) STARTUPINFOA si = {0}; si.cb = sizeof(si); PROCESS_INFORMATION pi = {0}; diff --git a/engine/v4k.c b/engine/v4k.c index 728c815..e16bbd6 100644 --- a/engine/v4k.c +++ b/engine/v4k.c @@ -25115,13 +25115,7 @@ const char * app_exec( const char *cmd ) { // pick the fastest code path per platform #if is(osx) - for( FILE *fp = popen( cmd, "r" ); fp; rc = pclose(fp), fp = 0) { - // while( fgets(buf, 4096 - 1, fp) ) {} - } - // if( rc != 0 ) { - // char *r = strrchr(buf, '\r'); if(r) *r = 0; - // char *n = strrchr(buf, '\n'); if(n) *n = 0; - // } + rc = system(cmd); #elif is(win32) STARTUPINFOA si = {0}; si.cb = sizeof(si); PROCESS_INFORMATION pi = {0}; diff --git a/tools/ase2ini.osx b/tools/ase2ini.osx index c408f7c..89ba7a2 100755 Binary files a/tools/ase2ini.osx and b/tools/ase2ini.osx differ diff --git a/tools/cook.osx b/tools/cook.osx index d7a83c9..dc1eefd 100755 Binary files a/tools/cook.osx and b/tools/cook.osx differ