Merge changes

This commit is contained in:
Joshua Granick
2016-12-07 22:11:02 -08:00
parent 89d3f85028
commit c96cb19ad1
29 changed files with 314 additions and 447 deletions

View File

@@ -43,7 +43,7 @@ namespace lime {
int bitsPerSample;
int channels;
int sampleRate;
ArrayBufferView *data;
ArrayBufferView data;
private:

View File

@@ -18,7 +18,7 @@ namespace lime {
Image (value image);
~Image ();
ImageBuffer *buffer;
ImageBuffer buffer;
int height;
int offsetX;
int offsetY;

View File

@@ -21,11 +21,12 @@ namespace lime {
void Blit (const unsigned char *data, int x, int y, int width, int height);
void Resize (int width, int height, int bitsPerPixel = 32);
void Set (value imageBuffer);
int Stride ();
value Value ();
int bitsPerPixel;
ArrayBufferView *data;
ArrayBufferView data;
PixelFormat format;
int height;
bool premultiplied;

View File

@@ -19,6 +19,7 @@ namespace lime {
ArrayBufferView (value arrayBufferView);
~ArrayBufferView ();
void Clear ();
unsigned char *Data ();
const unsigned char *Data () const;
int Length () const;
@@ -27,7 +28,7 @@ namespace lime {
void Set (const QuickVec<unsigned char> data);
value Value ();
Bytes *buffer;
Bytes buffer;
int byteLength;
int length;

View File

@@ -9,7 +9,10 @@
namespace lime {
struct Bytes {
class Bytes {
public:
Bytes ();
@@ -19,6 +22,7 @@ namespace lime {
Bytes (const QuickVec<unsigned char> data);
~Bytes ();
void Clear ();
unsigned char *Data ();
const unsigned char *Data () const;
int Length () const;
@@ -30,7 +34,6 @@ namespace lime {
unsigned char *_data;
int _length;
AutoGCRoot *_root;
value _value;