sharpetronics/fastimage
1
0
Fork 0
mirror of https://github.com/sdsykes/fastimage.git synced 2025-10-06 00:02:01 -04:00
Code Issues Projects Releases Wiki Activity

move get_byte, get_int into module

Browse Source
This commit is contained in:
Marc-Andre Lafortune 2014-01-29 09:22:05 -05:00
parent a909410cdd
commit 16487f7512
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/fastimage.rb
View File

@ -296,7 +296,18 @@ class FastImage
send("parse_size_for_#{@type}")
end
module StreamUtil
def read_byte
read(1).ord
end
def read_int
read(2).unpack('n')[0]
end
end
class FiberStream
include StreamUtil
attr_reader :bytes_delivered
def initialize(read_fiber)
@ -330,14 +341,6 @@ class FastImage
end
end
def get_byte
@stream.read(1).unpack("C")[0]
end
def get_int
@stream.read(2).unpack('n')[0]
end
def parse_type
case @stream.peek(2)
when "BM"
@ -372,11 +375,11 @@ class FastImage
@stream.read(2)
:started
when :started
get_byte == 0xFF ? :sof : :started
@stream.read_byte == 0xFF ? :sof : :started
when :sof
case get_byte
case @stream.read_byte
when 0xe1 # APP1
skip_chars = get_int - 2
skip_chars = @stream.read_int - 2
skip_from = @stream.bytes_delivered
if @stream.read(4) == "Exif"
@stream.read(2)
@ -394,13 +397,13 @@ class FastImage
:skipframe
end
when :skipframe
skip_chars = get_int - 2
skip_chars = @stream.read_int - 2
@stream.read(skip_chars)
:started
when :readsize
s = @stream.read(3)
height = get_int
width = get_int
height = @stream.read_int
width = @stream.read_int
width, height = height, width if @exif_orientation && @exif_orientation >= 5
return [width, height]
end