Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
fa25ae78
"src/git@developer.sourcefind.cn:OpenDAS/dgl.git" did not exist on "e705118bcca5d39532b9cac3d89b708b6e7a7988"
Commit
fa25ae78
authored
Dec 03, 2013
by
Davis King
Browse files
Just removed unused variable names to avoid warnings from gcc.
parent
c2ff0cf8
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
32 additions
and
32 deletions
+32
-32
dlib/external/libjpeg/jdatasrc.cpp
dlib/external/libjpeg/jdatasrc.cpp
+1
-1
dlib/external/libjpeg/jdcoefct.cpp
dlib/external/libjpeg/jdcoefct.cpp
+1
-1
dlib/external/libjpeg/jdcolor.cpp
dlib/external/libjpeg/jdcolor.cpp
+1
-1
dlib/external/libjpeg/jdmerge.cpp
dlib/external/libjpeg/jdmerge.cpp
+3
-3
dlib/external/libjpeg/jdpostct.cpp
dlib/external/libjpeg/jdpostct.cpp
+4
-4
dlib/external/libjpeg/jdsample.cpp
dlib/external/libjpeg/jdsample.cpp
+6
-6
dlib/external/libjpeg/jmemnobs.cpp
dlib/external/libjpeg/jmemnobs.cpp
+10
-10
dlib/external/libjpeg/jquant1.cpp
dlib/external/libjpeg/jquant1.cpp
+4
-4
dlib/external/libjpeg/jquant2.cpp
dlib/external/libjpeg/jquant2.cpp
+2
-2
No files found.
dlib/external/libjpeg/jdatasrc.cpp
View file @
fa25ae78
...
@@ -166,7 +166,7 @@ skip_input_data (j_decompress_ptr cinfo, long num_bytes)
...
@@ -166,7 +166,7 @@ skip_input_data (j_decompress_ptr cinfo, long num_bytes)
*/
*/
METHODDEF
(
void
)
METHODDEF
(
void
)
term_source
(
j_decompress_ptr
cinfo
)
term_source
(
j_decompress_ptr
)
{
{
/* no work necessary here */
/* no work necessary here */
}
}
...
...
dlib/external/libjpeg/jdcoefct.cpp
View file @
fa25ae78
...
@@ -225,7 +225,7 @@ decompress_onepass (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
...
@@ -225,7 +225,7 @@ decompress_onepass (j_decompress_ptr cinfo, JSAMPIMAGE output_buf)
*/
*/
METHODDEF
(
int
)
METHODDEF
(
int
)
dummy_consume_data
(
j_decompress_ptr
cinfo
)
dummy_consume_data
(
j_decompress_ptr
)
{
{
return
JPEG_SUSPENDED
;
/* Always indicate nothing was done */
return
JPEG_SUSPENDED
;
/* Always indicate nothing was done */
}
}
...
...
dlib/external/libjpeg/jdcolor.cpp
View file @
fa25ae78
...
@@ -290,7 +290,7 @@ ycck_cmyk_convert (j_decompress_ptr cinfo,
...
@@ -290,7 +290,7 @@ ycck_cmyk_convert (j_decompress_ptr cinfo,
*/
*/
METHODDEF
(
void
)
METHODDEF
(
void
)
start_pass_dcolor
(
j_decompress_ptr
cinfo
)
start_pass_dcolor
(
j_decompress_ptr
)
{
{
/* no work needed */
/* no work needed */
}
}
...
...
dlib/external/libjpeg/jdmerge.cpp
View file @
fa25ae78
...
@@ -143,7 +143,7 @@ start_pass_merged_upsample (j_decompress_ptr cinfo)
...
@@ -143,7 +143,7 @@ start_pass_merged_upsample (j_decompress_ptr cinfo)
METHODDEF
(
void
)
METHODDEF
(
void
)
merged_2v_upsample
(
j_decompress_ptr
cinfo
,
merged_2v_upsample
(
j_decompress_ptr
cinfo
,
JSAMPIMAGE
input_buf
,
JDIMENSION
*
in_row_group_ctr
,
JSAMPIMAGE
input_buf
,
JDIMENSION
*
in_row_group_ctr
,
JDIMENSION
in_row_groups_avail
,
JDIMENSION
,
JSAMPARRAY
output_buf
,
JDIMENSION
*
out_row_ctr
,
JSAMPARRAY
output_buf
,
JDIMENSION
*
out_row_ctr
,
JDIMENSION
out_rows_avail
)
JDIMENSION
out_rows_avail
)
/* 2:1 vertical sampling case: may need a spare row. */
/* 2:1 vertical sampling case: may need a spare row. */
...
@@ -192,9 +192,9 @@ merged_2v_upsample (j_decompress_ptr cinfo,
...
@@ -192,9 +192,9 @@ merged_2v_upsample (j_decompress_ptr cinfo,
METHODDEF
(
void
)
METHODDEF
(
void
)
merged_1v_upsample
(
j_decompress_ptr
cinfo
,
merged_1v_upsample
(
j_decompress_ptr
cinfo
,
JSAMPIMAGE
input_buf
,
JDIMENSION
*
in_row_group_ctr
,
JSAMPIMAGE
input_buf
,
JDIMENSION
*
in_row_group_ctr
,
JDIMENSION
in_row_groups_avail
,
JDIMENSION
,
JSAMPARRAY
output_buf
,
JDIMENSION
*
out_row_ctr
,
JSAMPARRAY
output_buf
,
JDIMENSION
*
out_row_ctr
,
JDIMENSION
out_rows_avail
)
JDIMENSION
)
/* 1:1 vertical sampling case: much easier, never need a spare row. */
/* 1:1 vertical sampling case: much easier, never need a spare row. */
{
{
my_upsample_ptr
upsample
=
(
my_upsample_ptr
)
cinfo
->
upsample
;
my_upsample_ptr
upsample
=
(
my_upsample_ptr
)
cinfo
->
upsample
;
...
...
dlib/external/libjpeg/jdpostct.cpp
View file @
fa25ae78
...
@@ -158,8 +158,8 @@ METHODDEF(void)
...
@@ -158,8 +158,8 @@ METHODDEF(void)
post_process_prepass
(
j_decompress_ptr
cinfo
,
post_process_prepass
(
j_decompress_ptr
cinfo
,
JSAMPIMAGE
input_buf
,
JDIMENSION
*
in_row_group_ctr
,
JSAMPIMAGE
input_buf
,
JDIMENSION
*
in_row_group_ctr
,
JDIMENSION
in_row_groups_avail
,
JDIMENSION
in_row_groups_avail
,
JSAMPARRAY
output_buf
,
JDIMENSION
*
out_row_ctr
,
JSAMPARRAY
,
JDIMENSION
*
out_row_ctr
,
JDIMENSION
out_rows_avail
)
JDIMENSION
)
{
{
my_post_ptr
post
=
(
my_post_ptr
)
cinfo
->
post
;
my_post_ptr
post
=
(
my_post_ptr
)
cinfo
->
post
;
JDIMENSION
old_next_row
,
num_rows
;
JDIMENSION
old_next_row
,
num_rows
;
...
@@ -200,8 +200,8 @@ post_process_prepass (j_decompress_ptr cinfo,
...
@@ -200,8 +200,8 @@ post_process_prepass (j_decompress_ptr cinfo,
METHODDEF
(
void
)
METHODDEF
(
void
)
post_process_2pass
(
j_decompress_ptr
cinfo
,
post_process_2pass
(
j_decompress_ptr
cinfo
,
JSAMPIMAGE
input_buf
,
JDIMENSION
*
in_row_group_ctr
,
JSAMPIMAGE
,
JDIMENSION
*
,
JDIMENSION
in_row_groups_avail
,
JDIMENSION
,
JSAMPARRAY
output_buf
,
JDIMENSION
*
out_row_ctr
,
JSAMPARRAY
output_buf
,
JDIMENSION
*
out_row_ctr
,
JDIMENSION
out_rows_avail
)
JDIMENSION
out_rows_avail
)
{
{
...
...
dlib/external/libjpeg/jdsample.cpp
View file @
fa25ae78
...
@@ -88,7 +88,7 @@ start_pass_upsample (j_decompress_ptr cinfo)
...
@@ -88,7 +88,7 @@ start_pass_upsample (j_decompress_ptr cinfo)
METHODDEF
(
void
)
METHODDEF
(
void
)
sep_upsample
(
j_decompress_ptr
cinfo
,
sep_upsample
(
j_decompress_ptr
cinfo
,
JSAMPIMAGE
input_buf
,
JDIMENSION
*
in_row_group_ctr
,
JSAMPIMAGE
input_buf
,
JDIMENSION
*
in_row_group_ctr
,
JDIMENSION
in_row_groups_avail
,
JDIMENSION
,
JSAMPARRAY
output_buf
,
JDIMENSION
*
out_row_ctr
,
JSAMPARRAY
output_buf
,
JDIMENSION
*
out_row_ctr
,
JDIMENSION
out_rows_avail
)
JDIMENSION
out_rows_avail
)
{
{
...
@@ -154,7 +154,7 @@ sep_upsample (j_decompress_ptr cinfo,
...
@@ -154,7 +154,7 @@ sep_upsample (j_decompress_ptr cinfo,
*/
*/
METHODDEF
(
void
)
METHODDEF
(
void
)
fullsize_upsample
(
j_decompress_ptr
cinfo
,
jpeg_component_info
*
compptr
,
fullsize_upsample
(
j_decompress_ptr
,
jpeg_component_info
*
,
JSAMPARRAY
input_data
,
JSAMPARRAY
*
output_data_ptr
)
JSAMPARRAY
input_data
,
JSAMPARRAY
*
output_data_ptr
)
{
{
*
output_data_ptr
=
input_data
;
*
output_data_ptr
=
input_data
;
...
@@ -167,8 +167,8 @@ fullsize_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
...
@@ -167,8 +167,8 @@ fullsize_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
*/
*/
METHODDEF
(
void
)
METHODDEF
(
void
)
noop_upsample
(
j_decompress_ptr
cinfo
,
jpeg_component_info
*
compptr
,
noop_upsample
(
j_decompress_ptr
,
jpeg_component_info
*
,
JSAMPARRAY
input_data
,
JSAMPARRAY
*
output_data_ptr
)
JSAMPARRAY
,
JSAMPARRAY
*
output_data_ptr
)
{
{
*
output_data_ptr
=
NULL
;
/* safety check */
*
output_data_ptr
=
NULL
;
/* safety check */
}
}
...
@@ -230,7 +230,7 @@ int_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
...
@@ -230,7 +230,7 @@ int_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
*/
*/
METHODDEF
(
void
)
METHODDEF
(
void
)
h2v1_upsample
(
j_decompress_ptr
cinfo
,
jpeg_component_info
*
compptr
,
h2v1_upsample
(
j_decompress_ptr
cinfo
,
jpeg_component_info
*
,
JSAMPARRAY
input_data
,
JSAMPARRAY
*
output_data_ptr
)
JSAMPARRAY
input_data
,
JSAMPARRAY
*
output_data_ptr
)
{
{
JSAMPARRAY
output_data
=
*
output_data_ptr
;
JSAMPARRAY
output_data
=
*
output_data_ptr
;
...
@@ -258,7 +258,7 @@ h2v1_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
...
@@ -258,7 +258,7 @@ h2v1_upsample (j_decompress_ptr cinfo, jpeg_component_info * compptr,
*/
*/
METHODDEF
(
void
)
METHODDEF
(
void
)
h2v2_upsample
(
j_decompress_ptr
cinfo
,
jpeg_component_info
*
compptr
,
h2v2_upsample
(
j_decompress_ptr
cinfo
,
jpeg_component_info
*
,
JSAMPARRAY
input_data
,
JSAMPARRAY
*
output_data_ptr
)
JSAMPARRAY
input_data
,
JSAMPARRAY
*
output_data_ptr
)
{
{
JSAMPARRAY
output_data
=
*
output_data_ptr
;
JSAMPARRAY
output_data
=
*
output_data_ptr
;
...
...
dlib/external/libjpeg/jmemnobs.cpp
View file @
fa25ae78
...
@@ -32,13 +32,13 @@ extern void free JPP((void *ptr));
...
@@ -32,13 +32,13 @@ extern void free JPP((void *ptr));
*/
*/
GLOBAL
(
void
*
)
GLOBAL
(
void
*
)
jpeg_get_small
(
j_common_ptr
cinfo
,
size_t
sizeofobject
)
jpeg_get_small
(
j_common_ptr
,
size_t
sizeofobject
)
{
{
return
(
void
*
)
malloc
(
sizeofobject
);
return
(
void
*
)
malloc
(
sizeofobject
);
}
}
GLOBAL
(
void
)
GLOBAL
(
void
)
jpeg_free_small
(
j_common_ptr
cinfo
,
void
*
object
,
size_t
sizeofobject
)
jpeg_free_small
(
j_common_ptr
,
void
*
object
,
size_t
)
{
{
free
(
object
);
free
(
object
);
}
}
...
@@ -52,13 +52,13 @@ jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)
...
@@ -52,13 +52,13 @@ jpeg_free_small (j_common_ptr cinfo, void * object, size_t sizeofobject)
*/
*/
GLOBAL
(
void
FAR
*
)
GLOBAL
(
void
FAR
*
)
jpeg_get_large
(
j_common_ptr
cinfo
,
size_t
sizeofobject
)
jpeg_get_large
(
j_common_ptr
,
size_t
sizeofobject
)
{
{
return
(
void
FAR
*
)
malloc
(
sizeofobject
);
return
(
void
FAR
*
)
malloc
(
sizeofobject
);
}
}
GLOBAL
(
void
)
GLOBAL
(
void
)
jpeg_free_large
(
j_common_ptr
cinfo
,
void
FAR
*
object
,
size_t
sizeofobject
)
jpeg_free_large
(
j_common_ptr
,
void
FAR
*
object
,
size_t
)
{
{
free
(
object
);
free
(
object
);
}
}
...
@@ -70,8 +70,8 @@ jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)
...
@@ -70,8 +70,8 @@ jpeg_free_large (j_common_ptr cinfo, void FAR * object, size_t sizeofobject)
*/
*/
GLOBAL
(
long
)
GLOBAL
(
long
)
jpeg_mem_available
(
j_common_ptr
cinfo
,
long
min_bytes_needed
,
jpeg_mem_available
(
j_common_ptr
,
long
,
long
max_bytes_needed
,
long
already_allocated
)
long
max_bytes_needed
,
long
)
{
{
return
max_bytes_needed
;
return
max_bytes_needed
;
}
}
...
@@ -84,8 +84,8 @@ jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,
...
@@ -84,8 +84,8 @@ jpeg_mem_available (j_common_ptr cinfo, long min_bytes_needed,
*/
*/
GLOBAL
(
void
)
GLOBAL
(
void
)
jpeg_open_backing_store
(
j_common_ptr
cinfo
,
backing_store_ptr
info
,
jpeg_open_backing_store
(
j_common_ptr
cinfo
,
backing_store_ptr
,
long
total_bytes_needed
)
long
)
{
{
ERREXIT
(
cinfo
,
JERR_NO_BACKING_STORE
);
ERREXIT
(
cinfo
,
JERR_NO_BACKING_STORE
);
}
}
...
@@ -97,13 +97,13 @@ jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
...
@@ -97,13 +97,13 @@ jpeg_open_backing_store (j_common_ptr cinfo, backing_store_ptr info,
*/
*/
GLOBAL
(
long
)
GLOBAL
(
long
)
jpeg_mem_init
(
j_common_ptr
cinfo
)
jpeg_mem_init
(
j_common_ptr
)
{
{
return
0
;
/* just set max_memory_to_use to 0 */
return
0
;
/* just set max_memory_to_use to 0 */
}
}
GLOBAL
(
void
)
GLOBAL
(
void
)
jpeg_mem_term
(
j_common_ptr
cinfo
)
jpeg_mem_term
(
j_common_ptr
)
{
{
/* no work */
/* no work */
}
}
dlib/external/libjpeg/jquant1.cpp
View file @
fa25ae78
...
@@ -242,7 +242,7 @@ select_ncolors (j_decompress_ptr cinfo, int Ncolors[])
...
@@ -242,7 +242,7 @@ select_ncolors (j_decompress_ptr cinfo, int Ncolors[])
LOCAL
(
int
)
LOCAL
(
int
)
output_value
(
j_decompress_ptr
cinfo
,
int
ci
,
int
j
,
int
maxj
)
output_value
(
j_decompress_ptr
,
int
,
int
j
,
int
maxj
)
/* Return j'th output value, where j will range from 0 to maxj */
/* Return j'th output value, where j will range from 0 to maxj */
/* The output values must fall in 0..MAXJSAMPLE in increasing order */
/* The output values must fall in 0..MAXJSAMPLE in increasing order */
{
{
...
@@ -256,7 +256,7 @@ output_value (j_decompress_ptr cinfo, int ci, int j, int maxj)
...
@@ -256,7 +256,7 @@ output_value (j_decompress_ptr cinfo, int ci, int j, int maxj)
LOCAL
(
int
)
LOCAL
(
int
)
largest_input_value
(
j_decompress_ptr
cinfo
,
int
ci
,
int
j
,
int
maxj
)
largest_input_value
(
j_decompress_ptr
,
int
,
int
j
,
int
maxj
)
/* Return largest input value that should map to j'th output value */
/* Return largest input value that should map to j'th output value */
/* Must have largest(j=0) >= 0, and largest(j=maxj) >= MAXJSAMPLE */
/* Must have largest(j=0) >= 0, and largest(j=maxj) >= MAXJSAMPLE */
{
{
...
@@ -738,7 +738,7 @@ alloc_fs_workspace (j_decompress_ptr cinfo)
...
@@ -738,7 +738,7 @@ alloc_fs_workspace (j_decompress_ptr cinfo)
*/
*/
METHODDEF
(
void
)
METHODDEF
(
void
)
start_pass_1_quant
(
j_decompress_ptr
cinfo
,
boolean
is_pre_scan
)
start_pass_1_quant
(
j_decompress_ptr
cinfo
,
boolean
)
{
{
my_cquantize_ptr
cquantize
=
(
my_cquantize_ptr
)
cinfo
->
cquantize
;
my_cquantize_ptr
cquantize
=
(
my_cquantize_ptr
)
cinfo
->
cquantize
;
size_t
arraysize
;
size_t
arraysize
;
...
@@ -795,7 +795,7 @@ start_pass_1_quant (j_decompress_ptr cinfo, boolean is_pre_scan)
...
@@ -795,7 +795,7 @@ start_pass_1_quant (j_decompress_ptr cinfo, boolean is_pre_scan)
*/
*/
METHODDEF
(
void
)
METHODDEF
(
void
)
finish_pass_1_quant
(
j_decompress_ptr
cinfo
)
finish_pass_1_quant
(
j_decompress_ptr
)
{
{
/* no work in 1-pass case */
/* no work in 1-pass case */
}
}
...
...
dlib/external/libjpeg/jquant2.cpp
View file @
fa25ae78
...
@@ -222,7 +222,7 @@ typedef my_cquantizer * my_cquantize_ptr;
...
@@ -222,7 +222,7 @@ typedef my_cquantizer * my_cquantize_ptr;
METHODDEF
(
void
)
METHODDEF
(
void
)
prescan_quantize
(
j_decompress_ptr
cinfo
,
JSAMPARRAY
input_buf
,
prescan_quantize
(
j_decompress_ptr
cinfo
,
JSAMPARRAY
input_buf
,
JSAMPARRAY
output_buf
,
int
num_rows
)
JSAMPARRAY
,
int
num_rows
)
{
{
my_cquantize_ptr
cquantize
=
(
my_cquantize_ptr
)
cinfo
->
cquantize
;
my_cquantize_ptr
cquantize
=
(
my_cquantize_ptr
)
cinfo
->
cquantize
;
register
JSAMPROW
ptr
;
register
JSAMPROW
ptr
;
...
@@ -1153,7 +1153,7 @@ finish_pass1 (j_decompress_ptr cinfo)
...
@@ -1153,7 +1153,7 @@ finish_pass1 (j_decompress_ptr cinfo)
METHODDEF
(
void
)
METHODDEF
(
void
)
finish_pass2
(
j_decompress_ptr
cinfo
)
finish_pass2
(
j_decompress_ptr
)
{
{
/* no work */
/* no work */
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment