require 'formula' class Zbar < Formula homepage 'http://zbar.sourceforge.net' url 'https://downloads.sourceforge.net/project/zbar/zbar/0.10/zbar-0.10.tar.bz2' sha1 '273b47c26788faba4325baecc34063e27a012963' revision 1 depends_on :x11 => :optional depends_on 'pkg-config' => :build depends_on 'jpeg' depends_on 'imagemagick' depends_on 'ufraw' depends_on 'xz' # Fix JPEG handling using patch from # http://sourceforge.net/p/zbar/discussion/664596/thread/58b8d79b#8f67 # already applied upstream but not present in the 0.10 release patch :DATA def install args = %W[ --disable-dependency-tracking --prefix=#{prefix} --without-python --without-qt --disable-video --without-gtk ] if build.with? 'x11' args << '--with-x' else args << '--without-x' end system "./configure", *args system "make install" end end __END__ diff --git a/zbar/jpeg.c b/zbar/jpeg.c index fb566f4..d1c1fb2 100644 --- a/zbar/jpeg.c +++ b/zbar/jpeg.c @@ -79,8 +79,15 @@ int fill_input_buffer (j_decompress_ptr cinfo) void skip_input_data (j_decompress_ptr cinfo, long num_bytes) { - cinfo->src->next_input_byte = NULL; - cinfo->src->bytes_in_buffer = 0; + if (num_bytes > 0) { + if (num_bytes < cinfo->src->bytes_in_buffer) { + cinfo->src->next_input_byte += num_bytes; + cinfo->src->bytes_in_buffer -= num_bytes; + } + else { + fill_input_buffer(cinfo); + } + } } void term_source (j_decompress_ptr cinfo)