summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Friloux <guillaume.friloux@gmail.com>2013-12-19 11:12:46 +0100
committerGuillaume Friloux <guillaume.friloux@gmail.com>2013-12-19 11:12:46 +0100
commit8937708e4363b16c8b26f9a8d7526d162ac94547 (patch)
treec4d075e9a03c4724a5e11f82d25cb58a6013a664
parent86d2983bf3034cd2c669f6f2efb8fb06a58bc0dd (diff)
Fix coding style madness.
-rw-r--r--src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c29
1 files changed, 15 insertions, 14 deletions
diff --git a/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c b/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c
index 11df6e7fa7..b8b2677146 100644
--- a/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c
+++ b/src/modules/evas/loaders/jpeg/evas_image_load_jpeg.c
@@ -337,8 +337,9 @@ _get_orientation(void *map, size_t length)
337 337
338static Eina_Bool 338static Eina_Bool
339evas_image_load_file_head_jpeg_internal(unsigned int *w, unsigned int *h, 339evas_image_load_file_head_jpeg_internal(unsigned int *w, unsigned int *h,
340 unsigned char *scale, unsigned char *rotated, 340 unsigned char *scale,
341 Evas_Image_Load_Opts *opts, 341 unsigned char *rotated,
342 Evas_Image_Load_Opts *opts,
342 void *map, size_t length, 343 void *map, size_t length,
343 int *error) 344 int *error)
344{ 345{
@@ -506,7 +507,7 @@ evas_image_load_file_head_jpeg_internal(unsigned int *w, unsigned int *h,
506 507
507 *w = cinfo.output_width; 508 *w = cinfo.output_width;
508 *h = cinfo.output_height; 509 *h = cinfo.output_height;
509 510
510 // be nice and clip region to image. if its totally outside, fail load 511 // be nice and clip region to image. if its totally outside, fail load
511 if ((opts->region.w > 0) && (opts->region.h > 0)) 512 if ((opts->region.w > 0) && (opts->region.h > 0))
512 { 513 {
@@ -583,7 +584,7 @@ static double
583get_time(void) 584get_time(void)
584{ 585{
585 struct timeval timev; 586 struct timeval timev;
586 587
587 gettimeofday(&timev, NULL); 588 gettimeofday(&timev, NULL);
588 return (double)timev.tv_sec + (((double)timev.tv_usec) / 1000000); 589 return (double)timev.tv_sec + (((double)timev.tv_usec) / 1000000);
589} 590}
@@ -591,8 +592,8 @@ get_time(void)
591 592
592static Eina_Bool 593static Eina_Bool
593evas_image_load_file_data_jpeg_internal(Evas_Image_Load_Opts *opts, 594evas_image_load_file_data_jpeg_internal(Evas_Image_Load_Opts *opts,
594 Evas_Image_Property *prop, 595 Evas_Image_Property *prop,
595 void *pixels, 596 void *pixels,
596 void *map, size_t size, 597 void *map, size_t size,
597 int *error) 598 int *error)
598{ 599{
@@ -870,7 +871,7 @@ evas_image_load_file_data_jpeg_internal(Evas_Image_Load_Opts *opts,
870 return EINA_FALSE;*/ 871 return EINA_FALSE;*/
871 } 872 }
872 // els if scan block intersects region start or later 873 // els if scan block intersects region start or later
873 else if ((l + scans) > 874 else if ((l + scans) >
874 (opts->region.y)) 875 (opts->region.y))
875 { 876 {
876 for (y = 0; y < scans; y++) 877 for (y = 0; y < scans; y++)
@@ -932,7 +933,7 @@ evas_image_load_file_data_jpeg_internal(Evas_Image_Load_Opts *opts,
932 /* We handle then RGB with 3 components */ 933 /* We handle then RGB with 3 components */
933 else if (cinfo.output_components == 3) 934 else if (cinfo.output_components == 3)
934 { 935 {
935/* 936/*
936 double t; 937 double t;
937 if (region) 938 if (region)
938 { 939 {
@@ -979,7 +980,7 @@ evas_image_load_file_data_jpeg_internal(Evas_Image_Load_Opts *opts,
979 goto done; 980 goto done;
980 } 981 }
981 // else if scan block intersects region start or later 982 // else if scan block intersects region start or later
982 else if ((l + scans) > 983 else if ((l + scans) >
983 (opts->region.y)) 984 (opts->region.y))
984 { 985 {
985 for (y = 0; y < scans; y++) 986 for (y = 0; y < scans; y++)
@@ -1002,7 +1003,7 @@ evas_image_load_file_data_jpeg_internal(Evas_Image_Load_Opts *opts,
1002 } 1003 }
1003 } 1004 }
1004 } 1005 }
1005/* 1006/*
1006 t = get_time() - t; 1007 t = get_time() - t;
1007 printf("%3.3f\n", t); 1008 printf("%3.3f\n", t);
1008 */ 1009 */
@@ -1044,7 +1045,7 @@ evas_image_load_file_data_jpeg_internal(Evas_Image_Load_Opts *opts,
1044 return EINA_TRUE;*/ 1045 return EINA_TRUE;*/
1045 } 1046 }
1046 // els if scan block intersects region start or later 1047 // els if scan block intersects region start or later
1047 else if ((l + scans) > 1048 else if ((l + scans) >
1048 (opts->region.y)) 1049 (opts->region.y))
1049 { 1050 {
1050 for (y = 0; y < scans; y++) 1051 for (y = 0; y < scans; y++)
@@ -1096,7 +1097,7 @@ done:
1096 data2--; 1097 data2--;
1097 } 1098 }
1098 } 1099 }
1099 else 1100 else
1100 { 1101 {
1101 data2 = NULL; 1102 data2 = NULL;
1102 to = NULL; 1103 to = NULL;
@@ -1327,8 +1328,8 @@ evas_image_load_file_head_jpeg(void *loader_data,
1327static Eina_Bool 1328static Eina_Bool
1328evas_image_load_file_data_jpeg(void *loader_data, 1329evas_image_load_file_data_jpeg(void *loader_data,
1329 Evas_Image_Property *prop, 1330 Evas_Image_Property *prop,
1330 void *pixels, 1331 void *pixels,
1331 int *error) 1332 int *error)
1332{ 1333{
1333 Evas_Loader_Internal *loader = loader_data; 1334 Evas_Loader_Internal *loader = loader_data;
1334 Evas_Image_Load_Opts *opts; 1335 Evas_Image_Load_Opts *opts;