On Mon, Jul 23, 2001 at 01:50:45PM -0400, [EMAIL PROTECTED] wrote:
> Committed, and doesn't break anything for me. I hope it works for the CJK people.
>
Oops, as I expected, I got the scale all wrong. A new patch against cvs
fixed it.
both plain text and .gz.
--
Best regard
hashao
Index: gr_UnixGraphics.cpp
===================================================================
RCS file: /cvsroot/abi/src/af/gr/unix/gr_UnixGraphics.cpp,v
retrieving revision 1.116
diff -u -r1.116 gr_UnixGraphics.cpp
--- gr_UnixGraphics.cpp 2001/07/23 17:49:28 1.116
+++ gr_UnixGraphics.cpp 2001/07/24 02:18:41
@@ -608,7 +608,7 @@
GlobalFontInfo * gfsi = pSingleByte->getMetricsData()->gfi;
UT_ASSERT(gfsi);
UT_uint32 ascsingle = (UT_uint32) ( (double) gfsi->fontBBox.ury *
(double) hndl->getSize() /1000.);
- UT_uint32 ascmulti = (UT_uint32) pMultiByte->get_CJK_Ascent();
+ UT_uint32 ascmulti = (UT_uint32) ( (double)
+pMultiByte->get_CJK_Ascent() * (double) hndl->getSize() /1000.);
return MAX(ascsingle,ascmulti);
}
}
@@ -644,7 +644,7 @@
GlobalFontInfo * gfsi = pSingleByte->getMetricsData()->gfi;
UT_ASSERT(gfsi);
UT_uint32 dsingle = (UT_uint32) ( -(double) gfsi->fontBBox.lly *
(double) hndl->getSize() /1000.);
- UT_uint32 dmulti = (UT_uint32) pMultiByte->get_CJK_Ascent();
+ UT_uint32 dmulti = (UT_uint32) ( (double)
+pMultiByte->get_CJK_Descent() * (double) hndl->getSize() /1000.);
return MAX(dsingle,dmulti);
}
}
gr2.diff.gz
