diff options
author | lana <none@none> | 2010-06-07 17:08:26 -0700 |
---|---|---|
committer | lana <none@none> | 2010-06-07 17:08:26 -0700 |
commit | ccff0e0e43d4382df77e9e850249eb204496f411 (patch) | |
tree | 32acf0e07457aca44756ebb757d80c823f522a62 /src/share/native/sun/java2d/opengl/OGLTextRenderer.c | |
parent | d807b2caa7c62548b272e8a9a7cbc229f1c0b3d5 (diff) | |
parent | 9250509d4d1cf6646f820249b7884713609ac148 (diff) |
Merge
Diffstat (limited to 'src/share/native/sun/java2d/opengl/OGLTextRenderer.c')
-rw-r--r-- | src/share/native/sun/java2d/opengl/OGLTextRenderer.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/share/native/sun/java2d/opengl/OGLTextRenderer.c b/src/share/native/sun/java2d/opengl/OGLTextRenderer.c index c1dfd585e..7b35884a2 100644 --- a/src/share/native/sun/java2d/opengl/OGLTextRenderer.c +++ b/src/share/native/sun/java2d/opengl/OGLTextRenderer.c @@ -244,6 +244,7 @@ static void OGLTR_AddToGlyphCache(GlyphInfo *glyph, jboolean rgbOrder) { GLenum pixelFormat; + CacheCellInfo *ccinfo; J2dTraceLn(J2D_TRACE_INFO, "OGLTR_AddToGlyphCache"); @@ -258,11 +259,12 @@ OGLTR_AddToGlyphCache(GlyphInfo *glyph, jboolean rgbOrder) } AccelGlyphCache_AddGlyph(glyphCache, glyph); + ccinfo = (CacheCellInfo *) glyph->cellInfo; - if (glyph->cellInfo != NULL) { + if (ccinfo != NULL) { // store glyph image in texture cell j2d_glTexSubImage2D(GL_TEXTURE_2D, 0, - glyph->cellInfo->x, glyph->cellInfo->y, + ccinfo->x, ccinfo->y, glyph->width, glyph->height, pixelFormat, GL_UNSIGNED_BYTE, glyph->image); } @@ -668,7 +670,7 @@ OGLTR_DrawGrayscaleGlyphViaCache(OGLContext *oglc, } } - cell = ginfo->cellInfo; + cell = (CacheCellInfo *) (ginfo->cellInfo); cell->timesRendered++; x1 = (jfloat)x; @@ -871,7 +873,7 @@ OGLTR_DrawLCDGlyphViaCache(OGLContext *oglc, OGLSDOps *dstOps, } } - cell = ginfo->cellInfo; + cell = (CacheCellInfo *) (ginfo->cellInfo); cell->timesRendered++; // location of the glyph in the destination's coordinate space |