poppler 2.2.4-x64-mingw32

data/test/poppler-test-utils.rb

@@ -0,0 +1,58 @@
+require 'open-uri'
+require 'fileutils'
+
+module PopplerTestUtils
+  def ensure_dir(dir)
+    FileUtils.mkdir_p(dir)
+    dir
+  end
+
+  def test_dir
+    File.expand_path(File.dirname(__FILE__))
+  end
+
+  def fixtures_dir
+    ensure_dir(File.join(test_dir, "fixtures"))
+  end
+
+  def tmp_dir
+    ensure_dir(File.join(test_dir, "tmp"))
+  end
+
+  def form_pdf
+    file = File.join(fixtures_dir, "form.pdf")
+    return file if File.exist?(file)
+    pdf = open("http://www.irs.gov/pub/irs-pdf/fw9.pdf").read
+    File.open(file, "wb") do |output|
+      output.print(pdf)
+    end
+    file
+  end
+
+  def image_pdf
+    File.join(fixtures_dir, "image.pdf")
+  end
+
+  def image_png
+    File.join(fixtures_dir, "image.png")
+  end
+
+  def later_version?(major, minor, micro=nil)
+    micro ||= 0
+    (Poppler::BUILD_VERSION <=> [major, minor, micro]) >= 0
+  end
+
+  def only_poppler_version(major, minor, micro=nil)
+    micro ||= 0
+    unless later_version?(major, minor, micro)
+      omit("Require Poppler >= #{major}.#{minor}.#{micro}")
+    end
+  end
+
+  def only_old_poppler_version(major, minor, micro=nil)
+    micro ||= 0
+    if later_version?(major, minor, micro)
+      omit("Require Poppler < #{major}.#{minor}.#{micro}")
+    end
+  end
+end

data/test/run-test.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+
+base_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+
+have_make = system("which make > /dev/null")
+
+glib_dir = File.expand_path(File.join(base_dir, "..", "glib2"))
+gdk_pixbuf_dir = File.expand_path(File.join(base_dir, "..", "gdk_pixbuf2"))
+pango_dir = File.join(File.join(base_dir, ".." , "pango"))
+
+$LOAD_PATH.unshift(File.join(glib_dir, "test"))
+require 'glib-test-init'
+
+[[gdk_pixbuf_dir, "gdk_pixbuf2"],
+ [pango_dir, "pango"],
+ [glib_dir, "glib2"],
+ [base_dir, "poppler"]].each do |dir, module_name|
+  if have_make
+    system("cd #{dir.dump} && make > /dev/null") or exit(false)
+  end
+  $LOAD_PATH.unshift(File.join(dir, "ext", module_name))
+  $LOAD_PATH.unshift(File.join(dir, "lib"))
+end
+require "poppler"
+
+$LOAD_PATH.unshift(File.join(base_dir, "test"))
+require 'poppler-test-utils'
+class Test::Unit::TestCase
+  include PopplerTestUtils
+end
+
+exit Test::Unit::AutoRunner.run(true)

data/test/test_annotation.rb

@@ -0,0 +1,86 @@
+class TestAnnotation < Test::Unit::TestCase
+  def test_type
+    only_poppler_version(0, 7, 2)
+    assert_kind_of(Poppler::AnnotationType, annotation.type)
+  end
+
+  def test_contents
+    only_poppler_version(0, 7, 2)
+    assert_nil(annotation.contents)
+  end
+
+  def test_name
+    only_poppler_version(0, 7, 2)
+    assert_nil(annotation.name)
+  end
+
+  def test_modified
+    only_poppler_version(0, 7, 2)
+    assert_nil(annotation.modified)
+  end
+
+  def test_flags
+    only_poppler_version(0, 7, 2)
+    assert_kind_of(Poppler::AnnotationFlag, annotation.flags)
+  end
+
+  def test_color
+    only_poppler_version(0, 7, 2)
+    assert_nil(annotation.color)
+  end
+
+  def test_markup
+    only_poppler_version(0, 7, 2)
+    # We don't have a PDF that has annotation markup...
+    assert_method_defined(Poppler::AnnotationMarkup, :label)
+    assert_method_defined(Poppler::AnnotationMarkup, :popup_is_open?)
+    assert_method_defined(Poppler::AnnotationMarkup, :opacity)
+    assert_method_defined(Poppler::AnnotationMarkup, :date)
+    assert_method_defined(Poppler::AnnotationMarkup, :subject)
+    assert_method_defined(Poppler::AnnotationMarkup, :reply_to)
+    assert_method_defined(Poppler::AnnotationMarkup, :external_data)
+  end
+
+  def test_text
+    only_poppler_version(0, 7, 2)
+    # We don't have a PDF that has annotation text...
+    assert_method_defined(Poppler::AnnotationText, :open?)
+    assert_method_defined(Poppler::AnnotationText, :icon)
+    assert_method_defined(Poppler::AnnotationText, :state)
+  end
+
+  def test_free_text
+    only_poppler_version(0, 7, 2)
+    # We don't have a PDF that has annotation free text...
+    assert_method_defined(Poppler::AnnotationFreeText, :quadding)
+    assert_method_defined(Poppler::AnnotationFreeText, :callout_line)
+  end
+
+  def test_callout_line
+    only_poppler_version(0, 7, 2)
+    callout_line = Poppler::AnnotationCalloutLine.new(true,
+                                                      1.1, 2.2, 3.3,
+                                                      4.4, 5.5, 6.6)
+    assert(callout_line.multiline?)
+    assert_equal(1.1, callout_line.x1)
+    assert_equal(2.2, callout_line.y1)
+    assert_equal(3.3, callout_line.x2)
+    assert_equal(4.4, callout_line.y2)
+    assert_equal(5.5, callout_line.x3)
+    assert_equal(6.6, callout_line.y3)
+    assert_equal([true, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6], callout_line.to_a)
+  end
+
+  private
+  def annotation
+    document = Poppler::Document.new(form_pdf)
+    page = document[0]
+    page.annotation_mapping[0].annotation
+  end
+
+  def assert_method_defined(object, method)
+    assert do
+      object.method_defined?(method)
+    end
+  end
+end

data/test/test_color.rb

@@ -0,0 +1,26 @@
+class TestColor < Test::Unit::TestCase
+  def test_initialize
+    only_poppler_version(0, 7, 2)
+    rose = Poppler::Color.new(65535, 0, 32639)
+    assert_equal([65535, 0, 32639], [rose.red, rose.green, rose.blue])
+    assert_equal([65535, 0, 32639], rose.to_a)
+  end
+
+  def test_accessor
+    only_poppler_version(0, 7, 2)
+    white = Poppler::Color.new(65535, 65535, 65535)
+    red = white.dup
+    red.green = 0
+    red.blue = 0
+    assert_equal([65535, 65535, 65535], [white.red, white.green, white.blue])
+    assert_equal([65535, 0, 0], [red.red, red.green, red.blue])
+  end
+
+  def test_inspect
+    only_poppler_version(0, 7, 2)
+    color = Poppler::Color.new(0, 32767, 65535)
+    rgb = '[0, 32767, 65535]'
+    assert_match(/\A#<Poppler::Color:.*: #{Regexp.escape(rgb)}>\z/,
+                 color.inspect)
+  end
+end

data/test/test_constants.rb

@@ -0,0 +1,30 @@
+class TestConstants < Test::Unit::TestCase
+  def test_annotation
+    if later_version?(0, 7, 2)
+      assertion = :assert_const_defined
+    else
+      assertion = :assert_not_const_defined
+    end
+    send(assertion, Poppler, :AnnotationType)
+    if assertion == :assert_const_defined
+      assert_equal("3d", Poppler::AnnotationType::TYPE_3D.nick)
+    end
+    send(assertion, Poppler, :AnnotationFlag)
+    send(assertion, Poppler, :AnnotationMarkupReplyType)
+    send(assertion, Poppler, :AnnotationExternalDataType)
+    if assertion == :assert_const_defined
+      assert_equal("3d", Poppler::AnnotationExternalDataType::TYPE_3D.nick)
+    end
+    if later_version?(0, 9, 0)
+      assert_not_const_defined(Poppler, :AnnotationTextIcon)
+    else
+      send(assertion, Poppler, :AnnotationTextIcon)
+    end
+    send(assertion, Poppler, :AnnotationTextState)
+    send(assertion, Poppler, :AnnotationFreeTextQuadding)
+  end
+
+  def test_permissions
+    assert_const_defined(Poppler, :Permissions)
+  end
+end

data/test/test_document.rb

@@ -0,0 +1,41 @@
+class TestDocument < Test::Unit::TestCase
+  def test_save
+    saved_pdf = File.join(tmp_dir, "saved.pdf")
+    FileUtils.rm_f(saved_pdf)
+
+    document = Poppler::Document.new(form_pdf)
+    find_first_text_field(document).text = "XXX"
+    assert(document.save(saved_pdf))
+    assert(File.exist?(saved_pdf))
+
+    only_poppler_version(0, 8, 2)
+    reread_document = Poppler::Document.new(saved_pdf)
+    assert_equal("XXX", find_first_text_field(reread_document).text)
+  end
+
+  def test_save_a_copy
+    only_poppler_version(0, 7, 2)
+    copied_pdf = File.join(tmp_dir, "copied.pdf")
+    FileUtils.rm_f(copied_pdf)
+
+    document = Poppler::Document.new(form_pdf)
+    first_text_field = find_first_text_field(document)
+    default_text = first_text_field.text
+    first_text_field.text = "XXX"
+    assert(document.save_a_copy(copied_pdf))
+    assert(File.exist?(copied_pdf))
+
+    reread_document = Poppler::Document.new(copied_pdf)
+    assert_equal(default_text, find_first_text_field(reread_document).text)
+  end
+
+  private
+  def find_first_text_field(document)
+    document.each do |page|
+      page.form_field_mapping.each do |mapping|
+        field = mapping.field
+        return field if field.is_a?(Poppler::TextField)
+      end
+    end
+  end
+end

data/test/test_page.rb

@@ -0,0 +1,42 @@
+class TestPage < Test::Unit::TestCase
+  def test_get_image
+    omit("We don't have PDF that has image...")
+    document = Poppler::Document.new(image_pdf)
+    page, mapping = find_first_image_mapping(document)
+    assert_kind_of(Cairo::ImageSurface, page.get_image(mapping.image_id))
+    assert_kind_of(Cairo::ImageSurface, mapping.image)
+  end
+
+  def test_selection_region
+    document = Poppler::Document.new(form_pdf)
+    page = document[0]
+    rectangle = Poppler::Rectangle.new(0, 0, *page.size)
+    region = page.get_selection_region(0.5, :word, rectangle)
+    if later_version?(0, 7, 2)
+      assert_kind_of(Poppler::Rectangle, region[0])
+    else
+      assert_kind_of(Gdk::Region, region)
+    end
+  end
+
+  def test_annotation_mapping
+    only_poppler_version(0, 7, 2)
+    document = Poppler::Document.new(form_pdf)
+    page = document[0]
+    assert_equal([Poppler::AnnotationMapping],
+                 page.annotation_mapping.collect {|mapping| mapping.class}.uniq)
+    mapping = page.annotation_mapping[0]
+    assert_kind_of(Poppler::Rectangle, mapping.area)
+    assert_kind_of(Poppler::Annotation, mapping.annotation)
+  end
+
+  private
+  def find_first_image_mapping(document)
+    document.each do |page|
+      page.image_mapping.each do |mapping|
+        return [page, mapping]
+      end
+    end
+    nil
+  end
+end

data/vendor/local/include/jconfig.h

@@ -0,0 +1,60 @@
+/* jconfig.h.  Generated from jconfig.cfg by configure.  */
+/* jconfig.cfg --- source file edited by configure script */
+/* see jconfig.txt for explanations */
+
+#define HAVE_PROTOTYPES 1
+#define HAVE_UNSIGNED_CHAR 1
+#define HAVE_UNSIGNED_SHORT 1
+/* #undef void */
+/* #undef const */
+/* #undef CHAR_IS_UNSIGNED */
+#define HAVE_STDDEF_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_LOCALE_H 1
+/* #undef NEED_BSD_STRINGS */
+/* #undef NEED_SYS_TYPES_H */
+/* #undef NEED_FAR_POINTERS */
+/* #undef NEED_SHORT_EXTERNAL_NAMES */
+/* Define this if you get warnings about undefined structures. */
+/* #undef INCOMPLETE_TYPES_BROKEN */
+
+/* Define "boolean" as unsigned char, not enum, on Windows systems. */
+#ifdef _WIN32
+#ifndef __RPCNDR_H__		/* don't conflict if rpcndr.h already read */
+typedef unsigned char boolean;
+#endif
+#ifndef FALSE			/* in case these macros already exist */
+#define FALSE	0		/* values of boolean */
+#endif
+#ifndef TRUE
+#define TRUE	1
+#endif
+#define HAVE_BOOLEAN		/* prevent jmorecfg.h from redefining it */
+#endif
+
+#ifdef JPEG_INTERNALS
+
+/* #undef RIGHT_SHIFT_IS_UNSIGNED */
+#define INLINE __inline__
+/* These are for configuring the JPEG memory manager. */
+/* #undef DEFAULT_MAX_MEM */
+/* #undef NO_MKTEMP */
+
+#endif /* JPEG_INTERNALS */
+
+#ifdef JPEG_CJPEG_DJPEG
+
+#define BMP_SUPPORTED		/* BMP image file format */
+#define GIF_SUPPORTED		/* GIF image file format */
+#define PPM_SUPPORTED		/* PBMPLUS PPM/PGM image file format */
+/* #undef RLE_SUPPORTED */
+#define TARGA_SUPPORTED		/* Targa image file format */
+
+/* #undef TWO_FILE_COMMANDLINE */
+/* #undef NEED_SIGNAL_CATCHER */
+/* #undef DONT_USE_B_MODE */
+
+/* Define this if you want percent-done progress reports from cjpeg/djpeg. */
+/* #undef PROGRESS_REPORT */
+
+#endif /* JPEG_CJPEG_DJPEG */

data/vendor/local/include/jerror.h

@@ -0,0 +1,304 @@
+/*
+ * jerror.h
+ *
+ * Copyright (C) 1994-1997, Thomas G. Lane.
+ * Modified 1997-2012 by Guido Vollbeding.
+ * This file is part of the Independent JPEG Group's software.
+ * For conditions of distribution and use, see the accompanying README file.
+ *
+ * This file defines the error and message codes for the JPEG library.
+ * Edit this file to add new codes, or to translate the message strings to
+ * some other language.
+ * A set of error-reporting macros are defined too.  Some applications using
+ * the JPEG library may wish to include this file to get the error codes
+ * and/or the macros.
+ */
+
+/*
+ * To define the enum list of message codes, include this file without
+ * defining macro JMESSAGE.  To create a message string table, include it
+ * again with a suitable JMESSAGE definition (see jerror.c for an example).
+ */
+#ifndef JMESSAGE
+#ifndef JERROR_H
+/* First time through, define the enum list */
+#define JMAKE_ENUM_LIST
+#else
+/* Repeated inclusions of this file are no-ops unless JMESSAGE is defined */
+#define JMESSAGE(code,string)
+#endif /* JERROR_H */
+#endif /* JMESSAGE */
+
+#ifdef JMAKE_ENUM_LIST
+
+typedef enum {
+
+#define JMESSAGE(code,string)	code ,
+
+#endif /* JMAKE_ENUM_LIST */
+
+JMESSAGE(JMSG_NOMESSAGE, "Bogus message code %d") /* Must be first entry! */
+
+/* For maintenance convenience, list is alphabetical by message code name */
+JMESSAGE(JERR_BAD_ALIGN_TYPE, "ALIGN_TYPE is wrong, please fix")
+JMESSAGE(JERR_BAD_ALLOC_CHUNK, "MAX_ALLOC_CHUNK is wrong, please fix")
+JMESSAGE(JERR_BAD_BUFFER_MODE, "Bogus buffer control mode")
+JMESSAGE(JERR_BAD_COMPONENT_ID, "Invalid component ID %d in SOS")
+JMESSAGE(JERR_BAD_CROP_SPEC, "Invalid crop request")
+JMESSAGE(JERR_BAD_DCT_COEF, "DCT coefficient out of range")
+JMESSAGE(JERR_BAD_DCTSIZE, "DCT scaled block size %dx%d not supported")
+JMESSAGE(JERR_BAD_DROP_SAMPLING,
+	 "Component index %d: mismatching sampling ratio %d:%d, %d:%d, %c")
+JMESSAGE(JERR_BAD_HUFF_TABLE, "Bogus Huffman table definition")
+JMESSAGE(JERR_BAD_IN_COLORSPACE, "Bogus input colorspace")
+JMESSAGE(JERR_BAD_J_COLORSPACE, "Bogus JPEG colorspace")
+JMESSAGE(JERR_BAD_LENGTH, "Bogus marker length")
+JMESSAGE(JERR_BAD_LIB_VERSION,
+	 "Wrong JPEG library version: library is %d, caller expects %d")
+JMESSAGE(JERR_BAD_MCU_SIZE, "Sampling factors too large for interleaved scan")
+JMESSAGE(JERR_BAD_POOL_ID, "Invalid memory pool code %d")
+JMESSAGE(JERR_BAD_PRECISION, "Unsupported JPEG data precision %d")
+JMESSAGE(JERR_BAD_PROGRESSION,
+	 "Invalid progressive parameters Ss=%d Se=%d Ah=%d Al=%d")
+JMESSAGE(JERR_BAD_PROG_SCRIPT,
+	 "Invalid progressive parameters at scan script entry %d")
+JMESSAGE(JERR_BAD_SAMPLING, "Bogus sampling factors")
+JMESSAGE(JERR_BAD_SCAN_SCRIPT, "Invalid scan script at entry %d")
+JMESSAGE(JERR_BAD_STATE, "Improper call to JPEG library in state %d")
+JMESSAGE(JERR_BAD_STRUCT_SIZE,
+	 "JPEG parameter struct mismatch: library thinks size is %u, caller expects %u")
+JMESSAGE(JERR_BAD_VIRTUAL_ACCESS, "Bogus virtual array access")
+JMESSAGE(JERR_BUFFER_SIZE, "Buffer passed to JPEG library is too small")
+JMESSAGE(JERR_CANT_SUSPEND, "Suspension not allowed here")
+JMESSAGE(JERR_CCIR601_NOTIMPL, "CCIR601 sampling not implemented yet")
+JMESSAGE(JERR_COMPONENT_COUNT, "Too many color components: %d, max %d")
+JMESSAGE(JERR_CONVERSION_NOTIMPL, "Unsupported color conversion request")
+JMESSAGE(JERR_DAC_INDEX, "Bogus DAC index %d")
+JMESSAGE(JERR_DAC_VALUE, "Bogus DAC value 0x%x")
+JMESSAGE(JERR_DHT_INDEX, "Bogus DHT index %d")
+JMESSAGE(JERR_DQT_INDEX, "Bogus DQT index %d")
+JMESSAGE(JERR_EMPTY_IMAGE, "Empty JPEG image (DNL not supported)")
+JMESSAGE(JERR_EMS_READ, "Read from EMS failed")
+JMESSAGE(JERR_EMS_WRITE, "Write to EMS failed")
+JMESSAGE(JERR_EOI_EXPECTED, "Didn't expect more than one scan")
+JMESSAGE(JERR_FILE_READ, "Input file read error")
+JMESSAGE(JERR_FILE_WRITE, "Output file write error --- out of disk space?")
+JMESSAGE(JERR_FRACT_SAMPLE_NOTIMPL, "Fractional sampling not implemented yet")
+JMESSAGE(JERR_HUFF_CLEN_OVERFLOW, "Huffman code size table overflow")
+JMESSAGE(JERR_HUFF_MISSING_CODE, "Missing Huffman code table entry")
+JMESSAGE(JERR_IMAGE_TOO_BIG, "Maximum supported image dimension is %u pixels")
+JMESSAGE(JERR_INPUT_EMPTY, "Empty input file")
+JMESSAGE(JERR_INPUT_EOF, "Premature end of input file")
+JMESSAGE(JERR_MISMATCHED_QUANT_TABLE,
+	 "Cannot transcode due to multiple use of quantization table %d")
+JMESSAGE(JERR_MISSING_DATA, "Scan script does not transmit all data")
+JMESSAGE(JERR_MODE_CHANGE, "Invalid color quantization mode change")
+JMESSAGE(JERR_NOTIMPL, "Not implemented yet")
+JMESSAGE(JERR_NOT_COMPILED, "Requested feature was omitted at compile time")
+JMESSAGE(JERR_NO_ARITH_TABLE, "Arithmetic table 0x%02x was not defined")
+JMESSAGE(JERR_NO_BACKING_STORE, "Backing store not supported")
+JMESSAGE(JERR_NO_HUFF_TABLE, "Huffman table 0x%02x was not defined")
+JMESSAGE(JERR_NO_IMAGE, "JPEG datastream contains no image")
+JMESSAGE(JERR_NO_QUANT_TABLE, "Quantization table 0x%02x was not defined")
+JMESSAGE(JERR_NO_SOI, "Not a JPEG file: starts with 0x%02x 0x%02x")
+JMESSAGE(JERR_OUT_OF_MEMORY, "Insufficient memory (case %d)")
+JMESSAGE(JERR_QUANT_COMPONENTS,
+	 "Cannot quantize more than %d color components")
+JMESSAGE(JERR_QUANT_FEW_COLORS, "Cannot quantize to fewer than %d colors")
+JMESSAGE(JERR_QUANT_MANY_COLORS, "Cannot quantize to more than %d colors")
+JMESSAGE(JERR_SOF_BEFORE, "Invalid JPEG file structure: %s before SOF")
+JMESSAGE(JERR_SOF_DUPLICATE, "Invalid JPEG file structure: two SOF markers")
+JMESSAGE(JERR_SOF_NO_SOS, "Invalid JPEG file structure: missing SOS marker")
+JMESSAGE(JERR_SOF_UNSUPPORTED, "Unsupported JPEG process: SOF type 0x%02x")
+JMESSAGE(JERR_SOI_DUPLICATE, "Invalid JPEG file structure: two SOI markers")
+JMESSAGE(JERR_TFILE_CREATE, "Failed to create temporary file %s")
+JMESSAGE(JERR_TFILE_READ, "Read failed on temporary file")
+JMESSAGE(JERR_TFILE_SEEK, "Seek failed on temporary file")
+JMESSAGE(JERR_TFILE_WRITE,
+	 "Write failed on temporary file --- out of disk space?")
+JMESSAGE(JERR_TOO_LITTLE_DATA, "Application transferred too few scanlines")
+JMESSAGE(JERR_UNKNOWN_MARKER, "Unsupported marker type 0x%02x")
+JMESSAGE(JERR_VIRTUAL_BUG, "Virtual array controller messed up")
+JMESSAGE(JERR_WIDTH_OVERFLOW, "Image too wide for this implementation")
+JMESSAGE(JERR_XMS_READ, "Read from XMS failed")
+JMESSAGE(JERR_XMS_WRITE, "Write to XMS failed")
+JMESSAGE(JMSG_COPYRIGHT, JCOPYRIGHT)
+JMESSAGE(JMSG_VERSION, JVERSION)
+JMESSAGE(JTRC_16BIT_TABLES,
+	 "Caution: quantization tables are too coarse for baseline JPEG")
+JMESSAGE(JTRC_ADOBE,
+	 "Adobe APP14 marker: version %d, flags 0x%04x 0x%04x, transform %d")
+JMESSAGE(JTRC_APP0, "Unknown APP0 marker (not JFIF), length %u")
+JMESSAGE(JTRC_APP14, "Unknown APP14 marker (not Adobe), length %u")
+JMESSAGE(JTRC_DAC, "Define Arithmetic Table 0x%02x: 0x%02x")
+JMESSAGE(JTRC_DHT, "Define Huffman Table 0x%02x")
+JMESSAGE(JTRC_DQT, "Define Quantization Table %d  precision %d")
+JMESSAGE(JTRC_DRI, "Define Restart Interval %u")
+JMESSAGE(JTRC_EMS_CLOSE, "Freed EMS handle %u")
+JMESSAGE(JTRC_EMS_OPEN, "Obtained EMS handle %u")
+JMESSAGE(JTRC_EOI, "End Of Image")
+JMESSAGE(JTRC_HUFFBITS, "        %3d %3d %3d %3d %3d %3d %3d %3d")
+JMESSAGE(JTRC_JFIF, "JFIF APP0 marker: version %d.%02d, density %dx%d  %d")
+JMESSAGE(JTRC_JFIF_BADTHUMBNAILSIZE,
+	 "Warning: thumbnail image size does not match data length %u")
+JMESSAGE(JTRC_JFIF_EXTENSION,
+	 "JFIF extension marker: type 0x%02x, length %u")
+JMESSAGE(JTRC_JFIF_THUMBNAIL, "    with %d x %d thumbnail image")
+JMESSAGE(JTRC_MISC_MARKER, "Miscellaneous marker 0x%02x, length %u")
+JMESSAGE(JTRC_PARMLESS_MARKER, "Unexpected marker 0x%02x")
+JMESSAGE(JTRC_QUANTVALS, "        %4u %4u %4u %4u %4u %4u %4u %4u")
+JMESSAGE(JTRC_QUANT_3_NCOLORS, "Quantizing to %d = %d*%d*%d colors")
+JMESSAGE(JTRC_QUANT_NCOLORS, "Quantizing to %d colors")
+JMESSAGE(JTRC_QUANT_SELECTED, "Selected %d colors for quantization")
+JMESSAGE(JTRC_RECOVERY_ACTION, "At marker 0x%02x, recovery action %d")
+JMESSAGE(JTRC_RST, "RST%d")
+JMESSAGE(JTRC_SMOOTH_NOTIMPL,
+	 "Smoothing not supported with nonstandard sampling ratios")
+JMESSAGE(JTRC_SOF, "Start Of Frame 0x%02x: width=%u, height=%u, components=%d")
+JMESSAGE(JTRC_SOF_COMPONENT, "    Component %d: %dhx%dv q=%d")
+JMESSAGE(JTRC_SOI, "Start of Image")
+JMESSAGE(JTRC_SOS, "Start Of Scan: %d components")
+JMESSAGE(JTRC_SOS_COMPONENT, "    Component %d: dc=%d ac=%d")
+JMESSAGE(JTRC_SOS_PARAMS, "  Ss=%d, Se=%d, Ah=%d, Al=%d")
+JMESSAGE(JTRC_TFILE_CLOSE, "Closed temporary file %s")
+JMESSAGE(JTRC_TFILE_OPEN, "Opened temporary file %s")
+JMESSAGE(JTRC_THUMB_JPEG,
+	 "JFIF extension marker: JPEG-compressed thumbnail image, length %u")
+JMESSAGE(JTRC_THUMB_PALETTE,
+	 "JFIF extension marker: palette thumbnail image, length %u")
+JMESSAGE(JTRC_THUMB_RGB,
+	 "JFIF extension marker: RGB thumbnail image, length %u")
+JMESSAGE(JTRC_UNKNOWN_IDS,
+	 "Unrecognized component IDs %d %d %d, assuming YCbCr")
+JMESSAGE(JTRC_XMS_CLOSE, "Freed XMS handle %u")
+JMESSAGE(JTRC_XMS_OPEN, "Obtained XMS handle %u")
+JMESSAGE(JWRN_ADOBE_XFORM, "Unknown Adobe color transform code %d")
+JMESSAGE(JWRN_ARITH_BAD_CODE, "Corrupt JPEG data: bad arithmetic code")
+JMESSAGE(JWRN_BOGUS_PROGRESSION,
+	 "Inconsistent progression sequence for component %d coefficient %d")
+JMESSAGE(JWRN_EXTRANEOUS_DATA,
+	 "Corrupt JPEG data: %u extraneous bytes before marker 0x%02x")
+JMESSAGE(JWRN_HIT_MARKER, "Corrupt JPEG data: premature end of data segment")
+JMESSAGE(JWRN_HUFF_BAD_CODE, "Corrupt JPEG data: bad Huffman code")
+JMESSAGE(JWRN_JFIF_MAJOR, "Warning: unknown JFIF revision number %d.%02d")
+JMESSAGE(JWRN_JPEG_EOF, "Premature end of JPEG file")
+JMESSAGE(JWRN_MUST_RESYNC,
+	 "Corrupt JPEG data: found marker 0x%02x instead of RST%d")
+JMESSAGE(JWRN_NOT_SEQUENTIAL, "Invalid SOS parameters for sequential JPEG")
+JMESSAGE(JWRN_TOO_MUCH_DATA, "Application transferred too many scanlines")
+
+#ifdef JMAKE_ENUM_LIST
+
+  JMSG_LASTMSGCODE
+} J_MESSAGE_CODE;
+
+#undef JMAKE_ENUM_LIST
+#endif /* JMAKE_ENUM_LIST */
+
+/* Zap JMESSAGE macro so that future re-inclusions do nothing by default */
+#undef JMESSAGE
+
+
+#ifndef JERROR_H
+#define JERROR_H
+
+/* Macros to simplify using the error and trace message stuff */
+/* The first parameter is either type of cinfo pointer */
+
+/* Fatal errors (print message and exit) */
+#define ERREXIT(cinfo,code)  \
+  ((cinfo)->err->msg_code = (code), \
+   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
+#define ERREXIT1(cinfo,code,p1)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
+#define ERREXIT2(cinfo,code,p1,p2)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (cinfo)->err->msg_parm.i[1] = (p2), \
+   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
+#define ERREXIT3(cinfo,code,p1,p2,p3)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (cinfo)->err->msg_parm.i[1] = (p2), \
+   (cinfo)->err->msg_parm.i[2] = (p3), \
+   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
+#define ERREXIT4(cinfo,code,p1,p2,p3,p4)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (cinfo)->err->msg_parm.i[1] = (p2), \
+   (cinfo)->err->msg_parm.i[2] = (p3), \
+   (cinfo)->err->msg_parm.i[3] = (p4), \
+   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
+#define ERREXIT6(cinfo,code,p1,p2,p3,p4,p5,p6)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (cinfo)->err->msg_parm.i[1] = (p2), \
+   (cinfo)->err->msg_parm.i[2] = (p3), \
+   (cinfo)->err->msg_parm.i[3] = (p4), \
+   (cinfo)->err->msg_parm.i[4] = (p5), \
+   (cinfo)->err->msg_parm.i[5] = (p6), \
+   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
+#define ERREXITS(cinfo,code,str)  \
+  ((cinfo)->err->msg_code = (code), \
+   strncpy((cinfo)->err->msg_parm.s, (str), JMSG_STR_PARM_MAX), \
+   (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo)))
+
+#define MAKESTMT(stuff)		do { stuff } while (0)
+
+/* Nonfatal errors (we can keep going, but the data is probably corrupt) */
+#define WARNMS(cinfo,code)  \
+  ((cinfo)->err->msg_code = (code), \
+   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))
+#define WARNMS1(cinfo,code,p1)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))
+#define WARNMS2(cinfo,code,p1,p2)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (cinfo)->err->msg_parm.i[1] = (p2), \
+   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), -1))
+
+/* Informational/debugging messages */
+#define TRACEMS(cinfo,lvl,code)  \
+  ((cinfo)->err->msg_code = (code), \
+   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
+#define TRACEMS1(cinfo,lvl,code,p1)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
+#define TRACEMS2(cinfo,lvl,code,p1,p2)  \
+  ((cinfo)->err->msg_code = (code), \
+   (cinfo)->err->msg_parm.i[0] = (p1), \
+   (cinfo)->err->msg_parm.i[1] = (p2), \
+   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
+#define TRACEMS3(cinfo,lvl,code,p1,p2,p3)  \
+  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
+	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); \
+	   (cinfo)->err->msg_code = (code); \
+	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
+#define TRACEMS4(cinfo,lvl,code,p1,p2,p3,p4)  \
+  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
+	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
+	   (cinfo)->err->msg_code = (code); \
+	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
+#define TRACEMS5(cinfo,lvl,code,p1,p2,p3,p4,p5)  \
+  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
+	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
+	   _mp[4] = (p5); \
+	   (cinfo)->err->msg_code = (code); \
+	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
+#define TRACEMS8(cinfo,lvl,code,p1,p2,p3,p4,p5,p6,p7,p8)  \
+  MAKESTMT(int * _mp = (cinfo)->err->msg_parm.i; \
+	   _mp[0] = (p1); _mp[1] = (p2); _mp[2] = (p3); _mp[3] = (p4); \
+	   _mp[4] = (p5); _mp[5] = (p6); _mp[6] = (p7); _mp[7] = (p8); \
+	   (cinfo)->err->msg_code = (code); \
+	   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)); )
+#define TRACEMSS(cinfo,lvl,code,str)  \
+  ((cinfo)->err->msg_code = (code), \
+   strncpy((cinfo)->err->msg_parm.s, (str), JMSG_STR_PARM_MAX), \
+   (*(cinfo)->err->emit_message) ((j_common_ptr) (cinfo), (lvl)))
+
+#endif /* JERROR_H */