diff --git a/lime/audio/AudioBuffer.hx b/lime/audio/AudioBuffer.hx
index b6af8f56d..8946a6cdc 100644
--- a/lime/audio/AudioBuffer.hx
+++ b/lime/audio/AudioBuffer.hx
@@ -1,6 +1,7 @@
package lime.audio;
+import haxe.io.Bytes;
import lime.audio.openal.AL;
import lime.system.System;
import lime.utils.ByteArray;
@@ -56,7 +57,13 @@ class AudioBuffer {
var audioBuffer = new AudioBuffer ();
audioBuffer.bitsPerSample = data.bitsPerSample;
audioBuffer.channels = data.channels;
- audioBuffer.data = data.data;
+ #if neko
+ var bytes = @:privateAccess (new Bytes (data.data.length, data.data.b));
+ #else
+ var bytes = Bytes.ofString (data.data.b);
+ @:privateAccess (bytes).length = data.data.length;
+ #end
+ audioBuffer.data = ByteArray.fromBytes (bytes);
audioBuffer.sampleRate = data.sampleRate;
return audioBuffer;
@@ -80,7 +87,13 @@ class AudioBuffer {
var audioBuffer = new AudioBuffer ();
audioBuffer.bitsPerSample = data.bitsPerSample;
audioBuffer.channels = data.channels;
- audioBuffer.data = data.data;
+ #if neko
+ var bytes = @:privateAccess (new Bytes (data.data.length, data.data.b));
+ #else
+ var bytes = Bytes.ofString (data.data.b);
+ @:privateAccess (bytes).length = data.data.length;
+ #end
+ audioBuffer.data = ByteArray.fromBytes (bytes);
audioBuffer.sampleRate = data.sampleRate;
return audioBuffer;
diff --git a/lime/graphics/Image.hx b/lime/graphics/Image.hx
index c94dfc445..ffbe2b641 100644
--- a/lime/graphics/Image.hx
+++ b/lime/graphics/Image.hx
@@ -3,6 +3,7 @@ package lime.graphics;
import haxe.crypto.BaseCode;
import haxe.io.Bytes;
+import haxe.io.BytesData;
import haxe.io.BytesInput;
import haxe.io.BytesOutput;
import lime.app.Application;
@@ -14,6 +15,7 @@ import lime.graphics.utils.ImageDataUtil;
import lime.math.ColorMatrix;
import lime.math.Rectangle;
import lime.math.Vector2;
+import lime.utils.ArrayBuffer;
import lime.utils.ByteArray;
import lime.utils.UInt8Array;
import lime.system.System;
@@ -946,8 +948,13 @@ class Image {
if (data != null) {
- var byteArray:ByteArray = data.data;
- __fromImageBuffer (new ImageBuffer (new UInt8Array (byteArray), data.width, data.height, data.bpp));
+ #if neko
+ var bytes = @:privateAccess (new Bytes (data.data.length, data.data.b));
+ #else
+ var bytes = Bytes.ofString (data.data.b);
+ @:privateAccess (bytes).length = data.data.length;
+ #end
+ __fromImageBuffer (new ImageBuffer (new UInt8Array (bytes), data.width, data.height, data.bitsPerPixel));
if (onload != null) {
@@ -1011,14 +1018,18 @@ class Image {
if (#if (sys && (!disable_cffi || !format) && !java) true #else false #end && !System.disableCFFI) {
var data = lime_image_load (path);
+
if (data != null) {
- var ba:ByteArray = cast(data.data, ByteArray);
- #if nodejs
- var u8a = ba.byteView;
+
+ #if neko
+ var bytes = @:privateAccess (new Bytes (data.data.length, data.data.b));
#else
- var u8a = new UInt8Array(ba);
+ var bytes = Bytes.ofString (data.data.b);
+ @:privateAccess (bytes).length = data.data.length;
#end
- buffer = new ImageBuffer (u8a, data.width, data.height, data.bpp);
+ var u8a = new UInt8Array (bytes);
+ buffer = new ImageBuffer (u8a, data.width, data.height, data.bitsPerPixel);
+
}
}
@@ -1035,7 +1046,7 @@ class Image {
var data = Tools.extract32 (png);
var header = Tools.getHeader (png);
- var data = new UInt8Array (ByteArray.fromBytes (Bytes.ofData (data.getData ())));
+ var data = new UInt8Array (Bytes.ofData (data.getData ()));
var length = header.width * header.height;
var b, g, r, a;
diff --git a/lime/graphics/ImageBuffer.hx b/lime/graphics/ImageBuffer.hx
index 36d276146..4b975ecef 100644
--- a/lime/graphics/ImageBuffer.hx
+++ b/lime/graphics/ImageBuffer.hx
@@ -103,8 +103,7 @@ class ImageBuffer {
var bytes = Bytes.alloc (data.byteLength);
bytes.blit (0, buffer.data.buffer, 0, data.byteLength);
- var byteArray = ByteArray.fromBytes (bytes);
- buffer.data = new UInt8Array (byteArray);
+ buffer.data = new UInt8Array (bytes);
}
#end
diff --git a/lime/graphics/cairo/CairoSurface.hx b/lime/graphics/cairo/CairoSurface.hx
index d81a75c7e..725ef20d1 100644
--- a/lime/graphics/cairo/CairoSurface.hx
+++ b/lime/graphics/cairo/CairoSurface.hx
@@ -58,11 +58,7 @@ abstract CairoSurface(Dynamic) {
public static function fromImage (image:Image):CairoSurface {
#if lime_cairo
- #if nodejs
- return createForData (lime_buffer_get_native_pointer (#if nodejs image.data #else image.data.buffer #end), CairoFormat.ARGB32, image.width, image.height, image.buffer.stride);
- #else
- return createForData (ByteArray.fromBytes (image.data.buffer).__getNativePointer (), CairoFormat.ARGB32, image.width, image.height, image.buffer.stride);
- #end
+ return createForData (lime_bytes_get_data_pointer (#if nodejs image.data #else image.data.buffer #end), CairoFormat.ARGB32, image.width, image.height, image.buffer.stride);
#else
return null;
#end
@@ -107,13 +103,13 @@ abstract CairoSurface(Dynamic) {
#if lime_cairo
+ private static var lime_bytes_get_data_pointer = System.load ("lime", "lime_bytes_get_data_pointer", 1);
private static var lime_cairo_image_surface_create = System.load ("lime", "lime_cairo_image_surface_create", 3);
private static var lime_cairo_image_surface_create_for_data = System.load ("lime", "lime_cairo_image_surface_create_for_data", 5);
private static var lime_cairo_image_surface_get_height = System.load ("lime", "lime_cairo_image_surface_get_height", 1);
private static var lime_cairo_image_surface_get_width = System.load ("lime", "lime_cairo_image_surface_get_width", 1);
private static var lime_cairo_surface_destroy = System.load ("lime", "lime_cairo_surface_destroy", 1);
private static var lime_cairo_surface_flush = System.load ("lime", "lime_cairo_surface_flush", 1);
- private static var lime_buffer_get_native_pointer = System.load ("lime", "lime_buffer_get_native_pointer", 1);
#end
diff --git a/lime/graphics/opengl/GL.hx b/lime/graphics/opengl/GL.hx
index 26272a125..5ee1bf702 100644
--- a/lime/graphics/opengl/GL.hx
+++ b/lime/graphics/opengl/GL.hx
@@ -544,11 +544,11 @@ class GL {
#if (js && html5 && !display)
context.bufferData (target, data, usage);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_buffer_data (target, ByteArray.fromBytes (data.buffer), data.byteOffset, data.byteLength, usage);
+ lime_gl_buffer_data (target, data.buffer, data.byteOffset, data.byteLength, usage);
#elseif (nodejs && lime_opengl)
lime_gl_buffer_data (target, data, data.byteOffset, data.byteLength, usage);
#elseif java
- //GL15.glBufferData (target, ByteArray.fromBytes (data.buffer), data.byteOffset, data.byteLength, usage);
+ //GL15.glBufferData (target, data.buffer, data.byteOffset, data.byteLength, usage);
#end
}
@@ -559,11 +559,11 @@ class GL {
#if (js && html5 && !display)
context.bufferSubData (target, offset, data);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_buffer_sub_data (target, offset, ByteArray.fromBytes (data.buffer), data.byteOffset, data.byteLength);
+ lime_gl_buffer_sub_data (target, offset, data.buffer, data.byteOffset, data.byteLength);
#elseif (nodejs && lime_opengl)
lime_gl_buffer_sub_data (target, offset, data, data.byteOffset, data.byteLength);
#elseif java
- //GL15.glBufferSubData (target, offset, ByteArray.fromBytes (data.buffer), data.byteOffset, data.byteLength);
+ //GL15.glBufferSubData (target, offset, data.buffer, data.byteOffset, data.byteLength);
#end
}
@@ -667,11 +667,11 @@ class GL {
#if (js && html5 && !display)
context.compressedTexImage2D (target, level, internalformat, width, height, border, data);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_compressed_tex_image_2d (target, level, internalformat, width, height, border, data == null ? null : ByteArray.fromBytes (data.buffer), data == null ? null : data.byteOffset);
+ lime_gl_compressed_tex_image_2d (target, level, internalformat, width, height, border, data == null ? null : data.buffer, data == null ? null : data.byteOffset);
#elseif (nodejs && lime_opengl)
lime_gl_compressed_tex_image_2d (target, level, internalformat, width, height, border, data == null ? null : data , data == null ? null : data.byteOffset);
#elseif java
- //GL13.glCompressedTexImage2D (target, level, internalformat, width, height, border, data == null ? null : ByteArray.fromBytes (data.buffer), data == null ? null : data.byteOffset);
+ //GL13.glCompressedTexImage2D (target, level, internalformat, width, height, border, data == null ? null : data.buffer, data == null ? null : data.byteOffset);
#end
}
@@ -682,11 +682,11 @@ class GL {
#if (js && html5 && !display)
context.compressedTexSubImage2D (target, level, xoffset, yoffset, width, height, format, data);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_compressed_tex_sub_image_2d (target, level, xoffset, yoffset, width, height, format, data == null ? null : ByteArray.fromBytes (data.buffer), data == null ? null : data.byteOffset);
+ lime_gl_compressed_tex_sub_image_2d (target, level, xoffset, yoffset, width, height, format, data == null ? null : data.buffer, data == null ? null : data.byteOffset);
#elseif (nodejs && lime_opengl)
lime_gl_compressed_tex_sub_image_2d (target, level, xoffset, yoffset, width, height, format, data == null ? null : data, data == null ? null : data.byteOffset);
#elseif java
- //GL13.glCompressedTexSubImage2D (target, level, xoffset, yoffset, width, height, format, data == null ? null : ByteArray.fromBytes (data.buffer), data == null ? null : data.byteOffset);
+ //GL13.glCompressedTexSubImage2D (target, level, xoffset, yoffset, width, height, format, data == null ? null : data.buffer, data == null ? null : data.byteOffset);
#end
}
@@ -1649,7 +1649,7 @@ class GL {
#if (js && html5 && !display)
context.readPixels (x, y, width, height, format, type, pixels);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_read_pixels (x, y, width, height, format, type, pixels == null ? null : ByteArray.fromBytes (pixels.buffer), pixels == null ? null : pixels.byteOffset);
+ lime_gl_read_pixels (x, y, width, height, format, type, pixels == null ? null : pixels.buffer, pixels == null ? null : pixels.byteOffset);
#elseif (nodejs && lime_opengl)
lime_gl_read_pixels (x, y, width, height, format, type, pixels == null ? null : pixels, pixels == null ? null : pixels.byteOffset);
#end
@@ -1772,7 +1772,7 @@ class GL {
#if (js && html5 && !display)
context.texImage2D (target, level, internalformat, width, height, border, format, type, pixels);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_tex_image_2d (target, level, internalformat, width, height, border, format, type, pixels == null ? null : ByteArray.fromBytes (pixels.buffer), pixels == null ? null : pixels.byteOffset);
+ lime_gl_tex_image_2d (target, level, internalformat, width, height, border, format, type, pixels == null ? null : pixels.buffer, pixels == null ? null : pixels.byteOffset);
#elseif (nodejs && lime_opengl)
lime_gl_tex_image_2d (target, level, internalformat, width, height, border, format, type, pixels == null ? null : pixels, pixels == null ? null : pixels.byteOffset);
#end
@@ -1807,7 +1807,7 @@ class GL {
#if (js && html5 && !display)
context.texSubImage2D (target, level, xoffset, yoffset, width, height, format, type, pixels);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_tex_sub_image_2d (target, level, xoffset, yoffset, width, height, format, type, pixels == null ? null : ByteArray.fromBytes (pixels.buffer), pixels == null ? null : pixels.byteOffset);
+ lime_gl_tex_sub_image_2d (target, level, xoffset, yoffset, width, height, format, type, pixels == null ? null : pixels.buffer, pixels == null ? null : pixels.byteOffset);
#elseif (nodejs && lime_opengl)
lime_gl_tex_sub_image_2d (target, level, xoffset, yoffset, width, height, format, type, pixels == null ? null : pixels, pixels == null ? null : pixels.byteOffset);
#end
@@ -1831,7 +1831,7 @@ class GL {
#if (js && html5 && !display)
context.uniform1fv (location, x);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_uniform1fv (location, ByteArray.fromBytes (x.buffer));
+ lime_gl_uniform1fv (location, x.buffer);
#elseif (nodejs && lime_opengl)
lime_gl_uniform1fv (location, x);
#end
@@ -1855,7 +1855,7 @@ class GL {
#if (js && html5 && !display)
context.uniform1iv (location, v);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_uniform1iv (location, ByteArray.fromBytes (v.buffer));
+ lime_gl_uniform1iv (location, v.buffer);
#elseif (nodejs && lime_opengl)
lime_gl_uniform1iv (location, v);
#end
@@ -1879,7 +1879,7 @@ class GL {
#if (js && html5 && !display)
context.uniform2fv (location, v);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_uniform2fv (location, ByteArray.fromBytes (v.buffer));
+ lime_gl_uniform2fv (location, v.buffer);
#elseif (nodejs && lime_opengl)
lime_gl_uniform2fv (location, v);
#end
@@ -1903,7 +1903,7 @@ class GL {
#if (js && html5 && !display)
context.uniform2iv (location, v);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_uniform2iv (location, ByteArray.fromBytes (v.buffer));
+ lime_gl_uniform2iv (location, v.buffer);
#elseif (nodejs && lime_opengl)
lime_gl_uniform2iv (location, v);
#end
@@ -1927,7 +1927,7 @@ class GL {
#if (js && html5 && !display)
context.uniform3fv (location, v);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_uniform3fv (location, ByteArray.fromBytes (v.buffer));
+ lime_gl_uniform3fv (location, v.buffer);
#elseif (nodejs && lime_opengl)
lime_gl_uniform3fv (location, v);
#end
@@ -1951,7 +1951,7 @@ class GL {
#if (js && html5 && !display)
context.uniform3iv (location, v);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_uniform3iv (location, ByteArray.fromBytes (v.buffer));
+ lime_gl_uniform3iv (location, v.buffer);
#elseif (nodejs && lime_opengl)
lime_gl_uniform3iv (location, v);
#end
@@ -1975,7 +1975,7 @@ class GL {
#if (js && html5 && !display)
context.uniform4fv (location, v);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_uniform4fv (location, ByteArray.fromBytes (v.buffer));
+ lime_gl_uniform4fv (location, v.buffer);
#elseif (nodejs && lime_opengl)
lime_gl_uniform4fv (location, v);
#end
@@ -1999,7 +1999,7 @@ class GL {
#if (js && html5 && !display)
context.uniform4iv (location, v);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_uniform4iv (location, ByteArray.fromBytes (v.buffer));
+ lime_gl_uniform4iv (location, v.buffer);
#elseif (nodejs && lime_opengl)
lime_gl_uniform4iv (location, v);
#end
@@ -2012,7 +2012,7 @@ class GL {
#if (js && html5 && !display)
context.uniformMatrix2fv (location, transpose, v);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_uniform_matrix (location, transpose, ByteArray.fromBytes (v.buffer), 2);
+ lime_gl_uniform_matrix (location, transpose, v.buffer, 2);
#elseif (nodejs && lime_opengl)
lime_gl_uniform_matrix (location, transpose, v, 2);
#end
@@ -2025,7 +2025,7 @@ class GL {
#if (js && html5 && !display)
context.uniformMatrix3fv (location, transpose, v);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_uniform_matrix (location, transpose, ByteArray.fromBytes (v.buffer), 3);
+ lime_gl_uniform_matrix (location, transpose, v.buffer, 3);
#elseif (nodejs && lime_opengl)
lime_gl_uniform_matrix (location, transpose, v, 3);
#end
@@ -2038,7 +2038,7 @@ class GL {
#if (js && html5 && !display)
context.uniformMatrix4fv (location, transpose, v);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_uniform_matrix (location, transpose, ByteArray.fromBytes (v.buffer), 4);
+ lime_gl_uniform_matrix (location, transpose, v.buffer, 4);
#elseif (nodejs && lime_opengl)
lime_gl_uniform_matrix (location, transpose, v, 4);
#end
@@ -2091,7 +2091,7 @@ class GL {
#if (js && html5 && !display)
context.vertexAttrib1fv (indx, values);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_vertex_attrib1fv (indx, ByteArray.fromBytes (values.buffer));
+ lime_gl_vertex_attrib1fv (indx, values.buffer);
#elseif (nodejs && lime_opengl)
lime_gl_vertex_attrib1fv (indx, values);
#end
@@ -2115,7 +2115,7 @@ class GL {
#if (js && html5 && !display)
context.vertexAttrib2fv (indx, values);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_vertex_attrib2fv (indx, ByteArray.fromBytes (values.buffer));
+ lime_gl_vertex_attrib2fv (indx, values.buffer);
#elseif (nodejs && lime_opengl)
lime_gl_vertex_attrib2fv (indx, values);
#end
@@ -2139,7 +2139,7 @@ class GL {
#if (js && html5 && !display)
context.vertexAttrib3fv (indx, values);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_vertex_attrib3fv (indx, ByteArray.fromBytes (values.buffer));
+ lime_gl_vertex_attrib3fv (indx, values.buffer);
#elseif (nodejs && lime_opengl)
lime_gl_vertex_attrib3fv (indx, values);
#end
@@ -2163,7 +2163,7 @@ class GL {
#if (js && html5 && !display)
context.vertexAttrib4fv (indx, values);
#elseif ((cpp || neko) && lime_opengl)
- lime_gl_vertex_attrib4fv (indx, ByteArray.fromBytes (values.buffer));
+ lime_gl_vertex_attrib4fv (indx, values.buffer);
#elseif (nodejs && lime_opengl)
lime_gl_vertex_attrib4fv (indx, values);
#end
diff --git a/lime/graphics/utils/ImageDataUtil.hx b/lime/graphics/utils/ImageDataUtil.hx
index 90ac83de9..6413ebd06 100644
--- a/lime/graphics/utils/ImageDataUtil.hx
+++ b/lime/graphics/utils/ImageDataUtil.hx
@@ -2,6 +2,7 @@ package lime.graphics.utils;
import haxe.ds.Vector;
+import haxe.io.Bytes;
import lime.graphics.Image;
import lime.graphics.ImageBuffer;
import lime.graphics.PixelFormat;
@@ -676,7 +677,7 @@ class ImageDataUtil {
#end
#if ((cpp || neko) && !disable_cffi)
- if (!System.disableCFFI) byteArray = lime_image_data_util_get_pixels (image, rect, format); else
+ if (!System.disableCFFI) lime_image_data_util_get_pixels (image, rect, format, byteArray); else
#end
{
@@ -1213,7 +1214,7 @@ class ImageDataUtil {
private static var lime_image_data_util_copy_pixels = System.load ("lime", "lime_image_data_util_copy_pixels", 5);
private static var lime_image_data_util_fill_rect = System.load ("lime", "lime_image_data_util_fill_rect", 3);
private static var lime_image_data_util_flood_fill = System.load ("lime", "lime_image_data_util_flood_fill", 4);
- private static var lime_image_data_util_get_pixels = System.load ("lime", "lime_image_data_util_get_pixels", 3);
+ private static var lime_image_data_util_get_pixels = System.load ("lime", "lime_image_data_util_get_pixels", 4);
private static var lime_image_data_util_merge = System.load ("lime", "lime_image_data_util_merge", -1);
private static var lime_image_data_util_multiply_alpha = System.load ("lime", "lime_image_data_util_multiply_alpha", 1);
private static var lime_image_data_util_resize = System.load ("lime", "lime_image_data_util_resize", 4);
diff --git a/lime/text/TextLayout.hx b/lime/text/TextLayout.hx
index 572d9c674..44ebbb55f 100644
--- a/lime/text/TextLayout.hx
+++ b/lime/text/TextLayout.hx
@@ -62,7 +62,7 @@ class TextLayout {
}
- lime_text_layout_position (__handle, font.src, size, text, __buffer);
+ var data = lime_text_layout_position (__handle, font.src, size, text, __buffer);
if (__buffer.length > 4) {
@@ -83,7 +83,7 @@ class TextLayout {
}
- }
+ }
}
#end
diff --git a/project/Build.xml b/project/Build.xml
index 7f7e95501..9ea73b2a7 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -199,6 +199,7 @@
+
diff --git a/project/include/audio/AudioBuffer.h b/project/include/audio/AudioBuffer.h
index f4b276769..5287716fa 100644
--- a/project/include/audio/AudioBuffer.h
+++ b/project/include/audio/AudioBuffer.h
@@ -3,7 +3,7 @@
#include
-#include
+#include
#ifdef ANDROID
#include
@@ -42,7 +42,7 @@ namespace lime {
int bitsPerSample;
int channels;
int sampleRate;
- ByteArray *data;
+ Bytes *data;
private:
diff --git a/project/include/graphics/ImageBuffer.h b/project/include/graphics/ImageBuffer.h
index d092f9964..96219c7c0 100644
--- a/project/include/graphics/ImageBuffer.h
+++ b/project/include/graphics/ImageBuffer.h
@@ -4,7 +4,7 @@
#include
#include
-#include
+#include
namespace lime {
@@ -24,7 +24,7 @@ namespace lime {
value Value ();
int bpp;
- ByteArray *data;
+ Bytes *data;
PixelFormat format;
int height;
int width;
diff --git a/project/include/graphics/format/JPEG.h b/project/include/graphics/format/JPEG.h
index a3499d498..d5dc1eea0 100644
--- a/project/include/graphics/format/JPEG.h
+++ b/project/include/graphics/format/JPEG.h
@@ -3,7 +3,7 @@
#include
-#include
+#include
#include
@@ -16,7 +16,7 @@ namespace lime {
public:
static bool Decode (Resource *resource, ImageBuffer *imageBuffer, bool decodeData = true);
- static bool Encode (ImageBuffer *imageBuffer, ByteArray *bytes, int quality);
+ static bool Encode (ImageBuffer *imageBuffer, Bytes *bytes, int quality);
};
diff --git a/project/include/graphics/format/PNG.h b/project/include/graphics/format/PNG.h
index c536a59a8..de8c540bd 100644
--- a/project/include/graphics/format/PNG.h
+++ b/project/include/graphics/format/PNG.h
@@ -3,7 +3,7 @@
#include
-#include
+#include
#include
@@ -16,7 +16,7 @@ namespace lime {
public:
static bool Decode (Resource *resource, ImageBuffer *imageBuffer, bool decodeData = true);
- static bool Encode (ImageBuffer *imageBuffer, ByteArray *bytes);
+ static bool Encode (ImageBuffer *imageBuffer, Bytes *bytes);
};
diff --git a/project/include/graphics/utils/ImageDataUtil.h b/project/include/graphics/utils/ImageDataUtil.h
index 1b06ef15b..02e1e86fc 100644
--- a/project/include/graphics/utils/ImageDataUtil.h
+++ b/project/include/graphics/utils/ImageDataUtil.h
@@ -9,7 +9,7 @@
#include