Tk Source Code

Check-in [8df304bb]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:left-over upstream androwish change
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | androwish
Files: files | file ages | folders
SHA1: 8df304bb00f5e7dff373667d6ebab27a7acb4a36
User & Date: jan.nijtmans 2015-12-01 13:34:32
Context
2015-12-09
10:26
Merge trunk. Upstream androwish changes check-in: 98752c01 user: jan.nijtmans tags: androwish
2015-12-01
13:34
left-over upstream androwish change check-in: 8df304bb user: jan.nijtmans tags: androwish
2015-11-30
07:39
merge trunk, upstream androwish changes check-in: f4f42423 user: jan.nijtmans tags: androwish
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to sdl/agg-2.4/agg2d/agg2d.h.

62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
#include "agg_image_accessors.h"


class Agg2D
{
    class GradientF
    {
    public:
        virtual int calculate(int x, int y, int d);
    };

    class GradientF_Pad : public GradientF
    {
    public:
        virtual int calculate(int x, int y, int d)
        {
            return x;
        }
    };








<
<
<
<
<
<







62
63
64
65
66
67
68






69
70
71
72
73
74
75
#include "agg_image_accessors.h"


class Agg2D
{
    class GradientF
    {






    public:
        virtual int calculate(int x, int y, int d)
        {
            return x;
        }
    };

650
651
652
653
654
655
656
657
658
659
660
661
662
663
664

#ifndef AGG2D_USE_FREETYPE
    HDC                             m_fontDC;
#endif
    FontEngine                      m_fontEngine;
    FontCacheManager                m_fontCacheManager;

    GradientF_Pad                   m_GradientF_Pad;
    GradientF_Repeat                m_GradientF_Repeat;
    GradientF_Reflect               m_GradientF_Reflect;
};


inline bool operator == (const Agg2D::Color& c1, const Agg2D::Color& c2)
{







|







644
645
646
647
648
649
650
651
652
653
654
655
656
657
658

#ifndef AGG2D_USE_FREETYPE
    HDC                             m_fontDC;
#endif
    FontEngine                      m_fontEngine;
    FontCacheManager                m_fontCacheManager;

    GradientF                       m_GradientF_Pad;
    GradientF_Repeat                m_GradientF_Repeat;
    GradientF_Reflect               m_GradientF_Reflect;
};


inline bool operator == (const Agg2D::Color& c1, const Agg2D::Color& c2)
{