diff options
| author | Robin Watts <robin.watts@artifex.com> | 2012-07-05 17:55:18 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2012-07-05 18:02:03 +0100 |
| commit | eeaccf8444a4884801a92c0d23f66bd54c986a67 (patch) | |
| tree | fc9e254dfeef4d61a80aace2f5dbbcd985580a9a /pdf/pdf_form.c | |
| parent | b81be8d34b179d48e677463bd7b66ffdea129517 (diff) | |
| parent | 15fc25b0055dbdbfaf4257ac908d43fd5a2da19d (diff) | |
| download | mupdf-eeaccf8444a4884801a92c0d23f66bd54c986a67.tar.xz | |
Merge branch 'master' into forms
Diffstat (limited to 'pdf/pdf_form.c')
| -rw-r--r-- | pdf/pdf_form.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pdf/pdf_form.c b/pdf/pdf_form.c index 3a9c7a46..dbc3a326 100644 --- a/pdf/pdf_form.c +++ b/pdf/pdf_form.c @@ -632,7 +632,7 @@ static int text_splitter_layout(fz_context *ctx, text_splitter *splitter) vstretchwidth = splitter->width * (splitter->max_lines + 1) * splitter->fontsize / splitter->height; - bestwidth = MIN(fitwidth, MIN(hstretchwidth, vstretchwidth)); + bestwidth = fz_min(fitwidth, fz_min(hstretchwidth, vstretchwidth)); if (bestwidth == vstretchwidth) splitter->max_lines ++; @@ -827,7 +827,7 @@ static fz_buffer *create_text_appearance(pdf_document *doc, fz_rect *bbox, fz_ma } else if (info->comb) { - int i, n = MIN((int)strlen(text), info->max_len); + int i, n = fz_mini((int)strlen(text), info->max_len); float comb_width = full_width/info->max_len; float char_width = pdf_text_stride(ctx, info->font_rec.font, fontsize, (unsigned char *)"M", 1, FLT_MAX, NULL); float init_skip = (comb_width - char_width)/2.0; |