From 14a5cb921843f621b0261817de920db8fdee26be Mon Sep 17 00:00:00 2001 From: neil Date: Tue, 26 Aug 2014 15:03:40 +0000 Subject: [PATCH] Converted jpeg_au.library into the MorphOS-compatible jfif.library. All the same functions that jpeg_au had are still present, but the LVO order has changed. git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@49537 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- workbench/classes/datatypes/jpeg/jpeg.conf | 4 ++-- workbench/libs/jpeg/{jpeg_au.conf => jfif.conf} | 22 +++++++++++----------- workbench/libs/jpeg/mmakefile.src | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) rename workbench/libs/jpeg/{jpeg_au.conf => jfif.conf} (97%) diff --git a/workbench/classes/datatypes/jpeg/jpeg.conf b/workbench/classes/datatypes/jpeg/jpeg.conf index c82b2fefa2..cf4d982c1f 100644 --- a/workbench/classes/datatypes/jpeg/jpeg.conf +++ b/workbench/classes/datatypes/jpeg/jpeg.conf @@ -1,9 +1,9 @@ ##begin config basename JPEG -version 41.0 +version 41.1 superclass PICTUREDTCLASS rellib stdc -rellib jpeg_au +rellib jfif ##end config ##begin cdef #include diff --git a/workbench/libs/jpeg/jpeg_au.conf b/workbench/libs/jpeg/jfif.conf similarity index 97% rename from workbench/libs/jpeg/jpeg_au.conf rename to workbench/libs/jpeg/jfif.conf index 99687d3b36..a76b208f31 100644 --- a/workbench/libs/jpeg/jpeg_au.conf +++ b/workbench/libs/jpeg/jfif.conf @@ -1,8 +1,8 @@ ##begin config basename Jpeg -version 1.0 -date 07.06.2012 -copyright Copyright (C) 1991-1998, Thomas G. Lane, Modified 2002-2011 by Guido Vollbeding, 2012 The AROS Development Team +version 52.1 +date 26.8.2014 +copyright Copyright (C) 1991-1998, Thomas G. Lane, Modified 2002-2011 by Guido Vollbeding, 2012-2014 The AROS Development Team options pertaskbase rellib stdcio rellib stdc @@ -14,21 +14,15 @@ rellib stdc ##end cdef ##begin functionlist -struct jpeg_error_mgr * jpeg_std_error(struct jpeg_error_mgr * err) void jpeg_CreateCompress(j_compress_ptr cinfo, int version, size_t structsize) void jpeg_CreateDecompress(j_decompress_ptr cinfo, int version, size_t structsize) void jpeg_destroy_compress(j_compress_ptr cinfo) void jpeg_destroy_decompress(j_decompress_ptr cinfo) -void jpeg_stdio_dest(j_compress_ptr cinfo, FILE * outfile) -void jpeg_stdio_src(j_decompress_ptr cinfo, FILE * infile) -void jpeg_mem_dest(j_compress_ptr cinfo, unsigned char ** outbuffer, unsigned long * outsize) -void jpeg_mem_src(j_decompress_ptr cinfo, unsigned char * inbuffer, unsigned long insize) void jpeg_set_defaults(j_compress_ptr cinfo) void jpeg_set_colorspace(j_compress_ptr cinfo, J_COLOR_SPACE colorspace) void jpeg_default_colorspace(j_compress_ptr cinfo) void jpeg_set_quality(j_compress_ptr cinfo, int quality, boolean force_baseline) void jpeg_set_linear_quality(j_compress_ptr cinfo, int scale_factor, boolean force_baseline) -void jpeg_default_qtables(j_compress_ptr cinfo, boolean force_baseline) void jpeg_add_quant_table(j_compress_ptr cinfo, int which_tbl, const unsigned int *basic_table, int scale_factor, boolean force_baseline) int jpeg_quality_scaling(int quality) void jpeg_simple_progression(j_compress_ptr cinfo) @@ -38,7 +32,6 @@ JHUFF_TBL * jpeg_alloc_huff_table(j_common_ptr cinfo) void jpeg_start_compress(j_compress_ptr cinfo, boolean write_all_tables) JDIMENSION jpeg_write_scanlines(j_compress_ptr cinfo, JSAMPARRAY scanlines, JDIMENSION num_lines) void jpeg_finish_compress(j_compress_ptr cinfo) -void jpeg_calc_jpeg_dimensions(j_compress_ptr cinfo) JDIMENSION jpeg_write_raw_data(j_compress_ptr cinfo, JSAMPIMAGE data, JDIMENSION num_lines) void jpeg_write_marker(j_compress_ptr cinfo, int marker, const JOCTET * dataptr, unsigned int datalen) void jpeg_write_m_header(j_compress_ptr cinfo, int marker, unsigned int datalen) @@ -55,7 +48,6 @@ boolean jpeg_finish_output(j_decompress_ptr cinfo) boolean jpeg_input_complete(j_decompress_ptr cinfo) void jpeg_new_colormap(j_decompress_ptr cinfo) int jpeg_consume_input(j_decompress_ptr cinfo) -void jpeg_core_output_dimensions(j_decompress_ptr cinfo) void jpeg_calc_output_dimensions(j_decompress_ptr cinfo) void jpeg_save_markers(j_decompress_ptr cinfo, int marker_code, unsigned int length_limit) void jpeg_set_marker_processor(j_decompress_ptr cinfo, int marker_code, jpeg_marker_parser_method routine) @@ -67,4 +59,12 @@ void jpeg_abort_decompress(j_decompress_ptr cinfo) void jpeg_abort(j_common_ptr cinfo) void jpeg_destroy(j_common_ptr cinfo) boolean jpeg_resync_to_restart(j_decompress_ptr cinfo, int desired) +struct jpeg_error_mgr * jpeg_std_error(struct jpeg_error_mgr * err) +void jpeg_stdio_dest(j_compress_ptr cinfo, FILE * outfile) +void jpeg_stdio_src(j_decompress_ptr cinfo, FILE * infile) +void jpeg_mem_dest(j_compress_ptr cinfo, unsigned char ** outbuffer, unsigned long * outsize) +void jpeg_mem_src(j_decompress_ptr cinfo, unsigned char * inbuffer, unsigned long insize) +void jpeg_default_qtables(j_compress_ptr cinfo, boolean force_baseline) +void jpeg_calc_jpeg_dimensions(j_compress_ptr cinfo) +void jpeg_core_output_dimensions(j_decompress_ptr cinfo) ##end functionlist diff --git a/workbench/libs/jpeg/mmakefile.src b/workbench/libs/jpeg/mmakefile.src index 02e73d2e41..4413262aa8 100644 --- a/workbench/libs/jpeg/mmakefile.src +++ b/workbench/libs/jpeg/mmakefile.src @@ -22,7 +22,7 @@ USER_CFLAGS += -Wno-main #MM- core-linklibs : linklibs-jpeg %build_module mmake=workbench-libs-jpeg \ - modname=jpeg_au modtype=library \ + modname=jfif modtype=library \ files="$(FILES)" linklibname=jpeg -- 2.11.4.GIT