Skip to content

Precision issues with high dpis and drawquad #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Precision issues with high dpis and drawquad #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95d5432
pdf: replace long by long long
Eolien55 Mar 1, 2025
2f91dcf
pdf: fix drawquad
Eolien55 Mar 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions pdf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ static void pfont_write(struct pfont *ps)
pdfout(" /LastChar %d\n", ps->gend % 256);
pdfout(" /Widths [");
for (i = ps->gbeg; i <= ps->gend; i++)
pdfout(" %d", (long) font_glget(fn, i)->wid * 100 * 72 / dev_res);
pdfout(" %d", (long long) font_glget(fn, i)->wid * 100 * 72 / dev_res);
pdfout(" ]\n");
pdfout(" /FontDescriptor %d 0 R\n", ps->des);
pdfout(" /Encoding %d 0 R\n", enc_obj);
Expand Down Expand Up @@ -205,7 +205,7 @@ static void pfont_writecid(struct pfont *ps)
gcnt++;
pdfout(" /W [ %d [", ps->gbeg);
for (i = ps->gbeg; i <= ps->gend; i++)
pdfout(" %d", (long) font_glget(fn, i)->wid * 100 * 72 / dev_res);
pdfout(" %d", (long long) font_glget(fn, i)->wid * 100 * 72 / dev_res);
pdfout(" ] ]\n");
pdfout(">>\n");
obj_end();
Expand Down Expand Up @@ -358,8 +358,8 @@ static int o_loadfont(struct glyph *g)
static char *pdfpos00(int uh, int uv)
{
static char buf[64];
int h = (long) uh * 72 / dev_res;
int v = (long) pdf_height * 100 - (long) uv * 72 / dev_res;
int h = (long long) uh * 72 / dev_res;
int v = (long long) pdf_height * 100 - (long long) uv * 72 / dev_res;
sprintf(buf, "%s%d.%02d %s%d.%02d",
h < 0 ? "-" : "", abs(h) / 100, abs(h) % 100,
v < 0 ? "-" : "", abs(v) / 100, abs(v) % 100);
Expand All @@ -376,7 +376,7 @@ static char *pdfpos(int uh, int uv)
static char *pdfunit(int uh, int sz)
{
static char buf[64];
int h = (long) uh * 1000 * 72 / sz / dev_res;
int h = (long long) uh * 1000 * 72 / sz / dev_res;
sprintf(buf, "%s%d", h < 0 ? "-" : "", abs(h));
return buf;
}
Expand Down Expand Up @@ -664,9 +664,9 @@ static int pdfext(char *pdf, int len, int hwid, int vwid)
bbox = pdf_dval_val(pdf, len, pages, "/MediaBox");
if (bbox >= 0 && !pdfbbox100(pdf, len, bbox, dim)) {
if (hwid > 0)
hzoom = (long) hwid * (100 * 7200 / dev_res) / (dim[2] - dim[0]);
hzoom = (long long) hwid * (100 * 7200 / dev_res) / (dim[2] - dim[0]);
if (vwid > 0)
vzoom = (long) vwid * (100 * 7200 / dev_res) / (dim[3] - dim[1]);
vzoom = (long long) vwid * (100 * 7200 / dev_res) / (dim[3] - dim[1]);
if (vwid <= 0)
vzoom = hzoom;
if (hwid <= 0)
Expand Down Expand Up @@ -915,17 +915,17 @@ void drawl(int h, int v)
/* draw circle/ellipse quadrant */
static void drawquad(int ch, int cv)
{
long b = 551915;
long x0 = o_h * 1000;
long y0 = o_v * 1000;
long x3 = x0 + ch * 1000 / 2;
long y3 = y0 + cv * 1000 / 2;
long x1 = x0;
long y1 = y0 + cv * b / 1000 / 2;
long x2 = x0 + ch * b / 1000 / 2;
long y2 = y3;
if (ch * cv < 0) {
x1 = x3 - ch * b / 1000 / 2;
long long b = 551915;
long long x0 = o_h * 1000;
long long y0 = o_v * 1000;
long long x3 = x0 + ch * 1000 / 2;
long long y3 = y0 + cv * 1000 / 2;
long long x1 = x0;
long long y1 = y0 + cv * b / 1000 / 2;
long long x2 = x3 - ch * b / 1000 / 2;
long long y2 = y3;
if (ch/abs(ch) * cv/abs(cv) < 0) {
x1 = x0 + ch * b / 1000 / 2;
y1 = y0;
x2 = x3;
y2 = y3 - cv * b / 1000 / 2;
Expand Down