1
=== modified file 'playground/demo-shell/typo/typo_freetype_renderer.cpp'
2
--- playground/demo-shell/typo/typo_freetype_renderer.cpp	2015-02-27 03:22:32 +0000
3
+++ playground/demo-shell/typo/typo_freetype_renderer.cpp	2016-10-10 06:06:06 +0000
4
@@ -105,17 +105,17 @@
5
105
        int right = x + bitmap.width;
105
        int right = x + bitmap.width;
6
106
        int bottom = y + bitmap.rows;
106
        int bottom = y + bitmap.rows;
7
107
107
9
108
        if (x >= 0 && right <= img.width && y >= 0 && bottom <= img.height)
108
        if (x >= 0 && right <= width && y >= 0 && bottom <= height)
10
109
        {
109
        {
11
110
            unsigned char* src = bitmap.buffer;
110
            unsigned char* src = bitmap.buffer;
13
111
            unsigned char* dest = img.buf + y*img.stride + x;
111
            unsigned char* dest = img.data() + y*img.stride() + x;
14
112
112
15
113
            int ylimit = y + bitmap.rows;
113
            int ylimit = y + bitmap.rows;
16
114
            for (; y < ylimit; ++y)
114
            for (; y < ylimit; ++y)
17
115
            {
115
            {
18
116
                memcpy(dest, src, bitmap.width);
116
                memcpy(dest, src, bitmap.width);
19
117
                src += bitmap.pitch;
117
                src += bitmap.pitch;
21
118
                dest += img.stride;
118
                dest += img.stride();
22
119
            }
119
            }
23
120
        }
120
        }
24
121
121
25
122
122
26
=== modified file 'playground/demo-shell/typo/typo_glcache.cpp'
27
--- playground/demo-shell/typo/typo_glcache.cpp	2016-05-13 08:03:23 +0000
28
+++ playground/demo-shell/typo/typo_glcache.cpp	2016-10-10 06:06:06 +0000
29
@@ -76,10 +76,10 @@
30
76
    {
76
    {
31
77
        Renderer::Image img;
77
        Renderer::Image img;
32
78
        renderer->render(str, img);
78
        renderer->render(str, img);
34
79
        if (img.buf)
79
        if (img.data())
35
80
        {
80
        {
38
81
            entry.width = img.width;
81
            entry.width = img.width();
39
82
            entry.height = img.height;
82
            entry.height = img.height();
40
83
            glGenTextures(1, &entry.tex);
83
            glGenTextures(1, &entry.tex);
41
84
            glBindTexture(GL_TEXTURE_2D, entry.tex);
84
            glBindTexture(GL_TEXTURE_2D, entry.tex);
42
85
            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
85
            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
43
@@ -87,10 +87,10 @@
44
87
            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
87
            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
45
88
            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
88
            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
46
89
            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
89
            glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
48
90
            glPixelStorei(GL_UNPACK_ALIGNMENT, img.align);
90
            glPixelStorei(GL_UNPACK_ALIGNMENT, img.alignment());
49
91
            glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA,
91
            glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA,
52
92
                         img.width, img.height, 0, GL_ALPHA,
92
                         img.width(), img.height(), 0, GL_ALPHA,
53
93
                         GL_UNSIGNED_BYTE, img.buf);
93
                         GL_UNSIGNED_BYTE, img.data());
54
94
            glGenerateMipmap(GL_TEXTURE_2D); // Antialiasing shrinkage please
94
            glGenerateMipmap(GL_TEXTURE_2D); // Antialiasing shrinkage please
55
95
        }
95
        }
56
96
    }
96
    }
57
97
97
58
=== modified file 'playground/demo-shell/typo/typo_renderer.cpp'
59
--- playground/demo-shell/typo/typo_renderer.cpp	2015-02-19 09:30:02 +0000
60
+++ playground/demo-shell/typo/typo_renderer.cpp	2016-10-10 06:06:06 +0000
61
@@ -22,7 +22,8 @@
62
22
using namespace mir::examples::typo;
22
using namespace mir::examples::typo;
63
23
23
64
24
Renderer::Image::Image()
24
Renderer::Image::Image()
66
25
    : buf(nullptr), width(0), stride(0), height(0), align(4), format(alpha8)
25
    : buf(nullptr), width_(0), stride_(0), height_(0), align_(4),
67
26
      format_(alpha8)
68
26
{
27
{
69
27
}
28
}
70
28
29
71
@@ -33,13 +34,13 @@
72
33
34
73
34
void Renderer::Image::reserve(int w, int h, Format f)
35
void Renderer::Image::reserve(int w, int h, Format f)
74
35
{
36
{
78
36
    width = w;
37
    width_ = w;
79
37
    height = h;
38
    height_ = h;
80
38
    format = f;
39
    format_ = f;
81
39
    int const bpp = 1;  // format is always alpha8
40
    int const bpp = 1;  // format is always alpha8
83
40
    stride = (((width * bpp) + align - 1) / align) * align;
41
    stride_ = (((width_ * bpp) + align_ - 1) / align_) * align_;
84
41
    delete[] buf;
42
    delete[] buf;
86
42
    auto size = stride * height;
43
    auto size = stride_ * height_;
87
43
    buf = new unsigned char[size];
44
    buf = new unsigned char[size];
88
44
    memset(buf, 0, size);
45
    memset(buf, 0, size);
89
45
}
46
}
90
46
47
91
=== modified file 'playground/demo-shell/typo/typo_renderer.h'
92
--- playground/demo-shell/typo/typo_renderer.h	2015-02-20 06:24:57 +0000
93
+++ playground/demo-shell/typo/typo_renderer.h	2016-10-10 06:06:06 +0000
94
@@ -24,15 +24,29 @@
95
24
class Renderer
24
class Renderer
96
25
{
25
{
97
26
public:
26
public:
99
27
    struct Image
27
    class Image
100
28
    {
28
    {
101
29
    public:
102
29
        Image();
30
        Image();
103
31
        Image(Image const&) = delete;
104
32
        Image(Image const&&) = delete;
105
33
        Image& operator=(Image const&) = delete;
106
30
        ~Image();
34
        ~Image();
107
35
108
31
        typedef enum {alpha8} Format;
36
        typedef enum {alpha8} Format;
109
37
110
32
        void reserve(int w, int h, Format f);
38
        void reserve(int w, int h, Format f);
111
39
        unsigned char* data() const { return buf; };
112
40
        int width() const { return width_; }
113
41
        int height() const { return height_; }
114
42
        int stride() const { return stride_; }
115
43
        int alignment() const { return align_; }
116
44
        Format format() const { return format_; }
117
45
118
46
    private:
119
33
        unsigned char* buf;
47
        unsigned char* buf;
122
34
        int width, stride, height, align;
48
        int width_, stride_, height_, align_;
123
35
        Format format;
49
        Format format_;
124
36
    };
50
    };
125
37
51
126
38
    virtual ~Renderer();
52
    virtual ~Renderer();
127
39
53
128
=== modified file 'playground/demo-shell/typo/typo_stub_renderer.cpp'
129
--- playground/demo-shell/typo/typo_stub_renderer.cpp	2015-02-19 09:12:04 +0000
130
+++ playground/demo-shell/typo/typo_stub_renderer.cpp	2016-10-10 06:06:06 +0000
131
@@ -36,12 +36,12 @@
132
36
    char const* s = str;
36
    char const* s = str;
133
37
    for (int n = 0; unicode_from_utf8(&s); ++n)
37
    for (int n = 0; unicode_from_utf8(&s); ++n)
134
38
    {
38
    {
136
39
        unsigned char* row = img.buf + top*img.stride +
39
        unsigned char* row = img.data() + top*img.stride() +
137
40
                             n*(char_width+char_space);
40
                             n*(char_width+char_space);
138
41
        for (int y = 0; y < char_height; ++y)
41
        for (int y = 0; y < char_height; ++y)
139
42
        {
42
        {
140
43
            memset(row, 255, char_width);
43
            memset(row, 255, char_width);
142
44
            row += img.stride;
44
            row += img.stride();
143
45
        }
45
        }
144
46
    }
46
    }
145
47
}
47
}
Status:	Merged
Approved by:	Daniel van Vugt on 2016-10-11
Approved revision:	no longer in the source branch.
Merged at revision:	3754
Proposed branch:	lp:~vanvugt/mir/safer-typo-image
Merge into:	lp:mir
Diff against target:	145 lines (+35/-20) 5 files modified playground/demo-shell/typo/typo_freetype_renderer.cpp (+3/-3) playground/demo-shell/typo/typo_glcache.cpp (+6/-6) playground/demo-shell/typo/typo_renderer.cpp (+7/-6) playground/demo-shell/typo/typo_renderer.h (+17/-3) playground/demo-shell/typo/typo_stub_renderer.cpp (+2/-2)
To merge this branch:	bzr merge lp:~vanvugt/mir/safer-typo-image
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2016-10-11
Alan Griffiths		2016-10-10	Approve on 2016-10-10
Review via email: mp+308020@code.launchpad.net