From 52212099f5e6562200d06966d7f992cbdace2098 Mon Sep 17 00:00:00 2001 From: rachytski Date: Fri, 26 Aug 2011 12:01:37 +0300 Subject: [PATCH] iphone build fix. --- iphone/Maps/Classes/EAGLView.mm | 4 +++- iphone/Maps/Classes/MapViewController.h | 1 - iphone/Maps/Classes/MapViewController.mm | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/iphone/Maps/Classes/EAGLView.mm b/iphone/Maps/Classes/EAGLView.mm index efa3975aa2..7dc7ee3cdc 100644 --- a/iphone/Maps/Classes/EAGLView.mm +++ b/iphone/Maps/Classes/EAGLView.mm @@ -116,8 +116,10 @@ p.m_resourceManager = resourceManager; p.m_frameBuffer = frameBuffer; p.m_glyphCacheID = resourceManager->guiThreadGlyphCacheID(); + p.m_skinName = pl.SkinName(); + p.m_visualScale = pl.VisualScale(); - drawer = shared_ptr(new DrawerYG(pl.SkinName(), p)); + drawer = shared_ptr(new DrawerYG(p)); // frameBuffer->onSize(renderBuffer->width(), renderBuffer->height()); // frameBuffer->setRenderTarget(renderBuffer); diff --git a/iphone/Maps/Classes/MapViewController.h b/iphone/Maps/Classes/MapViewController.h index 7cde180b47..6753fcf0aa 100644 --- a/iphone/Maps/Classes/MapViewController.h +++ b/iphone/Maps/Classes/MapViewController.h @@ -4,7 +4,6 @@ #include "../../yg/texture.hpp" #include "../../map/framework_factory.hpp" #include "../../map/drawer_yg.hpp" -#include "../../map/render_queue.hpp" #include "../../map/navigator.hpp" #include "../../map/feature_vec_model.hpp" #include "../../std/shared_ptr.hpp" diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 6dca093424..11477ba524 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -249,7 +249,7 @@ NSInteger compareAddress(id l, id r, void * context) - (void)onPaint { shared_ptr windowHandle = [(EAGLView*)self.view windowHandle]; - shared_ptr paintEvent(new PaintEvent(windowHandle->drawer())); + shared_ptr paintEvent(new PaintEvent(windowHandle->drawer().get())); m_framework->Paint(paintEvent); }