From 2981c6c5852882c2b3693cdb3c904d97fab82dc1 Mon Sep 17 00:00:00 2001 From: Raf Schietekat Date: Fri, 2 Jun 2017 09:54:16 +0200 Subject: [PATCH] StringRenderer::pen_color_: int[3]->double[3] --- training/stringrenderer.cpp | 6 ++---- training/stringrenderer.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/training/stringrenderer.cpp b/training/stringrenderer.cpp index a891db19c..35aca8bae 100644 --- a/training/stringrenderer.cpp +++ b/training/stringrenderer.cpp @@ -101,6 +101,7 @@ StringRenderer::StringRenderer(const string& font_desc, int page_width, page_height_(page_height), h_margin_(50), v_margin_(50), + pen_color_{0.0, 0.0, 0.0}, char_spacing_(0), leading_(0), vertical_text_(false), @@ -120,15 +121,12 @@ StringRenderer::StringRenderer(const string& font_desc, int page_width, start_box_(0), page_(0), box_padding_(0), + page_boxes_(nullptr), total_chars_(0), font_index_(0), last_offset_(0) { - pen_color_[0] = 0.0; - pen_color_[1] = 0.0; - pen_color_[2] = 0.0; set_font(font_desc); set_resolution(kDefaultOutputResolution); - page_boxes_ = nullptr; } bool StringRenderer::set_font(const string& desc) { diff --git a/training/stringrenderer.h b/training/stringrenderer.h index 3fb3504ef..e1144d4ee 100644 --- a/training/stringrenderer.h +++ b/training/stringrenderer.h @@ -179,7 +179,7 @@ class StringRenderer { // Page properties int page_width_, page_height_, h_margin_, v_margin_; // Text rendering properties - int pen_color_[3]; + double pen_color_[3]; double char_spacing_; int leading_, resolution_; bool vertical_text_;