diff options
| author | jbeich <jbeich@FreeBSD.org> | 2018-05-03 07:33:19 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2018-05-03 07:33:19 +0800 |
| commit | cf15f9783d17c0383b089e93b2594314f1c4f5e5 (patch) | |
| tree | 8c58f99711f4f4402736baafb0a4ae1186fd4f21 /math | |
| parent | eef9d50be0ee1f2d9e7bfa8685e723ae2a4842dc (diff) | |
| download | freebsd-ports-gnome-cf15f9783d17c0383b089e93b2594314f1c4f5e5.tar.gz freebsd-ports-gnome-cf15f9783d17c0383b089e93b2594314f1c4f5e5.tar.zst freebsd-ports-gnome-cf15f9783d17c0383b089e93b2594314f1c4f5e5.zip | |
math/saga: unbreak build with wxWidgets 3.0.3 (try#2)
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)
Diffstat (limited to 'math')
| -rw-r--r-- | math/saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/math/saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp b/math/saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp new file mode 100644 index 000000000000..c78fc3f890a0 --- /dev/null +++ b/math/saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp @@ -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) ) + { |