3 files changed, 26 insertions, 8 deletions

diff --git a/src/libjin/Graphics/je_bitmap.cpp b/src/libjin/Graphics/je_bitmap.cpp
index c11028f..711b8b5 100644
--- a/src/libjin/Graphics/je_bitmap.cpp
+++ b/src/libjin/Graphics/je_bitmap.cpp
@@ -1,6 +1,7 @@
 #define STB_IMAGE_IMPLEMENTATION
 #include "stb/stb_image.h"
 
+#include "../common/je_exception.h"
 #include "../filesystem/je_asset_database.h"
 #include "../math/je_math.h"
 
@@ -35,8 +36,11 @@ namespace JinEngine
 				return nullptr; 
 			int w, h;
 			void* data = stbi_load_from_memory((unsigned char *)imgData, size, &w, &h, NULL, STBI_rgb_alpha);
-			if (data == nullptr)
-				return nullptr;
+            if (data == nullptr)
+            {
+                throw Exception("Could not create bitmap from image data.");
+                return nullptr;
+            }
 			Bitmap* bitmap = new Bitmap();
 			bitmap->pixels = (Color*)data; 
 			bitmap->width = w; 
@@ -73,6 +77,8 @@ namespace JinEngine
 			width = w; 
 			height = h; 
 			pixels = new Color[w*h];
+            if (pixels == nullptr)
+                throw Exception("Not enough memory.");
 		}
 
 		Bitmap::~Bitmap()
@@ -94,6 +100,8 @@ namespace JinEngine
 			if (pixels != nullptr)
 				delete[] pixels; 
 			pixels = new Color[w*h];
+            if (pixels == nullptr)
+                throw Exception("Not enough memory.");
 			size_t s = w * h * sizeof(Color);
 			memcpy(pixels, p, s);
 			width = w; 
@@ -106,6 +114,8 @@ namespace JinEngine
 				return;
 			if (without<int>(x, 0, width - 1) || without<int>(y, 0, height - 1))
 				return;
+            if (x + y * width >= width * height)
+                throw Exception("Pixel <%d, %d> of bitmap is out of range.", x, y);
 			pixels[x + y * width] = c;
 		}
 
@@ -114,7 +124,8 @@ namespace JinEngine
 			if (pixels != nullptr)
 				delete[] pixels;
 			pixels = new Color[w*h];
-			size_t s = w * h * sizeof(Color);
+            if (pixels == nullptr)
+                throw Exception("Not enough memory.");
 			width = w;
 			height = h;
 			for (int x = 0; x < w; ++x)
@@ -126,8 +137,10 @@ namespace JinEngine
 			}
 		}
 
-		void Bitmap::setPixels(Color* p)
+		void Bitmap::setPixels(Color* p, int count)
 		{
+            if (count > width * height)
+                throw Exception("Pixels are out of range.");
 			size_t s = width * height * sizeof(Color);
 			memcpy(pixels, p, s);
 		}
diff --git a/src/libjin/Graphics/je_bitmap.h b/src/libjin/Graphics/je_bitmap.h
index bb7bbfa..b0b7dad 100644
--- a/src/libjin/Graphics/je_bitmap.h
+++ b/src/libjin/Graphics/je_bitmap.h
@@ -122,8 +122,9 @@ namespace JinEngine
             /// Set pixels with given color data.
             /// 
             /// @param colors New pixels' colors.
+            /// @param count Number of pixels.
             /// 
-			void setPixels(Color* colors);
+			void setPixels(Color* colors, int count);
 
             /// 
             /// Get pixel in given position.
diff --git a/src/libjin/Graphics/je_window.cpp b/src/libjin/Graphics/je_window.cpp
index 7265898..86ccd29 100644
--- a/src/libjin/Graphics/je_window.cpp
+++ b/src/libjin/Graphics/je_window.cpp
@@ -70,15 +70,19 @@ namespace JinEngine
 				return false;
 			SDL_GL_SetSwapInterval(vsync ? 1 : 0);
 			SDL_GL_MakeCurrent(mWnd, ctx);
-			// default configuration
+			// Default configuration
 			gl.setClearColor(0, 0, 0, 0xff);
-			gl.pushColor(0xff, 0xff, 0xff, 0xff);
+            glClear(GL_COLOR_BUFFER_BIT);
+            gl.pushColor(0xff, 0xff, 0xff, 0xff);
 			gl.enable(GL_BLEND);
 			gl.enable(GL_TEXTURE_2D);
 			gl.setBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-			// bind to default canvas 
+			// Bind to default canvas 
 			Canvas::unbind();
 			Shader::unuse();
+            // Avoid white blinnk.
+            swapBuffers();
+
 			return true; 
 		}