summaryrefslogtreecommitdiff
path: root/jdatasrc.c
diff options
context:
space:
mode:
authorDRC <dcommander@users.sourceforge.net>2013-01-18 23:42:31 +0000
committerDRC <dcommander@users.sourceforge.net>2013-01-18 23:42:31 +0000
commitab70623eb29e09e67222be5b9e1ea320fe5aa0e9 (patch)
treecbb9c0fceb3e39c397f5509b7d842f9962c6c07b /jdatasrc.c
parentb87136c2c7b9f9545c4ced25e7435e373b4760f7 (diff)
Implement in-memory source/destination managers even when not emulating the libjpeg v8 API/ABI
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@913 632fc199-4ca6-4c93-a231-07263d6284db
Diffstat (limited to 'jdatasrc.c')
-rw-r--r--jdatasrc.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/jdatasrc.c b/jdatasrc.c
index 602f3e1..69e8f6d 100644
--- a/jdatasrc.c
+++ b/jdatasrc.c
@@ -1,9 +1,11 @@
/*
* jdatasrc.c
*
+ * This file was part of the Independent JPEG Group's software:
* Copyright (C) 1994-1996, Thomas G. Lane.
* Modified 2009-2011 by Guido Vollbeding.
- * This file is part of the Independent JPEG Group's software.
+ * Modifications:
+ * Copyright (C) 2013, D. R. Commander.
* For conditions of distribution and use, see the accompanying README file.
*
* This file contains decompression data source routines for the case of
@@ -53,7 +55,7 @@ init_source (j_decompress_ptr cinfo)
src->start_of_file = TRUE;
}
-#if JPEG_LIB_VERSION >= 80
+#if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)
METHODDEF(void)
init_mem_source (j_decompress_ptr cinfo)
{
@@ -120,7 +122,7 @@ fill_input_buffer (j_decompress_ptr cinfo)
return TRUE;
}
-#if JPEG_LIB_VERSION >= 80
+#if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)
METHODDEF(boolean)
fill_mem_input_buffer (j_decompress_ptr cinfo)
{
@@ -244,7 +246,7 @@ jpeg_stdio_src (j_decompress_ptr cinfo, FILE * infile)
}
-#if JPEG_LIB_VERSION >= 80
+#if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)
/*
* Prepare for input from a supplied memory buffer.
* The buffer must contain the whole JPEG data.