sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wrap BreakIterator into std::unique_ptr to avoid leaking memory

Browse source 
(per ICU docs: "The caller owns the returned object and is responsible for deleting it.")
This commit is contained in:
artemp 2014-09-08 12:01:22 +01:00
parent b0e4533dda
commit 635c3728f2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/text/text_layout.cpp
View file

@ -25,7 +25,7 @@
#include <mapnik/expression_evaluator.hpp>
#include <mapnik/debug.hpp>
#include <mapnik/text/harfbuzz_shaper.hpp>
#include <mapnik/make_unique.hpp>
// ICU
#include <unicode/brkiter.h>
@ -125,7 +125,7 @@ void text_layout::break_line(text_line & line, double wrap_width, unsigned text_
mapnik::value_unicode_string const& text = itemizer_.text();
Locale locale; // TODO: Is the default constructor correct?
UErrorCode status = U_ZERO_ERROR;
BreakIterator *breakitr = BreakIterator::createLineInstance(locale, status);
std::unique_ptr<BreakIterator> breakitr(BreakIterator::createLineInstance(locale, status));
// Not breaking the text if an error occurs is probably the best thing we can do.
// https://github.com/mapnik/mapnik/issues/2072