Merge pull request #54 from crupest/create-image

2 files changed, 59 insertions, 7 deletions

diff --git a/src/osx/graphics/quartz/Image.cpp b/src/osx/graphics/quartz/Image.cpp
index db10da76..feddad8c 100644
--- a/src/osx/graphics/quartz/Image.cpp
+++ b/src/osx/graphics/quartz/Image.cpp
@@ -1,14 +1,17 @@
 #include "cru/osx/graphics/quartz/Image.h"
+#include "cru/common/Exception.h"
 #include "cru/osx/graphics/quartz/Convert.h"
+#include "cru/osx/graphics/quartz/Painter.h"
 
 namespace cru::platform::graphics::osx::quartz {
 QuartzImage::QuartzImage(IGraphicsFactory* graphics_factory,
                          IImageFactory* image_factory, CGImageRef image,
-                         bool auto_release)
+                         bool auto_release, unsigned char* buffer)
     : OsxQuartzResource(graphics_factory),
       image_factory_(image_factory),
       image_(image),
-      auto_release_(auto_release) {}
+      auto_release_(auto_release),
+      buffer_(buffer) {}
 
 QuartzImage::~QuartzImage() {
   if (auto_release_) {
@@ -26,4 +29,28 @@ std::unique_ptr<IImage> QuartzImage::CreateWithRect(const Rect& rect) {
   return std::make_unique<QuartzImage>(GetGraphicsFactory(), image_factory_,
                                        new_cg_image, true);
 }
+
+std::unique_ptr<IPainter> QuartzImage::CreatePainter() {
+  if (!buffer_)
+    throw Exception(
+        u"Failed to create painter for image because failed to get its "
+        u"buffer.");
+
+  auto width = CGImageGetWidth(image_);
+  auto height = CGImageGetHeight(image_);
+  auto bits_per_component = CGImageGetBitsPerComponent(image_);
+  auto bytes_per_row = CGImageGetBytesPerRow(image_);
+  auto color_space = CGImageGetColorSpace(image_);
+  auto bitmap_info = CGImageGetBitmapInfo(image_);
+
+  auto cg_context =
+      CGBitmapContextCreate(buffer_, width, height, bits_per_component,
+                            bytes_per_row, color_space, bitmap_info);
+
+  return std::make_unique<QuartzCGContextPainter>(
+      GetGraphicsFactory(), cg_context, true, Size(width, height),
+      [](QuartzCGContextPainter* painter) {
+
+      });
+}
 }  // namespace cru::platform::graphics::osx::quartz
diff --git a/src/osx/graphics/quartz/ImageFactory.cpp b/src/osx/graphics/quartz/ImageFactory.cpp
index 7796ef3a..a8c17719 100644
--- a/src/osx/graphics/quartz/ImageFactory.cpp
+++ b/src/osx/graphics/quartz/ImageFactory.cpp
@@ -1,4 +1,5 @@
 #include "cru/osx/graphics/quartz/ImageFactory.h"
+#include "cru/common/Exception.h"
 #include "cru/osx/graphics/quartz/Convert.h"
 #include "cru/osx/graphics/quartz/Image.h"
 #include "cru/platform/graphics/Image.h"
@@ -20,12 +21,36 @@ std::unique_ptr<IImage> QuartzImageFactory::DecodeFromStream(
   CGImageRef cg_image =
       CGImageSourceCreateImageAtIndex(image_source, 0, nullptr);
 
-  QuartzImage* image =
-      new QuartzImage(GetGraphicsFactory(), this, cg_image, true);
-
-  CFRelease(cg_image);
+  CFRelease(image_source);
   CGDataProviderRelease(data_provider);
 
-  return std::unique_ptr<IImage>(image);
+  return std::unique_ptr<IImage>(
+      new QuartzImage(GetGraphicsFactory(), this, cg_image, true));
+}
+
+std::unique_ptr<IImage> QuartzImageFactory::CreateBitmap(int width,
+                                                         int height) {
+  if (width <= 0) throw Exception(u"Image width should be greater than 0.");
+  if (height <= 0) throw Exception(u"Image height should be greater than 0.");
+
+  CGColorSpaceRef color_space = CGColorSpaceCreateDeviceRGB();
+
+  const auto buffer_size = width * height * 4;
+  auto buffer = new unsigned char[buffer_size];
+
+  auto cg_data_provider = CGDataProviderCreateWithData(
+      nullptr, buffer, buffer_size,
+      [](void* info, const void* data, size_t size) {
+        delete[] static_cast<const unsigned char*>(data);
+      });
+
+  auto cg_image = CGImageCreate(width, height, 8, 32, 4 * width, color_space,
+                                kCGImageAlphaLast, nullptr, nullptr, true,
+                                kCGRenderingIntentDefault);
+
+  CGColorSpaceRelease(color_space);
+
+  return std::unique_ptr<IImage>(
+      new QuartzImage(GetGraphicsFactory(), this, cg_image, true, buffer));
 }
 }  // namespace cru::platform::graphics::osx::quartz