[arch-commits] Commit in giflib/trunk (PKGBUILD giflib-4.2.1-quantize.patch)
Bartłomiej Piotrowski
bpiotrowski at nymeria.archlinux.org
Mon Jul 1 19:08:31 UTC 2013
Date: Monday, July 1, 2013 @ 21:08:31
Author: bpiotrowski
Revision: 189260
upgpkg: giflib 4.2.1-3
- another attempt to bring back quantize support (FS#35362)
Modified:
giflib/trunk/PKGBUILD
giflib/trunk/giflib-4.2.1-quantize.patch
-----------------------------+
PKGBUILD | 4
giflib-4.2.1-quantize.patch | 465 +++++++++++++++++++++++++++++++++---------
2 files changed, 372 insertions(+), 97 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-07-01 18:54:09 UTC (rev 189259)
+++ PKGBUILD 2013-07-01 19:08:31 UTC (rev 189260)
@@ -6,7 +6,7 @@
pkgname=giflib
pkgver=4.2.1
-pkgrel=2
+pkgrel=3
pkgdesc="A library for reading and writing gif images"
url="http://sourceforge.net/projects/giflib/"
arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@
source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2
giflib-4.2.1-quantize.patch)
md5sums=('bbd3324af24156d5d7e66ab1cee8508d'
- '67e46b344340ac10f4f597d772679f23')
+ '26174405ba886a89b8a4db18fe653a99')
prepare() {
cd ${pkgname}-${pkgver}
Modified: giflib-4.2.1-quantize.patch
===================================================================
--- giflib-4.2.1-quantize.patch 2013-07-01 18:54:09 UTC (rev 189259)
+++ giflib-4.2.1-quantize.patch 2013-07-01 19:08:31 UTC (rev 189260)
@@ -1,39 +1,39 @@
-diff -up giflib-4.2.1/lib/Makefile.in.quantize giflib-4.2.1/lib/Makefile.in
---- giflib-4.2.1/lib/Makefile.in.quantize 2012-10-09 00:37:59.000000000 -0300
-+++ giflib-4.2.1/lib/Makefile.in 2012-11-17 12:16:04.485736553 -0200
-@@ -77,7 +77,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
- LTLIBRARIES = $(lib_LTLIBRARIES)
- libgif_la_DEPENDENCIES =
- am_libgif_la_OBJECTS = dgif_lib.lo egif_lib.lo gif_font.lo gif_hash.lo \
-- gifalloc.lo gif_err.lo
-+ gifalloc.lo gif_err.lo quantize.lo
- libgif_la_OBJECTS = $(am_libgif_la_OBJECTS)
- libgif_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-@@ -234,6 +234,7 @@ libgif_la_SOURCES = dgif_lib.c \
+From 7b01ed05d6c16172bd11a62d9b334f0eb7c5fc1e Mon Sep 17 00:00:00 2001
+From: "Eric S. Raymond" <esr at thyrsus.com>
+Date: Sun, 3 Jun 2012 07:59:30 -0400
+Subject: [PATCH] Return QuantizeBuffer() to the core library.
+
+Fulfils SourceForge FR 3531618.
+---
+ NEWS | 2 +
+ lib/Makefile.am | 3 +-
+ lib/gif_lib.h | 9 ++
+ lib/quantize.c | 309 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ util/rgb2gif.c | 302 ------------------------------------------------------
+ 5 files changed, 322 insertions(+), 303 deletions(-)
+ create mode 100644 lib/quantize.c
+
+index 813a2f8..ae6d5fa 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -13,7 +13,8 @@ libgif_la_SOURCES = dgif_lib.c \
gif_hash.h \
gifalloc.c \
gif_err.c \
-+ quantize.c \
- gif_lib_private.h
+- gif_lib_private.h
++ gif_lib_private.h \
++ quantize.c
- libgif_la_LDFLAGS = -version-info @SHLIBVERSION@
-@@ -319,6 +320,7 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gif_font.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gif_hash.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gifalloc.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/quantize.Plo at am__quote@
+ libgif_la_LDFLAGS = -version-info @SHLIBVERSION@ $(LT_LDFLAGS)
+ libgif_la_LIBADD = @DEVS@
+diff --git a/lib/gif_lib.h b/lib/gif_lib.h
+index e942089..73bc437 100644
+--- a/lib/gif_lib.h
++++ b/lib/gif_lib.h
+@@ -207,6 +207,15 @@ int DGifGetLZCodes(GifFileType *GifFile, int *GifCode);
- .c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-diff -up giflib-4.2.1/lib/gif_lib.h.quantize giflib-4.2.1/lib/gif_lib.h
---- giflib-4.2.1/lib/gif_lib.h.quantize 2012-10-09 00:36:32.000000000 -0300
-+++ giflib-4.2.1/lib/gif_lib.h 2012-11-17 12:16:04.488735917 -0200
-@@ -180,6 +180,15 @@ int DGifCloseFile(GifFileType * GifFile)
- #define D_GIF_ERR_IMAGE_DEFECT 112
- #define D_GIF_ERR_EOF_TOO_SOON 113
-+/******************************************************************************
+ /******************************************************************************
+ * O.K., here are the routines from GIF_LIB file QUANTIZE.C.
+******************************************************************************/
+int QuantizeBuffer(unsigned int Width, unsigned int Height,
@@ -42,37 +42,29 @@
+ GifByteType * OutputBuffer,
+ GifColorType * OutputColorMap);
+
- /* These are legacy. You probably do not want to call them directly */
- int DGifGetScreenDesc(GifFileType * GifFile);
- int DGifGetRecordType(GifFileType * GifFile, GifRecordType * GifType);
-diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c
---- giflib-4.2.1/lib/quantize.c.quantize 2012-11-17 12:17:44.741435334 -0200
-+++ giflib-4.2.1/lib/quantize.c 2012-11-17 12:16:04.491735283 -0200
-@@ -0,0 +1,332 @@
++/******************************************************************************
+ * O.K., here are the routines from GIF_LIB file GIF_ERR.C.
+ ******************************************************************************/
+ extern int GifError(void); /* new in 2012 - ESR */
+diff --git a/lib/quantize.c b/lib/quantize.c
+new file mode 100644
+index 0000000..feb1dc7
+--- /dev/null
++++ b/lib/quantize.c
+@@ -0,0 +1,309 @@
+/*****************************************************************************
-+ * "Gif-Lib" - Yet another gif library.
+ *
-+ * Written by: Gershon Elber IBM PC Ver 0.1, Jun. 1989
-+ ******************************************************************************
-+ * Module to quatize high resolution image into lower one. You may want to
-+ * peek into the following article this code is based on:
-+ * "Color Image Quantization for frame buffer Display", by Paul Heckbert
-+ * SIGGRAPH 1982 page 297-307.
-+ ******************************************************************************
-+ * History:
-+ * 5 Jan 90 - Version 1.0 by Gershon Elber.
++ * quantize.c - quantize a high resolution image into lower one
++ *
++ * Based on: "Color Image Quantization for frame buffer Display", by
++ * Paul Heckbert SIGGRAPH 1982 page 297-307.
++ *
++ * This doesn't really belong in the core library, was undocumented,
++ * and was removed in 4.2. Then it turned out some client apps were
++ * actually using it, so it was restored in 5.0.
++ *
+ *****************************************************************************/
+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#ifdef __MSDOS__
-+#include <dos.h>
-+#include <alloc.h>
-+#include <graphics.h>
-+#endif /* __MSDOS__ */
-+
+#include <stdlib.h>
+#include <stdio.h>
+#include "gif_lib.h"
@@ -80,20 +72,9 @@
+
+#define ABS(x) ((x) > 0 ? (x) : (-(x)))
+
-+#define PROGRAM_NAME "giflib"
-+
-+/* The colors are stripped to 5 bits per primary color if non MSDOS system
-+ * or to 4 (not enough memory...) if MSDOS as first step.
-+ */
-+#ifdef __MSDOS__
-+#define COLOR_ARRAY_SIZE 4096
-+#define BITS_PER_PRIM_COLOR 4
-+#define MAX_PRIM_COLOR 0x0f
-+#else
+#define COLOR_ARRAY_SIZE 32768
+#define BITS_PER_PRIM_COLOR 5
+#define MAX_PRIM_COLOR 0x1f
-+#endif /* __MSDOS__ */
+
+static int SortRGBAxis;
+
@@ -114,7 +95,7 @@
+static int SubdivColorMap(NewColorMapType * NewColorSubdiv,
+ unsigned int ColorMapSize,
+ unsigned int *NewColorMapSize);
-+static int SortCmpRtn(const VoidPtr Entry1, const VoidPtr Entry2);
++static int SortCmpRtn(const void *Entry1, const void *Entry2);
+
+/******************************************************************************
+ * Quantize high resolution image into lower one. Input image consists of a
@@ -226,10 +207,7 @@
+ OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j;
+ OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j;
+ OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j;
-+ } else
-+ fprintf(stderr,
-+ "\n%s: Null entry in quantized color map - that's weird.\n",
-+ PROGRAM_NAME);
++ }
+ }
+
+ /* Finally scan the input buffer again and put the mapped index in the
@@ -375,30 +353,327 @@
+ * Routine called by qsort to compare to entries.
+ ****************************************************************************/
+static int
-+SortCmpRtn(const VoidPtr Entry1,
-+ const VoidPtr Entry2) {
++SortCmpRtn(const void *Entry1,
++ const void *Entry2) {
+
+ return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] -
+ (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis];
+}
-diff -up giflib-4.2.1/util/rgb2gif.c.quantize giflib-4.2.1/util/rgb2gif.c
---- giflib-4.2.1/util/rgb2gif.c.quantize 2012-10-09 00:28:12.000000000 -0300
-+++ giflib-4.2.1/util/rgb2gif.c 2012-11-17 12:16:04.490735495 -0200
-@@ -129,7 +129,7 @@ static int SortCmpRtn(const void *Entry1
- * This function returns GIF_OK if succesfull, GIF_ERROR otherwise.
- ******************************************************************************/
- static int
++
++/* end */
+diff --git a/util/rgb2gif.c b/util/rgb2gif.c
+index 56386c7..46d9654 100644
+--- a/util/rgb2gif.c
++++ b/util/rgb2gif.c
+@@ -69,308 +69,6 @@ static void SaveGif(GifByteType *OutputBuffer,
+ static void QuitGifError(GifFileType *GifFile);
+
+ /******************************************************************************
+- * Code to quantize high resolution image into lower one. You may want to
+- * peek into the following article this code is based on:
+- * "Color Image Quantization for frame buffer Display", by Paul Heckbert
+- * SIGGRAPH 1982 page 297-307.
+- ******************************************************************************
+- * History:
+- * 5 Jan 90 - Version 1.0 by Gershon Elber.
+- *****************************************************************************/
+-
+-#define ABS(x) ((x) > 0 ? (x) : (-(x)))
+-
+-#define COLOR_ARRAY_SIZE 32768
+-#define BITS_PER_PRIM_COLOR 5
+-#define MAX_PRIM_COLOR 0x1f
+-
+-static int SortRGBAxis;
+-
+-typedef struct QuantizedColorType {
+- GifByteType RGB[3];
+- GifByteType NewColorIndex;
+- long Count;
+- struct QuantizedColorType *Pnext;
+-} QuantizedColorType;
+-
+-typedef struct NewColorMapType {
+- GifByteType RGBMin[3], RGBWidth[3];
+- unsigned int NumEntries; /* # of QuantizedColorType in linked list below */
+- unsigned long Count; /* Total number of pixels in all the entries */
+- QuantizedColorType *QuantizedColors;
+-} NewColorMapType;
+-
+-static int SubdivColorMap(NewColorMapType * NewColorSubdiv,
+- unsigned int ColorMapSize,
+- unsigned int *NewColorMapSize);
+-static int SortCmpRtn(const void *Entry1, const void *Entry2);
+-
+-/******************************************************************************
+- * Quantize high resolution image into lower one. Input image consists of a
+- * 2D array for each of the RGB colors with size Width by Height. There is no
+- * Color map for the input. Output is a quantized image with 2D array of
+- * indexes into the output color map.
+- * Note input image can be 24 bits at the most (8 for red/green/blue) and
+- * the output has 256 colors at the most (256 entries in the color map.).
+- * ColorMapSize specifies size of color map up to 256 and will be updated to
+- * real size before returning.
+- * Also non of the parameter are allocated by this routine.
+- * This function returns GIF_OK if succesfull, GIF_ERROR otherwise.
+- ******************************************************************************/
+-static int
-QuantizeBuffer(unsigned int Width,
-+GifQuantizeBuffer(unsigned int Width,
- unsigned int Height,
- int *ColorMapSize,
- GifByteType * RedInput,
-@@ -428,7 +428,7 @@ int main(int argc, char **argv)
- sizeof(GifByteType))) == NULL)
- GIF_EXIT("Failed to allocate memory required, aborted.");
-
-- if (QuantizeBuffer(Width, Height, &ColorMapSize,
-+ if (GifQuantizeBuffer(Width, Height, &ColorMapSize,
- RedBuffer, GreenBuffer, BlueBuffer,
- OutputBuffer, OutputColorMap->Colors) == GIF_ERROR)
- QuitGifError(NULL);
+- unsigned int Height,
+- int *ColorMapSize,
+- GifByteType * RedInput,
+- GifByteType * GreenInput,
+- GifByteType * BlueInput,
+- GifByteType * OutputBuffer,
+- GifColorType * OutputColorMap) {
+-
+- unsigned int Index, NumOfEntries;
+- int i, j, MaxRGBError[3];
+- unsigned int NewColorMapSize;
+- long Red, Green, Blue;
+- NewColorMapType NewColorSubdiv[256];
+- QuantizedColorType *ColorArrayEntries, *QuantizedColor;
+-
+- ColorArrayEntries = (QuantizedColorType *)malloc(
+- sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE);
+- if (ColorArrayEntries == NULL) {
+- return GIF_ERROR;
+- }
+-
+- for (i = 0; i < COLOR_ARRAY_SIZE; i++) {
+- ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR);
+- ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) &
+- MAX_PRIM_COLOR;
+- ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR;
+- ColorArrayEntries[i].Count = 0;
+- }
+-
+- /* Sample the colors and their distribution: */
+- for (i = 0; i < (int)(Width * Height); i++) {
+- Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
+- (2 * BITS_PER_PRIM_COLOR)) +
+- ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
+- BITS_PER_PRIM_COLOR) +
+- (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
+- ColorArrayEntries[Index].Count++;
+- }
+-
+- /* Put all the colors in the first entry of the color map, and call the
+- * recursive subdivision process. */
+- for (i = 0; i < 256; i++) {
+- NewColorSubdiv[i].QuantizedColors = NULL;
+- NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0;
+- for (j = 0; j < 3; j++) {
+- NewColorSubdiv[i].RGBMin[j] = 0;
+- NewColorSubdiv[i].RGBWidth[j] = 255;
+- }
+- }
+-
+- /* Find the non empty entries in the color table and chain them: */
+- for (i = 0; i < COLOR_ARRAY_SIZE; i++)
+- if (ColorArrayEntries[i].Count > 0)
+- break;
+- QuantizedColor = NewColorSubdiv[0].QuantizedColors = &ColorArrayEntries[i];
+- NumOfEntries = 1;
+- while (++i < COLOR_ARRAY_SIZE)
+- if (ColorArrayEntries[i].Count > 0) {
+- QuantizedColor->Pnext = &ColorArrayEntries[i];
+- QuantizedColor = &ColorArrayEntries[i];
+- NumOfEntries++;
+- }
+- QuantizedColor->Pnext = NULL;
+-
+- NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled colors */
+- NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */
+- NewColorMapSize = 1;
+- if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) !=
+- GIF_OK) {
+- free((char *)ColorArrayEntries);
+- return GIF_ERROR;
+- }
+- if (NewColorMapSize < *ColorMapSize) {
+- /* And clear rest of color map: */
+- for (i = NewColorMapSize; i < *ColorMapSize; i++)
+- OutputColorMap[i].Red = OutputColorMap[i].Green =
+- OutputColorMap[i].Blue = 0;
+- }
+-
+- /* Average the colors in each entry to be the color to be used in the
+- * output color map, and plug it into the output color map itself. */
+- for (i = 0; i < NewColorMapSize; i++) {
+- if ((j = NewColorSubdiv[i].NumEntries) > 0) {
+- QuantizedColor = NewColorSubdiv[i].QuantizedColors;
+- Red = Green = Blue = 0;
+- while (QuantizedColor) {
+- QuantizedColor->NewColorIndex = i;
+- Red += QuantizedColor->RGB[0];
+- Green += QuantizedColor->RGB[1];
+- Blue += QuantizedColor->RGB[2];
+- QuantizedColor = QuantizedColor->Pnext;
+- }
+- OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j;
+- OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j;
+- OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j;
+- } else
+- fprintf(stderr,
+- "\n%s: Null entry in quantized color map - that's weird.\n",
+- PROGRAM_NAME);
+- }
+-
+- /* Finally scan the input buffer again and put the mapped index in the
+- * output buffer. */
+- MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0;
+- for (i = 0; i < (int)(Width * Height); i++) {
+- Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
+- (2 * BITS_PER_PRIM_COLOR)) +
+- ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
+- BITS_PER_PRIM_COLOR) +
+- (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
+- Index = ColorArrayEntries[Index].NewColorIndex;
+- OutputBuffer[i] = Index;
+- if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i]))
+- MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]);
+- if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green - GreenInput[i]))
+- MaxRGBError[1] = ABS(OutputColorMap[Index].Green - GreenInput[i]);
+- if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i]))
+- MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]);
+- }
+-
+-#ifdef DEBUG
+- fprintf(stderr,
+- "Quantization L(0) errors: Red = %d, Green = %d, Blue = %d.\n",
+- MaxRGBError[0], MaxRGBError[1], MaxRGBError[2]);
+-#endif /* DEBUG */
+-
+- free((char *)ColorArrayEntries);
+-
+- *ColorMapSize = NewColorMapSize;
+-
+- return GIF_OK;
+-}
+-
+-/******************************************************************************
+- * Routine to subdivide the RGB space recursively using median cut in each
+- * axes alternatingly until ColorMapSize different cubes exists.
+- * The biggest cube in one dimension is subdivide unless it has only one entry.
+- * Returns GIF_ERROR if failed, otherwise GIF_OK.
+- ******************************************************************************/
+-static int
+-SubdivColorMap(NewColorMapType * NewColorSubdiv,
+- unsigned int ColorMapSize,
+- unsigned int *NewColorMapSize) {
+-
+- int MaxSize;
+- unsigned int i, j, Index = 0, NumEntries, MinColor, MaxColor;
+- long Sum, Count;
+- QuantizedColorType *QuantizedColor, **SortArray;
+-
+- while (ColorMapSize > *NewColorMapSize) {
+- /* Find candidate for subdivision: */
+- MaxSize = -1;
+- for (i = 0; i < *NewColorMapSize; i++) {
+- for (j = 0; j < 3; j++) {
+- if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) &&
+- (NewColorSubdiv[i].NumEntries > 1)) {
+- MaxSize = NewColorSubdiv[i].RGBWidth[j];
+- Index = i;
+- SortRGBAxis = j;
+- }
+- }
+- }
+-
+- if (MaxSize == -1)
+- return GIF_OK;
+-
+- /* Split the entry Index into two along the axis SortRGBAxis: */
+-
+- /* Sort all elements in that entry along the given axis and split at
+- * the median. */
+- SortArray = (QuantizedColorType **)malloc(
+- sizeof(QuantizedColorType *) *
+- NewColorSubdiv[Index].NumEntries);
+- if (SortArray == NULL)
+- return GIF_ERROR;
+- for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors;
+- j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL;
+- j++, QuantizedColor = QuantizedColor->Pnext)
+- SortArray[j] = QuantizedColor;
+-
+- qsort(SortArray, NewColorSubdiv[Index].NumEntries,
+- sizeof(QuantizedColorType *), SortCmpRtn);
+-
+- /* Relink the sorted list into one: */
+- for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++)
+- SortArray[j]->Pnext = SortArray[j + 1];
+- SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL;
+- NewColorSubdiv[Index].QuantizedColors = QuantizedColor = SortArray[0];
+- free((char *)SortArray);
+-
+- /* Now simply add the Counts until we have half of the Count: */
+- Sum = NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count;
+- NumEntries = 1;
+- Count = QuantizedColor->Count;
+- while (QuantizedColor->Pnext != NULL &&
+- (Sum -= QuantizedColor->Pnext->Count) >= 0 &&
+- QuantizedColor->Pnext->Pnext != NULL) {
+- QuantizedColor = QuantizedColor->Pnext;
+- NumEntries++;
+- Count += QuantizedColor->Count;
+- }
+- /* Save the values of the last color of the first half, and first
+- * of the second half so we can update the Bounding Boxes later.
+- * Also as the colors are quantized and the BBoxes are full 0..255,
+- * they need to be rescaled.
+- */
+- MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half */
+- /* coverity[var_deref_op] */
+- MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */
+- MaxColor <<= (8 - BITS_PER_PRIM_COLOR);
+- MinColor <<= (8 - BITS_PER_PRIM_COLOR);
+-
+- /* Partition right here: */
+- NewColorSubdiv[*NewColorMapSize].QuantizedColors =
+- QuantizedColor->Pnext;
+- QuantizedColor->Pnext = NULL;
+- NewColorSubdiv[*NewColorMapSize].Count = Count;
+- NewColorSubdiv[Index].Count -= Count;
+- NewColorSubdiv[*NewColorMapSize].NumEntries =
+- NewColorSubdiv[Index].NumEntries - NumEntries;
+- NewColorSubdiv[Index].NumEntries = NumEntries;
+- for (j = 0; j < 3; j++) {
+- NewColorSubdiv[*NewColorMapSize].RGBMin[j] =
+- NewColorSubdiv[Index].RGBMin[j];
+- NewColorSubdiv[*NewColorMapSize].RGBWidth[j] =
+- NewColorSubdiv[Index].RGBWidth[j];
+- }
+- NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] =
+- NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] +
+- NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] - MinColor;
+- NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor;
+-
+- NewColorSubdiv[Index].RGBWidth[SortRGBAxis] =
+- MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis];
+-
+- (*NewColorMapSize)++;
+- }
+-
+- return GIF_OK;
+-}
+-
+-/****************************************************************************
+- * Routine called by qsort to compare two entries.
+- ****************************************************************************/
+-static int
+-SortCmpRtn(const void *Entry1,
+- const void *Entry2) {
+-
+- return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] -
+- (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis];
+-}
+-/******************************************************************************
+ * Interpret the command line and scan the given GIF file.
+ ******************************************************************************/
+ int main(int argc, char **argv)
+--
+1.8.3.2
+
More information about the arch-commits
mailing list