summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <aacid@kde.org>2011-10-04 17:56:43 +0200
committerAlbert Astals Cid <aacid@kde.org>2011-10-04 17:56:43 +0200
commit43ee9bd99d3138b57a616205327a96bba09b4aea (patch)
tree11ec2cc8fc1ed2ccde82b05f66e517f52e1480d9
parent8217e3a5c0a2914e6d675c5a48467528d94a807b (diff)
we tweaked this a bit, don't need it
-rw-r--r--ALL_DIFF39
1 files changed, 0 insertions, 39 deletions
diff --git a/ALL_DIFF b/ALL_DIFF
index f9a61e7..f402f75 100644
--- a/ALL_DIFF
+++ b/ALL_DIFF
@@ -5208,45 +5208,6 @@ diff -ru xpdf-3.02/splash/SplashClip.cc xpdf-3.03/splash/SplashClip.cc
return splashClipAllOutside;
}
if (!((SplashCoord)spanXMin >= xMin && (SplashCoord)(spanXMax + 1) <= xMax &&
-diff -ru xpdf-3.02/splash/SplashFont.cc xpdf-3.03/splash/SplashFont.cc
---- xpdf-3.02/splash/SplashFont.cc 2007-02-27 23:05:52.000000000 +0100
-+++ xpdf-3.03/splash/SplashFont.cc 2011-08-15 23:08:53.000000000 +0200
-@@ -19,6 +19,13 @@
-
- //------------------------------------------------------------------------
-
-+// font cache size parameters
-+#define splashFontCacheAssoc 8
-+#define splashFontCacheMaxSets 8
-+#define splashFontCacheSize (128*1024)
-+
-+//------------------------------------------------------------------------
-+
- struct SplashFontCacheTag {
- int c;
- short xFrac, yFrac; // x and y fractions
-@@ -64,16 +71,11 @@
- }
-
- // set up the glyph pixmap cache
-- cacheAssoc = 8;
-- if (glyphSize <= 256) {
-- cacheSets = 8;
-- } else if (glyphSize <= 512) {
-- cacheSets = 4;
-- } else if (glyphSize <= 1024) {
-- cacheSets = 2;
-- } else {
-- cacheSets = 1;
-- }
-+ cacheAssoc = splashFontCacheAssoc;
-+ for (cacheSets = splashFontCacheMaxSets;
-+ cacheSets > 1 &&
-+ cacheSets * cacheAssoc * glyphSize > splashFontCacheSize;
-+ cacheSets >>= 1) ;
- cache = (Guchar *)gmallocn(cacheSets * cacheAssoc, glyphSize);
- cacheTags = (SplashFontCacheTag *)gmallocn(cacheSets * cacheAssoc,
- sizeof(SplashFontCacheTag));
diff -ru xpdf-3.02/splash/SplashFTFont.cc xpdf-3.03/splash/SplashFTFont.cc
--- xpdf-3.02/splash/SplashFTFont.cc 2007-02-27 23:05:52.000000000 +0100
+++ xpdf-3.03/splash/SplashFTFont.cc 2011-08-15 23:08:53.000000000 +0200