From 47320758ce88a8f11ad43508d2d925dba8103ac2 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Mon, 6 Dec 2010 23:49:44 +0000 Subject: [PATCH] Fixed merge build errors --- yg/texture.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yg/texture.hpp b/yg/texture.hpp index df3ec4863e..b6ecc2a464 100644 --- a/yg/texture.hpp +++ b/yg/texture.hpp @@ -89,7 +89,7 @@ namespace yg inline m2::PointU const GetDimensions(string const & fileName) { - gil::point2 size = gil::lodepng_read_dimensions(GetPlatform().ResourcesDir() + fileName); + gil::point2 size = gil::lodepng_read_dimensions(GetPlatform().ReadPathForFile(fileName)); return m2::PointU(size.x, size.y); } @@ -119,7 +119,7 @@ namespace yg Texture(string const & fileName) : BaseTexture(GetDimensions(fileName)) { typename Traits::image_t image(width(), height()); - gil::lodepng_read_and_convert_image((GetPlatform().ResourcesDir() + fileName).c_str(), image, typename Traits::color_converter()); + gil::lodepng_read_and_convert_image(GetPlatform().ReadPathForFile(fileName), image, typename Traits::color_converter()); upload(&gil::view(image)(0, 0)); }