Merge pull request #54 from crupest/create-image

3 files changed, 12 insertions, 3 deletions

diff --git a/include/cru/win/graphics/direct/Image.h b/include/cru/win/graphics/direct/Image.h
index 0b51f350..bcf2386b 100644
--- a/include/cru/win/graphics/direct/Image.h
+++ b/include/cru/win/graphics/direct/Image.h
@@ -20,6 +20,8 @@ class CRU_WIN_GRAPHICS_DIRECT_API Direct2DImage : public DirectGraphicsResource,
 
   std::unique_ptr<IImage> CreateWithRect(const Rect& rect) override;
 
+  std::unique_ptr<IPainter> CreatePainter() override;
+
   const Microsoft::WRL::ComPtr<ID2D1Bitmap1>& GetD2DBitmap() const {
     return d2d_bitmap_;
   }
diff --git a/include/cru/win/graphics/direct/ImageFactory.h b/include/cru/win/graphics/direct/ImageFactory.h
index 34d363b0..923e682f 100644
--- a/include/cru/win/graphics/direct/ImageFactory.h
+++ b/include/cru/win/graphics/direct/ImageFactory.h
@@ -19,6 +19,8 @@ class CRU_WIN_GRAPHICS_DIRECT_API WinImageFactory
  public:
   std::unique_ptr<IImage> DecodeFromStream(io::Stream* stream) override;
 
+  std::unique_ptr<IImage> CreateBitmap(int width, int height) override;
+
  private:
   DirectGraphicsFactory* graphics_factory_;
 
diff --git a/include/cru/win/graphics/direct/Painter.h b/include/cru/win/graphics/direct/Painter.h
index b1795395..da89ba5d 100644
--- a/include/cru/win/graphics/direct/Painter.h
+++ b/include/cru/win/graphics/direct/Painter.h
@@ -2,6 +2,7 @@
 #include "ComResource.h"
 #include "Resource.h"
 
+#include "cru/common/Base.h"
 #include "cru/platform/graphics/Painter.h"
 
 #include <vector>
@@ -11,13 +12,15 @@ class CRU_WIN_GRAPHICS_DIRECT_API D2DDeviceContextPainter
     : public DirectResource,
       public virtual IPainter,
       public virtual IComResource<ID2D1DeviceContext1> {
+  CRU_DEFINE_CLASS_LOG_TAG(u"D2DDeviceContextPainter")
  public:
-  explicit D2DDeviceContextPainter(ID2D1DeviceContext1* device_context);
+  explicit D2DDeviceContextPainter(ID2D1DeviceContext1* device_context,
+                                   bool release = false);
 
   CRU_DELETE_COPY(D2DDeviceContextPainter)
   CRU_DELETE_MOVE(D2DDeviceContextPainter)
 
-  ~D2DDeviceContextPainter() override = default;
+  ~D2DDeviceContextPainter() override;
 
  public:
   ID2D1DeviceContext1* GetComInterface() const override {
@@ -57,7 +60,7 @@ class CRU_WIN_GRAPHICS_DIRECT_API D2DDeviceContextPainter
   void EndDraw() override final;
 
  protected:
-  virtual void DoEndDraw() = 0;
+  virtual void DoEndDraw() {}
 
  private:
   bool IsValid() { return is_drawing_; }
@@ -71,5 +74,7 @@ class CRU_WIN_GRAPHICS_DIRECT_API D2DDeviceContextPainter
       drawing_state_stack_;
 
   bool is_drawing_ = true;
+
+  bool release_;
 };
 }  // namespace cru::platform::graphics::win::direct