diff options
author | chai <chaifix@163.com> | 2018-09-07 21:20:15 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2018-09-07 21:20:15 +0800 |
commit | 36f7e3e5542f3cfee11b34ce497fcb877b3462bf (patch) | |
tree | 596d9fd6a12058b9c2781f529551b0ebefa72f75 /src | |
parent | e72188433348c270a54879da9f086f1b527b580f (diff) |
*update
Diffstat (limited to 'src')
-rw-r--r-- | src/libjin/Graphics/Bitmap.cpp | 6 | ||||
-rw-r--r-- | src/lua/modules/net/net.cpp | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/libjin/Graphics/Bitmap.cpp b/src/libjin/Graphics/Bitmap.cpp index c2acff4..28b59af 100644 --- a/src/libjin/Graphics/Bitmap.cpp +++ b/src/libjin/Graphics/Bitmap.cpp @@ -52,7 +52,7 @@ namespace graphics { width = w; height = h; - pixels = (Color*)calloc(1, w*h*sizeof(Color)); + pixels = new Color[w*h]; } Bitmap::~Bitmap() @@ -73,8 +73,8 @@ namespace graphics { if (pixels != nullptr) delete[] pixels; + pixels = new Color[w*h]; size_t s = w * h * sizeof(Color); - pixels = (Color*)calloc(1, s); memcpy(pixels, p, s); width = w; height = h; @@ -93,8 +93,8 @@ namespace graphics { if (pixels != nullptr) delete[] pixels; + pixels = new Color[w*h]; size_t s = w * h * sizeof(Color); - pixels = (Color*)calloc(1, s); width = w; height = h; for (int x = 0; x < w; ++x) diff --git a/src/lua/modules/net/net.cpp b/src/lua/modules/net/net.cpp index a984920..8fb273c 100644 --- a/src/lua/modules/net/net.cpp +++ b/src/lua/modules/net/net.cpp @@ -8,6 +8,7 @@ namespace jin { namespace lua { + using namespace jin::lua::net; using namespace jin::net; |