poppler 2.2.0-x86-mingw32 → 2.2.1-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdb7047460e11ec2af2502616e22a63b5ec6e3a2
-  data.tar.gz: 80cd211220a0b082573c239d1c1234c11421964b
+  metadata.gz: 7fbd163a340b57d36400ae3b88d47a8b0768f5c0
+  data.tar.gz: 016be96c275bbef923de1243e6760e1c6efee5f2
 SHA512:
-  metadata.gz: 18229f889585e632d2fbe0d79ca422c0bf6e7b7f576500fcda9cb59d6efb14053337ba495669c2ff594b1bb8fcec287721cd08829d74bdc4e49c12a7f391b4ea
-  data.tar.gz: cb44140a29e676a470b3b470ec18d4ca1376e7c55a99989692b4fcc11c613804987f4e61c1b9a31895f70cb5b73cbdb65213b10fd7fbd15cbdee1a4cb443a1f6
+  metadata.gz: 4dc368d37b1be1e2cd382873f4667d2a41941dc7a27566e2237f3ed8d52a67f7d5395fca3e564e9e29eef10d8d508a2b3b9b2d463cf145ae8cb22ebb9daf0428
+  data.tar.gz: b32292494cb1318897b15d205ee25b3b6a5c05931c9f4761aa7d520e29b5ac8f14955de092b8f98a903878f268a43fd8b6d14450247f40741734ce70e0edbdb1

data/Rakefile

@@ -37,8 +37,8 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
   package.external_packages = [
     {
       :name => "libjpeg",
-      :base_name => "jpeg-9",
-      :archive_base_name => "jpegsrc.v9.tar.gz",
+      :base_name => "jpeg-9a",
+      :archive_base_name => "jpegsrc.v9a.tar.gz",
       :download_base_url => "http://www.ijg.org/files",
       :label => "libjpeg",
       :windows => {
@@ -48,9 +48,9 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
     },
     {
       :name => "sqlite-autoconf",
-      :download_base_url => "http://www.sqlite.org/2013",
+      :download_base_url => "http://www.sqlite.org/2014",
       :label => "SQLite",
-      :version => "3080200",
+      :version => "3080600",
       :compression_method => "gz",
       :windows => {
         :configure_args => [],
@@ -61,7 +61,7 @@ package_task = GNOME2::Rake::PackageTask.new do |package|
       :name => "poppler",
       :download_base_url => "http://poppler.freedesktop.org",
       :label => "Poppler",
-      :version => "0.24.5",
+      :version => "0.26.5",
       :compression_method => "xz",
       :windows => {
         :configure_args => [

data/ext/poppler/extconf.rb

@@ -61,7 +61,7 @@ setup_win32(module_name, base_dir)
 unless required_pkg_config_package([package_id, 0, 12, 0],
                                    :debian => "libpoppler-glib-dev",
                                    :redhat => "poppler-glib-devel",
-#                                   :homebrew => "poppler", # need --with-glib option
+                                   :homebrew => "poppler",
                                    :macports => "poppler")
   exit(false)
 end

data/test/test_annotation.rb

@@ -79,6 +79,8 @@ class TestAnnotation < Test::Unit::TestCase
   end
 
   def assert_method_defined(object, method)
-    assert_send([object, :method_defined?, method])
+    assert do
+      object.method_defined?(method)
+    end
   end
 end

data/test/test_page.rb

@@ -30,24 +30,6 @@ class TestPage < Test::Unit::TestCase
     assert_kind_of(Poppler::Annotation, mapping.annotation)
   end
 
-  def test_render
-    only_poppler_version(0, 20, 0)
-    document = Poppler::Document.new(image_pdf)
-    page = document[0]
-    png = StringIO.new
-    png.set_encoding("ASCII-8BIT")
-    Cairo::ImageSurface.new(:argb32, *page.size) do |surface|
-      Cairo::Context.new(surface) do |context|
-        page.render(context)
-      end
-      surface.write_to_png(png)
-    end
-    File.open(image_png, "rb") do |image|
-      # TODO: support image diff
-      assert_equal(image.read, png.string)
-    end
-  end
-
   private
   def find_first_image_mapping(document)
     document.each do |page|

data/vendor/local/include/jconfig.h

@@ -18,11 +18,17 @@
 /* Define this if you get warnings about undefined structures. */
 /* #undef INCOMPLETE_TYPES_BROKEN */
 
-/* Define "boolean" as unsigned char, not int, on Windows systems. */
+/* 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
 

data/vendor/local/include/jmorecfg.h

@@ -2,7 +2,7 @@
  * jmorecfg.h
  *
  * Copyright (C) 1991-1997, Thomas G. Lane.
- * Modified 1997-2012 by Guido Vollbeding.
+ * Modified 1997-2013 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.
  *
@@ -15,13 +15,22 @@
 /*
  * Define BITS_IN_JSAMPLE as either
  *   8   for 8-bit sample values (the usual setting)
+ *   9   for 9-bit sample values
+ *   10  for 10-bit sample values
+ *   11  for 11-bit sample values
  *   12  for 12-bit sample values
- * Only 8 and 12 are legal data precisions for lossy JPEG according to the
- * JPEG standard, and the IJG code does not support anything else!
- * We do not support run-time selection of data precision, sorry.
+ * Only 8, 9, 10, 11, and 12 bits sample data precision are supported for
+ * full-feature DCT processing.  Further depths up to 16-bit may be added
+ * later for the lossless modes of operation.
+ * Run-time selection and conversion of data precision will be added later
+ * and are currently not supported, sorry.
+ * Exception:  The transcoding part (jpegtran) supports all settings in a
+ * single instance, since it operates on the level of DCT coefficients and
+ * not sample values.  The DCT coefficients are of the same type (16 bits)
+ * in all cases (see below).
  */
 
-#define BITS_IN_JSAMPLE  8	/* use 8 or 12 */
+#define BITS_IN_JSAMPLE  8	/* use 8, 9, 10, 11, or 12 */
 
 
 /*
@@ -77,6 +86,48 @@ typedef char JSAMPLE;
 #endif /* BITS_IN_JSAMPLE == 8 */
 
 
+#if BITS_IN_JSAMPLE == 9
+/* JSAMPLE should be the smallest type that will hold the values 0..511.
+ * On nearly all machines "short" will do nicely.
+ */
+
+typedef short JSAMPLE;
+#define GETJSAMPLE(value)  ((int) (value))
+
+#define MAXJSAMPLE	511
+#define CENTERJSAMPLE	256
+
+#endif /* BITS_IN_JSAMPLE == 9 */
+
+
+#if BITS_IN_JSAMPLE == 10
+/* JSAMPLE should be the smallest type that will hold the values 0..1023.
+ * On nearly all machines "short" will do nicely.
+ */
+
+typedef short JSAMPLE;
+#define GETJSAMPLE(value)  ((int) (value))
+
+#define MAXJSAMPLE	1023
+#define CENTERJSAMPLE	512
+
+#endif /* BITS_IN_JSAMPLE == 10 */
+
+
+#if BITS_IN_JSAMPLE == 11
+/* JSAMPLE should be the smallest type that will hold the values 0..2047.
+ * On nearly all machines "short" will do nicely.
+ */
+
+typedef short JSAMPLE;
+#define GETJSAMPLE(value)  ((int) (value))
+
+#define MAXJSAMPLE	2047
+#define CENTERJSAMPLE	1024
+
+#endif /* BITS_IN_JSAMPLE == 11 */
+
+
 #if BITS_IN_JSAMPLE == 12
 /* JSAMPLE should be the smallest type that will hold the values 0..4095.
  * On nearly all machines "short" will do nicely.
@@ -252,7 +303,10 @@ typedef void noreturn_t;
  * Defining HAVE_BOOLEAN before including jpeglib.h should make it work.
  */
 
-#ifdef HAVE_BOOLEAN
+#ifndef HAVE_BOOLEAN
+#if defined FALSE || defined TRUE || defined QGLOBAL_H
+/* Qt3 defines FALSE and TRUE as "const" variables in qglobal.h */
+typedef int boolean;
 #ifndef FALSE			/* in case these macros already exist */
 #define FALSE	0		/* values of boolean */
 #endif
@@ -262,6 +316,7 @@ typedef void noreturn_t;
 #else
 typedef enum { FALSE = 0, TRUE = 1 } boolean;
 #endif
+#endif
 
 
 /*
@@ -299,11 +354,12 @@ typedef enum { FALSE = 0, TRUE = 1 } boolean;
 #define C_PROGRESSIVE_SUPPORTED	    /* Progressive JPEG? (Requires MULTISCAN)*/
 #define DCT_SCALING_SUPPORTED	    /* Input rescaling via DCT? (Requires DCT_ISLOW)*/
 #define ENTROPY_OPT_SUPPORTED	    /* Optimization of entropy coding parms? */
-/* Note: if you selected 12-bit data precision, it is dangerous to turn off
- * ENTROPY_OPT_SUPPORTED.  The standard Huffman tables are only good for 8-bit
- * precision, so jchuff.c normally uses entropy optimization to compute
- * usable tables for higher precision.  If you don't want to do optimization,
- * you'll have to supply different default Huffman tables.
+/* Note: if you selected more than 8-bit data precision, it is dangerous to
+ * turn off ENTROPY_OPT_SUPPORTED.  The standard Huffman tables are only
+ * good for 8-bit precision, so arithmetic coding is recommended for higher
+ * precision.  The Huffman encoder normally uses entropy optimization to
+ * compute usable tables for higher precision.  Otherwise, you'll have to
+ * supply different default Huffman tables.
  * The exact same statements apply for progressive JPEG: the default tables
  * don't work for progressive mode.  (This may get fixed, however.)
  */
@@ -314,7 +370,7 @@ typedef enum { FALSE = 0, TRUE = 1 } boolean;
 #define D_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
 #define D_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
 #define D_PROGRESSIVE_SUPPORTED	    /* Progressive JPEG? (Requires MULTISCAN)*/
-#define IDCT_SCALING_SUPPORTED	    /* Output rescaling via IDCT? */
+#define IDCT_SCALING_SUPPORTED	    /* Output rescaling via IDCT? (Requires DCT_ISLOW)*/
 #define SAVE_MARKERS_SUPPORTED	    /* jpeg_save_markers() needed? */
 #define BLOCK_SMOOTHING_SUPPORTED   /* Block smoothing? (Progressive only) */
 #undef  UPSAMPLE_SCALING_SUPPORTED  /* Output rescaling at upsample stage? */

data/vendor/local/include/jpeglib.h

@@ -2,7 +2,7 @@
  * jpeglib.h
  *
  * Copyright (C) 1991-1998, Thomas G. Lane.
- * Modified 2002-2012 by Guido Vollbeding.
+ * Modified 2002-2013 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.
  *
@@ -39,12 +39,12 @@ extern "C" {
 
 #define JPEG_LIB_VERSION        90	/* Compatibility version 9.0 */
 #define JPEG_LIB_VERSION_MAJOR  9
-#define JPEG_LIB_VERSION_MINOR  0
+#define JPEG_LIB_VERSION_MINOR  1
 
 
 /* Various constants determining the sizes of things.
- * All of these are specified by the JPEG standard, so don't change them
- * if you want to be compatible.
+ * All of these are specified by the JPEG standard,
+ * so don't change them if you want to be compatible.
  */
 
 #define DCTSIZE		    8	/* The basic DCT block is 8x8 coefficients */
@@ -157,16 +157,21 @@ typedef struct {
   /* The downsampled dimensions are the component's actual, unpadded number
    * of samples at the main buffer (preprocessing/compression interface);
    * DCT scaling is included, so
-   * downsampled_width = ceil(image_width * Hi/Hmax * DCT_h_scaled_size/DCTSIZE)
+   * downsampled_width =
+   *   ceil(image_width * Hi/Hmax * DCT_h_scaled_size/block_size)
    * and similarly for height.
    */
   JDIMENSION downsampled_width;	 /* actual width in samples */
   JDIMENSION downsampled_height; /* actual height in samples */
-  /* This flag is used only for decompression.  In cases where some of the
-   * components will be ignored (eg grayscale output from YCbCr image),
-   * we can skip most computations for the unused components.
+  /* For decompression, in cases where some of the components will be
+   * ignored (eg grayscale output from YCbCr image), we can skip most
+   * computations for the unused components.
+   * For compression, some of the components will need further quantization
+   * scale by factor of 2 after DCT (eg BG_YCC output from normal RGB input).
+   * The field is first set TRUE for decompression, FALSE for compression
+   * in initial_setup, and then adapted in color conversion setup.
    */
-  boolean component_needed;	/* do we need the value of this component? */
+  boolean component_needed;
 
   /* These values are computed before starting a scan of the component. */
   /* The decompressor output side may not use these variables. */
@@ -215,10 +220,12 @@ struct jpeg_marker_struct {
 typedef enum {
 	JCS_UNKNOWN,		/* error/unspecified */
 	JCS_GRAYSCALE,		/* monochrome */
-	JCS_RGB,		/* red/green/blue */
-	JCS_YCbCr,		/* Y/Cb/Cr (also known as YUV) */
+	JCS_RGB,		/* red/green/blue, standard RGB (sRGB) */
+	JCS_YCbCr,		/* Y/Cb/Cr (also known as YUV), standard YCC */
 	JCS_CMYK,		/* C/M/Y/K */
-	JCS_YCCK		/* Y/Cb/Cr/K */
+	JCS_YCCK,		/* Y/Cb/Cr/K */
+	JCS_BG_RGB,		/* big gamut red/green/blue, bg-sRGB */
+	JCS_BG_YCC		/* big gamut Y/Cb/Cr, bg-sYCC */
 } J_COLOR_SPACE;
 
 /* Supported color transforms. */

data/vendor/local/include/poppler/cpp/poppler-document.h

@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2009-2010, Pino Toscano <pino@kde.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef POPPLER_DOCUMENT_H
+#define POPPLER_DOCUMENT_H
+
+#include "poppler-global.h"
+#include "poppler-font.h"
+
+namespace poppler
+{
+
+class document_private;
+class embedded_file;
+class page;
+class toc;
+
+class POPPLER_CPP_EXPORT document : public poppler::noncopyable
+{
+public:
+    enum page_mode_enum {
+        use_none,
+        use_outlines,
+        use_thumbs,
+        fullscreen,
+        use_oc,
+        use_attach
+    };
+
+    enum page_layout_enum {
+        no_layout,
+        single_page,
+        one_column,
+        two_column_left,
+        two_column_right,
+        two_page_left,
+        two_page_right
+    };
+
+    ~document();
+
+    bool is_locked() const;
+    bool unlock(const std::string &owner_password, const std::string &user_password);
+
+    page_mode_enum page_mode() const;
+    page_layout_enum page_layout() const;
+    void get_pdf_version(int *major, int *minor) const;
+    std::vector<std::string> info_keys() const;
+    ustring info_key(const std::string &key) const;
+    time_type info_date(const std::string &key) const;
+    bool is_encrypted() const;
+    bool is_linearized() const;
+    bool has_permission(permission_enum which) const;
+    ustring metadata() const;
+    bool get_pdf_id(std::string *permanent_id, std::string *update_id) const;
+
+    int pages() const;
+    page* create_page(const ustring &label) const;
+    page* create_page(int index) const;
+
+    std::vector<font_info> fonts() const;
+    font_iterator* create_font_iterator(int start_page = 0) const;
+
+    toc* create_toc() const;
+
+    bool has_embedded_files() const;
+    std::vector<embedded_file *> embedded_files() const;
+
+    static document* load_from_file(const std::string &file_name,
+                                    const std::string &owner_password = std::string(),
+                                    const std::string &user_password = std::string());
+    static document* load_from_data(byte_array *file_data,
+                                    const std::string &owner_password = std::string(),
+                                    const std::string &user_password = std::string());
+    static document* load_from_raw_data(const char *file_data,
+                                        int file_data_length,
+                                        const std::string &owner_password = std::string(),
+                                        const std::string &user_password = std::string());
+
+private:
+    document(document_private &dd);
+
+    document_private *d;
+    friend class document_private;
+};
+
+}
+
+#endif