class Zbar < Formula desc "Suite of barcodes-reading tools" homepage "https://zbar.sourceforge.io" revision 5 stable do url "https://downloads.sourceforge.net/project/zbar/zbar/0.10/zbar-0.10.tar.bz2" sha256 "234efb39dbbe5cef4189cc76f37afbe3cfcfb45ae52493bfe8e191318bdbadc6" # Fix JPEG handling using patch from # https://sourceforge.net/p/zbar/discussion/664596/thread/58b8d79b#8f67 # already applied upstream but not present in the 0.10 release patch :DATA end bottle do cellar :any sha256 "3e6dc5f4f2d734287286677241c7d0580f4b2f786bbc8ce9a13d728fa4b54499" => :sierra sha256 "84e0feef90dfe6f75a28f27a625030d68ab7a029e14055717bbc4622e63c4f0a" => :el_capitan sha256 "e0dd76519a36dba47248616b8aa4f5cbe6b2b7df54529d36794de4e8488bbf1b" => :yosemite end head do url "https://github.com/ZBar/ZBar.git" depends_on "gettext" => :build depends_on "automake" => :build depends_on "autoconf" => :build depends_on "libtool" => :build depends_on "xmlto" => :build end depends_on :x11 => :optional depends_on "pkg-config" => :build depends_on "jpeg" depends_on "imagemagick" depends_on "ufraw" depends_on "xz" depends_on "freetype" depends_on "libtool" => :run def install if build.head? inreplace "configure.ac", "-Werror", "" gettext = Formula["gettext"] system "autoreconf", "-fvi", "-I", "#{gettext.opt_share}/aclocal" end # ImageMagick 7 compatibility # Reported 20 Jun 2016 https://sourceforge.net/p/zbar/support-requests/156/ inreplace ["configure", "zbarimg/zbarimg.c"], "wand/MagickWand.h", "ImageMagick-7/MagickWand/MagickWand.h" 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 test do system bin/"zbarimg", "-h" 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)