Skip to content
Open
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions src/Cairo.jl
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ import Graphics: arc, clip, clip_preserve, close_path, creategc, device_to_user!
import Base: copy, fill

libcairo_version = VersionNumber(unsafe_string(
ccall((:cairo_version_string,Cairo.libcairo),Cstring,()) ))
ccall((:cairo_version_string,libcairo),Cstring,()) ))
libpango_version = VersionNumber(unsafe_string(
ccall((:pango_version_string,Cairo.libpango),Cstring,()) ))
ccall((:pango_version_string,Pango_jll.libpango),Cstring,()) ))
if !Sys.iswindows()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Try removing this? My hunch is that this was necessary because the wrong library was being referenced.

libpangocairo_version = VersionNumber(unsafe_string(
ccall((:pango_version_string,Cairo.libpangocairo),Cstring,()) ))
ccall((:pango_version_string,Pango_jll.libpango),Cstring,()) ))
libgobject_version = VersionNumber(
unsafe_load(cglobal((:glib_major_version, Cairo.libgobject), Cuint)),
unsafe_load(cglobal((:glib_minor_version, Cairo.libgobject), Cuint)),
unsafe_load(cglobal((:glib_micro_version, Cairo.libgobject), Cuint)))
unsafe_load(cglobal((:glib_major_version, Glib_jll.libglib), Cuint)),
unsafe_load(cglobal((:glib_minor_version, Glib_jll.libglib), Cuint)),
unsafe_load(cglobal((:glib_micro_version, Glib_jll.libglib), Cuint)))
Comment on lines -31 to +35
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Honestly I think this was right.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And would probably work on Windows, too.

end

import Base.show
Expand Down
Loading