Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libicns for openSUSE:Factory checked
in at 2021-01-25 18:25:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libicns (Old)
and /work/SRC/openSUSE:Factory/.libicns.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libicns"
Mon Jan 25 18:25:18 2021 rev:6 rq:866640 version:0.8.1+git20201014
Changes:
--------
--- /work/SRC/openSUSE:Factory/libicns/libicns.changes 2020-06-11
14:49:23.138218420 +0200
+++ /work/SRC/openSUSE:Factory/.libicns.new.28504/libicns.changes
2021-01-25 18:25:44.844614162 +0100
@@ -1,0 +2,9 @@
+Thu Jan 21 16:44:24 UTC 2021 - Luigi Baldoni <aloi...@gmx.com>
+
+- Update to version 0.8.1+git20201014
+ * Add support for 64px ARGB (icp6) icons
+ * Add support for 128px ARGB (ic07) icons
+ * Remove some warnings
+ * Code optimization
+
+-------------------------------------------------------------------
Old:
----
libicns-0.8.1+git20190323.tar.xz
New:
----
libicns-0.8.1+git20201014.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libicns.spec ++++++
--- /var/tmp/diff_new_pack.hopItP/_old 2021-01-25 18:25:45.436615023 +0100
+++ /var/tmp/diff_new_pack.hopItP/_new 2021-01-25 18:25:45.440615029 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libicns
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2011 Malcolm J Lewis <malcolmle...@opensuse.org>
#
# All modifications and additions to the file contributed by third parties
@@ -19,7 +19,7 @@
%define sover 1
Name: libicns
-Version: 0.8.1+git20190323
+Version: 0.8.1+git20201014
Release: 0
Summary: Application for manipulation of the Mac OS icns
License: LGPL-2.1-or-later AND LGPL-2.0-or-later AND GPL-2.0-or-later
++++++ libicns-0.8.1+git20190323.tar.xz -> libicns-0.8.1+git20201014.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libicns-0.8.1+git20190323/icnsutils/icnsutil.c
new/libicns-0.8.1+git20201014/icnsutils/icnsutil.c
--- old/libicns-0.8.1+git20190323/icnsutils/icnsutil.c 2019-03-23
07:19:59.000000000 +0100
+++ new/libicns-0.8.1+git20201014/icnsutils/icnsutil.c 2020-10-14
04:01:18.000000000 +0200
@@ -46,8 +46,10 @@
"/icon_16...@2x.png",
"/icon_32x32.png",
"/icon_32...@2x.png",
+ "/icon_64x64.png",
"/icon_128x128.png",
"/icon_128x...@2x.png",
+ "/icon_128x128.png",
"/icon_256x256.png",
"/icon_256x...@2x.png",
"/icon_512x512.png",
@@ -60,8 +62,10 @@
ICNS_16x16_2X_32BIT_ARGB_DATA,
ICNS_32x32_32BIT_DATA,
ICNS_32x32_2X_32BIT_ARGB_DATA,
+ ICNS_64x64_32BIT_ARGB_DATA,
ICNS_128X128_32BIT_DATA,
ICNS_128x128_2X_32BIT_ARGB_DATA,
+ ICNS_128x128_32BIT_ARGB_DATA,
ICNS_256x256_32BIT_ARGB_DATA,
ICNS_256x256_2X_32BIT_ARGB_DATA,
ICNS_512x512_32BIT_ARGB_DATA,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libicns-0.8.1+git20190323/icnsutils/png2icns.c
new/libicns-0.8.1+git20201014/icnsutils/png2icns.c
--- old/libicns-0.8.1+git20190323/icnsutils/png2icns.c 2019-03-23
07:19:59.000000000 +0100
+++ new/libicns-0.8.1+git20201014/icnsutils/png2icns.c 2020-10-14
04:01:18.000000000 +0200
@@ -138,6 +138,8 @@
*height = h;
*bpp = bit_depth * 4;
+ png_set_interlace_handling(png_ptr);
+
png_read_update_info(png_ptr, info);
rowsize = png_get_rowbytes(png_ptr, info);
@@ -246,8 +248,11 @@
icns_set_print_errors(1);
- if( (iconType != ICNS_1024x1024_32BIT_ARGB_DATA) && (iconType !=
ICNS_512x512_32BIT_ARGB_DATA) && (iconType != ICNS_256x256_32BIT_ARGB_DATA) )
- {
+ if( (iconType != ICNS_1024x1024_32BIT_ARGB_DATA)
+ && (iconType != ICNS_512x512_32BIT_ARGB_DATA)
+ && (iconType != ICNS_256x256_32BIT_ARGB_DATA)
+ && (iconType != ICNS_128x128_32BIT_ARGB_DATA)
+ ) {
printf("Using icns type '%s', mask '%s' for '%s'\n", iconStr,
maskStr, pngname);
}
else
@@ -266,8 +271,11 @@
free(iconElement);
}
- if( (iconType != ICNS_1024x1024_32BIT_ARGB_DATA) && (iconType !=
ICNS_512x512_32BIT_ARGB_DATA) && (iconType != ICNS_256x256_32BIT_ARGB_DATA) )
- {
+ if( (iconType != ICNS_1024x1024_32BIT_ARGB_DATA)
+ && (iconType != ICNS_512x512_32BIT_ARGB_DATA)
+ && (iconType != ICNS_256x256_32BIT_ARGB_DATA)
+ && (iconType != ICNS_128x128_32BIT_ARGB_DATA)
+ ) {
icns_init_image_for_type(maskType, &icnsMask);
iconDataOffset = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libicns-0.8.1+git20190323/src/icns.h
new/libicns-0.8.1+git20201014/src/icns.h
--- old/libicns-0.8.1+git20190323/src/icns.h 2019-03-23 07:19:59.000000000
+0100
+++ new/libicns-0.8.1+git20201014/src/icns.h 2020-10-14 04:01:18.000000000
+0200
@@ -100,6 +100,8 @@
#define ICNS_512x512_32BIT_ARGB_DATA 0x69633039 // "ic09"
#define ICNS_256x256_32BIT_ARGB_DATA 0x69633038 // "ic08"
+#define ICNS_128x128_32BIT_ARGB_DATA 0x69633037 // "ic07"
+#define ICNS_64x64_32BIT_ARGB_DATA 0x69637036 // "icp6"
#define ICNS_128X128_32BIT_DATA 0x69743332 // "it32"
#define ICNS_128X128_8BIT_MASK 0x74386D6B // "t8mk"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libicns-0.8.1+git20190323/src/icns_element.c
new/libicns-0.8.1+git20201014/src/icns_element.c
--- old/libicns-0.8.1+git20190323/src/icns_element.c 2019-03-23
07:19:59.000000000 +0100
+++ new/libicns-0.8.1+git20201014/src/icns_element.c 2020-10-14
04:01:18.000000000 +0200
@@ -568,7 +568,9 @@
case ICNS_128x128_2X_32BIT_ARGB_DATA:
case ICNS_32x32_2X_32BIT_ARGB_DATA:
case ICNS_16x16_2X_32BIT_ARGB_DATA:
+ case ICNS_64x64_32BIT_ARGB_DATA:
//case ICNS_1024x1024_32BIT_ARGB_DATA:
+ case ICNS_128x128_32BIT_ARGB_DATA:
case ICNS_256x256_32BIT_ARGB_DATA:
case ICNS_512x512_32BIT_ARGB_DATA:
error = icns_image_to_png(imageIn,&newDataSize,&newDataPtr);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libicns-0.8.1+git20190323/src/icns_image.c
new/libicns-0.8.1+git20201014/src/icns_image.c
--- old/libicns-0.8.1+git20190323/src/icns_image.c 2019-03-23
07:19:59.000000000 +0100
+++ new/libicns-0.8.1+git20201014/src/icns_image.c 2020-10-14
04:01:18.000000000 +0200
@@ -100,11 +100,13 @@
// We used the jp2/png processor for these two, so we're done!
if(
+ (iconType == ICNS_128x128_32BIT_ARGB_DATA) ||
(iconType == ICNS_256x256_32BIT_ARGB_DATA) ||
(iconType == ICNS_512x512_32BIT_ARGB_DATA) ||
(iconType == ICNS_1024x1024_32BIT_ARGB_DATA) ||
(iconType == ICNS_16x16_2X_32BIT_ARGB_DATA) ||
(iconType == ICNS_32x32_2X_32BIT_ARGB_DATA) ||
+ (iconType == ICNS_64x64_32BIT_ARGB_DATA) ||
(iconType == ICNS_128x128_2X_32BIT_ARGB_DATA) ||
(iconType == ICNS_256x256_2X_32BIT_ARGB_DATA) ||
(iconType == ICNS_512x512_2X_32BIT_ARGB_DATA)
@@ -126,7 +128,7 @@
}
#endif
- if( (maskType == ICNS_NULL_DATA) )
+ if (maskType == ICNS_NULL_DATA)
{
char typeStr[5];
icns_print_err("icns_get_image32_with_mask_from_family: Can't
find mask for type '%s'\n",icns_type_str(iconType,typeStr));
@@ -430,6 +432,8 @@
case ICNS_16x16_2X_32BIT_ARGB_DATA:
case ICNS_512x512_32BIT_ARGB_DATA:
case ICNS_256x256_32BIT_ARGB_DATA:
+ case ICNS_128x128_32BIT_ARGB_DATA:
+ case ICNS_64x64_32BIT_ARGB_DATA:
{
uint8_t magicPNG[] =
{0x89,0x50,0x4E,0x47,0x0D,0x0A,0x1A,0x0A};
uint8_t magicByt[] =
{0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libicns-0.8.1+git20190323/src/icns_utils.c
new/libicns-0.8.1+git20201014/src/icns_utils.c
--- old/libicns-0.8.1+git20190323/src/icns_utils.c 2019-03-23
07:19:59.000000000 +0100
+++ new/libicns-0.8.1+git20201014/src/icns_utils.c 2020-10-14
04:01:18.000000000 +0200
@@ -50,8 +50,10 @@
return 27;
case ICNS_256x256_2X_32BIT_ARGB_DATA:
return 26;
+ case ICNS_128x128_32BIT_ARGB_DATA:
case ICNS_128x128_2X_32BIT_ARGB_DATA:
return 25;
+ case ICNS_64x64_32BIT_ARGB_DATA:
case ICNS_32x32_2X_32BIT_ARGB_DATA:
return 24;
case ICNS_16x16_2X_32BIT_ARGB_DATA:
@@ -137,6 +139,10 @@
return ICNS_NULL_MASK;
case ICNS_256x256_32BIT_ARGB_DATA:
return ICNS_NULL_MASK;
+ case ICNS_128x128_32BIT_ARGB_DATA:
+ return ICNS_NULL_MASK;
+ case ICNS_64x64_32BIT_ARGB_DATA:
+ return ICNS_NULL_MASK;
// 32-bit image types - 8-bit mask type
case ICNS_128X128_32BIT_DATA:
@@ -294,6 +300,24 @@
iconInfo.iconPixelDepth = 8;
iconInfo.iconBitDepth = 32;
break;
+ case ICNS_128x128_32BIT_ARGB_DATA:
+ iconInfo.isImage = 1;
+ iconInfo.isMask = 0;
+ iconInfo.iconWidth = 128;
+ iconInfo.iconHeight = 128;
+ iconInfo.iconChannels = 4;
+ iconInfo.iconPixelDepth = 8;
+ iconInfo.iconBitDepth = 32;
+ break;
+ case ICNS_64x64_32BIT_ARGB_DATA:
+ iconInfo.isImage = 1;
+ iconInfo.isMask = 0;
+ iconInfo.iconWidth = 64;
+ iconInfo.iconHeight = 64;
+ iconInfo.iconChannels = 4;
+ iconInfo.iconPixelDepth = 8;
+ iconInfo.iconBitDepth = 32;
+ break;
case ICNS_128X128_32BIT_DATA:
iconInfo.isImage = 1;
iconInfo.isMask = 0;
@@ -669,11 +693,11 @@
if(iconInfo.iconBitDepth == 32)
return ICNS_32x32_2X_32BIT_ARGB_DATA;
else
- return ICNS_NULL_TYPE;
+ return ICNS_64x64_32BIT_ARGB_DATA;
break;
case 128:
if(iconInfo.isImage == 1 || iconInfo.iconBitDepth == 32)
- return ICNS_128X128_32BIT_DATA;
+ return ICNS_128x128_32BIT_ARGB_DATA;
if(iconInfo.isMask == 1 || iconInfo.iconBitDepth == 8)
return ICNS_128X128_8BIT_MASK;
break;
