usergreen
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Pull Requests Activity

Fix coding style madness.

This commit is contained in:
Guillaume Friloux 2013-12-19 11:12:46 +01:00
parent 86d2983bf3
commit 8937708e43
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c
View File

@ -337,8 +337,9 @@ _get_orientation(void *map, size_t length)
static Eina_Bool static Eina_Bool
evas_image_load_file_head_jpeg_internal(unsigned int *w, unsigned int *h, evas_image_load_file_head_jpeg_internal(unsigned int *w, unsigned int *h,
unsigned char *scale, unsigned char *rotated, unsigned char *scale,
Evas_Image_Load_Opts *opts, unsigned char *rotated,
Evas_Image_Load_Opts *opts,
void *map, size_t length, void *map, size_t length,
int *error) int *error)
{ {
@ -506,7 +507,7 @@ evas_image_load_file_head_jpeg_internal(unsigned int *w, unsigned int *h,
*w = cinfo.output_width; *w = cinfo.output_width;
*h = cinfo.output_height; *h = cinfo.output_height;
// be nice and clip region to image. if its totally outside, fail load // be nice and clip region to image. if its totally outside, fail load
if ((opts->region.w > 0) && (opts->region.h > 0)) if ((opts->region.w > 0) && (opts->region.h > 0))
{ {
@ -583,7 +584,7 @@ static double
get_time(void) get_time(void)
{ {
struct timeval timev; struct timeval timev;
gettimeofday(&timev, NULL); gettimeofday(&timev, NULL);
return (double)timev.tv_sec + (((double)timev.tv_usec) / 1000000); return (double)timev.tv_sec + (((double)timev.tv_usec) / 1000000);
} }
@ -591,8 +592,8 @@ get_time(void)
static Eina_Bool static Eina_Bool
evas_image_load_file_data_jpeg_internal(Evas_Image_Load_Opts *opts, evas_image_load_file_data_jpeg_internal(Evas_Image_Load_Opts *opts,
Evas_Image_Property *prop, Evas_Image_Property *prop,
void *pixels, void *pixels,
void *map, size_t size, void *map, size_t size,
int *error) int *error)
{ {
@ -870,7 +871,7 @@ evas_image_load_file_data_jpeg_internal(Evas_Image_Load_Opts *opts,
return EINA_FALSE;*/ return EINA_FALSE;*/
} }
// els if scan block intersects region start or later // els if scan block intersects region start or later
else if ((l + scans) > else if ((l + scans) >
(opts->region.y)) (opts->region.y))
{ {
for (y = 0; y < scans; y++) for (y = 0; y < scans; y++)
@ -932,7 +933,7 @@ evas_image_load_file_data_jpeg_internal(Evas_Image_Load_Opts *opts,
/* We handle then RGB with 3 components */ /* We handle then RGB with 3 components */
else if (cinfo.output_components == 3) else if (cinfo.output_components == 3)
{ {
/* /*
double t; double t;
if (region) if (region)
{ {
@ -979,7 +980,7 @@ evas_image_load_file_data_jpeg_internal(Evas_Image_Load_Opts *opts,
goto done; goto done;
} }
// else if scan block intersects region start or later // else if scan block intersects region start or later
else if ((l + scans) > else if ((l + scans) >
(opts->region.y)) (opts->region.y))
{ {
for (y = 0; y < scans; y++) for (y = 0; y < scans; y++)
@ -1002,7 +1003,7 @@ evas_image_load_file_data_jpeg_internal(Evas_Image_Load_Opts *opts,
} }
} }
} }
/* /*
t = get_time() - t; t = get_time() - t;
printf("%3.3f\n", t); printf("%3.3f\n", t);
*/ */
@ -1044,7 +1045,7 @@ evas_image_load_file_data_jpeg_internal(Evas_Image_Load_Opts *opts,
return EINA_TRUE;*/ return EINA_TRUE;*/
} }
// els if scan block intersects region start or later // els if scan block intersects region start or later
else if ((l + scans) > else if ((l + scans) >
(opts->region.y)) (opts->region.y))
{ {
for (y = 0; y < scans; y++) for (y = 0; y < scans; y++)
@ -1096,7 +1097,7 @@ done:
data2--; data2--;
} }
} }
else else
{ {
data2 = NULL; data2 = NULL;
to = NULL; to = NULL;
@ -1327,8 +1328,8 @@ evas_image_load_file_head_jpeg(void *loader_data,
static Eina_Bool static Eina_Bool
evas_image_load_file_data_jpeg(void *loader_data, evas_image_load_file_data_jpeg(void *loader_data,
Evas_Image_Property *prop, Evas_Image_Property *prop,
void *pixels, void *pixels,
int *error) int *error)
{ {
Evas_Loader_Internal *loader = loader_data; Evas_Loader_Internal *loader = loader_data;
Evas_Image_Load_Opts *opts; Evas_Image_Load_Opts *opts;