← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xplanet/trusty

« back to all changes in this revision

Viewing changes to src/libannotate/Text.cpp

  • Committer: Package Import Robot
  • Author(s): Steve McIntyre
  • Date: 2014-01-30 18:54:10 UTC
  • mfrom: (4.1.8 sid)
  • Revision ID: package-import@ubuntu.com-20140130185410-o2u51emh707gbevv
Tags: 1.3.0-1
http://bugs.debian.org/678464
http://bugs.debian.org/736052
http://bugs.debian.org/662568
* New maintainer
* Move to new upstream version 1.3.0. (Closes: #678464)
  + Upstream highlights:
    - add "outlined" keyword to marker files
    - update JPL ephemeris code for 64 bit machines
    - add bump_shade config file parameter
    - add opacity keyword for markers
    - implement Rayleigh scattering
  + Remove old Debian patches now obsoleted:
    - possible-buffer-overflow (included upstream)
    - orbit-step-bug (included upstream)
    - gcc44-includes (included upstream)
    - hyphen-used-as-minus-sign (included upstream)
    - tsc-aspect-ratio (included upstream)
  + Update (and include!) FreeMonoBold
* Update libtiff build-deps (Closes: #736052)
* Update libpng build-deps (Closes: #662568)
* Update Standards-Version to 3.9.5
* Update to debhelper 9 to enable hardening build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libannotate/Text.cpp
19
19
           const std::string &text)
20
20
    : Annotation(color), align_(align), font_(""), fontSize_(-1), 
21
21
      iconHeight_(iconHeight), iconWidth_(iconWidth), needAlign_(true),
22
 
      needBoundingBox_(true), text_(text), x_(x), y_(y)
 
22
      needBoundingBox_(true), opacity_(1.0), outlined_(true), 
 
23
      text_(text), x_(x), y_(y)
23
24
{
24
25
    if (align_ == AUTO)
25
26
    {
219
220
        }
220
221
    }
221
222
 
222
 
    display->DrawOutlinedText(x_ + xOffset_, y_ + yOffset_, text_, color_);
 
223
    if (outlined_)
 
224
        display->DrawOutlinedText(x_ + xOffset_, y_ + yOffset_, 
 
225
                                  text_, color_, opacity_);
 
226
    else
 
227
        display->DrawText(x_ + xOffset_, y_ + yOffset_, 
 
228
                          text_, color_, opacity_);
223
229
 
224
230
    if (!font_.empty())
225
231
        display->Font(saveFont);