← Back to branch summary

~ubuntu-branches/debian/jessie/qtdeclarative-opensource-src/jessie

« back to all changes in this revision

Viewing changes to src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp

  • Committer: Package Import Robot
  • Author(s): Lisandro Damián Nicanor Pérez Meyer, Lisandro Damián Nicanor Pérez Meyer
  • Date: 2013-08-30 22:09:43 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20130830220943-en0u2dm8cfxpi53o
Tags: 5.1.1-1
[ Lisandro Damián Nicanor Pérez Meyer ]
* New upstream release.
* Update symbols file with buildds' logs.
* Remove fix_systemdialogs_path, applied upstream.
* Adjust examples install file.
* Update symbols files with current build.
* Tighten Qt 5 build dependencies.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
172
172
            }
173
173
        }
174
174
 
175
 
        glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, c.y, glyph.width(), glyph.height(), GL_ALPHA, GL_UNSIGNED_BYTE, glyph.constBits());
 
175
        for (int i = 0; i < glyph.height(); ++i)
 
176
            glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, c.y + i, glyph.width(), 1, GL_ALPHA, GL_UNSIGNED_BYTE, glyph.scanLine(i));
176
177
    }
177
178
 
178
179
    QHash<TextureInfo *, QVector<glyph_t> >::const_iterator i;
242
243
    updateTexture(oldTexture, texInfo->texture, texInfo->size);
243
244
 
244
245
    if (useWorkaround()) {
245
 
        glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, oldWidth, oldHeight, GL_ALPHA, GL_UNSIGNED_BYTE, texInfo->image.constBits());
 
246
        for (int i = 0; i < oldHeight; ++i)
 
247
            glTexSubImage2D(GL_TEXTURE_2D, 0, 0, i, oldWidth, 1, GL_ALPHA, GL_UNSIGNED_BYTE, texInfo->image.scanLine(i));
246
248
        texInfo->image = texInfo->image.copy(0, 0, width, height);
247
249
        glDeleteTextures(1, &oldTexture);
248
250
        return;