Hello community, here is the log from the commit of package gimp-dds for openSUSE:Factory checked in at 2012-11-02 17:32:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gimp-dds (Old) and /work/SRC/openSUSE:Factory/.gimp-dds.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gimp-dds", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gimp-dds/gimp-dds.changes 2012-08-04 09:12:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gimp-dds.new/gimp-dds.changes 2012-11-02 17:32:38.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Aug 15 16:55:17 UTC 2012 - [email protected] + +- Updated to version 2.2.1: + + Bugfix release. Fixes artifacts introduced by the compression + code in some images. +- Updates from version 2.2.0: + + Compressed non-power-of-2 texture support. + + Fix compressed mipmap images with width or height less than 4. +- Export CFLAGS in order to have a fully optimized build. Note: + as the Makefile does not support extending CFLAGS, we need to add + the content of the original variable as well, and invoke make -e. + +------------------------------------------------------------------- Old: ---- gimp-dds-2.1.0.tar.bz2 New: ---- gimp-dds-2.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gimp-dds.spec ++++++ --- /var/tmp/diff_new_pack.mZrdHX/_old 2012-11-02 17:32:39.000000000 +0100 +++ /var/tmp/diff_new_pack.mZrdHX/_new 2012-11-02 17:32:39.000000000 +0100 @@ -18,7 +18,7 @@ Name: gimp-dds -Version: 2.1.0 +Version: 2.2.1 Release: 0 Summary: Plugin for GIMP providing support for the DDS format License: GPL-2.0+ @@ -58,10 +58,12 @@ + Saving volume map images %prep -%setup +%setup -q %build -make %{?_smp_mflags} +# As we currently need to override CFLAGS, we also need to inject gtk2 and gimp cflags. +export CFLAGS="%{optflags} $(pkg-config --cflags gtk+-2.0 gimp-2.0)" +make %{?_smp_mflags} -e %install install -D -m 0755 dds %{buildroot}%{_libdir}/gimp/2.0/plug-ins/dds ++++++ gimp-dds-2.1.0.tar.bz2 -> gimp-dds-2.2.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/LICENSE new/gimp-dds-2.2.1/LICENSE --- old/gimp-dds-2.1.0/LICENSE 2012-05-04 04:09:52.000000000 +0200 +++ new/gimp-dds-2.2.1/LICENSE 2012-07-26 10:49:50.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2008 Shawn Kirst <[email protected]>, + Copyright (C) 2004 Shawn Kirst <[email protected]>, with parts (C) 2003 Arne Reuter <[email protected]> where specified. This program is free software; you can redistribute it and/or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/Makefile.mingw32 new/gimp-dds-2.2.1/Makefile.mingw32 --- old/gimp-dds-2.1.0/Makefile.mingw32 2012-06-23 15:57:54.000000000 +0200 +++ new/gimp-dds-2.2.1/Makefile.mingw32 2012-08-01 00:22:41.000000000 +0200 @@ -1,5 +1,5 @@ -GIMPTOOL=/usr/i686-w64-mingw32/sys-root/mingw/bin/gimptool-2.0 +GIMPTOOL=/usr/i686-w64-mingw32/sys-root/mingw/bin/gimptool-2.0.exe CC=i686-w64-mingw32-gcc CFLAGS=-pipe -g -O2 -Wall $(shell i686-w64-mingw32-pkg-config --cflags gtk+-2.0 gimp-2.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/Makefile.mingw64 new/gimp-dds-2.2.1/Makefile.mingw64 --- old/gimp-dds-2.1.0/Makefile.mingw64 2012-06-23 15:58:02.000000000 +0200 +++ new/gimp-dds-2.2.1/Makefile.mingw64 2012-08-01 00:22:37.000000000 +0200 @@ -1,5 +1,5 @@ -GIMPTOOL=/usr/x86_64-w64-mingw32/sys-root/mingw/bin/gimptool-2.0 +GIMPTOOL=wine64 /usr/x86_64-w64-mingw32/sys-root/mingw/bin/gimptool-2.0.exe CC=x86_64-w64-mingw32-gcc CFLAGS=-pipe -g -O2 -Wall $(shell x86_64-w64-mingw32-pkg-config --cflags gtk+-2.0 gimp-2.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/color.c new/gimp-dds-2.2.1/color.c --- old/gimp-dds-2.1.0/color.c 2010-04-23 09:57:01.000000000 +0200 +++ new/gimp-dds-2.2.1/color.c 2012-07-26 10:50:50.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <[email protected]>, + Copyright (C) 2004 Shawn Kirst <[email protected]>, with parts (C) 2003 Arne Reuter <[email protected]> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #include <math.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/color.h new/gimp-dds-2.2.1/color.h --- old/gimp-dds-2.1.0/color.h 2010-05-13 10:30:35.000000000 +0200 +++ new/gimp-dds-2.2.1/color.h 2012-07-26 10:50:58.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <[email protected]>, + Copyright (C) 2004 Shawn Kirst <[email protected]>, with parts (C) 2003 Arne Reuter <[email protected]> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #ifndef COLOR_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/dds.c new/gimp-dds-2.2.1/dds.c --- old/gimp-dds-2.1.0/dds.c 2010-04-24 02:44:35.000000000 +0200 +++ new/gimp-dds-2.2.1/dds.c 2012-07-26 10:51:09.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <[email protected]>, + Copyright (C) 2004 Shawn Kirst <[email protected]>, with parts (C) 2003 Arne Reuter <[email protected]> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/dds.h new/gimp-dds-2.2.1/dds.h --- old/gimp-dds-2.1.0/dds.h 2011-08-08 17:24:37.000000000 +0200 +++ new/gimp-dds-2.2.1/dds.h 2012-07-26 10:51:20.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <[email protected]>, + Copyright (C) 2004 Shawn Kirst <[email protected]>, with parts (C) 2003 Arne Reuter <[email protected]> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #ifndef DDS_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/ddsplugin.h new/gimp-dds-2.2.1/ddsplugin.h --- old/gimp-dds-2.1.0/ddsplugin.h 2010-04-23 09:57:01.000000000 +0200 +++ new/gimp-dds-2.2.1/ddsplugin.h 2012-08-01 00:34:35.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <[email protected]>, + Copyright (C) 2004 Shawn Kirst <[email protected]>, with parts (C) 2003 Arne Reuter <[email protected]> where specified. This program is free software; you can redistribute it and/or @@ -16,16 +16,16 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #ifndef __DDSPLUGIN_H #define __DDSPLUGIN_H #define DDS_PLUGIN_VERSION_MAJOR 2 -#define DDS_PLUGIN_VERSION_MINOR 0 -#define DDS_PLUGIN_VERSION_REVISION 10 +#define DDS_PLUGIN_VERSION_MINOR 2 +#define DDS_PLUGIN_VERSION_REVISION 1 #define DDS_PLUGIN_VERSION \ ((unsigned int)(DDS_PLUGIN_VERSION_MAJOR << 16) | \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/ddsread.c new/gimp-dds-2.2.1/ddsread.c --- old/gimp-dds-2.1.0/ddsread.c 2012-05-04 03:56:39.000000000 +0200 +++ new/gimp-dds-2.2.1/ddsread.c 2012-07-26 10:53:51.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <[email protected]>, + Copyright (C) 2004 Shawn Kirst <[email protected]>, with parts (C) 2003 Arne Reuter <[email protected]> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ /* @@ -598,16 +598,8 @@ unsigned int size = hdr->pitch_or_linsize >> (2 * level); int format = DDS_COMPRESS_NONE; - if(hdr->pixelfmt.flags & DDPF_FOURCC) - { - width = MAX(width, 4); - height = MAX(height, 4); - } - else - { - if(width < 1) width = 1; - if(height < 1) height = 1; - } + if(width < 1) width = 1; + if(height < 1) height = 1; switch(d->bpp) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/ddswrite.c new/gimp-dds-2.2.1/ddswrite.c --- old/gimp-dds-2.1.0/ddswrite.c 2012-05-04 03:39:49.000000000 +0200 +++ new/gimp-dds-2.2.1/ddswrite.c 2012-07-26 10:53:39.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <[email protected]>, + Copyright (C) 2004 Shawn Kirst <[email protected]>, with parts (C) 2003 Arne Reuter <[email protected]> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #include <stdio.h> @@ -732,7 +732,8 @@ { GimpDrawable *drawable; GimpPixelRgn rgn; - GimpImageType basetype, type; + GimpImageBaseType basetype; + GimpImageType type; unsigned char *src, *dst, *fmtdst, *tmp; unsigned char *palette = NULL; int i, c, x, y, size, fmtsize, offset, colors; @@ -977,7 +978,7 @@ unsigned char *palette = 0; GimpDrawable *drawable; GimpPixelRgn rgn; - GimpImageType type; + GimpImageBaseType type; type = gimp_image_base_type(image_id); @@ -1064,7 +1065,8 @@ static int write_image(FILE *fp, gint32 image_id, gint32 drawable_id) { GimpDrawable *drawable; - GimpImageType drawable_type, basetype; + GimpImageType drawable_type; + GimpImageBaseType basetype; GimpPixelRgn rgn; int i, w, h, bpp = 0, fmtbpp = 0, has_alpha = 0; int num_mipmaps; @@ -1088,23 +1090,6 @@ drawable_type = gimp_drawable_type(drawable_id); gimp_pixel_rgn_init(&rgn, drawable, 0, 0, w, h, 0, 0); - if((dds_write_vals.compression != DDS_COMPRESS_NONE) && - !(IS_MUL4(w) && IS_MUL4(h))) - { - dds_write_vals.compression = DDS_COMPRESS_NONE; - g_message("DDS: Cannot compress images whose dimensions are not multiples of 4.\n" - "Saved image will not be compressed."); - } - - if((dds_write_vals.compression != DDS_COMPRESS_NONE) && - dds_write_vals.mipmaps && - !(IS_POW2(w) && IS_POW2(h))) - { - dds_write_vals.mipmaps = 0; - g_message("DDS: Cannot generate mipmaps for compressed images whose dimensions are not powers of 2.\n" - "Saved image will not have mipmaps generated."); - } - switch(drawable_type) { case GIMP_RGB_IMAGE: bpp = 3; break; @@ -1629,7 +1614,7 @@ GtkWidget *check; GtkWidget *spin; GtkWidget *expander; - GimpImageType basetype; + GimpImageBaseType basetype; if(is_cubemap) dds_write_vals.savetype = DDS_SAVE_CUBEMAP; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/dxt.c new/gimp-dds-2.2.1/dxt.c --- old/gimp-dds-2.1.0/dxt.c 2012-05-04 03:37:58.000000000 +0200 +++ new/gimp-dds-2.2.1/dxt.c 2012-07-31 07:27:42.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <[email protected]>, + Copyright (C) 2004 Shawn Kirst <[email protected]>, with parts (C) 2003 Arne Reuter <[email protected]> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ /* @@ -41,6 +41,8 @@ #include "dxt_tables.h" +#define SWAP(a, b) do { typeof(a) t; t = a; a = b; b = t; } while(0) + /* extract 4x4 BGRA block */ static void extract_block(const unsigned char *src, int x, int y, int w, int h, unsigned char *block) @@ -99,22 +101,21 @@ /* linear interpolation at 1/3 point between a and b */ static void lerp_rgb13(unsigned char *dst, unsigned char *a, unsigned char *b) { +#if 0 dst[0] = blerp(a[0], b[0], 0x55); dst[1] = blerp(a[1], b[1], 0x55); dst[2] = blerp(a[2], b[2], 0x55); - +#else /* * according to the S3TC/DX10 specs, this is the correct way to do the * interpolation (with no rounding bias) * * dst = (2 * a + b) / 3; - * - * TODO: Find a smart way to handle this. Straight-forward for the compressor - * (advanced option in the save dialog to disable the rounding bias used - * in the above code), but more tricky to handle with the decompressor - * from a user's standpoint (if we are decompressing an image that was - * not compressed with this plugin, which option do you choose?). */ + dst[0] = (2 * a[0] + b[0]) / 3; + dst[1] = (2 * a[1] + b[1]) / 3; + dst[2] = (2 * a[2] + b[2]) / 3; +#endif } static int color_distance(const unsigned char *c0, @@ -655,14 +656,8 @@ x1 = cmin[0]; y1 = cmin[1]; - if(covariance[0] < 0) - { - x0 ^= x1; x1 ^= x0; x0 ^= x1; - } - if(covariance[1] < 0) - { - y0 ^= y1; y1 ^= y0; y0 ^= y1; - } + if(covariance[0] < 0) SWAP(x0, x1); + if(covariance[1] < 0) SWAP(y0, y1); cmax[0] = MAX(0, MIN(255, x0)); cmax[1] = MAX(0, MIN(255, y0)); @@ -870,9 +865,7 @@ min16 = pack_rgb565(cmin); if(max16 > min16) - { - max16 ^= min16; min16 ^= max16; max16 ^= min16; - } + SWAP(max16, min16); eval_colors(color, max16, min16); mask = match_colors_block_DXT1a(block, color); @@ -943,7 +936,7 @@ if(max16 < min16) { - max16 ^= min16; min16 ^= max16; max16 ^= min16; + SWAP(max16, min16); mask ^= 0x55555555; } } @@ -1441,10 +1434,10 @@ int x, y, i; unsigned char *d; - for(y = 0; y < 4; ++y) + for(y = 0; y < 4 && ((by + y) < height); ++y) { d = dst + ((y + by) * width + bx) * bpp; - for(x = 0; x < 4; ++x) + for(x = 0; x < 4 && ((bx + x) < width); ++x) { for(i = 0; i < bpp; ++ i) *d++ = block[y * 16 + (x * 4) + i]; @@ -1460,9 +1453,6 @@ unsigned int i, x, y; unsigned char block[16 * 4]; - if(!(IS_MUL4(width) && IS_MUL4(height))) - return(0); - s = src; for(y = 0; y < height; y += 4) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/dxt.h new/gimp-dds-2.2.1/dxt.h --- old/gimp-dds-2.1.0/dxt.h 2010-05-05 10:55:10.000000000 +0200 +++ new/gimp-dds-2.2.1/dxt.h 2012-07-26 10:53:19.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <[email protected]>, + Copyright (C) 2004 Shawn Kirst <[email protected]>, with parts (C) 2003 Arne Reuter <[email protected]> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #ifndef DXT_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/dxt_tables.h new/gimp-dds-2.2.1/dxt_tables.h --- old/gimp-dds-2.1.0/dxt_tables.h 2012-01-17 02:12:14.000000000 +0100 +++ new/gimp-dds-2.2.1/dxt_tables.h 2012-07-31 07:28:35.000000000 +0200 @@ -81,136 +81,136 @@ { {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x01}, {0x00, 0x01}, {0x01, 0x00}, {0x01, 0x00}, {0x01, 0x00}, {0x01, 0x01}, - {0x01, 0x01}, {0x01, 0x01}, {0x01, 0x02}, {0x01, 0x02}, - {0x02, 0x01}, {0x02, 0x01}, {0x00, 0x05}, {0x02, 0x02}, - {0x02, 0x02}, {0x02, 0x02}, {0x02, 0x03}, {0x02, 0x03}, - {0x03, 0x02}, {0x03, 0x02}, {0x02, 0x04}, {0x03, 0x03}, - {0x03, 0x03}, {0x04, 0x01}, {0x03, 0x04}, {0x03, 0x04}, - {0x03, 0x04}, {0x04, 0x03}, {0x04, 0x03}, {0x04, 0x03}, - {0x03, 0x06}, {0x04, 0x04}, {0x04, 0x04}, {0x05, 0x03}, - {0x04, 0x05}, {0x05, 0x04}, {0x05, 0x04}, {0x05, 0x04}, - {0x05, 0x05}, {0x05, 0x05}, {0x05, 0x05}, {0x07, 0x02}, - {0x05, 0x06}, {0x06, 0x05}, {0x06, 0x05}, {0x04, 0x09}, - {0x06, 0x06}, {0x06, 0x06}, {0x06, 0x06}, {0x06, 0x07}, - {0x06, 0x07}, {0x07, 0x06}, {0x07, 0x06}, {0x06, 0x08}, - {0x07, 0x07}, {0x07, 0x07}, {0x08, 0x05}, {0x07, 0x08}, - {0x07, 0x08}, {0x07, 0x08}, {0x08, 0x07}, {0x08, 0x07}, - {0x08, 0x07}, {0x07, 0x0a}, {0x08, 0x08}, {0x08, 0x08}, - {0x09, 0x07}, {0x08, 0x09}, {0x09, 0x08}, {0x09, 0x08}, - {0x09, 0x08}, {0x09, 0x09}, {0x09, 0x09}, {0x09, 0x09}, - {0x0b, 0x06}, {0x09, 0x0a}, {0x0a, 0x09}, {0x0a, 0x09}, - {0x08, 0x0d}, {0x0a, 0x0a}, {0x0a, 0x0a}, {0x0a, 0x0a}, - {0x0a, 0x0b}, {0x0a, 0x0b}, {0x0b, 0x0a}, {0x0b, 0x0a}, - {0x0a, 0x0c}, {0x0b, 0x0b}, {0x0b, 0x0b}, {0x0c, 0x09}, - {0x0b, 0x0c}, {0x0b, 0x0c}, {0x0b, 0x0c}, {0x0c, 0x0b}, - {0x0c, 0x0b}, {0x0c, 0x0b}, {0x0b, 0x0e}, {0x0c, 0x0c}, - {0x0c, 0x0c}, {0x0d, 0x0b}, {0x0c, 0x0d}, {0x0d, 0x0c}, - {0x0d, 0x0c}, {0x0d, 0x0c}, {0x0d, 0x0d}, {0x0d, 0x0d}, - {0x0d, 0x0d}, {0x0f, 0x0a}, {0x0d, 0x0e}, {0x0e, 0x0d}, - {0x0e, 0x0d}, {0x0c, 0x11}, {0x0e, 0x0e}, {0x0e, 0x0e}, - {0x0e, 0x0e}, {0x0e, 0x0f}, {0x0e, 0x0f}, {0x0f, 0x0e}, - {0x0f, 0x0e}, {0x0e, 0x10}, {0x0f, 0x0f}, {0x0f, 0x0f}, - {0x10, 0x0d}, {0x0f, 0x10}, {0x0f, 0x10}, {0x0f, 0x10}, - {0x10, 0x0f}, {0x10, 0x0f}, {0x10, 0x0f}, {0x0f, 0x12}, - {0x10, 0x10}, {0x10, 0x10}, {0x11, 0x0f}, {0x10, 0x11}, - {0x11, 0x10}, {0x11, 0x10}, {0x11, 0x10}, {0x11, 0x11}, - {0x11, 0x11}, {0x11, 0x11}, {0x13, 0x0e}, {0x11, 0x12}, - {0x12, 0x11}, {0x12, 0x11}, {0x10, 0x15}, {0x12, 0x12}, - {0x12, 0x12}, {0x12, 0x12}, {0x12, 0x13}, {0x12, 0x13}, - {0x13, 0x12}, {0x13, 0x12}, {0x12, 0x14}, {0x13, 0x13}, - {0x13, 0x13}, {0x14, 0x11}, {0x13, 0x14}, {0x13, 0x14}, - {0x13, 0x14}, {0x14, 0x13}, {0x14, 0x13}, {0x14, 0x13}, - {0x13, 0x16}, {0x14, 0x14}, {0x14, 0x14}, {0x15, 0x13}, - {0x14, 0x15}, {0x15, 0x14}, {0x15, 0x14}, {0x15, 0x14}, - {0x15, 0x15}, {0x15, 0x15}, {0x15, 0x15}, {0x17, 0x12}, - {0x15, 0x16}, {0x16, 0x15}, {0x16, 0x15}, {0x14, 0x19}, - {0x16, 0x16}, {0x16, 0x16}, {0x16, 0x16}, {0x16, 0x17}, - {0x16, 0x17}, {0x17, 0x16}, {0x17, 0x16}, {0x16, 0x18}, - {0x17, 0x17}, {0x17, 0x17}, {0x18, 0x15}, {0x17, 0x18}, - {0x17, 0x18}, {0x17, 0x18}, {0x18, 0x17}, {0x18, 0x17}, - {0x18, 0x17}, {0x17, 0x1a}, {0x18, 0x18}, {0x18, 0x18}, - {0x19, 0x17}, {0x18, 0x19}, {0x19, 0x18}, {0x19, 0x18}, - {0x19, 0x18}, {0x19, 0x19}, {0x19, 0x19}, {0x19, 0x19}, - {0x1b, 0x16}, {0x19, 0x1a}, {0x1a, 0x19}, {0x1a, 0x19}, - {0x18, 0x1d}, {0x1a, 0x1a}, {0x1a, 0x1a}, {0x1a, 0x1a}, - {0x1a, 0x1b}, {0x1a, 0x1b}, {0x1b, 0x1a}, {0x1b, 0x1a}, - {0x1a, 0x1c}, {0x1b, 0x1b}, {0x1b, 0x1b}, {0x1c, 0x19}, - {0x1b, 0x1c}, {0x1b, 0x1c}, {0x1b, 0x1c}, {0x1c, 0x1b}, - {0x1c, 0x1b}, {0x1c, 0x1b}, {0x1b, 0x1e}, {0x1c, 0x1c}, - {0x1c, 0x1c}, {0x1d, 0x1b}, {0x1c, 0x1d}, {0x1d, 0x1c}, - {0x1d, 0x1c}, {0x1d, 0x1c}, {0x1d, 0x1d}, {0x1d, 0x1d}, - {0x1d, 0x1d}, {0x1f, 0x1a}, {0x1d, 0x1e}, {0x1e, 0x1d}, - {0x1e, 0x1d}, {0x1e, 0x1d}, {0x1e, 0x1e}, {0x1e, 0x1e}, - {0x1e, 0x1e}, {0x1e, 0x1f}, {0x1e, 0x1f}, {0x1f, 0x1e}, + {0x01, 0x01}, {0x01, 0x01}, {0x02, 0x00}, {0x02, 0x00}, + {0x02, 0x00}, {0x02, 0x01}, {0x00, 0x05}, {0x03, 0x00}, + {0x03, 0x00}, {0x03, 0x00}, {0x03, 0x01}, {0x03, 0x01}, + {0x03, 0x01}, {0x03, 0x02}, {0x04, 0x00}, {0x04, 0x00}, + {0x03, 0x03}, {0x04, 0x01}, {0x05, 0x00}, {0x05, 0x00}, + {0x05, 0x00}, {0x05, 0x01}, {0x05, 0x01}, {0x05, 0x01}, + {0x03, 0x06}, {0x06, 0x00}, {0x06, 0x00}, {0x06, 0x01}, + {0x04, 0x05}, {0x07, 0x00}, {0x07, 0x00}, {0x07, 0x00}, + {0x07, 0x01}, {0x07, 0x01}, {0x07, 0x01}, {0x07, 0x02}, + {0x08, 0x00}, {0x08, 0x00}, {0x07, 0x03}, {0x08, 0x01}, + {0x09, 0x00}, {0x09, 0x00}, {0x09, 0x00}, {0x09, 0x01}, + {0x09, 0x01}, {0x09, 0x01}, {0x07, 0x06}, {0x0a, 0x00}, + {0x0a, 0x00}, {0x0a, 0x01}, {0x08, 0x05}, {0x0b, 0x00}, + {0x0b, 0x00}, {0x0b, 0x00}, {0x0b, 0x01}, {0x0b, 0x01}, + {0x0b, 0x01}, {0x0b, 0x02}, {0x0c, 0x00}, {0x0c, 0x00}, + {0x0b, 0x03}, {0x0c, 0x01}, {0x0d, 0x00}, {0x0d, 0x00}, + {0x0d, 0x00}, {0x0d, 0x01}, {0x0d, 0x01}, {0x0d, 0x01}, + {0x0b, 0x06}, {0x0e, 0x00}, {0x0e, 0x00}, {0x0e, 0x01}, + {0x0c, 0x05}, {0x0f, 0x00}, {0x0f, 0x00}, {0x0f, 0x00}, + {0x0f, 0x01}, {0x0f, 0x01}, {0x0f, 0x01}, {0x0f, 0x02}, + {0x10, 0x00}, {0x10, 0x00}, {0x0f, 0x03}, {0x10, 0x01}, + {0x11, 0x00}, {0x11, 0x00}, {0x11, 0x00}, {0x11, 0x01}, + {0x11, 0x01}, {0x11, 0x01}, {0x0f, 0x06}, {0x12, 0x00}, + {0x12, 0x00}, {0x12, 0x01}, {0x10, 0x05}, {0x13, 0x00}, + {0x13, 0x00}, {0x13, 0x00}, {0x13, 0x01}, {0x13, 0x01}, + {0x13, 0x01}, {0x13, 0x02}, {0x14, 0x00}, {0x14, 0x00}, + {0x13, 0x03}, {0x14, 0x01}, {0x15, 0x00}, {0x15, 0x00}, + {0x15, 0x00}, {0x15, 0x01}, {0x15, 0x01}, {0x15, 0x01}, + {0x13, 0x06}, {0x16, 0x00}, {0x16, 0x00}, {0x16, 0x01}, + {0x14, 0x05}, {0x17, 0x00}, {0x17, 0x00}, {0x17, 0x00}, + {0x17, 0x01}, {0x17, 0x01}, {0x17, 0x01}, {0x17, 0x02}, + {0x18, 0x00}, {0x18, 0x00}, {0x17, 0x03}, {0x18, 0x01}, + {0x19, 0x00}, {0x19, 0x00}, {0x19, 0x00}, {0x19, 0x01}, + {0x19, 0x01}, {0x19, 0x01}, {0x17, 0x06}, {0x1a, 0x00}, + {0x1a, 0x00}, {0x1a, 0x01}, {0x18, 0x05}, {0x1b, 0x00}, + {0x1b, 0x00}, {0x1b, 0x00}, {0x1b, 0x01}, {0x1b, 0x01}, + {0x1b, 0x01}, {0x1b, 0x02}, {0x1c, 0x00}, {0x1c, 0x00}, + {0x1b, 0x03}, {0x1c, 0x01}, {0x1d, 0x00}, {0x1d, 0x00}, + {0x1d, 0x00}, {0x1d, 0x01}, {0x1d, 0x01}, {0x1d, 0x01}, + {0x1b, 0x06}, {0x1e, 0x00}, {0x1e, 0x00}, {0x1e, 0x01}, + {0x1c, 0x05}, {0x1f, 0x00}, {0x1f, 0x00}, {0x1f, 0x00}, + {0x1f, 0x01}, {0x1f, 0x01}, {0x1f, 0x01}, {0x1f, 0x02}, + {0x1e, 0x04}, {0x1f, 0x03}, {0x1f, 0x03}, {0x1c, 0x09}, + {0x1f, 0x04}, {0x1f, 0x04}, {0x1f, 0x04}, {0x1f, 0x05}, + {0x1f, 0x05}, {0x1f, 0x05}, {0x1f, 0x06}, {0x1e, 0x08}, + {0x1f, 0x07}, {0x1f, 0x07}, {0x1c, 0x0d}, {0x1f, 0x08}, + {0x1f, 0x08}, {0x1f, 0x08}, {0x1f, 0x09}, {0x1f, 0x09}, + {0x1f, 0x09}, {0x1f, 0x0a}, {0x1e, 0x0c}, {0x1f, 0x0b}, + {0x1f, 0x0b}, {0x1c, 0x11}, {0x1f, 0x0c}, {0x1f, 0x0c}, + {0x1f, 0x0c}, {0x1f, 0x0d}, {0x1f, 0x0d}, {0x1f, 0x0d}, + {0x1f, 0x0e}, {0x1e, 0x10}, {0x1f, 0x0f}, {0x1f, 0x0f}, + {0x1c, 0x15}, {0x1f, 0x10}, {0x1f, 0x10}, {0x1f, 0x10}, + {0x1f, 0x11}, {0x1f, 0x11}, {0x1f, 0x11}, {0x1f, 0x12}, + {0x1e, 0x14}, {0x1f, 0x13}, {0x1f, 0x13}, {0x1c, 0x19}, + {0x1f, 0x14}, {0x1f, 0x14}, {0x1f, 0x14}, {0x1f, 0x15}, + {0x1f, 0x15}, {0x1f, 0x15}, {0x1f, 0x16}, {0x1e, 0x18}, + {0x1f, 0x17}, {0x1f, 0x17}, {0x1c, 0x1d}, {0x1f, 0x18}, + {0x1f, 0x18}, {0x1f, 0x18}, {0x1f, 0x19}, {0x1f, 0x19}, + {0x1f, 0x19}, {0x1f, 0x1a}, {0x1e, 0x1c}, {0x1f, 0x1b}, + {0x1f, 0x1b}, {0x1f, 0x1b}, {0x1f, 0x1c}, {0x1f, 0x1c}, + {0x1f, 0x1c}, {0x1f, 0x1d}, {0x1f, 0x1d}, {0x1f, 0x1d}, {0x1f, 0x1e}, {0x1f, 0x1e}, {0x1f, 0x1f}, {0x1f, 0x1f}, }; static const unsigned char omatch6[256][2] = { {0x00, 0x00}, {0x00, 0x01}, {0x01, 0x00}, {0x01, 0x00}, - {0x01, 0x01}, {0x01, 0x02}, {0x02, 0x01}, {0x02, 0x01}, - {0x02, 0x02}, {0x02, 0x03}, {0x03, 0x02}, {0x03, 0x02}, - {0x03, 0x03}, {0x03, 0x04}, {0x04, 0x03}, {0x04, 0x03}, - {0x04, 0x04}, {0x04, 0x05}, {0x05, 0x04}, {0x05, 0x04}, - {0x05, 0x05}, {0x05, 0x06}, {0x06, 0x05}, {0x06, 0x05}, - {0x06, 0x06}, {0x06, 0x07}, {0x07, 0x06}, {0x07, 0x06}, - {0x07, 0x07}, {0x07, 0x08}, {0x08, 0x07}, {0x08, 0x07}, - {0x08, 0x08}, {0x08, 0x09}, {0x09, 0x08}, {0x09, 0x08}, - {0x09, 0x09}, {0x09, 0x0a}, {0x0a, 0x09}, {0x0a, 0x09}, - {0x0a, 0x0a}, {0x0a, 0x0b}, {0x0b, 0x0a}, {0x0b, 0x0a}, - {0x0b, 0x0b}, {0x0b, 0x0c}, {0x09, 0x10}, {0x0c, 0x0b}, - {0x0c, 0x0c}, {0x0c, 0x0d}, {0x0a, 0x11}, {0x0d, 0x0c}, - {0x0d, 0x0d}, {0x0d, 0x0e}, {0x0c, 0x10}, {0x0e, 0x0d}, - {0x0e, 0x0e}, {0x0e, 0x0f}, {0x0d, 0x11}, {0x0f, 0x0e}, - {0x0f, 0x0f}, {0x10, 0x0d}, {0x0f, 0x10}, {0x10, 0x0f}, - {0x0f, 0x12}, {0x10, 0x10}, {0x10, 0x11}, {0x12, 0x0e}, - {0x11, 0x10}, {0x11, 0x11}, {0x11, 0x12}, {0x13, 0x0f}, - {0x12, 0x11}, {0x12, 0x12}, {0x12, 0x13}, {0x15, 0x0e}, - {0x13, 0x12}, {0x13, 0x13}, {0x13, 0x14}, {0x16, 0x0f}, - {0x14, 0x13}, {0x14, 0x14}, {0x14, 0x15}, {0x15, 0x14}, - {0x15, 0x14}, {0x15, 0x15}, {0x15, 0x16}, {0x16, 0x15}, - {0x16, 0x15}, {0x16, 0x16}, {0x16, 0x17}, {0x17, 0x16}, - {0x17, 0x16}, {0x17, 0x17}, {0x17, 0x18}, {0x18, 0x17}, - {0x18, 0x17}, {0x18, 0x18}, {0x18, 0x19}, {0x19, 0x18}, - {0x19, 0x18}, {0x19, 0x19}, {0x19, 0x1a}, {0x1a, 0x19}, - {0x1a, 0x19}, {0x1a, 0x1a}, {0x1a, 0x1b}, {0x1b, 0x1a}, - {0x1b, 0x1a}, {0x1b, 0x1b}, {0x1b, 0x1c}, {0x19, 0x20}, - {0x1c, 0x1b}, {0x1c, 0x1c}, {0x1c, 0x1d}, {0x1a, 0x21}, - {0x1d, 0x1c}, {0x1d, 0x1d}, {0x1d, 0x1e}, {0x1c, 0x20}, - {0x1e, 0x1d}, {0x1e, 0x1e}, {0x1e, 0x1f}, {0x1d, 0x21}, - {0x1f, 0x1e}, {0x1f, 0x1f}, {0x20, 0x1d}, {0x1f, 0x20}, - {0x20, 0x1f}, {0x1f, 0x22}, {0x20, 0x20}, {0x20, 0x21}, - {0x22, 0x1e}, {0x21, 0x20}, {0x21, 0x21}, {0x21, 0x22}, - {0x23, 0x1f}, {0x22, 0x21}, {0x22, 0x22}, {0x22, 0x23}, - {0x25, 0x1e}, {0x23, 0x22}, {0x23, 0x23}, {0x23, 0x24}, - {0x26, 0x1f}, {0x24, 0x23}, {0x24, 0x24}, {0x24, 0x25}, - {0x25, 0x24}, {0x25, 0x24}, {0x25, 0x25}, {0x25, 0x26}, - {0x26, 0x25}, {0x26, 0x25}, {0x26, 0x26}, {0x26, 0x27}, - {0x27, 0x26}, {0x27, 0x26}, {0x27, 0x27}, {0x27, 0x28}, - {0x28, 0x27}, {0x28, 0x27}, {0x28, 0x28}, {0x28, 0x29}, - {0x29, 0x28}, {0x29, 0x28}, {0x29, 0x29}, {0x29, 0x2a}, - {0x2a, 0x29}, {0x2a, 0x29}, {0x2a, 0x2a}, {0x2a, 0x2b}, - {0x2b, 0x2a}, {0x2b, 0x2a}, {0x2b, 0x2b}, {0x2b, 0x2c}, - {0x29, 0x30}, {0x2c, 0x2b}, {0x2c, 0x2c}, {0x2c, 0x2d}, - {0x2a, 0x31}, {0x2d, 0x2c}, {0x2d, 0x2d}, {0x2d, 0x2e}, - {0x2c, 0x30}, {0x2e, 0x2d}, {0x2e, 0x2e}, {0x2e, 0x2f}, - {0x2d, 0x31}, {0x2f, 0x2e}, {0x2f, 0x2f}, {0x30, 0x2d}, - {0x2f, 0x30}, {0x30, 0x2f}, {0x2f, 0x32}, {0x30, 0x30}, - {0x30, 0x31}, {0x32, 0x2e}, {0x31, 0x30}, {0x31, 0x31}, - {0x31, 0x32}, {0x33, 0x2f}, {0x32, 0x31}, {0x32, 0x32}, - {0x32, 0x33}, {0x35, 0x2e}, {0x33, 0x32}, {0x33, 0x33}, - {0x33, 0x34}, {0x36, 0x2f}, {0x34, 0x33}, {0x34, 0x34}, - {0x34, 0x35}, {0x35, 0x34}, {0x35, 0x34}, {0x35, 0x35}, - {0x35, 0x36}, {0x36, 0x35}, {0x36, 0x35}, {0x36, 0x36}, - {0x36, 0x37}, {0x37, 0x36}, {0x37, 0x36}, {0x37, 0x37}, - {0x37, 0x38}, {0x38, 0x37}, {0x38, 0x37}, {0x38, 0x38}, - {0x38, 0x39}, {0x39, 0x38}, {0x39, 0x38}, {0x39, 0x39}, - {0x39, 0x3a}, {0x3a, 0x39}, {0x3a, 0x39}, {0x3a, 0x3a}, - {0x3a, 0x3b}, {0x3b, 0x3a}, {0x3b, 0x3a}, {0x3b, 0x3b}, - {0x3b, 0x3c}, {0x3c, 0x3b}, {0x3c, 0x3b}, {0x3c, 0x3c}, - {0x3c, 0x3d}, {0x3d, 0x3c}, {0x3d, 0x3c}, {0x3d, 0x3d}, - {0x3d, 0x3e}, {0x3e, 0x3d}, {0x3e, 0x3d}, {0x3e, 0x3e}, - {0x3e, 0x3f}, {0x3f, 0x3e}, {0x3f, 0x3e}, {0x3f, 0x3f}, + {0x01, 0x01}, {0x02, 0x00}, {0x02, 0x00}, {0x02, 0x01}, + {0x03, 0x00}, {0x03, 0x01}, {0x04, 0x00}, {0x04, 0x00}, + {0x04, 0x01}, {0x05, 0x00}, {0x05, 0x00}, {0x05, 0x01}, + {0x06, 0x00}, {0x06, 0x01}, {0x07, 0x00}, {0x07, 0x00}, + {0x07, 0x01}, {0x08, 0x00}, {0x00, 0x10}, {0x08, 0x01}, + {0x09, 0x00}, {0x09, 0x01}, {0x01, 0x11}, {0x0a, 0x00}, + {0x0a, 0x01}, {0x0b, 0x00}, {0x03, 0x10}, {0x0b, 0x01}, + {0x0c, 0x00}, {0x0c, 0x01}, {0x04, 0x11}, {0x0d, 0x00}, + {0x0d, 0x01}, {0x0e, 0x00}, {0x06, 0x10}, {0x0e, 0x01}, + {0x0f, 0x00}, {0x0f, 0x01}, {0x07, 0x11}, {0x10, 0x00}, + {0x0f, 0x03}, {0x10, 0x01}, {0x11, 0x00}, {0x11, 0x01}, + {0x0f, 0x06}, {0x12, 0x00}, {0x12, 0x01}, {0x13, 0x00}, + {0x0f, 0x09}, {0x13, 0x01}, {0x14, 0x00}, {0x14, 0x01}, + {0x0f, 0x0c}, {0x15, 0x00}, {0x15, 0x01}, {0x16, 0x00}, + {0x0f, 0x0f}, {0x16, 0x01}, {0x17, 0x00}, {0x17, 0x01}, + {0x0f, 0x12}, {0x18, 0x00}, {0x18, 0x01}, {0x19, 0x00}, + {0x11, 0x10}, {0x19, 0x01}, {0x1a, 0x00}, {0x1a, 0x01}, + {0x12, 0x11}, {0x1b, 0x00}, {0x1b, 0x01}, {0x1c, 0x00}, + {0x14, 0x10}, {0x1c, 0x01}, {0x1d, 0x00}, {0x1d, 0x01}, + {0x15, 0x11}, {0x1e, 0x00}, {0x1e, 0x01}, {0x1f, 0x00}, + {0x17, 0x10}, {0x1f, 0x01}, {0x1f, 0x02}, {0x20, 0x00}, + {0x20, 0x01}, {0x21, 0x00}, {0x1f, 0x05}, {0x21, 0x01}, + {0x22, 0x00}, {0x22, 0x01}, {0x1f, 0x08}, {0x23, 0x00}, + {0x23, 0x01}, {0x24, 0x00}, {0x1f, 0x0b}, {0x24, 0x01}, + {0x25, 0x00}, {0x25, 0x01}, {0x1f, 0x0e}, {0x26, 0x00}, + {0x26, 0x01}, {0x27, 0x00}, {0x1f, 0x11}, {0x27, 0x01}, + {0x28, 0x00}, {0x28, 0x01}, {0x20, 0x11}, {0x29, 0x00}, + {0x29, 0x01}, {0x2a, 0x00}, {0x22, 0x10}, {0x2a, 0x01}, + {0x2b, 0x00}, {0x2b, 0x01}, {0x23, 0x11}, {0x2c, 0x00}, + {0x2c, 0x01}, {0x2d, 0x00}, {0x25, 0x10}, {0x2d, 0x01}, + {0x2e, 0x00}, {0x2e, 0x01}, {0x26, 0x11}, {0x2f, 0x00}, + {0x2f, 0x01}, {0x2f, 0x02}, {0x30, 0x00}, {0x30, 0x01}, + {0x2f, 0x04}, {0x31, 0x00}, {0x31, 0x01}, {0x32, 0x00}, + {0x2f, 0x07}, {0x32, 0x01}, {0x33, 0x00}, {0x33, 0x01}, + {0x2f, 0x0a}, {0x34, 0x00}, {0x34, 0x01}, {0x35, 0x00}, + {0x2f, 0x0d}, {0x35, 0x01}, {0x36, 0x00}, {0x36, 0x01}, + {0x2f, 0x10}, {0x37, 0x00}, {0x37, 0x01}, {0x38, 0x00}, + {0x30, 0x10}, {0x38, 0x01}, {0x39, 0x00}, {0x39, 0x01}, + {0x31, 0x11}, {0x3a, 0x00}, {0x3a, 0x01}, {0x3b, 0x00}, + {0x33, 0x10}, {0x3b, 0x01}, {0x3c, 0x00}, {0x3c, 0x01}, + {0x34, 0x11}, {0x3d, 0x00}, {0x3d, 0x01}, {0x3e, 0x00}, + {0x36, 0x10}, {0x3e, 0x01}, {0x3f, 0x00}, {0x3f, 0x01}, + {0x37, 0x11}, {0x3f, 0x02}, {0x3f, 0x03}, {0x3f, 0x04}, + {0x39, 0x10}, {0x3f, 0x05}, {0x3f, 0x06}, {0x3f, 0x07}, + {0x3a, 0x11}, {0x3f, 0x08}, {0x3f, 0x09}, {0x3f, 0x0a}, + {0x3c, 0x10}, {0x3f, 0x0b}, {0x3f, 0x0c}, {0x3f, 0x0d}, + {0x3d, 0x11}, {0x3f, 0x0e}, {0x3f, 0x0f}, {0x36, 0x21}, + {0x3f, 0x10}, {0x3f, 0x11}, {0x3f, 0x12}, {0x38, 0x20}, + {0x3f, 0x13}, {0x3f, 0x14}, {0x3f, 0x15}, {0x39, 0x21}, + {0x3f, 0x16}, {0x3f, 0x17}, {0x3f, 0x18}, {0x3b, 0x20}, + {0x3f, 0x19}, {0x3f, 0x1a}, {0x3f, 0x1b}, {0x3c, 0x21}, + {0x3f, 0x1c}, {0x3f, 0x1d}, {0x3f, 0x1e}, {0x3e, 0x20}, + {0x3f, 0x1f}, {0x3f, 0x20}, {0x37, 0x30}, {0x3f, 0x21}, + {0x3f, 0x22}, {0x3f, 0x23}, {0x38, 0x31}, {0x3f, 0x24}, + {0x3f, 0x25}, {0x3f, 0x26}, {0x3a, 0x30}, {0x3f, 0x27}, + {0x3f, 0x28}, {0x3f, 0x29}, {0x3b, 0x31}, {0x3f, 0x2a}, + {0x3f, 0x2b}, {0x3f, 0x2c}, {0x3d, 0x30}, {0x3f, 0x2d}, + {0x3f, 0x2e}, {0x3f, 0x2f}, {0x3e, 0x31}, {0x3f, 0x30}, + {0x3f, 0x31}, {0x3f, 0x31}, {0x3f, 0x32}, {0x3f, 0x33}, + {0x3f, 0x34}, {0x3f, 0x34}, {0x3f, 0x35}, {0x3f, 0x36}, + {0x3f, 0x37}, {0x3f, 0x37}, {0x3f, 0x38}, {0x3f, 0x39}, + {0x3f, 0x3a}, {0x3f, 0x3a}, {0x3f, 0x3b}, {0x3f, 0x3c}, + {0x3f, 0x3d}, {0x3f, 0x3d}, {0x3f, 0x3e}, {0x3f, 0x3f}, }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/endian.h new/gimp-dds-2.2.1/endian.h --- old/gimp-dds-2.1.0/endian.h 2010-08-10 10:11:24.000000000 +0200 +++ new/gimp-dds-2.2.1/endian.h 2012-07-26 10:53:08.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <[email protected]>, + Copyright (C) 2004 Shawn Kirst <[email protected]>, with parts (C) 2003 Arne Reuter <[email protected]> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #ifndef ENDIAN_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/imath.h new/gimp-dds-2.2.1/imath.h --- old/gimp-dds-2.1.0/imath.h 2010-04-30 07:12:01.000000000 +0200 +++ new/gimp-dds-2.2.1/imath.h 2012-07-26 10:53:00.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <[email protected]>, + Copyright (C) 2004 Shawn Kirst <[email protected]>, with parts (C) 2003 Arne Reuter <[email protected]> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #ifndef IMATH_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/mipmap.c new/gimp-dds-2.2.1/mipmap.c --- old/gimp-dds-2.1.0/mipmap.c 2011-08-08 17:24:48.000000000 +0200 +++ new/gimp-dds-2.2.1/mipmap.c 2012-07-26 10:52:48.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <[email protected]>, + Copyright (C) 2004 Shawn Kirst <[email protected]>, with parts (C) 2003 Arne Reuter <[email protected]> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #include <string.h> @@ -51,7 +51,7 @@ unsigned int get_mipmapped_size(int width, int height, int bpp, int level, int num, int format) { - int w, h, cw, ch, n = 0; + int w, h, n = 0; unsigned int size = 0; w = width >> level; @@ -68,11 +68,7 @@ if(format == DDS_COMPRESS_NONE) size += (w * h); else - { - cw = MAX(w, 4); - ch = MAX(h, 4); - size += ((cw + 3) >> 2) * ((ch + 3) >> 2); - } + size += ((w + 3) >> 2) * ((h + 3) >> 2); ++n; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/mipmap.h new/gimp-dds-2.2.1/mipmap.h --- old/gimp-dds-2.1.0/mipmap.h 2010-04-23 09:57:01.000000000 +0200 +++ new/gimp-dds-2.2.1/mipmap.h 2012-07-26 10:52:39.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <[email protected]>, + Copyright (C) 2004 Shawn Kirst <[email protected]>, with parts (C) 2003 Arne Reuter <[email protected]> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #ifndef MIPMAP_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/misc.c new/gimp-dds-2.2.1/misc.c --- old/gimp-dds-2.1.0/misc.c 2010-04-23 09:57:01.000000000 +0200 +++ new/gimp-dds-2.2.1/misc.c 2012-07-26 10:52:29.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <[email protected]>, + Copyright (C) 2004 Shawn Kirst <[email protected]>, with parts (C) 2003 Arne Reuter <[email protected]> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #include <libgimp/gimp.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/misc.h new/gimp-dds-2.2.1/misc.h --- old/gimp-dds-2.1.0/misc.h 2010-04-23 09:57:01.000000000 +0200 +++ new/gimp-dds-2.2.1/misc.h 2012-07-26 10:52:14.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <[email protected]>, + Copyright (C) 2004 Shawn Kirst <[email protected]>, with parts (C) 2003 Arne Reuter <[email protected]> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #ifndef MISC_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/mktables.c new/gimp-dds-2.2.1/mktables.c --- old/gimp-dds-2.1.0/mktables.c 2012-01-17 02:12:07.000000000 +0100 +++ new/gimp-dds-2.2.1/mktables.c 2012-07-31 07:28:35.000000000 +0200 @@ -22,9 +22,9 @@ { minE = expand[mn]; maxE = expand[mx]; - e = abs(maxE + mul8bit(minE - maxE, 0x55) - i) * 100; + e = abs(maxE + mul8bit(minE - maxE, 0x55) - i); - e += abs(maxE - minE) * 3; + //e += abs(maxE - minE) * 3 / 100; if(e < bestE) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
