Changeset 651 for trunk/src/gui/painting/qtextureglyphcache.cpp

Timestamp:

Mar 8, 2010, 12:52:58 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.2 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/painting/qtextureglyphcache.cpp (modified) (3 diffs)

trunk/src/gui/painting/qtextureglyphcache.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -47 +47 @@
 #include "private/qnativeimage_p.h"
 #include "private/qfontengine_ft_p.h"
+
+#ifndef QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH
+#define QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH 256
+#endif
 
 QT_BEGIN_NAMESPACE
@@ -113 +117 @@
     rowHeight += margin * 2;
     if (isNull())
-        createCache(256, rowHeight);
+        createCache(QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH, rowHeight);
 
     // now actually use the coords and paint the wanted glyps into cache.