diff options
Diffstat (limited to 'jpegutils')
| -rw-r--r-- | jpegutils/jpegint-8a.h | 7 | ||||
| -rw-r--r-- | jpegutils/transupp-6b.c | 17 | ||||
| -rw-r--r-- | jpegutils/transupp-6b.h | 5 | ||||
| -rw-r--r-- | jpegutils/transupp-8a.c | 19 | ||||
| -rw-r--r-- | jpegutils/transupp-8a.h | 4 |
5 files changed, 0 insertions, 52 deletions
diff --git a/jpegutils/jpegint-8a.h b/jpegutils/jpegint-8a.h index 0c27a4e..142f311 100644 --- a/jpegutils/jpegint-8a.h +++ b/jpegutils/jpegint-8a.h @@ -11,7 +11,6 @@ * applications using the library shouldn't need to include this file. */ - /* Declarations for both compression & decompression */ typedef enum { /* Operating modes for buffer controllers */ @@ -39,7 +38,6 @@ typedef enum { /* Operating modes for buffer controllers */ #define DSTATE_RDCOEFS 209 /* reading file in jpeg_read_coefficients */ #define DSTATE_STOPPING 210 /* looking for EOI in jpeg_finish_decompress */ - /* Declarations for compression modules */ /* Master control module */ @@ -133,7 +131,6 @@ struct jpeg_marker_writer { JMETHOD(void, write_marker_byte, (j_compress_ptr cinfo, int val)); }; - /* Declarations for decompression modules */ /* Master control module */ @@ -259,7 +256,6 @@ struct jpeg_color_quantizer { JMETHOD(void, new_color_map, (j_decompress_ptr cinfo)); }; - /* Miscellaneous useful macros */ #undef MAX @@ -267,7 +263,6 @@ struct jpeg_color_quantizer { #undef MIN #define MIN(a,b) ((a) < (b) ? (a) : (b)) - /* We assume that right shift corresponds to signed division by 2 with * rounding towards minus infinity. This is correct for typical "arithmetic * shift" instructions that shift in copies of the sign bit. But some @@ -289,7 +284,6 @@ struct jpeg_color_quantizer { #define RIGHT_SHIFT(x,shft) ((x) >> (shft)) #endif - /* Short forms of external names for systems with brain-damaged linkers. */ #ifdef NEED_SHORT_EXTERNAL_NAMES @@ -335,7 +329,6 @@ struct jpeg_color_quantizer { #define jpeg_aritab jAriTab #endif /* NEED_SHORT_EXTERNAL_NAMES */ - /* Compression module initialization routines */ EXTERN(void) jinit_compress_master JPP((j_compress_ptr cinfo)); EXTERN(void) jinit_c_master_control JPP((j_compress_ptr cinfo, diff --git a/jpegutils/transupp-6b.c b/jpegutils/transupp-6b.c index 2bb9133..7edd4de 100644 --- a/jpegutils/transupp-6b.c +++ b/jpegutils/transupp-6b.c @@ -59,7 +59,6 @@ enum { ((cinfo)->err->msg_code = (code), \ (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo))) - static long jround_up (long a, long b) /* Compute a rounded up to next multiple of b, ie, ceil(a/b)*b */ @@ -69,7 +68,6 @@ jround_up (long a, long b) return a - (a % b); } - static void jcopy_block_row (JBLOCKROW input_row, JBLOCKROW output_row, JDIMENSION num_blocks) @@ -85,7 +83,6 @@ jcopy_block_row (JBLOCKROW input_row, JBLOCKROW output_row, } } - /* * Lossless image transformation routines. These routines work on DCT * coefficient arrays and thus do not require any lossy decompression @@ -123,7 +120,6 @@ jcopy_block_row (JBLOCKROW input_row, JBLOCKROW output_row, * dimensions and ignore the source's. */ - static void do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays) @@ -172,7 +168,6 @@ do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - static void do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, @@ -243,7 +238,6 @@ do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - static void do_transpose (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, @@ -287,7 +281,6 @@ do_transpose (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - static void do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, @@ -351,7 +344,6 @@ do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - static void do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, @@ -415,7 +407,6 @@ do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - static void do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, @@ -516,7 +507,6 @@ do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - static void do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, jvirt_barray_ptr *src_coef_arrays, @@ -615,7 +605,6 @@ do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - /* Request any required workspace. * * We allocate the workspace virtual arrays from the source decompression @@ -695,7 +684,6 @@ jtransform_request_workspace (j_decompress_ptr srcinfo, info->workspace_coef_arrays = coef_arrays; } - /* Transpose destination image parameters */ static void @@ -735,7 +723,6 @@ transpose_critical_parameters (j_compress_ptr dstinfo) } } - /* Trim off any partial iMCUs on the indicated destination edge */ static void @@ -778,7 +765,6 @@ trim_bottom_edge (j_compress_ptr dstinfo) dstinfo->image_height = MCU_rows * (max_v_samp_factor * DCTSIZE); } - /* Adjust output image parameters as needed. * * This must be called after jpeg_copy_critical_parameters() @@ -867,7 +853,6 @@ jtransform_adjust_parameters (j_decompress_ptr srcinfo, return src_coef_arrays; } - /* Execute the actual transformation, if any. * * This must be called *after* jpeg_write_coefficients, because it depends @@ -912,7 +897,6 @@ jtransform_execute_transformation (j_decompress_ptr srcinfo, } } - /* Setup decompression object to save desired markers in memory. * This must be called before jpeg_read_header() to have the desired effect. */ @@ -988,5 +972,4 @@ jcopy_markers_execute (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - #endif /* HAVE_LIBJPEG */ diff --git a/jpegutils/transupp-6b.h b/jpegutils/transupp-6b.h index a42e4c1..21f3839 100644 --- a/jpegutils/transupp-6b.h +++ b/jpegutils/transupp-6b.h @@ -47,13 +47,11 @@ #ifdef HAVE_LIBJPEG - #ifndef TRANSUPP_H #define TRANSUPP_H #include <jpeglib.h> - typedef enum { JXFORM_NONE, /* no transformation */ JXFORM_FLIP_H, /* horizontal flip */ @@ -111,7 +109,6 @@ typedef struct { jvirt_barray_ptr * workspace_coef_arrays; /* workspace for transformations */ } jpeg_transform_info; - /* Request any required workspace */ void jtransform_request_workspace (j_decompress_ptr srcinfo, jpeg_transform_info *info); @@ -129,7 +126,6 @@ void jtransform_execute_transformation (j_decompress_ptr srcinfo, jvirt_barray_ptr *src_coef_arrays, jpeg_transform_info *info); - /* * Support for copying optional markers from source to destination file. */ @@ -151,7 +147,6 @@ void jcopy_markers_execute (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JCOPY_OPTION option); - #endif /* TRANSUPP_H */ #endif /* HAVE_LIBJPEG */ diff --git a/jpegutils/transupp-8a.c b/jpegutils/transupp-8a.c index 58af4a2..bffa9c7 100644 --- a/jpegutils/transupp-8a.c +++ b/jpegutils/transupp-8a.c @@ -48,7 +48,6 @@ #include "transupp-8a.h" /* My own external interface */ #include <ctype.h> /* to declare isdigit() */ - #if TRANSFORMS_SUPPORTED /* @@ -100,7 +99,6 @@ * source buffer it is an undocumented property of jdcoefct.c. */ - LOCAL(void) do_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, @@ -138,7 +136,6 @@ do_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - LOCAL(void) do_flip_h_no_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JDIMENSION x_crop_offset, @@ -205,7 +202,6 @@ do_flip_h_no_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - LOCAL(void) do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, @@ -267,7 +263,6 @@ do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - LOCAL(void) do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, @@ -347,7 +342,6 @@ do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - LOCAL(void) do_transpose (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, @@ -395,7 +389,6 @@ do_transpose (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - LOCAL(void) do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, @@ -476,7 +469,6 @@ do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - LOCAL(void) do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, @@ -547,7 +539,6 @@ do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - LOCAL(void) do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, @@ -655,7 +646,6 @@ do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - LOCAL(void) do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, @@ -770,7 +760,6 @@ do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, } } - /* Parse an unsigned integer: subroutine for jtransform_parse_crop_spec. * Returns TRUE if valid integer found, FALSE if not. * *strptr is advanced over the digit string, and *result is set to its value. @@ -792,7 +781,6 @@ jt_read_integer (const char ** strptr, JDIMENSION * result) return TRUE; } - /* Parse a crop specification (written in X11 geometry style). * The routine returns TRUE if the spec string is valid, FALSE if not. * @@ -849,7 +837,6 @@ jtransform_parse_crop_spec (jpeg_transform_info *info, const char *spec) return TRUE; } - /* Trim off any partial iMCUs on the indicated destination edge */ LOCAL(void) @@ -874,7 +861,6 @@ trim_bottom_edge (jpeg_transform_info *info, JDIMENSION full_height) info->output_height = MCU_rows * info->iMCU_sample_height; } - /* Request any required workspace. * * This routine figures out the size that the output image will be @@ -1120,7 +1106,6 @@ jtransform_request_workspace (j_decompress_ptr srcinfo, return TRUE; } - /* Transpose destination image parameters */ LOCAL(void) @@ -1163,7 +1148,6 @@ transpose_critical_parameters (j_compress_ptr dstinfo) } } - /* Adjust Exif image parameters. * * We try to adjust the Tags ExifImageWidth and ExifImageHeight if possible. @@ -1319,7 +1303,6 @@ adjust_exif_parameters (JOCTET FAR * data, unsigned int length, } while (--number_of_tags); } - /* Adjust output image parameters as needed. * * This must be called after jpeg_copy_critical_parameters() @@ -1416,7 +1399,6 @@ jtransform_adjust_parameters (j_decompress_ptr srcinfo, return src_coef_arrays; } - /* Execute the actual transformation, if any. * * This must be called *after* jpeg_write_coefficients, because it depends @@ -1533,7 +1515,6 @@ jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height, #endif /* TRANSFORMS_SUPPORTED */ - /* Setup decompression object to save desired markers in memory. * This must be called before jpeg_read_header() to have the desired effect. */ diff --git a/jpegutils/transupp-8a.h b/jpegutils/transupp-8a.h index d7baf00..d87de0b 100644 --- a/jpegutils/transupp-8a.h +++ b/jpegutils/transupp-8a.h @@ -78,7 +78,6 @@ #ifndef TRANSUPP_H #define TRANSUPP_H - /* Short forms of external names for systems with brain-damaged linkers. */ #ifdef NEED_SHORT_EXTERNAL_NAMES @@ -91,7 +90,6 @@ #define jcopy_markers_execute jCMrkExec #endif /* NEED_SHORT_EXTERNAL_NAMES */ - /* * Codes for supported types of image transformations. */ @@ -155,7 +153,6 @@ typedef struct { int iMCU_sample_height; } jpeg_transform_info; - #if TRANSFORMS_SUPPORTED /* Parse a crop specification (written in X11 geometry style) */ @@ -191,7 +188,6 @@ EXTERN(boolean) jtransform_perfect_transform #endif /* TRANSFORMS_SUPPORTED */ - /* * Support for copying optional markers from source to destination file. */ |