comparison Framework/Scene2D/CairoCompositor.h @ 860:238693c3bc51 am-dev

merge default -> am-dev
author Alain Mazy <alain@mazy.be>
date Mon, 24 Jun 2019 14:35:00 +0200
parents c237e0625065
children 80829436ce0c 6e888cf6a48b
comparison
equal deleted inserted replaced
856:a6e17a5a39e7 860:238693c3bc51
20 20
21 21
22 #pragma once 22 #pragma once
23 23
24 #include "../Fonts/GlyphBitmapAlphabet.h" 24 #include "../Fonts/GlyphBitmapAlphabet.h"
25 #include "../Viewport/CairoContext.h" 25 #include "../Wrappers/CairoContext.h"
26 #include "Internals/CompositorHelper.h" 26 #include "Internals/CompositorHelper.h"
27 #include "Internals/ICairoContextProvider.h" 27 #include "Internals/ICairoContextProvider.h"
28 28
29 namespace OrthancStone 29 namespace OrthancStone
30 { 30 {