From f22caf9aee2aa64313468b04efa615e2e1c7f8b3 Mon Sep 17 00:00:00 2001 From: Yonit Halperin Date: Sun, 18 Sep 2011 14:52:04 +0300 Subject: client: rewrite surfaces cache use std::map instead of a specific template (CHash). There is no need for special template. Moreover, using std::map will allow easy iteration over the surfaces. (cherry picked from commit fcb3b4ce5231218bcf949da4270bd85a2cfb3535 branch 0.8) Conflicts: client/display_channel.cpp --- client/red_gdi_canvas.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'client/red_gdi_canvas.cpp') diff --git a/client/red_gdi_canvas.cpp b/client/red_gdi_canvas.cpp index 038f784d..ed091af1 100644 --- a/client/red_gdi_canvas.cpp +++ b/client/red_gdi_canvas.cpp @@ -34,7 +34,7 @@ GDICanvas::GDICanvas(int width, int height, uint32_t format, PixmapCache& pixmap_cache, PaletteCache& palette_cache, - GlzDecoderWindow &glz_decoder_window, CSurfaces &csurfaces) + GlzDecoderWindow &glz_decoder_window, SurfacesCache &csurfaces) : Canvas (pixmap_cache, palette_cache, glz_decoder_window, csurfaces) , _pixmap (0) { @@ -45,7 +45,7 @@ GDICanvas::GDICanvas(int width, int height, uint32_t format, &_pixmap->get_mutex(), format, &pixmap_cache.base, &palette_cache.base, - &csurfaces.base, + &csurfaces, &glz_decoder(), &jpeg_decoder(), &zlib_decoder()))) { -- cgit