1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
diff -urN libterralib-3.3.1.orig/src/terralib/drivers/libjpeg/jmemdst.c libterralib-3.3.1/src/terralib/drivers/libjpeg/jmemdst.c
--- libterralib-3.3.1.orig/src/terralib/drivers/libjpeg/jmemdst.c 2010-01-21 21:28:29.000000000 +0000
+++ libterralib-3.3.1/src/terralib/drivers/libjpeg/jmemdst.c 2010-01-21 22:09:14.000000000 +0000
@@ -115,7 +115,7 @@
*/
GLOBAL(void)
-jpeg_mem_dest(j_compress_ptr cinfo, void **pTargetData, unsigned int *pNumBytes)
+j_mem_dest(j_compress_ptr cinfo, void **pTargetData, unsigned int *pNumBytes)
{
mem_dest_ptr dest; if(cinfo->dest == NULL)
{
diff -urN libterralib-3.3.1.orig/src/terralib/drivers/libjpeg/jmemdstsrc.h libterralib-3.3.1/src/terralib/drivers/libjpeg/jmemdstsrc.h
--- libterralib-3.3.1.orig/src/terralib/drivers/libjpeg/jmemdstsrc.h 2010-01-21 21:28:29.000000000 +0000
+++ libterralib-3.3.1/src/terralib/drivers/libjpeg/jmemdstsrc.h 2010-01-21 22:08:40.000000000 +0000
@@ -49,7 +49,7 @@
//! Function to allows the writting of JPEG data to a memory buffer
GLOBAL(void)
-jpeg_mem_dest(j_compress_ptr cinfo, void **pTargetData, unsigned int *pNumBytes);
+j_mem_dest(j_compress_ptr cinfo, void **pTargetData, unsigned int *pNumBytes);
// Expanded data source object for memory buffer input
typedef struct
@@ -63,6 +63,6 @@
//! Function to allows the reading of JPEG data from a memory buffer
GLOBAL(void)
-jpeg_mem_src (j_decompress_ptr cinfo, unsigned char* buffer, unsigned int bufsize);
+j_mem_src (j_decompress_ptr cinfo, unsigned char* buffer, unsigned int bufsize);
#endif
diff -urN libterralib-3.3.1.orig/src/terralib/drivers/libjpeg/jmemsrc.c libterralib-3.3.1/src/terralib/drivers/libjpeg/jmemsrc.c
--- libterralib-3.3.1.orig/src/terralib/drivers/libjpeg/jmemsrc.c 2010-01-21 21:28:29.000000000 +0000
+++ libterralib-3.3.1/src/terralib/drivers/libjpeg/jmemsrc.c 2010-01-21 22:08:45.000000000 +0000
@@ -70,7 +70,7 @@
Prepare for input from a memory buffer.
*/
GLOBAL(void)
-jpeg_mem_src (j_decompress_ptr cinfo, unsigned char* buffer, unsigned int bufsize)
+j_mem_src (j_decompress_ptr cinfo, unsigned char* buffer, unsigned int bufsize)
{
my_src_ptr src;
diff -urN libterralib-3.3.1.orig/src/terralib/drivers/libjpeg/TeLibJpegWrapper.cpp libterralib-3.3.1/src/terralib/drivers/libjpeg/TeLibJpegWrapper.cpp
--- libterralib-3.3.1.orig/src/terralib/drivers/libjpeg/TeLibJpegWrapper.cpp 2010-01-21 21:28:29.000000000 +0000
+++ libterralib-3.3.1/src/terralib/drivers/libjpeg/TeLibJpegWrapper.cpp 2010-01-21 22:08:54.000000000 +0000
@@ -101,7 +101,7 @@
cinfo.err = jpeg_std_error(&jerr);
jpeg_create_decompress(&cinfo);
- jpeg_mem_src (&cinfo, srcBuffer, size);
+ j_mem_src (&cinfo, srcBuffer, size);
jpeg_read_header(&cinfo,true);
jpeg_start_decompress(&cinfo);
@@ -202,7 +202,7 @@
jpeg_set_defaults(&cinfo);
jpeg_set_quality(&cinfo, quality, true);
- jpeg_mem_dest(&cinfo,reinterpret_cast<void**>(&dstBuffer),reinterpret_cast<unsigned int*>(&len));
+ j_mem_dest(&cinfo,reinterpret_cast<void**>(&dstBuffer),reinterpret_cast<unsigned int*>(&len));
jpeg_start_compress(&cinfo,true);
while (cinfo.next_scanline < cinfo.image_height)
{
|
