Merge pull request #27 from lobingera/pr27

added stream sync + gio infra

Author: lobingera

LICENSE.md

@@ -1,6 +1,6 @@
 The Rsvg.jl package is licensed under the MIT "Expat" License:
 
-> Copyright (c) 2015: lobingera.
+> Copyright (c) 2015-2018: lobingera.
 >
 > Permission is hereby granted, free of charge, to any person obtaining
 > a copy of this software and associated documentation files (the

deps/build.jl

@@ -4,23 +4,33 @@ using Compat
 
 @BinDeps.setup
 
+
 rsvg = library_dependency("rsvg", aliases = ["librsvg", "librsvg-2.2", "librsvg-2-2", "librsvg-2", "librsvg-2.so.2"])
+gio = library_dependency("gio", aliases = ["libgio-2.0", "libgio-2.0-0"])
+
+
 
 @static if Compat.Sys.islinux() begin
-        provides(AptGet, "librsvg2-2",rsvg)
+        provides(AptGet, "librsvg2-2", rsvg)
+        provides(AptGet, "libgio", gio)
     end
 end
 
 @static if Compat.Sys.isapple() begin
         using Homebrew
         provides(Homebrew.HB, "librsvg", [rsvg], os=:Darwin)
+        provides(Homebrew.HB, "libgio", [gio], os=:Darwin) 
     end
 end
 
 @static if Compat.Sys.iswindows() begin
         using WinRPM
         provides(WinRPM.RPM,"librsvg-2-2",rsvg,os = :Windows)
+        provides(WinRPM.RPM,"glib2",gio,os = :Windows)
     end
 end
 
-@BinDeps.install Dict(:rsvg => :librsvg)
+@BinDeps.install Dict([
+	(:rsvg => :librsvg),
+    (:gio, :libgio),
+])

src/Rsvg.jl

@@ -8,6 +8,7 @@ isfile(depsjl) ? include(depsjl) : error("Rsvg not properly ",
 using Cairo, Compat
 
 include("gerror.jl")
+include("gio.jl")
 include("types.jl")
 include("calls.jl")
 

src/calls.jl

@@ -1,5 +1,33 @@
 # collection of calls
 
+# /**
+#  * rsvg_handle_new_from_stream_sync:
+#  * @input_stream: a #GInputStream
+#  * @base_file: (allow-none): a #GFile, or %NULL
+#  * @flags: flags from #RsvgHandleFlags
+#  * @cancellable: (allow-none): a #GCancellable, or %NULL
+#  * @error: (allow-none): a location to store a #GError, or %NULL
+#  *
+#  * Creates a new #RsvgHandle for @stream.
+#  *
+#  * If @cancellable is not %NULL, then the operation can be cancelled by
+#  * triggering the cancellable object from another thread. If the
+#  * operation was cancelled, the error %G_IO_ERROR_CANCELLED will be
+#  * returned.
+#  *
+#  * Returns: a new #RsvgHandle on success, or %NULL with @error filled in
+#  *
+#  * Since: 2.32
+#  */
+# RsvgHandle *
+# rsvg_handle_new_from_stream_sync (GInputStream   *input_stream,
+#                                   GFile          *base_file,
+#                                   RsvgHandleFlags flags,
+#                                   GCancellable    *cancellable,
+#                                   GError         **error)
+# {
+
+
 """
 handle_get_dimensions(handle::RsvgHandle, dimension_data::RsvgDimensionData)
 """
@@ -66,11 +94,39 @@ end
 """
 handle_new_from_data(data::AbstractString)
 """
-handle_new_from_data(data::AbstractString) = handle_new_from_data(data::AbstractString,GError(0,0,0))
+function handle_new_from_data(data::AbstractString)
+
+    perr = Ref{Ptr{GError}}(C_NULL)
+
+    g_input_stream = Rsvg.glib_memory_input_stream_new_from_data(data)
+
+    ptr = ccall((:rsvg_handle_new_from_stream_sync, librsvg), Ptr{Nothing},
+        (GInputStream,Ptr{Nothing},UInt32,Ptr{Nothing},Ptr{Ptr{GError}}), 
+        g_input_stream,C_NULL,0,C_NULL,perr)
+
+
+    if ptr == C_NULL
+        err = unsafe_load(perr[])
+        message = unsafe_string(err.message)
+        ccall((:g_error_free, librsvg), Cvoid, (Ptr{GError},), perr[])
+        error(message)
+    end
+
+    RsvgHandle(ptr)
+end
+
 
 """
 handle_free(handle::RsvgHandle)
 """
 function handle_free(handle::RsvgHandle)
     ccall((:rsvg_handle_free,librsvg), Nothing, (RsvgHandle,), handle)
 end
+
+"""
+handle_free(handle::GInputStream)
+"""
+function handle_free(handle::GInputStream)
+    ccall((:g_input_stream_close,libgio), Nothing, 
+        (GInputStream,Ptr{Nothing},Ptr{Nothing}), handle,C_NULL,C_NULL)
+end

src/gio.jl

@@ -0,0 +1,43 @@
+# g_memory_input_stream_new_from_data ()
+# GInputStream *
+# g_memory_input_stream_new_from_data (const void *data,
+#                                      gssize len,
+#                                      GDestroyNotify destroy);
+# Creates a new GMemoryInputStream with data in memory of a given size.
+# Parameters
+# data
+# input data.
+# 	[array length=len][element-type guint8][transfer full]
+# len
+# length of the data, may be -1 if data is a nul-terminated string
+# destroy
+# function that is called to free data , or NULL.
+# 	[nullable]
+# Returns
+# new GInputStream read from data of len bytes.
+
+mutable struct GInputStream
+	ptr::Ptr{Nothing}
+	    
+    function GInputStream(ptr::Ptr{Nothing})
+        self = new(ptr)
+        @compat finalizer(destroy, self)
+        self
+    end
+end
+
+function destroy(handle::GInputStream)
+    if handle.ptr == C_NULL
+        return
+    end
+    handle_free(handle)
+    handle.ptr = C_NULL
+    nothing
+end
+
+
+function glib_memory_input_stream_new_from_data(data::AbstractString)
+	    ptr = ccall((:g_memory_input_stream_new_from_data, libgio), Ptr{Nothing},
+                (Ptr{UInt8},UInt32,Ptr{Nothing}), string(data), sizeof(data),C_NULL)
+    	GInputStream(ptr)
+end

test/runtests.jl

@@ -63,6 +63,14 @@ f = tempname() * ".png"
 test_render_string_to_png(f);
 @test stat(f).size > 0
 
+f = tempname() * ".png"
+test_render_long_string_to_png(3000,f);
+@test stat(f).size > 0
+
+f = tempname() * ".png"
+test_render_long_string_to_png(60000,f);
+@test stat(f).size > 0
+
 end
 
 @testset "roundtrip, render svg to svg" begin

test/test.jl

@@ -56,6 +56,44 @@ function test_render_string_to_png(output::AbstractString="b.png",content_string
     Cairo.write_to_png(cs,output);
     end
 
+testc0 = """
+    c -11.06653,0 -20.16601,9.09944 -20.16601,20.16604 0,11.0665 
+    9.09948,20.166 20.16601,20.166 11.06654,0 20.16602,-9.0995 
+    20.16602,-20.166 0,-11.0666 -9.09948,-20.16604 -20.16602,-20.16604 
+    z m 0,12.00004 c 4.58126,0 8.16602,3.5847 8.16602,8.166 0,4.5812 
+    -3.58476,8.166 -8.16602,8.166 -4.58125,0 -8.16601,-3.5848 
+    -8.16601,-8.166 0,-4.5813 3.58476,-8.166 8.16601,-8.166 z
+    """
+
+function test_render_long_string_to_png(content_length::Int,output::AbstractString="b.png")
+
+    sa = Array{AbstractString}(undef,2+(4*content_length))
+    r = rand(content_length,2)
+
+    sa[1] = "<svg version=\"1.1\" fill=\"#" *
+    "0088ff\" " *
+    "height=\"520\" width=\"520\" " *
+    ">" *
+    "<g>"
+
+    p = 1 # index into sa, p+=1 is post-increment
+
+    for k=1:content_length
+        sa[p+=1] = @sprintf("<path id=\"i%07d\" d=\"",k)
+        sa[p+=1] = @sprintf("M %13.6f,%13.6f",20.0 + 460.0*r[k,1],40.0 + 480.0*r[k,2])
+        sa[p+=1] = testc0
+        sa[p+=1] = "\"/> "
+    end
+    sa[p+=1] = "</g> </svg>"
+
+    r = Rsvg.handle_new_from_data(join(sa,'\n'));
+    cs = Cairo.CairoImageSurface(600,600,Cairo.FORMAT_ARGB32);
+    c = Cairo.CairoContext(cs);
+    Rsvg.handle_render_cairo(c,r);
+    Cairo.write_to_png(cs,output);
+    end
+
+
 function test_roundtrip(filename_in::AbstractString,filename_out::AbstractString)
 
     # file should be available