image_compressor_pack 0.1.3-universal-darwin-15 → 1.0.0.1-universal-darwin-15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68076e1a53c3428c2ffa7e496cfade6c328b213c
-  data.tar.gz: e26da721b440bec22cf5c7eafff44cf580cef7df
+  metadata.gz: a7af89077a4bbbe1dbacccf35c7c5b649800d110
+  data.tar.gz: ec33e56ba44c636095dc05eee1ebcae047e9e1bd
 SHA512:
-  metadata.gz: ecbf0cf377b3d58a53ec7f0ec100ee156c9ff22376724f310364b84fbfbb377ed2a3bafcd8697a861241ced312e24f5e12a18d9fe1aa1fca63a98eeda56beccd
-  data.tar.gz: ce49bf6922dfaa8afe4cbed3dda11e7a064f8738920a512ada0ac3149b65bedbf575afde2f11ce439b2a16b11ed46a02b467af2949acbe570cf1dacd0c01467f
+  metadata.gz: 542b8b5f978e9d3d40de9aa7d2f9a97e0685b0efc5c22c0d587ea12a07b50f32594829b3bd55d04d6f0cfb14c7d5e8c5b9802565d5a44be9e147e3912e75ba16
+  data.tar.gz: 1884afe91279adbb8028b05bc0a2e8bc494fbc2b15cc26d262dbf2e18a873c0dbb165757cfc713a572fd8f33d905d47d8ebfee30e7d383a6be3bb5bcd7aa06fe

data/lib/.paths.yml

@@ -1,12 +1,12 @@
 ---
-- ports/x86_64-apple-darwin15.0.0/advancecomp/1.2/bin
-- ports/x86_64-apple-darwin15.0.0/gifsicle/1.88/bin
-- ports/x86_64-apple-darwin15.0.0/jhead/3.0/bin
-- ports/x86_64-apple-darwin15.0.0/jpeg-archive/2.1.1/bin
-- ports/x86_64-apple-darwin15.0.0/jpegoptim/1.4.3/bin
-- ports/x86_64-apple-darwin15.0.0/lcms2/2.7/bin
-- ports/x86_64-apple-darwin15.0.0/mozjpeg/3.1/bin
-- ports/x86_64-apple-darwin15.0.0/nasm/2.12.01/bin
-- ports/x86_64-apple-darwin15.0.0/optipng/0.7.6/bin
-- ports/x86_64-apple-darwin15.0.0/pngcrush/1.8.1/bin
-- ports/x86_64-apple-darwin15.0.0/pngquant/2.7.1/bin
+- ports/x86_64-apple-darwin15.6.0/advancecomp/1.22/bin
+- ports/x86_64-apple-darwin15.6.0/gifsicle/1.88/bin
+- ports/x86_64-apple-darwin15.6.0/jhead/3.0/bin
+- ports/x86_64-apple-darwin15.6.0/jpeg-archive/2.1.1/bin
+- ports/x86_64-apple-darwin15.6.0/jpegoptim/1.4.4/bin
+- ports/x86_64-apple-darwin15.6.0/lcms2/2.8/bin
+- ports/x86_64-apple-darwin15.6.0/mozjpeg/3.1/bin
+- ports/x86_64-apple-darwin15.6.0/nasm/2.12.02/bin
+- ports/x86_64-apple-darwin15.6.0/optipng/0.7.6/bin
+- ports/x86_64-apple-darwin15.6.0/pngcrush/1.8.10/bin
+- ports/x86_64-apple-darwin15.6.0/pngquant/2.8.0/bin

data/lib/image_compressor_pack/dynamically_linked_recipes.yml

@@ -1,8 +1,8 @@
 nasm:
-  version: 2.12.01
+  version: 2.12.02
   files:
-    - :url: http://www.nasm.us/pub/nasm/releasebuilds/2.12.01/nasm-2.12.01.tar.gz
-      :sha256: 4cab94c041ae85740b47d92d0a25dd2325f05b2378dcf6fac4d09c49c62ee481
+    - :url: http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/nasm-2.12.02.tar.gz
+      :sha256: b7346d827b282ccf70608fe90b9bcf27effb1ddbd1bcba8a5ab4be95284fd01b
 zlib:
   version: 1.2.8
   files:
@@ -10,15 +10,16 @@ zlib:
       :md5: 44d667c142d7cda120332623eab69f40
   configure_options: ['--static']
 lcms2:
-  version: 2.7
+  version: 2.8
   files:
-    - :url: http://download.sourceforge.net/lcms/lcms2-2.7.tar.gz
-      :sha256: 4524234ae7de185e6b6da5d31d6875085b2198bc63b1211f7dde6e2d197d6a53
+    - :url: http://downloads.sourceforge.net/project/lcms/lcms/2.8/lcms2-2.8.tar.gz
+      :sha256: 66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22
+  configure_options: ['--enable-static', '--disable-shared', '--without-jpeg', '--without-tiff']
 libpng:
-  version: 1.6.21
+  version: 1.6.26
   files:
-    - :url: http://download.sourceforge.net/libpng/libpng-1.6.21.tar.gz
-      :md5: aca36ec8e0a3b406a5912243bc243717
+    - :url: http://downloads.sourceforge.net/project/libpng/libpng16/1.6.26/libpng-1.6.26.tar.gz
+      :md5: 236cd975520fc1f34cc0b8f0e615f7a0
   patch_files:
     - 0001-Do-not-build-binary-utilities.patch
   configure_options: ['--enable-static', '--disable-shared', '--without-binconfigs', '--disable-unversioned-libpng-pc', '--disable-unversioned-libpng-config']
@@ -37,10 +38,10 @@ optipng:
       :sha256: 4870631fcbd3825605f00a168b8debf44ea1cda8ef98a73e5411eee97199be80
   configure_options: ['-with-system-libs']
 pngquant:
-  version: 2.7.1
+  version: 2.8.0
   files:
-    - :url: https://github.com/pornel/pngquant/archive/2.7.1.tar.gz
-      :sha256: e8645bea07ef255c102f053d3566ac00e64005aa0e68a2c9f00bc39e575f1dfd
+    - :url: https://pngquant.org/pngquant-2.8.0-src.tar.gz
+      :sha1: f4428793dbc439a12bc67c7a585aa2fb9b86b349
   patch_files:
     - 0001-Work-around-mini-portile-s-configure-invocation.patch
     - 0002-Add-default-LDFLAGS.patch
@@ -51,10 +52,12 @@ pngquant:
     - 0007-Use-cc-instead-of-gcc-by-default.patch
   configure_options: []
 advancecomp:
-  version: 1.20
+  version: 1.22
   files:
-    - :url: https://github.com/amadvance/advancecomp/releases/download/v1.20/advancecomp-1.20.tar.gz
-      :sha256: 590a447cfc7ab3a37ec707e13967a0046a81a888c561ebaff5415b1e946da67b
+    - :url: https://github.com/amadvance/advancecomp/releases/download/v1.22/advancecomp-1.22.tar.gz
+      :sha256: 31dec84049b919176d14070b8e6f97e086a0ddcd24ff1b83cf498245ece6607d
+  patch_files:
+    - 0001-Add-missing-libdeflate-header-file.patch
 gifsicle:
   version: 1.88
   files:
@@ -72,19 +75,19 @@ jhead:
     - 0003-Make-the-configure-script-set-the-DESTDIR.patch
     - 0004-Make-the-makefile-install-to-the-proper-location.patch
 pngcrush:
-  version: 1.8.1
+  version: 1.8.10
   files:
-    - :url: http://downloads.sourceforge.net/project/pmt/pngcrush/1.8.1/pngcrush-1.8.1.tar.gz
-      :sha256: ab299feb0dd77d2e84a043cf773302ad6323733d9b82e8ce76468dd024c0ad63
+    - :url: http://downloads.sourceforge.net/project/pmt/pngcrush/1.8.10/pngcrush-1.8.10.tar.gz
+      :sha256: ed8dc4759d5067ebf53a2a5188eff1e8ad10262737cf50516cccf8c60d220b6d
   patch_files:
     - 0001-Add-an-install-task.patch
     - 0002-Add-a-configure-script.patch
     - 0003-Use-cc-by-default-instead-of-gcc.patch
 jpegoptim:
-  version: 1.4.3
+  version: 1.4.4
   files:
-    - :url: http://www.kokkonen.net/tjko/src/jpegoptim-1.4.3.tar.gz
-      :sha256: 233d4ae09273cb977e162671f4767be7ef5d96e8c1888d3ed4aa70c4dac1a34c
+    - :url: http://www.kokkonen.net/tjko/src/jpegoptim-1.4.4.tar.gz
+      :sha256: 89a03ea2dfe9483dfb2e009a2851be0befb0deb7cb45c04550bcc91e1e88c1b2
   patch_files:
     - 0001-Link-lm-after-ljpeg.patch
 jpeg-archive:

data/lib/image_compressor_pack/statically_linked_recipes.yml

@@ -1,25 +1,26 @@
 nasm:
-  version: 2.12.01
+  version: 2.12.02
   files:
-    - :url: http://www.nasm.us/pub/nasm/releasebuilds/2.12.01/nasm-2.12.01.tar.gz
-      :sha256: 4cab94c041ae85740b47d92d0a25dd2325f05b2378dcf6fac4d09c49c62ee481
+    - :url: http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/nasm-2.12.02.tar.gz
+      :sha256: b7346d827b282ccf70608fe90b9bcf27effb1ddbd1bcba8a5ab4be95284fd01b
   configure_options: ['LDFLAGS=-static']
 zlib:
   version: 1.2.8
   files:
-    - :url: http://download.sourceforge.net/libpng/zlib-1.2.8.tar.gz
+    - :url: http://downloads.sourceforge.net/project/libpng/zlib/1.2.8/zlib-1.2.8.tar.gz
       :md5: 44d667c142d7cda120332623eab69f40
   configure_options: ['--static']
 lcms2:
-  version: 2.7
+  version: 2.8
   files:
-    - :url: http://download.sourceforge.net/lcms/lcms2-2.7.tar.gz
-      :sha256: 4524234ae7de185e6b6da5d31d6875085b2198bc63b1211f7dde6e2d197d6a53
+    - :url: http://downloads.sourceforge.net/project/lcms/lcms/2.8/lcms2-2.8.tar.gz
+      :sha256: 66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22
+  configure_options: ['--enable-static', '--disable-shared', '--without-jpeg', '--without-tiff']
 libpng:
-  version: 1.6.21
+  version: 1.6.26
   files:
-    - :url: http://download.sourceforge.net/libpng/libpng-1.6.21.tar.gz
-      :md5: aca36ec8e0a3b406a5912243bc243717
+    - :url: http://downloads.sourceforge.net/project/libpng/libpng16/1.6.26/libpng-1.6.26.tar.gz
+      :md5: 236cd975520fc1f34cc0b8f0e615f7a0
   patch_files:
     - 0001-Do-not-build-binary-utilities.patch
   configure_options: ['--enable-static', '--disable-shared', '--without-binconfigs', '--disable-unversioned-libpng-pc', '--disable-unversioned-libpng-config']
@@ -41,10 +42,10 @@ optipng:
   patch_files:
     - 0001-Allow-passing-LDFLAGS-as-configure-arg.patch
 pngquant:
-  version: 2.7.1
+  version: 2.8.0
   files:
-    - :url: https://github.com/pornel/pngquant/archive/2.7.1.tar.gz
-      :sha256: e8645bea07ef255c102f053d3566ac00e64005aa0e68a2c9f00bc39e575f1dfd
+    - :url: https://pngquant.org/pngquant-2.8.0-src.tar.gz
+      :sha1: f4428793dbc439a12bc67c7a585aa2fb9b86b349
   patch_files:
     - 0001-Work-around-mini-portile-s-configure-invocation.patch
     - 0002-Add-default-LDFLAGS.patch
@@ -54,10 +55,12 @@ pngquant:
     - 0007-Use-cc-instead-of-gcc-by-default.patch
   configure_options: ['--extra-ldflags=-lpng']
 advancecomp:
-  version: 1.20
+  version: 1.22
   files:
-    - :url: https://github.com/amadvance/advancecomp/releases/download/v1.20/advancecomp-1.20.tar.gz
-      :sha256: 590a447cfc7ab3a37ec707e13967a0046a81a888c561ebaff5415b1e946da67b
+    - :url: https://github.com/amadvance/advancecomp/releases/download/v1.22/advancecomp-1.22.tar.gz
+      :sha256: 31dec84049b919176d14070b8e6f97e086a0ddcd24ff1b83cf498245ece6607d
+  patch_files:
+    - 0001-Add-missing-libdeflate-header-file.patch
   configure_options: ['LDFLAGS=-static']
 gifsicle:
   version: 1.88
@@ -77,20 +80,20 @@ jhead:
     - 0004-Make-the-makefile-install-to-the-proper-location.patch
     - 0005-Produce-a-static-binary.patch
 pngcrush:
-  version: 1.8.1
+  version: 1.8.10
   files:
-    - :url: http://downloads.sourceforge.net/project/pmt/pngcrush/1.8.1/pngcrush-1.8.1.tar.gz
-      :sha256: ab299feb0dd77d2e84a043cf773302ad6323733d9b82e8ce76468dd024c0ad63
+    - :url: http://downloads.sourceforge.net/project/pmt/pngcrush/1.8.10/pngcrush-1.8.10.tar.gz
+      :sha256: ed8dc4759d5067ebf53a2a5188eff1e8ad10262737cf50516cccf8c60d220b6d
   patch_files:
     - 0001-Add-an-install-task.patch
     - 0002-Add-a-configure-script.patch
     - 0003-Use-cc-by-default-instead-of-gcc.patch
     - 0004-Produce-a-static-binary.patch
 jpegoptim:
-  version: 1.4.3
+  version: 1.4.4
   files:
-    - :url: http://www.kokkonen.net/tjko/src/jpegoptim-1.4.3.tar.gz
-      :sha256: 233d4ae09273cb977e162671f4767be7ef5d96e8c1888d3ed4aa70c4dac1a34c
+    - :url: http://www.kokkonen.net/tjko/src/jpegoptim-1.4.4.tar.gz
+      :sha256: 89a03ea2dfe9483dfb2e009a2851be0befb0deb7cb45c04550bcc91e1e88c1b2
   patch_files:
     - 0001-Link-lm-after-ljpeg.patch
   configure_options: ['LDFLAGS=-static']

data/lib/image_compressor_pack/version.rb

@@ -1,3 +1,3 @@
 module ImageCompressorPack
-  VERSION = "0.1.3"
+  VERSION = "1.0.0.1"
 end

data/ports/{x86_64-apple-darwin15.0.0/advancecomp/1.2 → x86_64-apple-darwin15.6.0/advancecomp/1.22}/share/man/man1/advdef.1

@@ -48,7 +48,7 @@ Set the compression level to \[dq]fast\[dq] using the zlib
 compressor.
 .TP
 .B \-2, \-\-shrink\-normal
-Set the compression level to \[dq]normal\[dq] using the 7z
+Set the compression level to \[dq]normal\[dq] using the libdeflate
 compressor.
 This is the default level of compression.
 .TP

data/ports/{x86_64-apple-darwin15.0.0/advancecomp/1.2 → x86_64-apple-darwin15.6.0/advancecomp/1.22}/share/man/man1/advmng.1

@@ -95,7 +95,7 @@ Set the compression level to \[dq]fast\[dq] using the zlib
 compressor.
 .TP
 .B \-2, \-\-shrink\-normal
-Set the compression level to \[dq]normal\[dq] using the 7z
+Set the compression level to \[dq]normal\[dq] using the libdeflate
 compressor.
 This is the default level of compression.
 .TP

data/ports/{x86_64-apple-darwin15.0.0/advancecomp/1.2 → x86_64-apple-darwin15.6.0/advancecomp/1.22}/share/man/man1/advpng.1

@@ -62,7 +62,7 @@ Set the compression level to \[dq]fast\[dq] using the zlib
 compressor.
 .TP
 .B \-2, \-\-shrink\-normal
-Set the compression level to \[dq]normal\[dq] using the 7z
+Set the compression level to \[dq]normal\[dq] using the libdeflate
 compressor.
 This is the default level of compression.
 .TP

data/ports/{x86_64-apple-darwin15.0.0/advancecomp/1.2 → x86_64-apple-darwin15.6.0/advancecomp/1.22}/share/man/man1/advzip.1

@@ -30,17 +30,17 @@ advzip [\-a, \-\-add] [\-x, \-\-extract] [\-l, \-\-list]
 The main purpose of this utility is to recompress and test
 the zip archives to get the smallest possible size.
 .PP
-For recompression the 7\-Zip (www.7\-zip.com) Deflate
-implementation is used. This implementation generally
-gives 5\-10% more compression than the zLib Deflate
-implementation.
+For recompression the libdeflate implementation is used.
+This implementation generally gives 5\-10% more compression
+than the zLib Deflate implementation, and it\'s also
+generally faster.
 .PP
 For experimental purpose also the 7\-Zip LZMA algorithm is
 available with the \-N option. In this case, the generated
 zips WILL NOT BE USABLE by any other program. To make
 them usable you need to recompress them without the \-N
 option. Generally this algorithm gives 10\-20% more
-compression than the 7\-Zip Deflate implementation.
+compression than the zLib Deflate implementation.
 .SH OPTIONS 
 .TP
 .B \-a, \-\-add ARCHIVE FILES...
@@ -88,7 +88,7 @@ Set the compression level to \[dq]fast\[dq] using the zlib
 compressor.
 .TP
 .B \-2, \-\-shrink\-normal
-Set the compression level to \[dq]normal\[dq] using the 7z
+Set the compression level to \[dq]normal\[dq] using the libdeflate
 compressor.
 This is the default level of compression.
 .TP

data/ports/{x86_64-apple-darwin15.0.0/jpegoptim/1.4.3 → x86_64-apple-darwin15.6.0/jpegoptim/1.4.4}/share/man/man1/jpegoptim.1

@@ -1,4 +1,4 @@
-.TH JPEGOPTIM 1 "28 Nov 2014" 
+.TH JPEGOPTIM 1 "15 Aug 2016" 
 .UC 4 
 .SH NAME 
 jpegoptim \- utility to optimize/compress JPEG/JFIF files.
@@ -170,7 +170,7 @@ jpeginfo(1)
 Timo Kokkonen <tjko@iki.fi>
 
 .SH COPYING
-Copyright (C) 1996-2015  Timo Kokkonen
+Copyright (C) 1996-2016  Timo Kokkonen
 
 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

data/ports/{x86_64-apple-darwin15.0.0/lcms2/2.7 → x86_64-apple-darwin15.6.0/lcms2/2.8}/include/lcms2.h

@@ -1,7 +1,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2014 Marti Maria Saguer
+//  Copyright (c) 1998-2016 Marti Maria Saguer
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the "Software"),
@@ -23,7 +23,7 @@
 //
 //---------------------------------------------------------------------------------
 //
-// Version 2.7
+// Version 2.8
 //
 
 #ifndef _lcms2_H
@@ -75,7 +75,7 @@ extern "C" {
 #endif
 
 // Version/release
-#define LCMS_VERSION        2070
+#define LCMS_VERSION        2080
 
 // I will give the chance of redefining basic types for compilers that are not fully C99 compliant
 #ifndef CMS_BASIC_TYPES_ALREADY_DEFINED
@@ -173,43 +173,44 @@ typedef int                  cmsBool;
 #  define CMS_IS_WINDOWS_ 1
 #endif
 
-// Try to detect big endian platforms. This list can be endless, so only some checks are performed over here.
-// you can pass this toggle to the compiler by using -DCMS_USE_BIG_ENDIAN or something similar
+// Try to detect big endian platforms. This list can be endless, so primarily rely on the configure script
+// on Unix-like systems, and allow it to be set on the compiler command line using
+// -DCMS_USE_BIG_ENDIAN or something similar
+#ifdef CMS_USE_BIG_ENDIAN // set at compiler command line takes overall precedence
 
-#if defined(__sgi__) || defined(__sgi) || defined(sparc)
-#   define CMS_USE_BIG_ENDIAN      1
-#endif
-
-#if defined(__s390__) || defined(__s390x__)
-#   define CMS_USE_BIG_ENDIAN   1
-#endif
-
-
-#if defined(__powerpc__) || defined(__ppc__) || defined(TARGET_CPU_PPC)
-#  if __powerpc__ || __ppc__ || TARGET_CPU_PPC
-#   define CMS_USE_BIG_ENDIAN   1
-#   if defined (__GNUC__) && defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__)
-#       if __BYTE_ORDER__  == __ORDER_LITTLE_ENDIAN__
-                // Don't use big endian for PowerPC little endian mode
-#                undef CMS_USE_BIG_ENDIAN
-#       endif
-#     endif
-#   endif
-#endif
+#  if CMS_USE_BIG_ENDIAN == 0
+#    undef CMS_USE_BIG_ENDIAN
+#  endif
 
-#ifdef macintosh
-# ifdef __BIG_ENDIAN__
-#   define CMS_USE_BIG_ENDIAN      1
-# endif
-# ifdef __LITTLE_ENDIAN__
-#   undef CMS_USE_BIG_ENDIAN
-# endif
-#endif
+#else // CMS_USE_BIG_ENDIAN
+
+#  ifdef WORDS_BIGENDIAN // set by configure (or explicitly on compiler command line)
+#    define CMS_USE_BIG_ENDIAN 1
+#  else // WORDS_BIGENDIAN
+// Fall back to platform/compiler specific tests
+#    if defined(__sgi__) || defined(__sgi) || defined(sparc)
+#      define CMS_USE_BIG_ENDIAN      1
+#    endif
+
+#    if defined(__s390__) || defined(__s390x__)
+#      define CMS_USE_BIG_ENDIAN   1
+#    endif
+
+#    ifdef macintosh
+#      ifdef __BIG_ENDIAN__
+#        define CMS_USE_BIG_ENDIAN      1
+#      endif
+#      ifdef __LITTLE_ENDIAN__
+#        undef CMS_USE_BIG_ENDIAN
+#      endif
+#    endif
+#  endif  // WORDS_BIGENDIAN
+
+#  if defined(_HOST_BIG_ENDIAN) || defined(__BIG_ENDIAN__)
+#    define CMS_USE_BIG_ENDIAN      1
+#  endif
 
-// WORDS_BIGENDIAN takes precedence
-#if defined(_HOST_BIG_ENDIAN) || defined(__BIG_ENDIAN__) || defined(WORDS_BIGENDIAN)
-#   define CMS_USE_BIG_ENDIAN      1
-#endif
+#endif  // CMS_USE_BIG_ENDIAN
 
 
 // Calling convention -- this is hardly platform and compiler dependent
@@ -219,7 +220,7 @@ typedef int                  cmsBool;
 #        define CMSEXPORT       __stdcall _export
 #        define CMSAPI
 #     else
-#        define CMSEXPORT      _stdcall
+#        define CMSEXPORT      __stdcall
 #        ifdef CMS_DLL_BUILD
 #            define CMSAPI    __declspec(dllexport)
 #        else
@@ -381,7 +382,8 @@ typedef enum {
     cmsSigViewingCondDescTag                = 0x76756564,  // 'vued'
     cmsSigViewingConditionsTag              = 0x76696577,  // 'view'
     cmsSigVcgtTag                           = 0x76636774,  // 'vcgt'
-    cmsSigMetaTag                           = 0x6D657461   // 'meta'
+    cmsSigMetaTag                           = 0x6D657461,  // 'meta'
+    cmsSigArgyllArtsTag                     = 0x61727473   // 'arts'
 
 } cmsTagSignature;
 
@@ -654,7 +656,7 @@ typedef void* cmsHTRANSFORM;
 //            T: Pixeltype
 //            F: Flavor  0=MinIsBlack(Chocolate) 1=MinIsWhite(Vanilla)
 //            P: Planar? 0=Chunky, 1=Planar
-//            X: swap 16 bps endianess?
+//            X: swap 16 bps endianness?
 //            S: Do swap? ie, BGR, KYMC
 //            E: Extra samples
 //            C: Channels (Samples per pixel)
@@ -897,7 +899,7 @@ typedef void* cmsHTRANSFORM;
 #define TYPE_ARGB_FLT         (FLOAT_SH(1)|COLORSPACE_SH(PT_RGB)|EXTRA_SH(1)|CHANNELS_SH(3)|BYTES_SH(4)|SWAPFIRST_SH(1))
 #define TYPE_BGR_FLT          (FLOAT_SH(1)|COLORSPACE_SH(PT_RGB)|CHANNELS_SH(3)|BYTES_SH(4)|DOSWAP_SH(1))
 #define TYPE_BGRA_FLT         (FLOAT_SH(1)|COLORSPACE_SH(PT_RGB)|EXTRA_SH(1)|CHANNELS_SH(3)|BYTES_SH(4)|DOSWAP_SH(1)|SWAPFIRST_SH(1))
-#define TYPE_ABGR_FLT         (FLOAT_SH(1)|COLORSPACE_SH(PT_RGB)|CHANNELS_SH(3)|BYTES_SH(4)|DOSWAP_SH(1))
+#define TYPE_ABGR_FLT         (FLOAT_SH(1)|COLORSPACE_SH(PT_RGB)|EXTRA_SH(1)|CHANNELS_SH(3)|BYTES_SH(4)|DOSWAP_SH(1))
 
 #define TYPE_CMYK_FLT         (FLOAT_SH(1)|COLORSPACE_SH(PT_CMYK)|CHANNELS_SH(4)|BYTES_SH(4))
 
@@ -1014,7 +1016,7 @@ CMSAPI long int          CMSEXPORT cmsfilelength(FILE* f);
 // Context handling --------------------------------------------------------------------------------------------------------
 
 // Each context holds its owns globals and its own plug-ins. There is a global context with the id = 0 for lecacy compatibility
-// though using the global context is not recomended. Proper context handling makes lcms more thread-safe.
+// though using the global context is not recommended. Proper context handling makes lcms more thread-safe.
 
 typedef struct _cmsContext_struct* cmsContext;
 
@@ -1383,7 +1385,7 @@ typedef struct {
 typedef struct {
 
     cmsUInt32Number n;
-    cmsContext     ContextID;
+    cmsContext      ContextID;
     cmsPSEQDESC*    seq;
 
 } cmsSEQ;
@@ -1650,6 +1652,8 @@ CMSAPI cmsUInt32Number  CMSEXPORT cmsGetSupportedIntentsTHR(cmsContext ContextID
 // Specific to unbounded mode
 #define cmsFLAGS_NONEGATIVES              0x8000    // Prevent negative numbers in floating point transforms
 
+// Copy alpha channels when transforming           
+#define cmsFLAGS_COPY_ALPHA               0x04000000 // Alpha channels are copied on cmsDoTransform()
 
 // Fine-tune control over number of gridpoints
 #define cmsFLAGS_GRIDPOINTS(n)           (((n) & 0xFF) << 16)
@@ -1728,12 +1732,22 @@ CMSAPI void             CMSEXPORT cmsDoTransform(cmsHTRANSFORM Transform,
                                                  void * OutputBuffer,
                                                  cmsUInt32Number Size);
 
-CMSAPI void             CMSEXPORT cmsDoTransformStride(cmsHTRANSFORM Transform,
+CMSAPI void             CMSEXPORT cmsDoTransformStride(cmsHTRANSFORM Transform,   // Deprecated
                                                  const void * InputBuffer,
                                                  void * OutputBuffer,
                                                  cmsUInt32Number Size,
                                                  cmsUInt32Number Stride);
 
+CMSAPI void             CMSEXPORT cmsDoTransformLineStride(cmsHTRANSFORM  Transform,
+                                                 const void* InputBuffer,
+                                                 void* OutputBuffer,
+                                                 cmsUInt32Number PixelsPerLine,
+                                                 cmsUInt32Number LineCount,
+                                                 cmsUInt32Number BytesPerLineIn,
+                                                 cmsUInt32Number BytesPerLineOut,
+                                                 cmsUInt32Number BytesPerPlaneIn,
+                                                 cmsUInt32Number BytesPerPlaneOut);
+
 
 CMSAPI void             CMSEXPORT cmsSetAlarmCodes(const cmsUInt16Number NewAlarm[cmsMAXCHANNELS]);
 CMSAPI void             CMSEXPORT cmsGetAlarmCodes(cmsUInt16Number NewAlarm[cmsMAXCHANNELS]);