cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

math/saga: unbreak build with wxWidgets 3.0.3 (try#2)

Browse Source 
grid_to_kml.cpp: In member function 'bool CGrid_from_KML::Load_Overlay(const wchar_t*, const CSG_MetaData&)':
grid_to_kml.cpp:585:49: error: conversion from 'const wxScopedWCharBuffer {aka const wxScopedCharTypeBuffer<wchar_t>}' to non-scalar type 'CSG_String' requested
  CSG_String   FullPath = fn.GetFullPath().wc_str();
                          ~~~~~~~~~~~~~~~~~~~~~~~^~

PR:		223758
Submitted by:	rozhuk.im@gmail.com
Approved by:	Rainer Hurling (maintainer)
This commit is contained in:
Jan Beich 2018-05-02 23:33:19 +00:00
parent c5cbd38041
commit d71f826c80
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=468893
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
math/saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp Normal file
View File

@ -0,0 +1,16 @@
grid_to_kml.cpp: In member function 'bool CGrid_from_KML::Load_Overlay(const wchar_t*, const CSG_MetaData&)':
grid_to_kml.cpp:585:49: error: conversion from 'const wxScopedWCharBuffer {aka const wxScopedCharTypeBuffer<wchar_t>}' to non-scalar type 'CSG_String' requested
CSG_String FullPath = fn.GetFullPath().wc_str();
~~~~~~~~~~~~~~~~~~~~~~~^~
--- src/tools/io/io_grid_image/grid_to_kml.cpp.orig 2017-06-21 13:50:57 UTC
+++ src/tools/io/io_grid_image/grid_to_kml.cpp
@@ -582,7 +582,7 @@ bool CGrid_from_KML::Load_Overlay(const SG_Char *Dir,
}
CSG_Data_Manager Data;
- CSG_String FullPath = fn.GetFullPath().wc_str();
+ CSG_String FullPath = static_cast<const wchar_t*>(fn.GetFullPath().wc_str());
if( !Data.Add(FullPath) || !Data.Get_Grid_System(0) || !Data.Get_Grid_System(0)->Get(0) )
{