Skip to content

Commit 95b75e2

Browse files
src/extra.i: removed support for mupdf < 1.26.
1 parent cb860db commit 95b75e2

1 file changed

Lines changed: 1 addition & 15 deletions

File tree

src/extra.i

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3081,7 +3081,6 @@ mupdf::FzRect JM_make_spanlist(
30813081
float size = -1;
30823082
unsigned flags = 0;
30833083

3084-
#if MUPDF_VERSION_GE(1, 25, 2)
30853084
/* From mupdf:include/mupdf/fitz/structured-text.h:fz_stext_char::flags, which
30863085
uses anonymous enum values:
30873086
FZ_STEXT_STRIKEOUT = 1,
@@ -3092,7 +3091,6 @@ mupdf::FzRect JM_make_spanlist(
30923091
FZ_STEXT_CLIPPED = 64
30933092
*/
30943093
unsigned char_flags = 0;
3095-
#endif
30963094

30973095
const char *font = "";
30983096
unsigned argb = 0;
@@ -3121,25 +3119,17 @@ mupdf::FzRect JM_make_spanlist(
31213119
fz_point origin = ch.m_internal->origin;
31223120
style.size = ch.m_internal->size;
31233121
style.flags = flags;
3124-
#if MUPDF_VERSION_GE(1, 25, 2)
31253122
/* FZ_STEXT_SYNTHETIC is per-char, not per-span. */
31263123
style.char_flags = ch.m_internal->flags & ~FZ_STEXT_SYNTHETIC;
3127-
#endif
31283124
style.font = JM_font_name(ch.m_internal->font);
3129-
#if MUPDF_VERSION_GE(1, 25, 0)
3130-
style.argb = ch.m_internal->argb;
3131-
#else
3132-
style.argb = ch.m_internal->color;
3133-
#endif
3125+
style.argb = ch.m_internal->argb;
31343126
style.asc = JM_font_ascender(ch.m_internal->font);
31353127
style.desc = JM_font_descender(ch.m_internal->font);
31363128

31373129
if (0
31383130
|| style.size != old_style.size
31393131
|| style.flags != old_style.flags
3140-
#if MUPDF_VERSION_GE(1, 25, 2)
31413132
|| style.char_flags != old_style.char_flags
3142-
#endif
31433133
|| style.argb != old_style.argb
31443134
|| strcmp(style.font, old_style.font) != 0
31453135
|| style.bidi != old_style.bidi
@@ -3179,14 +3169,10 @@ mupdf::FzRect JM_make_spanlist(
31793169
DICT_SETITEM_DROP(span, dictkey_size, Py_BuildValue("f", style.size));
31803170
DICT_SETITEM_DROP(span, dictkey_flags, Py_BuildValue("I", style.flags));
31813171
DICT_SETITEM_DROP(span, dictkey_bidi, Py_BuildValue("I", style.bidi));
3182-
#if MUPDF_VERSION_GE(1, 25, 2)
31833172
DICT_SETITEM_DROP(span, dictkey_char_flags, Py_BuildValue("I", style.char_flags));
3184-
#endif
31853173
DICT_SETITEM_DROP(span, dictkey_font, JM_EscapeStrFromStr(style.font));
31863174
DICT_SETITEM_DROP(span, dictkey_color, Py_BuildValue("I", style.argb & 0xffffff));
3187-
#if MUPDF_VERSION_GE(1, 25, 0)
31883175
DICT_SETITEMSTR_DROP(span, "alpha", Py_BuildValue("I", style.argb >> 24));
3189-
#endif
31903176
DICT_SETITEMSTR_DROP(span, "ascender", Py_BuildValue("f", asc));
31913177
DICT_SETITEMSTR_DROP(span, "descender", Py_BuildValue("f", desc));
31923178

0 commit comments

Comments
 (0)