aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlecoanet2007-06-18 13:01:17 +0000
committerlecoanet2007-06-18 13:01:17 +0000
commitb60d7a87b3974014f2d658a204fbbd83bc34aa70 (patch)
treeeff597c5421af3c76d087d7694bd7f7e63ed729c
parent4ac2d17dcd70f32b83248109f595fca00e756b1f (diff)
downloadtkzinc-b60d7a87b3974014f2d658a204fbbd83bc34aa70.zip
tkzinc-b60d7a87b3974014f2d658a204fbbd83bc34aa70.tar.gz
tkzinc-b60d7a87b3974014f2d658a204fbbd83bc34aa70.tar.bz2
tkzinc-b60d7a87b3974014f2d658a204fbbd83bc34aa70.tar.xz
Backup to images not filtered. The linear filter caused
more annoying artifacts than it corrected.
-rw-r--r--generic/Image.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/generic/Image.c b/generic/Image.c
index 18b2f65..91fca94 100644
--- a/generic/Image.c
+++ b/generic/Image.c
@@ -1055,8 +1055,8 @@ ZnImageTex(ZnImage image,
glBindTexture(GL_TEXTURE_2D, this->i.texobj);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+ glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glGetError();
if (is_bmap) {
glTexImage2D(GL_TEXTURE_2D, 0, GL_INTENSITY4,
@@ -1689,11 +1689,7 @@ ZnGetFontIndex(ZnTexFontInfo tfi,
* It is possible to index the points below 127. Unicode
* is the same as ascii down there.
*/
-#ifdef PTK_800
- return c - 1;
-#else
return c - 32;
-#endif
}
/*
@@ -1704,11 +1700,7 @@ ZnGetFontIndex(ZnTexFontInfo tfi,
if (!tgvi) {
return -1;
}
-#ifdef PTK_800
- min = 127 - 1;
-#else
min = 127 - 32;
-#endif
max = txf->num_glyphs;
while (min < max) {
mid = (min + max) >> 1;