From 24664fe6d78daf411781f1cb9975edd7e955cc9f Mon Sep 17 00:00:00 2001 From: SimonDanisch Date: Mon, 23 Jan 2017 15:04:34 +0100 Subject: [PATCH] cleaned up code for streamed images --- src/visualize/image_like.jl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/visualize/image_like.jl b/src/visualize/image_like.jl index fe3bb4e..af61bbc 100644 --- a/src/visualize/image_like.jl +++ b/src/visualize/image_like.jl @@ -1,14 +1,14 @@ GLAbstraction.gl_convert{T}(::Type{T}, img::Images.Image) = gl_convert(T, Images.data(img)) -function _default{T <: Colorant, X}(main::Images.Image{T, 2, X}, s::Style, d::Dict) - props = main.properties +function _default{T <: Colorant, X}(main::TOrSignal{Images.Image{T, 2, X}}, s::Style, d::Dict) + props = value(main).properties # TODO update this if signal if haskey(props, "spatialorder") so = props["spatialorder"] get!(d, :spatialorder, join(so, "")) end - _default(Images.data(main), s, d) + _default(const_lift(Images.data, main), s, d) end -_default{T <: Colorant, X}(main::Signal{Images.Image{T, 2, X}}, s::Style, d::Dict) = _default(const_lift(Images.data, main), s, d) + """ A matrix of colors is interpreted as an image