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

Compile fix

Browse Source
This commit is contained in:
Joshua Granick
2016-12-07 22:32:35 -08:00
parent d93eb97508
commit f77bcca328
1 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
project/src/ExternalInterface.cpp
View File

@@ -698,7 +698,6 @@ namespace lime {
} }
<<<<<<< 89d3f850286be9c2b1813f38d8319f20acaa1d7b
void lime_haptic_vibrate (int period, int duration) { void lime_haptic_vibrate (int period, int duration) {
#ifdef IPHONE #ifdef IPHONE
@@ -708,10 +707,7 @@ namespace lime {
} }
value lime_image_encode (value buffer, int type, int quality, value bytes) {
=======
value lime_image_encode (value buffer, int type, int quality) { value lime_image_encode (value buffer, int type, int quality) {
>>>>>>> Never allocate CFFI utility classes on heap to avoid GC issues (requires clean build)
ImageBuffer imageBuffer = ImageBuffer (buffer); ImageBuffer imageBuffer = ImageBuffer (buffer);
Bytes data; Bytes data;
@@ -1015,13 +1011,8 @@ namespace lime {
value lime_jpeg_decode_file (HxString path, bool decodeData) { value lime_jpeg_decode_file (HxString path, bool decodeData) {
<<<<<<< 89d3f850286be9c2b1813f38d8319f20acaa1d7b
ImageBuffer imageBuffer (buffer);
Resource resource = Resource (path.c_str ());
=======
ImageBuffer imageBuffer; ImageBuffer imageBuffer;
Resource resource = Resource (path.__s); Resource resource = Resource (path.c_str ());
>>>>>>> Never allocate CFFI utility classes on heap to avoid GC issues (requires clean build)
#ifdef LIME_JPEG #ifdef LIME_JPEG
if (JPEG::Decode (&resource, &imageBuffer, decodeData)) { if (JPEG::Decode (&resource, &imageBuffer, decodeData)) {
@@ -1176,13 +1167,8 @@ namespace lime {
value lime_png_decode_file (HxString path, bool decodeData) { value lime_png_decode_file (HxString path, bool decodeData) {
<<<<<<< 89d3f850286be9c2b1813f38d8319f20acaa1d7b
ImageBuffer imageBuffer (buffer);
Resource resource = Resource (path.c_str ());
=======
ImageBuffer imageBuffer; ImageBuffer imageBuffer;
Resource resource = Resource (path.__s); Resource resource = Resource (path.c_str ());
>>>>>>> Never allocate CFFI utility classes on heap to avoid GC issues (requires clean build)
#ifdef LIME_PNG #ifdef LIME_PNG
if (PNG::Decode (&resource, &imageBuffer, decodeData)) { if (PNG::Decode (&resource, &imageBuffer, decodeData)) {