GNOME.org
 

[gthumb] Removed unused jpeg-marker, jpeg-memory-mgr files

commit d1d0c3ca124c934f99b835860030a16218c13622
Author: Michael J. Chudobiak <mjc avtechpulse com>
Date:   Sat May 30 10:04:26 2009 -0400

    Removed unused jpeg-marker, jpeg-memory-mgr files
---
 libgthumb/jpegutils/Makefile.am       |    4 -
 libgthumb/jpegutils/jpeg-marker.c     |  122 ------------------------
 libgthumb/jpegutils/jpeg-marker.h     |  103 --------------------
 libgthumb/jpegutils/jpeg-memory-mgr.c |  167 ---------------------------------
 libgthumb/jpegutils/jpeg-memory-mgr.h |   34 -------
 libgthumb/jpegutils/jpegtran.c        |    1 -
 6 files changed, 0 insertions(+), 431 deletions(-)

diff --git a/libgthumb/jpegutils/Makefile.am b/libgthumb/jpegutils/Makefile.am
index 1ef98f9..c259bd1 100644
--- a/libgthumb/jpegutils/Makefile.am
+++ b/libgthumb/jpegutils/Makefile.am
@@ -7,10 +7,6 @@ INCLUDES = 				\
 noinst_LTLIBRARIES = libgthumb-jpegutils.la
 
 libgthumb_jpegutils_la_SOURCES =	\
-	jpeg-memory-mgr.c			\
-	jpeg-memory-mgr.h			\
-	jpeg-marker.c			\
-	jpeg-marker.h			\
 	jpegtran.c			\
 	jpegtran.h			\
 	transupp.c			\
diff --git a/libgthumb/jpegutils/jpeg-marker.c b/libgthumb/jpegutils/jpeg-marker.c
deleted file mode 100644
index afc02a8..0000000
--- a/libgthumb/jpegutils/jpeg-marker.c
+++ /dev/null
@@ -1,122 +0,0 @@
-/* jpeg-marker.c
- *
- * Copyright © 2001 Lutz Müller <lutz users sourceforge net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details. 
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#include "config.h"
-#include "jpeg-marker.h"
-
-#include <stdlib.h>
-
-static struct {
-        JPEGMarker marker;
-        const char *name;
-        const char *description;
-} JPEGMarkerTable[] = {
-        {JPEG_MARKER_SOF0, "SOF0", "Encoding (baseline)"},
-        {JPEG_MARKER_SOF1, "SOF1", "Encoding (extended sequential)"},
-        {JPEG_MARKER_SOF2, "SOF2", "Encoding (progressive)"},
-        {JPEG_MARKER_SOF3, "SOF3", "Encoding (lossless)"},
-        {JPEG_MARKER_SOF5, "SOF5", "Encoding (differential sequential)"},
-        {JPEG_MARKER_SOF6, "SOF6", "Encoding (differential progressive)"},
-        {JPEG_MARKER_SOF7, "SOF7", "Encoding (differential lossless)"},
-        {JPEG_MARKER_SOF9, "SOF9",
-		"Encoding (extended sequential, arithmetic)"},
-        {JPEG_MARKER_SOF10, "SOF10", "Encoding (progressive, arithmetic)"},
-        {JPEG_MARKER_SOF11, "SOF11", "Encoding (lossless, arithmetic)"},
-        {JPEG_MARKER_SOF13, "SOF13",
-		"Encoding (differential sequential, arithmetic)"},
-        {JPEG_MARKER_SOF14, "SOF14",
-		"Encoding (differential progressive, arithmetic)"},
-        {JPEG_MARKER_SOF15, "SOF15",
-		"Encoding (differential lossless, arithmetic)"},
-	{JPEG_MARKER_SOI, "SOI", "Start of image"},
-	{JPEG_MARKER_EOI, "EOI", "End of image"},
-	{JPEG_MARKER_SOS, "SOS", "Start of scan"},
-	{JPEG_MARKER_COM, "COM", "Comment"},
-	{JPEG_MARKER_DHT, "DHT", "Define Huffman table"},
-	{JPEG_MARKER_JPG, "JPG", "Extension"},
-	{JPEG_MARKER_DAC, "DAC", "Define arithmetic coding conditioning"},
-	{JPEG_MARKER_RST1, "RST1", "Restart 1"},
-	{JPEG_MARKER_RST2, "RST2", "Restart 2"},
-	{JPEG_MARKER_RST3, "RST3", "Restart 3"},
-	{JPEG_MARKER_RST4, "RST4", "Restart 4"},
-	{JPEG_MARKER_RST5, "RST5", "Restart 5"},
-	{JPEG_MARKER_RST6, "RST6", "Restart 6"},
-	{JPEG_MARKER_RST7, "RST7", "Restart 7"},
-	{JPEG_MARKER_DQT, "DQT", "Define quantization table"},
-	{JPEG_MARKER_DNL, "DNL", "Define number of lines"},
-	{JPEG_MARKER_DRI, "DRI", "Define restart interval"},
-	{JPEG_MARKER_DHP, "DHP", "Define hierarchical progression"},
-	{JPEG_MARKER_EXP, "EXP", "Expand reference component"},
-	{JPEG_MARKER_APP0, "APP0", "Application segment 0"},
-	{JPEG_MARKER_APP1, "APP1", "Application segment 1"},
-	{JPEG_MARKER_APP2, "APP2", "Application segment 2"},
-	{JPEG_MARKER_APP3, "APP3", "Application segment 3"},
-	{JPEG_MARKER_APP4, "APP4", "Application segment 4"},
-	{JPEG_MARKER_APP5, "APP5", "Application segment 5"},
-	{JPEG_MARKER_APP6, "APP6", "Application segment 6"},
-	{JPEG_MARKER_APP7, "APP7", "Application segment 7"},
-	{JPEG_MARKER_APP8, "APP8", "Application segment 8"},
-	{JPEG_MARKER_APP9, "APP9", "Application segment 9"},
-	{JPEG_MARKER_APP10, "APP10", "Application segment 10"},
-	{JPEG_MARKER_APP11, "APP11", "Application segment 11"},
-	{JPEG_MARKER_APP12, "APP12", "Application segment 12"},
-	{JPEG_MARKER_APP13, "APP13", "Application segment 13"},
-	{JPEG_MARKER_APP14, "APP14", "Application segment 14"},
-	{JPEG_MARKER_APP15, "APP15", "Application segment 15"},
-	{JPEG_MARKER_JPG0, "JPG0", "Extension 0"},
-	{JPEG_MARKER_JPG1, "JPG1", "Extension 1"},
-	{JPEG_MARKER_JPG2, "JPG2", "Extension 2"},
-	{JPEG_MARKER_JPG3, "JPG3", "Extension 3"},
-	{JPEG_MARKER_JPG4, "JPG4", "Extension 4"},
-	{JPEG_MARKER_JPG5, "JPG5", "Extension 5"},
-	{JPEG_MARKER_JPG6, "JPG6", "Extension 6"},
-	{JPEG_MARKER_JPG7, "JPG7", "Extension 7"},
-	{JPEG_MARKER_JPG8, "JPG8", "Extension 8"},
-	{JPEG_MARKER_JPG9, "JPG9", "Extension 9"},
-	{JPEG_MARKER_JPG10, "JPG10", "Extension 10"},
-	{JPEG_MARKER_JPG11, "JPG11", "Extension 11"},
-	{JPEG_MARKER_JPG12, "JPG12", "Extension 12"},
-	{JPEG_MARKER_JPG13, "JPG13", "Extension 13"},
-	{0, NULL, NULL}
-};
-
-const char *
-jpeg_marker_get_name (JPEGMarker marker)
-{
-	unsigned int i;
-
-	for (i = 0; JPEGMarkerTable[i].name; i++)
-		if (JPEGMarkerTable[i].marker == marker)
-			break;
-
-	return (JPEGMarkerTable[i].name);
-}
-
-const char *
-jpeg_marker_get_description (JPEGMarker marker)
-{
-	unsigned int i;
-
-	for (i = 0; JPEGMarkerTable[i].description; i++)
-		if (JPEGMarkerTable[i].marker == marker)
-			break;
-
-	return (JPEGMarkerTable[i].description);
-}
-
diff --git a/libgthumb/jpegutils/jpeg-marker.h b/libgthumb/jpegutils/jpeg-marker.h
deleted file mode 100644
index 34a32eb..0000000
--- a/libgthumb/jpegutils/jpeg-marker.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* jpeg-marker.h
- *
- * Copyright © 2001 Lutz Müller <lutz users sourceforge net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details. 
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-#ifndef __JPEG_MARKER_H__
-#define __JPEG_MARKER_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-typedef enum {
-        JPEG_MARKER_SOF0        = 0xc0,
-        JPEG_MARKER_SOF1        = 0xc1,
-        JPEG_MARKER_SOF2        = 0xc2,
-        JPEG_MARKER_SOF3        = 0xc3,
-	JPEG_MARKER_DHT		= 0xc4,
-        JPEG_MARKER_SOF5        = 0xc5,
-        JPEG_MARKER_SOF6        = 0xc6,
-        JPEG_MARKER_SOF7        = 0xc7,
-	JPEG_MARKER_JPG		= 0xc8,
-        JPEG_MARKER_SOF9        = 0xc9,
-        JPEG_MARKER_SOF10       = 0xca,
-        JPEG_MARKER_SOF11       = 0xcb,
-	JPEG_MARKER_DAC		= 0xcc,
-        JPEG_MARKER_SOF13       = 0xcd,
-        JPEG_MARKER_SOF14       = 0xce,
-        JPEG_MARKER_SOF15       = 0xcf,
-        JPEG_MARKER_RST0	= 0xd0,
-        JPEG_MARKER_RST1	= 0xd1,
-        JPEG_MARKER_RST2	= 0xd2,
-        JPEG_MARKER_RST3	= 0xd3,
-        JPEG_MARKER_RST4	= 0xd4,
-	JPEG_MARKER_RST5	= 0xd5,
-        JPEG_MARKER_RST6	= 0xd6,
-        JPEG_MARKER_RST7	= 0xd7,
-        JPEG_MARKER_SOI         = 0xd8,
-        JPEG_MARKER_EOI         = 0xd9,
-        JPEG_MARKER_SOS         = 0xda,
-        JPEG_MARKER_DQT		= 0xdb,
-        JPEG_MARKER_DNL		= 0xdc,
-        JPEG_MARKER_DRI		= 0xdd,
-        JPEG_MARKER_DHP		= 0xde,
-        JPEG_MARKER_EXP		= 0xdf,
-	JPEG_MARKER_APP0	= 0xe0,
-        JPEG_MARKER_APP1        = 0xe1,
-	JPEG_MARKER_APP2        = 0xe2,
-	JPEG_MARKER_APP3        = 0xe3,
-	JPEG_MARKER_APP4        = 0xe4,
-	JPEG_MARKER_APP5        = 0xe5,
-	JPEG_MARKER_APP6        = 0xe6,
-	JPEG_MARKER_APP7        = 0xe7,
-	JPEG_MARKER_APP8        = 0xe8,
-	JPEG_MARKER_APP9        = 0xe9,
-	JPEG_MARKER_APP10       = 0xea,
-	JPEG_MARKER_APP11       = 0xeb,
-	JPEG_MARKER_APP12       = 0xec,
-	JPEG_MARKER_APP13       = 0xed,
-	JPEG_MARKER_APP14       = 0xee,
-	JPEG_MARKER_APP15       = 0xef,
-	JPEG_MARKER_JPG0	= 0xf0,
-	JPEG_MARKER_JPG1	= 0xf1,
-	JPEG_MARKER_JPG2	= 0xf2,
-	JPEG_MARKER_JPG3	= 0xf3,
-	JPEG_MARKER_JPG4	= 0xf4,
-	JPEG_MARKER_JPG5	= 0xf5,
-	JPEG_MARKER_JPG6	= 0xf6,
-	JPEG_MARKER_JPG7	= 0xf7,
-	JPEG_MARKER_JPG8	= 0xf8,
-	JPEG_MARKER_JPG9	= 0xf9,
-	JPEG_MARKER_JPG10	= 0xfa,
-	JPEG_MARKER_JPG11	= 0xfb,
-	JPEG_MARKER_JPG12	= 0xfc,
-	JPEG_MARKER_JPG13	= 0xfd,
-        JPEG_MARKER_COM         = 0xfe
-} JPEGMarker;
-
-#define JPEG_IS_MARKER(m) (((m) >= JPEG_MARKER_SOF0) &&		\
-			   ((m) <= JPEG_MARKER_COM))
-
-const char *jpeg_marker_get_name        (JPEGMarker marker);
-const char *jpeg_marker_get_description (JPEGMarker marker);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __JPEG_MARKER_H__ */
diff --git a/libgthumb/jpegutils/jpeg-memory-mgr.c b/libgthumb/jpegutils/jpeg-memory-mgr.c
deleted file mode 100644
index 8c3cbf7..0000000
--- a/libgthumb/jpegutils/jpeg-memory-mgr.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  GThumb
- *
- *  Copyright (C) 2001, 2002 The Free Software Foundation, Inc.
- *
- *  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
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, wr/usr/include/jerror.hite to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- */
-
-#include "jpeg-memory-mgr.h"
-
-#include <jerror.h>
-
-
-/* Expanded data source object for memory input */
-
-typedef struct {
-	struct jpeg_source_mgr pub;	/* public fields */
-	JOCTET *data;	/* source data buffer */
-  	size_t size;	/* size of source data buffer */
-} my_source_mgr;
-
-typedef my_source_mgr * my_src_ptr;
-
-/* Expanded data source object for memory output */
-
-typedef struct {
-	struct jpeg_destination_mgr pub;	/* public fields */
-	JOCTET **data;	/* destination data buffer */
-  	size_t *size;	/* size of destination data buffer */
-} my_destination_mgr;
-
-typedef my_destination_mgr * my_dest_ptr;
-
-
-METHODDEF(void)
-init_source (j_decompress_ptr cinfo)
-{
-	my_src_ptr src = (my_src_ptr) cinfo->src;
-
-	src->pub.next_input_byte = src->data;
-	src->pub.bytes_in_buffer = src->size;
-}
-
- 
-METHODDEF(boolean)
-fill_input_buffer (j_decompress_ptr cinfo)
-{
-	ERREXIT(cinfo, JERR_INPUT_EOF);
-	return TRUE;
-}
-
-
-METHODDEF(void)
-skip_input_data (j_decompress_ptr cinfo, long num_bytes)
-{
-	my_src_ptr src = (my_src_ptr) cinfo->src;
-
-	if (num_bytes > 0) {
-		if ((size_t)num_bytes > src->pub.bytes_in_buffer) {
-			ERREXIT(cinfo, JERR_INPUT_EOF);
-		}
-		src->pub.next_input_byte += (size_t) num_bytes;
-		src->pub.bytes_in_buffer -= (size_t) num_bytes;
-	}
-}
-
-
-METHODDEF(void)
-term_source (j_decompress_ptr cinfo)
-{
-	/* no work necessary here */
-}
-
-METHODDEF(void)
-init_destination (j_compress_ptr cinfo)
-{
-	my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
-
-	dest->pub.next_output_byte = *dest->data;
-	dest->pub.free_in_buffer = *dest->size;
-}
-
-
-METHODDEF(boolean)
-empty_output_buffer (j_compress_ptr cinfo)
-{
-	ERREXIT(cinfo, JERR_BUFFER_SIZE);
-	return TRUE;
-}
-
-
-METHODDEF(void)
-term_destination (j_compress_ptr cinfo)
-{
-	my_dest_ptr dest = (my_dest_ptr) cinfo->dest;
-
-	*dest->size -= dest->pub.free_in_buffer;
-}
-
-/*
- * Prepare for input from a memory buffer.
- * The caller must have already allocated the buffer, and is
- * responsible for freeing it after finishing decompression.
- */
-
-GLOBAL(void)
-jpeg_memory_src (j_decompress_ptr cinfo, const void *data, size_t size)
-{
-	my_src_ptr src = NULL;
-
-	if (cinfo->src == NULL) {	/* first time for this JPEG object? */
-		cinfo->src = (struct jpeg_source_mgr *)
-			(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-			sizeof(my_source_mgr));
-	}
-
-	src = (my_src_ptr) cinfo->src;
-	src->pub.init_source = init_source;
-	src->pub.fill_input_buffer = fill_input_buffer;
-	src->pub.skip_input_data = skip_input_data;
-	src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
-	src->pub.term_source = term_source;
-	src->pub.next_input_byte = NULL;
-	src->pub.bytes_in_buffer = 0;
-	src->data = (JOCTET *) data;
-	src->size = (size_t) size;
-}
-
-/*
- * Prepare for output to a memory buffer.
- * The caller must have already allocated the buffer, and is
- * responsible for freeing it after finishing compression.
- */
-
-GLOBAL(void)
-jpeg_memory_dest (j_compress_ptr cinfo, void **data, size_t *size)
-{
-	my_dest_ptr dest = NULL;
-
-	if (cinfo->dest == NULL) {	/* first time for this JPEG object? */
-		cinfo->dest = (struct jpeg_destination_mgr *)
-			(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
-			sizeof(my_destination_mgr));
-	}
-
-	dest = (my_dest_ptr) cinfo->dest;
-	dest->pub.init_destination = init_destination;
-	dest->pub.empty_output_buffer = empty_output_buffer;
-	dest->pub.term_destination = term_destination;
-	dest->pub.next_output_byte = NULL;
-	dest->pub.free_in_buffer = 0;
-	dest->data = (JOCTET **) data;
-	dest->size = (size_t *) size;
-}
diff --git a/libgthumb/jpegutils/jpeg-memory-mgr.h b/libgthumb/jpegutils/jpeg-memory-mgr.h
deleted file mode 100644
index 89cacd8..0000000
--- a/libgthumb/jpegutils/jpeg-memory-mgr.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  GThumb
- *
- *  Copyright (C) 2001, 2002 The Free Software Foundation, Inc.
- *
- *  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
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- */
-
-#ifndef JPEG_MEMORY_MGR_H
-#define JPEG_MEMORY_MGR_H
-
-#include <stdio.h>
-#include <jpeglib.h>
-
-GLOBAL(void)
-jpeg_memory_src (j_decompress_ptr cinfo, const void *data, size_t size);
-
-GLOBAL(void)
-jpeg_memory_dest (j_compress_ptr cinfo, void **data, size_t *size);
-
-#endif /* JPEG_MEMORY_MGR_H */
diff --git a/libgthumb/jpegutils/jpegtran.c b/libgthumb/jpegutils/jpegtran.c
index 641dece..ca91039 100644
--- a/libgthumb/jpegutils/jpegtran.c
+++ b/libgthumb/jpegutils/jpegtran.c
@@ -49,7 +49,6 @@
 #include "gthumb-error.h"
 #include "file-utils.h"
 #include "transupp.h"		/* Support routines for jpegtran */
-#include "jpeg-memory-mgr.h"
 #include "jpegtran.h"
 #include "gth-exif-utils.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]