Index: jchuff.h |
diff --git a/jchuff.h b/jchuff.h |
index a9599fc1e6f9613ca5b7ce02a3b734f0c89cba51..4236089adc06be403aa5ce97233e388bcdc84a4a 100644 |
--- a/jchuff.h |
+++ b/jchuff.h |
@@ -1,9 +1,12 @@ |
/* |
* jchuff.h |
* |
+ * This file was part of the Independent JPEG Group's software: |
* Copyright (C) 1991-1997, Thomas G. Lane. |
- * This file is part of the Independent JPEG Group's software. |
- * For conditions of distribution and use, see the accompanying README file. |
+ * It was modified by The libjpeg-turbo Project to include only code relevant |
+ * to libjpeg-turbo. |
+ * For conditions of distribution and use, see the accompanying README.ijg |
+ * file. |
* |
* This file contains declarations for Huffman entropy encoding routines |
* that are shared between the sequential encoder (jchuff.c) and the |
@@ -25,23 +28,16 @@ |
/* Derived data constructed for each Huffman table */ |
typedef struct { |
- unsigned int ehufco[256]; /* code for each symbol */ |
- char ehufsi[256]; /* length of code for each symbol */ |
+ unsigned int ehufco[256]; /* code for each symbol */ |
+ char ehufsi[256]; /* length of code for each symbol */ |
/* If no code has been allocated for a symbol S, ehufsi[S] contains 0 */ |
} c_derived_tbl; |
-/* Short forms of external names for systems with brain-damaged linkers. */ |
- |
-#ifdef NEED_SHORT_EXTERNAL_NAMES |
-#define jpeg_make_c_derived_tbl jMkCDerived |
-#define jpeg_gen_optimal_table jGenOptTbl |
-#endif /* NEED_SHORT_EXTERNAL_NAMES */ |
- |
/* Expand a Huffman table definition into the derived format */ |
EXTERN(void) jpeg_make_c_derived_tbl |
- JPP((j_compress_ptr cinfo, boolean isDC, int tblno, |
- c_derived_tbl ** pdtbl)); |
+ (j_compress_ptr cinfo, boolean isDC, int tblno, |
+ c_derived_tbl ** pdtbl); |
/* Generate an optimal table definition given the specified counts */ |
EXTERN(void) jpeg_gen_optimal_table |
- JPP((j_compress_ptr cinfo, JHUFF_TBL * htbl, long freq[])); |
+ (j_compress_ptr cinfo, JHUFF_TBL *htbl, long freq[]); |