Update to 0.1.60

Changelog:
2018-10-05 babl-0.1.60                                              </dt><dd>
Improved thread safety, acceleration for R'G'B'A u8 -> cairo-ARGB32 conversion.
                                                                    </dd><dt>
2018-10-05 babl-0.1.58                                              </dt><dd>
Preserve color of transparent pixels in conversion to premultiplied alpha,
Added single precision code-paths for faster fallback/reference conversions.
New BABL_ICC_INTENT_PERFORMANCE bitflag for combining with intent as bitflags,
use of matrix+trc when relative colorimetric CLUT is present. New color model
and formats, CIE xyY.

3 files changed, 40 insertions, 40 deletions

diff --git a/graphics/babl/Makefile b/graphics/babl/Makefile
index 8be9215aa03..c1942396ce3 100644
--- a/graphics/babl/Makefile
+++ b/graphics/babl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2018/08/28 13:31:48 ryoon Exp $
+# $NetBSD: Makefile,v 1.22 2018/11/22 12:59:07 ryoon Exp $
 
-DISTNAME=	babl-0.1.56
+DISTNAME=	babl-0.1.60
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.gimp.org/pub/babl/0.1/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/babl/distinfo b/graphics/babl/distinfo
index 166bf4a9f69..e29883620a9 100644
--- a/graphics/babl/distinfo
+++ b/graphics/babl/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.19 2018/08/28 13:31:48 ryoon Exp $
+$NetBSD: distinfo,v 1.20 2018/11/22 12:59:07 ryoon Exp $
 
-SHA1 (babl-0.1.56.tar.bz2) = 3acc4fac2d9bcad989fd71a73e9ab9d2fdeb7084
-RMD160 (babl-0.1.56.tar.bz2) = 1a87b265df5e552e9e59b818e9d5364643044934
-SHA512 (babl-0.1.56.tar.bz2) = e3d6192126df136537ce13b2858a7ec078251093762052bb3edd826a26ab36fee73375ee854bdf423f22fc30f23bcafb3ae46e986ed6555f3ef0809b12c612ba
-Size (babl-0.1.56.tar.bz2) = 673080 bytes
-SHA1 (patch-extensions_gggl.c) = 308fa13ab4dfc3f259f1c220d9619d24e8459716
+SHA1 (babl-0.1.60.tar.bz2) = 3582b064d9c605d669ea74df2bc7437d9f322b40
+RMD160 (babl-0.1.60.tar.bz2) = 599e621a0f7458257eed64de9daac78834f67601
+SHA512 (babl-0.1.60.tar.bz2) = a65533b4527c4334c7ab14fb16be41e3e2e93f51bbeb24dd427fa9263e25fa8ad83337b73a805bebc2414fb57bccceaa681f89ce5c5187bd0a03703bf07cccc2
+Size (babl-0.1.60.tar.bz2) = 685707 bytes
+SHA1 (patch-extensions_gggl.c) = fd0c5258436ebacfc0e866a236fb863b0dfd9bc0
diff --git a/graphics/babl/patches/patch-extensions_gggl.c b/graphics/babl/patches/patch-extensions_gggl.c
index f1a0a6575ac..30bed8f3ad4 100644
--- a/graphics/babl/patches/patch-extensions_gggl.c
+++ b/graphics/babl/patches/patch-extensions_gggl.c
@@ -1,12 +1,12 @@
-$NetBSD: patch-extensions_gggl.c,v 1.1 2018/05/01 20:26:38 martin Exp $
+$NetBSD: patch-extensions_gggl.c,v 1.2 2018/11/22 12:59:07 ryoon Exp $
 
 Patch also submitted upstream:
 	https://bugzilla.gnome.org/show_bug.cgi?id=795726
 
 Fixes crashes on alignment critical architectures.
 
---- extensions/gggl.c.orig	2018-04-07 16:38:23.000000000 +0200
-+++ extensions/gggl.c	2018-05-01 22:09:47.319795395 +0200
+--- extensions/gggl.c.orig	2018-10-22 16:57:44.000000000 +0000
++++ extensions/gggl.c
 @@ -56,12 +56,15 @@ conv_F_8 (const Babl *conversion,unsigne
  
    while (n--)
@@ -127,28 +127,28 @@ Fixes crashes on alignment critical architectures.
        dst           += 4;
        src           += 8;
      }
-@@ -178,7 +202,9 @@ conv_16_8 (const Babl *conversion,unsign
+@@ -189,7 +213,9 @@ conv_16_8 (const Babl *conversion,unsign
+ 
    while (n--)
      {
- #define div_257(a) ((((a)+128)-(((a)+128)>>8))>>8)
 -      (*(unsigned char *) dst) = div_257 (*(unsigned short *) src);
 +      unsigned short sv;
 +      memcpy(&sv, src, sizeof(sv));
 +      *dst = div_257 (sv);
-       dst                     += 1;
-       src                     += 2;
+       dst += 1;
+       src += 2;
      }
-@@ -191,7 +217,8 @@ conv_8_16 (const Babl *conversion,unsign
- 
+@@ -201,7 +227,8 @@ conv_8_16 (const Babl *conversion,unsign
+   long n = samples;
    while (n--)
      {
--      (*(unsigned short *) dst) = ((*(unsigned char *) src) << 8) | *src;
+-      (*(unsigned short *) dst) = *src << 8 | *src;
 +      unsigned short dv = (*src << 8) | *src;
 +      memcpy(dst, &dv, sizeof(dv));
-       dst                      += 2;
-       src                      += 1;
+       dst += 2;
+       src += 1;
      }
-@@ -353,12 +380,14 @@ conv_gaF_gAF (const Babl *conversion,uns
+@@ -363,12 +390,14 @@ conv_gaF_gAF (const Babl *conversion,uns
  
    while (n--)
      {
@@ -167,7 +167,7 @@ Fixes crashes on alignment critical architectures.
        dst           += 4;
        src           += 4;
      }
-@@ -371,15 +400,19 @@ conv_gAF_gaF (const Babl *conversion,uns
+@@ -381,15 +410,19 @@ conv_gAF_gaF (const Babl *conversion,uns
  
    while (n--)
      {
@@ -192,7 +192,7 @@ Fixes crashes on alignment critical architectures.
        dst           += 4;
        src           += 4;
      }
-@@ -394,16 +427,9 @@ conv_rgbaF_rgbF (const Babl *conversion,
+@@ -404,16 +437,9 @@ conv_rgbaF_rgbF (const Babl *conversion,
  
    while (n--)
      {
@@ -212,7 +212,7 @@ Fixes crashes on alignment critical architectures.
      }
  }
  
-@@ -411,15 +437,12 @@ static void
+@@ -421,15 +447,12 @@ static void
  conv_rgbF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
  {
    long n = samples;
@@ -231,7 +231,7 @@ Fixes crashes on alignment critical architectures.
      }
  }
  
-@@ -433,7 +456,7 @@ conv_gaF_gF (const Babl *conversion,unsi
+@@ -443,7 +466,7 @@ conv_gaF_gF (const Babl *conversion,unsi
  
    while (n--)
      {
@@ -240,7 +240,7 @@ Fixes crashes on alignment critical architectures.
        dst         += 4;
        src         += 4;
        src         += 4;
-@@ -444,13 +467,14 @@ static void
+@@ -454,13 +477,14 @@ static void
  conv_gF_gaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
  {
    long n = samples;
@@ -257,7 +257,7 @@ Fixes crashes on alignment critical architectures.
        dst           += 4;
      }
  }
-@@ -472,7 +496,7 @@ conv_gF_rgbF (const Babl *conversion,uns
+@@ -482,7 +506,7 @@ conv_gF_rgbF (const Babl *conversion,uns
  
        for (c = 0; c < 3; c++)
          {
@@ -266,7 +266,7 @@ Fixes crashes on alignment critical architectures.
            dst             += 4;
          }
        src += 4;
-@@ -521,11 +545,11 @@ conv_gaF_rgbaF (const Babl *conversion,u
+@@ -531,11 +555,11 @@ conv_gaF_rgbaF (const Babl *conversion,u
  
        for (c = 0; c < 3; c++)
          {
@@ -280,7 +280,7 @@ Fixes crashes on alignment critical architectures.
        dst           += 4;
        src           += 4;
      }
-@@ -543,16 +567,20 @@ conv_rgbaF_rgbA8 (const Babl *conversion
+@@ -553,16 +577,20 @@ conv_rgbaF_rgbA8 (const Babl *conversion
  
    while (n--)
      {
@@ -304,7 +304,7 @@ Fixes crashes on alignment critical architectures.
        dst++;
        src += 4;
      }
-@@ -569,12 +597,17 @@ conv_rgbaF_rgb16 (const Babl *conversion
+@@ -579,12 +607,17 @@ conv_rgbaF_rgb16 (const Babl *conversion
  
        for (c = 0; c < 3; c++)
          {
@@ -327,7 +327,7 @@ Fixes crashes on alignment critical architectures.
            dst                    += 2;
            src                    += 4;
          }
-@@ -589,10 +622,14 @@ conv_rgbA16_rgbaF (const Babl *conversio
+@@ -599,10 +632,14 @@ conv_rgbA16_rgbaF (const Babl *conversio
  
    while (n--)
      {
@@ -343,7 +343,7 @@ Fixes crashes on alignment critical architectures.
        if (alpha == 0.0f)
          recip_alpha = 10000.0;
        else
-@@ -600,11 +637,15 @@ conv_rgbA16_rgbaF (const Babl *conversio
+@@ -610,11 +647,15 @@ conv_rgbA16_rgbaF (const Babl *conversio
  
        for (c = 0; c < 3; c++)
          {
@@ -361,7 +361,7 @@ Fixes crashes on alignment critical architectures.
        dst           += 4;
        src           += 2;
      }
-@@ -614,16 +655,13 @@ static void
+@@ -624,16 +665,13 @@ static void
  conv_gF_rgbaF (const Babl *conversion,unsigned char *src, unsigned char *dst, long samples)
  {
    long n = samples;
@@ -382,7 +382,7 @@ Fixes crashes on alignment critical architectures.
        dst           += 4;
        src           += 4;
      }
-@@ -638,15 +676,18 @@ conv_gF_rgbaF (const Babl *conversion,un
+@@ -648,15 +686,18 @@ conv_gF_rgbaF (const Babl *conversion,un
                   int samples)
     {
      long n=samples;
@@ -403,7 +403,7 @@ Fixes crashes on alignment critical architectures.
          dst += 4;
      }
     }
-@@ -657,15 +698,18 @@ conv_gF_rgbaF (const Babl *conversion,un
+@@ -667,15 +708,18 @@ conv_gF_rgbaF (const Babl *conversion,un
                 int samples)
     {
      long n=samples;
@@ -424,7 +424,7 @@ Fixes crashes on alignment critical architectures.
          dst += 4;
      }
     }
-@@ -676,15 +720,21 @@ conv_gF_rgbaF (const Babl *conversion,un
+@@ -686,15 +730,21 @@ conv_gF_rgbaF (const Babl *conversion,un
                    int samples)
     {
      long n=samples;
@@ -448,7 +448,7 @@ Fixes crashes on alignment critical architectures.
          src += 2;
          dst += 4;
      }
-@@ -696,14 +746,12 @@ conv_gF_rgbaF (const Babl *conversion,un
+@@ -706,14 +756,12 @@ conv_gF_rgbaF (const Babl *conversion,un
                 int samples)
     {
      long n=samples;
@@ -468,7 +468,7 @@ Fixes crashes on alignment critical architectures.
          dst += 4;
          src += 4;
  
-@@ -719,11 +767,12 @@ conv_rgba8_rgbA8 (const Babl *conversion
+@@ -729,11 +777,12 @@ conv_rgba8_rgbA8 (const Babl *conversion
      {
        if (src[3] == 255)
          {
@@ -483,7 +483,7 @@ Fixes crashes on alignment critical architectures.
          }
        else
          {
-@@ -747,12 +796,13 @@ conv_rgbA8_rgba8 (const Babl *conversion
+@@ -757,12 +806,13 @@ conv_rgbA8_rgba8 (const Babl *conversion
      {
        if (src[3] == 255)
          {
@@ -499,7 +499,7 @@ Fixes crashes on alignment critical architectures.
            dst                  += 4;
          }
        else
-@@ -773,7 +823,10 @@ conv_rgb8_rgba8 (const Babl *conversion,
+@@ -786,7 +836,10 @@ conv_rgb8_rgba8 (const Babl *conversion,
    long n = samples-1;
    while (n--)
      {