summaryrefslogtreecommitdiff
path: root/src/lib/emile
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2015-03-17 08:50:44 +0100
committerCedric BAIL <cedric@osg.samsung.com>2015-03-17 09:58:20 +0100
commit065f87bd15c46828c06e0ef1073fddc55ec08db6 (patch)
tree0515d9bb848e8c681fe617b28b42c6b7b23bafa6 /src/lib/emile
parent6e59828f74290432166de13731728d547619ac19 (diff)
emile: cleanup comments and internal functions name.
Diffstat (limited to 'src/lib/emile')
-rw-r--r--src/lib/emile/emile_cipher_gnutls.c21
-rw-r--r--src/lib/emile/emile_cipher_openssl.c2
-rw-r--r--src/lib/emile/emile_compress.c15
-rw-r--r--src/lib/emile/emile_image.c92
4 files changed, 59 insertions, 71 deletions
diff --git a/src/lib/emile/emile_cipher_gnutls.c b/src/lib/emile/emile_cipher_gnutls.c
index 5cf85e4cc5..eda1d54b09 100644
--- a/src/lib/emile/emile_cipher_gnutls.c
+++ b/src/lib/emile/emile_cipher_gnutls.c
@@ -1,6 +1,6 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include <config.h> 2# include <config.h>
3#endif /* ifdef HAVE_CONFIG_H */ 3#endif
4 4
5#ifdef HAVE_NETINET_IN_H 5#ifdef HAVE_NETINET_IN_H
6# include <netinet/in.h> 6# include <netinet/in.h>
@@ -113,16 +113,17 @@ _emile_cipher_init(void)
113 /* Disable warning messages about problems with the secure memory subsystem. 113 /* Disable warning messages about problems with the secure memory subsystem.
114 This command should be run right after gcry_check_version. */ 114 This command should be run right after gcry_check_version. */
115 if (gcry_control(GCRYCTL_DISABLE_SECMEM_WARN)) 115 if (gcry_control(GCRYCTL_DISABLE_SECMEM_WARN))
116 return EINA_FALSE; /* This command is used to allocate a pool of secure memory and thus 116 return EINA_FALSE;
117 enabling the use of secure memory. It also drops all extra privileges the 117
118 process has (i.e. if it is run as setuid (root)). If the argument nbytes 118 /* This command is used to allocate a pool of secure memory and thus
119 is 0, secure memory will be disabled. The minimum amount of secure memory 119 enabling the use of secure memory. It also drops all extra privileges the
120 allocated is currently 16384 bytes; you may thus use a value of 1 to 120 process has (i.e. if it is run as setuid (root)). If the argument nbytes
121 request that default size. */ 121 is 0, secure memory will be disabled. The minimum amount of secure memory
122 122 allocated is currently 16384 bytes; you may thus use a value of 1 to
123 request that default size. */
123 if (gcry_control(GCRYCTL_INIT_SECMEM, 16384, 0)) 124 if (gcry_control(GCRYCTL_INIT_SECMEM, 16384, 0))
124 WRN( 125 WRN("BIG FAT WARNING: I AM UNABLE TO REQUEST SECMEM, "
125 "BIG FAT WARNING: I AM UNABLE TO REQUEST SECMEM, Cryptographic operation are at risk !"); 126 "Cryptographic operation are at risk !");
126 } 127 }
127 128
128 if (gnutls_global_init()) 129 if (gnutls_global_init())
diff --git a/src/lib/emile/emile_cipher_openssl.c b/src/lib/emile/emile_cipher_openssl.c
index 37dbc89a2e..222205422a 100644
--- a/src/lib/emile/emile_cipher_openssl.c
+++ b/src/lib/emile/emile_cipher_openssl.c
@@ -1,6 +1,6 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include <config.h> 2# include <config.h>
3#endif /* ifdef HAVE_CONFIG_H */ 3#endif
4 4
5#ifdef HAVE_NETINET_IN_H 5#ifdef HAVE_NETINET_IN_H
6# include <netinet/in.h> 6# include <netinet/in.h>
diff --git a/src/lib/emile/emile_compress.c b/src/lib/emile/emile_compress.c
index b0807cb8ce..6f7ac583df 100644
--- a/src/lib/emile/emile_compress.c
+++ b/src/lib/emile/emile_compress.c
@@ -1,12 +1,9 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include <config.h> 2# include <config.h>
3#endif /* ifdef HAVE_CONFIG_H */ 3#endif
4 4
5#include <zlib.h> 5#include <zlib.h>
6 6
7#include <Eina.h>
8#include "Emile.h"
9
10#ifdef ENABLE_LIBLZ4 7#ifdef ENABLE_LIBLZ4
11# include <lz4.h> 8# include <lz4.h>
12# include <lz4hc.h> 9# include <lz4hc.h>
@@ -15,8 +12,12 @@
15# include "lz4hc.h" 12# include "lz4hc.h"
16#endif 13#endif
17 14
15#include <Eina.h>
16
17#include "Emile.h"
18
18static int 19static int
19emile_compress_buffer_size(const Eina_Binbuf *data, Emile_Compressor_Type t) 20_emile_compress_buffer_size(const Eina_Binbuf *data, Emile_Compressor_Type t)
20{ 21{
21 switch (t) 22 switch (t)
22 { 23 {
@@ -40,7 +41,7 @@ emile_binbuf_compress(const Eina_Binbuf *data,
40 int level = l; 41 int level = l;
41 Eina_Bool ok = EINA_FALSE; 42 Eina_Bool ok = EINA_FALSE;
42 43
43 length = emile_compress_buffer_size(data, t); 44 length = _emile_compress_buffer_size(data, t);
44 45
45 compact = malloc(length); 46 compact = malloc(length);
46 if (!compact) return NULL; 47 if (!compact) return NULL;
@@ -50,7 +51,7 @@ emile_binbuf_compress(const Eina_Binbuf *data,
50 case EMILE_LZ4: 51 case EMILE_LZ4:
51 length = LZ4_compress((const char *) eina_binbuf_string_get(data), compact, eina_binbuf_length_get(data)); 52 length = LZ4_compress((const char *) eina_binbuf_string_get(data), compact, eina_binbuf_length_get(data));
52 if (length > 0) ok = EINA_TRUE; 53 if (length > 0) ok = EINA_TRUE;
53 compact = realloc(compact, length); // It is going to be smaller and should never fail, if it does you are in deep poo. 54 compact = realloc(compact, length); /* It is going to be smaller and should never fail, if it does you are in deep poo. */
54 break; 55 break;
55 case EMILE_LZ4HC: 56 case EMILE_LZ4HC:
56 length = LZ4_compressHC((const char *) eina_binbuf_string_get(data), compact, eina_binbuf_length_get(data)); 57 length = LZ4_compressHC((const char *) eina_binbuf_string_get(data), compact, eina_binbuf_length_get(data));
diff --git a/src/lib/emile/emile_image.c b/src/lib/emile/emile_image.c
index 6f8261eaf7..ff53275b47 100644
--- a/src/lib/emile/emile_image.c
+++ b/src/lib/emile/emile_image.c
@@ -1,18 +1,14 @@
1#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
2# include <config.h> 2# include <config.h>
3#endif /* ifdef HAVE_CONFIG_H */ 3#endif
4 4
5#ifdef HAVE_NETINET_IN_H 5#ifdef HAVE_NETINET_IN_H
6# include <netinet/in.h> 6# include <netinet/in.h>
7#endif 7#endif
8 8
9#ifdef HAVE_EVIL
10# include <Evil.h>
11#endif
12
13#ifdef _WIN32 9#ifdef _WIN32
14# include <winsock2.h> 10# include <winsock2.h>
15#endif /* ifdef _WIN32 */ 11#endif
16 12
17#ifdef ENABLE_LIBLZ4 13#ifdef ENABLE_LIBLZ4
18# include <lz4.h> 14# include <lz4.h>
@@ -28,6 +24,10 @@
28#include <setjmp.h> 24#include <setjmp.h>
29#include <jpeglib.h> 25#include <jpeglib.h>
30 26
27#ifdef HAVE_EVIL
28# include <Evil.h>
29#endif
30
31#include "rg_etc1.h" 31#include "rg_etc1.h"
32#include "Emile.h" 32#include "Emile.h"
33 33
@@ -172,7 +172,7 @@ _emile_image_file_source_unmap(Emile_Image *image)
172} 172}
173 173
174static int 174static int
175roundup(int val, int rup) 175_roundup(int val, int rup)
176{ 176{
177 if (val >= 0 && rup > 0) 177 if (val >= 0 && rup > 0)
178 return (val + rup - 1) - ((val + rup - 1) % rup); 178 return (val + rup - 1) - ((val + rup - 1) % rup);
@@ -280,7 +280,7 @@ _emile_tgv_head(Emile_Image *image,
280 m = _emile_image_file_source_map(image, &length); 280 m = _emile_image_file_source_map(image, &length);
281 if (!m) return EINA_FALSE; 281 if (!m) return EINA_FALSE;
282 282
283 // This can be used for later ABI change of the structure. 283 /* This can be used for later ABI change of the structure. */
284 if (sizeof (Emile_Image_Property) != property_size) return EINA_FALSE; 284 if (sizeof (Emile_Image_Property) != property_size) return EINA_FALSE;
285 285
286 switch (m[OFFSET_ALGORITHM] & 0xFF) 286 switch (m[OFFSET_ALGORITHM] & 0xFF)
@@ -319,8 +319,8 @@ _emile_tgv_head(Emile_Image *image,
319 319
320 if (image->blockless) 320 if (image->blockless)
321 { 321 {
322 image->block.width = roundup(image->size.width + 2, 4); 322 image->block.width = _roundup(image->size.width + 2, 4);
323 image->block.height = roundup(image->size.height + 2, 4); 323 image->block.height = _roundup(image->size.height + 2, 4);
324 } 324 }
325 else 325 else
326 { 326 {
@@ -333,7 +333,7 @@ _emile_tgv_head(Emile_Image *image,
333 if (image->load_opts && 333 if (image->load_opts &&
334 (image->opts.region.w > 0 && image->opts.region.h > 0)) 334 (image->opts.region.w > 0 && image->opts.region.h > 0))
335 { 335 {
336 // ETC colorspace doesn't work with region for now 336 /* ETC colorspace doesn't work with region for now */
337 prop->cspaces = NULL; 337 prop->cspaces = NULL;
338 338
339 if (!eina_rectangle_intersection(&image->region, 339 if (!eina_rectangle_intersection(&image->region,
@@ -348,8 +348,8 @@ _emile_tgv_head(Emile_Image *image,
348 prop->h = image->size.height; 348 prop->h = image->size.height;
349 prop->borders.l = 1; 349 prop->borders.l = 1;
350 prop->borders.t = 1; 350 prop->borders.t = 1;
351 prop->borders.r = roundup(prop->w + 2, 4) - prop->w - 1; 351 prop->borders.r = _roundup(prop->w + 2, 4) - prop->w - 1;
352 prop->borders.b = roundup(prop->h + 2, 4) - prop->h - 1; 352 prop->borders.b = _roundup(prop->h + 2, 4) - prop->h - 1;
353 353
354 return EINA_TRUE; 354 return EINA_TRUE;
355} 355}
@@ -412,7 +412,7 @@ _emile_tgv_data(Emile_Image *image,
412 412
413 *error = EMILE_IMAGE_LOAD_ERROR_CORRUPT_FILE; 413 *error = EMILE_IMAGE_LOAD_ERROR_CORRUPT_FILE;
414 414
415 // By definition, prop{.w, .h} == region{.w, .h} 415 /* By definition, prop{.w, .h} == region{.w, .h} */
416 EINA_RECTANGLE_SET(&master, 416 EINA_RECTANGLE_SET(&master,
417 image->region.x, image->region.y, 417 image->region.x, image->region.y,
418 prop->w, prop->h); 418 prop->w, prop->h);
@@ -446,7 +446,7 @@ _emile_tgv_data(Emile_Image *image,
446 abort(); 446 abort();
447 break; 447 break;
448 case EMILE_COLORSPACE_ARGB8888: 448 case EMILE_COLORSPACE_ARGB8888:
449 // Offset to take duplicated pixels into account 449 /* Offset to take duplicated pixels into account */
450 master.x += 1; 450 master.x += 1;
451 master.y += 1; 451 master.y += 1;
452 break; 452 break;
@@ -462,10 +462,10 @@ _emile_tgv_data(Emile_Image *image,
462 *error = EMILE_IMAGE_LOAD_ERROR_GENERIC; 462 *error = EMILE_IMAGE_LOAD_ERROR_GENERIC;
463 return EINA_FALSE; 463 return EINA_FALSE;
464 } 464 }
465 // else: ETC2 is compatible with ETC1 and is preferred 465 /* else: ETC2 is compatible with ETC1 and is preferred */
466 } 466 }
467 467
468 // Allocate space for each ETC block (8 or 16 bytes per 4 * 4 pixels group) 468 /* Allocate space for each ETC block (8 or 16 bytes per 4 * 4 pixels group) */
469 block_count = image->block.width * image->block.height / (4 * 4); 469 block_count = image->block.width * image->block.height / (4 * 4);
470 if (image->compress) 470 if (image->compress)
471 buffer = eina_binbuf_manage_read_only_new_length(alloca(etc_block_size * block_count), etc_block_size * block_count); 471 buffer = eina_binbuf_manage_read_only_new_length(alloca(etc_block_size * block_count), etc_block_size * block_count);
@@ -610,12 +610,12 @@ _emile_tgv_data(Emile_Image *image,
610 default: 610 default:
611 abort(); 611 abort();
612 } 612 }
613 } // bx,by inside blocks 613 } /* bx,by inside blocks */
614 } // x,y macroblocks 614 } /* x,y macroblocks */
615 615
616 // TODO: Add support for more unpremultiplied modes (ETC2) 616 // TODO: Add support for more unpremultiplied modes (ETC2)
617 if (prop->cspace == EMILE_COLORSPACE_ARGB8888) 617 if (prop->cspace == EMILE_COLORSPACE_ARGB8888)
618 prop->premul = image->unpremul; // call premul if unpremul data 618 prop->premul = image->unpremul; /* call premul if unpremul data */
619 619
620 r = EINA_TRUE; 620 r = EINA_TRUE;
621 621
@@ -626,7 +626,7 @@ _emile_tgv_data(Emile_Image *image,
626static void 626static void
627_emile_tgv_close(Emile_Image *image EINA_UNUSED) 627_emile_tgv_close(Emile_Image *image EINA_UNUSED)
628{ 628{
629 // TGV file loader doesn't keep any data allocated around 629 /* TGV file loader doesn't keep any data allocated around */
630} 630}
631 631
632/* JPEG Handling */ 632/* JPEG Handling */
@@ -1307,14 +1307,14 @@ _emile_jpeg_head(Emile_Image *image,
1307 jpeg_read_header(&cinfo, TRUE); 1307 jpeg_read_header(&cinfo, TRUE);
1308 cinfo.do_fancy_upsampling = FALSE; 1308 cinfo.do_fancy_upsampling = FALSE;
1309 cinfo.do_block_smoothing = FALSE; 1309 cinfo.do_block_smoothing = FALSE;
1310 cinfo.dct_method = JDCT_ISLOW; // JDCT_FLOAT JDCT_IFAST(quality loss) 1310 cinfo.dct_method = JDCT_ISLOW; /* JDCT_FLOAT JDCT_IFAST(quality loss) */
1311 cinfo.dither_mode = JDITHER_ORDERED; 1311 cinfo.dither_mode = JDITHER_ORDERED;
1312 cinfo.buffered_image = TRUE; // buffered mode in case jpg is progressive 1312 cinfo.buffered_image = TRUE; /* buffered mode in case jpg is progressive */
1313 jpeg_start_decompress(&cinfo); 1313 jpeg_start_decompress(&cinfo);
1314 1314
1315 if (cinfo.jpeg_color_space == JCS_GRAYSCALE) 1315 if (cinfo.jpeg_color_space == JCS_GRAYSCALE)
1316 { 1316 {
1317 // We do handle GRY8 and AGRY88 (with FF for alpha) colorspace as an output for JPEG 1317 /* We do handle GRY8 and AGRY88 (with FF for alpha) colorspace as an output for JPEG */
1318 prop->cspaces = cspaces_agry; 1318 prop->cspaces = cspaces_agry;
1319 } 1319 }
1320 1320
@@ -1435,7 +1435,7 @@ _emile_jpeg_head(Emile_Image *image,
1435 cinfo.do_block_smoothing = FALSE; 1435 cinfo.do_block_smoothing = FALSE;
1436 cinfo.scale_num = 1; 1436 cinfo.scale_num = 1;
1437 cinfo.scale_denom = prop->scale; 1437 cinfo.scale_denom = prop->scale;
1438 cinfo.buffered_image = TRUE; // buffered mode in case jpg is progressive 1438 cinfo.buffered_image = TRUE; /* buffered mode in case jpg is progressive */
1439 jpeg_calc_output_dimensions(&(cinfo)); 1439 jpeg_calc_output_dimensions(&(cinfo));
1440 jpeg_start_decompress(&cinfo); 1440 jpeg_start_decompress(&cinfo);
1441 } 1441 }
@@ -1443,7 +1443,7 @@ _emile_jpeg_head(Emile_Image *image,
1443 prop->w = cinfo.output_width; 1443 prop->w = cinfo.output_width;
1444 prop->h = cinfo.output_height; 1444 prop->h = cinfo.output_height;
1445 1445
1446 // be nice and clip region to image. if its totally outside, fail load 1446 /* be nice and clip region to image. if its totally outside, fail load */
1447 if ((opts->region.w > 0) && (opts->region.h > 0)) 1447 if ((opts->region.w > 0) && (opts->region.h > 0))
1448 { 1448 {
1449 unsigned int load_region_x = opts->region.x, load_region_y = opts->region.y; 1449 unsigned int load_region_x = opts->region.x, load_region_y = opts->region.y;
@@ -1467,7 +1467,7 @@ _emile_jpeg_head(Emile_Image *image,
1467 prop->w = load_region_w; 1467 prop->w = load_region_w;
1468 prop->h = load_region_h; 1468 prop->h = load_region_h;
1469 } 1469 }
1470/* end head decoding */ 1470 /* end head decoding */
1471 1471
1472 if (change_wh) 1472 if (change_wh)
1473 { 1473 {
@@ -1489,7 +1489,7 @@ _emile_jpeg_data(Emile_Image *image,
1489 void *pixels, 1489 void *pixels,
1490 Emile_Image_Load_Error *error) 1490 Emile_Image_Load_Error *error)
1491{ 1491{
1492 // Handle RGB, ARGB, GRY and AGRY 1492 /* Handle RGB, ARGB, GRY and AGRY */
1493 Emile_Image_Load_Opts *opts = NULL; 1493 Emile_Image_Load_Opts *opts = NULL;
1494 unsigned int w, h; 1494 unsigned int w, h;
1495 struct jpeg_decompress_struct cinfo; 1495 struct jpeg_decompress_struct cinfo;
@@ -1548,7 +1548,7 @@ _emile_jpeg_data(Emile_Image *image,
1548 jpeg_read_header(&cinfo, TRUE); 1548 jpeg_read_header(&cinfo, TRUE);
1549 cinfo.do_fancy_upsampling = FALSE; 1549 cinfo.do_fancy_upsampling = FALSE;
1550 cinfo.do_block_smoothing = FALSE; 1550 cinfo.do_block_smoothing = FALSE;
1551 cinfo.dct_method = JDCT_ISLOW; // JDCT_FLOAT JDCT_IFAST(quality loss) 1551 cinfo.dct_method = JDCT_ISLOW; /* JDCT_FLOAT JDCT_IFAST(quality loss) */
1552 cinfo.dither_mode = JDITHER_ORDERED; 1552 cinfo.dither_mode = JDITHER_ORDERED;
1553 1553
1554 if (prop->scale > 1) 1554 if (prop->scale > 1)
@@ -1634,8 +1634,6 @@ _emile_jpeg_data(Emile_Image *image,
1634 } 1634 }
1635 if ((!region) && ((w != ie_w) || (h != ie_h))) 1635 if ((!region) && ((w != ie_w) || (h != ie_h)))
1636 { 1636 {
1637 // race condition, the file could have change from when we call header
1638 // this test will not solve the problem with region code.
1639 *error = EMILE_IMAGE_LOAD_ERROR_GENERIC; 1637 *error = EMILE_IMAGE_LOAD_ERROR_GENERIC;
1640 goto on_error; 1638 goto on_error;
1641 } 1639 }
@@ -1644,18 +1642,6 @@ _emile_jpeg_data(Emile_Image *image,
1644 { 1642 {
1645 *error = EMILE_IMAGE_LOAD_ERROR_GENERIC; 1643 *error = EMILE_IMAGE_LOAD_ERROR_GENERIC;
1646 goto on_error; 1644 goto on_error;
1647 /* ie_w = opts_region.w; */
1648 /* ie_h = opts_region.h; */
1649 /* if (change_wh) */
1650 /* { */
1651 /* ie->w = ie_h; */
1652 /* ie->h = ie_w; */
1653 /* } */
1654 /* else */
1655 /* { */
1656 /* ie->w = ie_w; */
1657 /* ie->h = ie_h; */
1658 /* } */
1659 } 1645 }
1660 1646
1661 switch (prop->cspace) 1647 switch (prop->cspace)
@@ -1682,8 +1668,8 @@ _emile_jpeg_data(Emile_Image *image,
1682 goto on_error; 1668 goto on_error;
1683 } 1669 }
1684 1670
1685/* end head decoding */ 1671 /* end head decoding */
1686/* data decoding */ 1672 /* data decoding */
1687 if (cinfo.rec_outbuf_height > 16) 1673 if (cinfo.rec_outbuf_height > 16)
1688 { 1674 {
1689 *error = EMILE_IMAGE_LOAD_ERROR_UNKNOWN_FORMAT; 1675 *error = EMILE_IMAGE_LOAD_ERROR_UNKNOWN_FORMAT;
@@ -1781,7 +1767,7 @@ _emile_jpeg_data(Emile_Image *image,
1781 } 1767 }
1782 else 1768 else
1783 { 1769 {
1784 // if line # > region last line, break 1770 /* if line # > region last line, break */
1785 if (l >= (opts_region.y + opts_region.h)) 1771 if (l >= (opts_region.y + opts_region.h))
1786 { 1772 {
1787 line_done = EINA_TRUE; 1773 line_done = EINA_TRUE;
@@ -1792,7 +1778,7 @@ _emile_jpeg_data(Emile_Image *image,
1792 *error = EMILE_IMAGE_LOAD_ERROR_NONE; 1778 *error = EMILE_IMAGE_LOAD_ERROR_NONE;
1793 return EINA_FALSE;*/ 1779 return EINA_FALSE;*/
1794 } 1780 }
1795 // els if scan block intersects region start or later 1781 /* else if scan block intersects region start or later */
1796 else if ((l + scans) > 1782 else if ((l + scans) >
1797 (opts_region.y)) 1783 (opts_region.y))
1798 { 1784 {
@@ -1893,15 +1879,15 @@ _emile_jpeg_data(Emile_Image *image,
1893 } 1879 }
1894 else 1880 else
1895 { 1881 {
1896 // if line # > region last line, break 1882 /* if line # > region last line, break
1897 // but not return immediately for rotation job 1883 but not return immediately for rotation job */
1898 if (l >= (opts_region.y + opts_region.h)) 1884 if (l >= (opts_region.y + opts_region.h))
1899 { 1885 {
1900 line_done = EINA_TRUE; 1886 line_done = EINA_TRUE;
1901 /* if rotation flag is set , we have to rotate image */ 1887 /* if rotation flag is set , we have to rotate image */
1902 goto done; 1888 goto done;
1903 } 1889 }
1904 // else if scan block intersects region start or later 1890 /* else if scan block intersects region start or later */
1905 else if ((l + scans) > 1891 else if ((l + scans) >
1906 (opts_region.y)) 1892 (opts_region.y))
1907 { 1893 {
@@ -1968,7 +1954,7 @@ _emile_jpeg_data(Emile_Image *image,
1968 } 1954 }
1969 else 1955 else
1970 { 1956 {
1971 // if line # > region last line, break 1957 /* if line # > region last line, break */
1972 if (l >= (opts_region.y + opts_region.h)) 1958 if (l >= (opts_region.y + opts_region.h))
1973 { 1959 {
1974 line_done = EINA_TRUE; 1960 line_done = EINA_TRUE;
@@ -1979,7 +1965,7 @@ _emile_jpeg_data(Emile_Image *image,
1979 *error = EMILE_IMAGE_LOAD_ERROR_NONE; 1965 *error = EMILE_IMAGE_LOAD_ERROR_NONE;
1980 return EINA_TRUE;*/ 1966 return EINA_TRUE;*/
1981 } 1967 }
1982 // els if scan block intersects region start or later 1968 /* else if scan block intersects region start or later */
1983 else if ((l + scans) > 1969 else if ((l + scans) >
1984 (opts_region.y)) 1970 (opts_region.y))
1985 { 1971 {
@@ -2143,7 +2129,7 @@ done:
2143static void 2129static void
2144_emile_jpeg_close(Emile_Image *image EINA_UNUSED) 2130_emile_jpeg_close(Emile_Image *image EINA_UNUSED)
2145{ 2131{
2146 // JPEG file loader doesn't keep any data allocated around (for now) 2132 /* JPEG file loader doesn't keep any data allocated around (for now) */
2147} 2133}
2148 2134
2149/* Generic helper to instantiate a new Emile_Image */ 2135/* Generic helper to instantiate a new Emile_Image */