Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common
Modified Files:
evas_convert_color.c evas_convert_colorspace.c
evas_convert_gry_1.c evas_convert_gry_4.c evas_convert_gry_8.c
evas_convert_main.c evas_convert_rgb_16.c
evas_convert_rgb_24.c evas_convert_rgb_32.c
evas_convert_rgb_8.c evas_convert_yuv.c evas_draw_main.c
evas_gradient_main.c evas_image_main.c evas_scale_span.c
Added Files:
evas_convert_color.h evas_convert_colorspace.h
evas_convert_gry_1.h evas_convert_gry_4.h evas_convert_gry_8.h
evas_convert_main.h evas_convert_rgb_16.h
evas_convert_rgb_24.h evas_convert_rgb_32.h
evas_convert_rgb_8.h evas_convert_yuv.h
Log Message:
* move convert function declarations to their own header file
* add vim header in the files I modified
* fix minor warnings
i think i don't break compilation on that commit :)
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_convert_color.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- evas_convert_color.c 28 Dec 2006 12:35:08 -0000 1.6
+++ evas_convert_color.c 10 Jul 2008 22:53:33 -0000 1.7
@@ -1,4 +1,9 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "evas_common.h"
+#include "evas_convert_color.h"
EAPI void
===================================================================
RCS file:
/cvs/e/e17/libs/evas/src/lib/engines/common/evas_convert_colorspace.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- evas_convert_colorspace.c 19 May 2008 03:37:37 -0000 1.1
+++ evas_convert_colorspace.c 10 Jul 2008 22:53:33 -0000 1.2
@@ -1,4 +1,9 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "evas_common.h"
+#include "evas_convert_colorspace.h"
#define CONVERT_RGB_565_TO_RGB_888(s) \
(((((s) << 3) & 0xf8) | (((s) >> 2) & 0x7)) | \
@@ -11,6 +16,7 @@
static inline void *
evas_common_convert_argb8888_to_rgb565_a5p(void *data, int w, int h, int
stride, Evas_Bool has_alpha)
{
+ return NULL;
}
static inline void *
@@ -18,7 +24,6 @@
{
DATA16 *src, *end;
DATA32 *ret, *dst;
- int r, g, b;
src = data;
end = src + (stride * h);
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_convert_gry_1.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_convert_gry_1.c 14 Nov 2002 05:38:10 -0000 1.2
+++ evas_convert_gry_1.c 10 Jul 2008 22:53:33 -0000 1.3
@@ -1,4 +1,9 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "evas_common.h"
+#include "evas_convert_gry_1.h"
#ifdef BUILD_CONVERT_1_GRY_1
void evas_common_convert_rgba_to_1bpp_gry_1_dith (DATA32 *src, DATA8
*dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8
*pal){}
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_convert_gry_4.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_convert_gry_4.c 14 Nov 2002 05:38:10 -0000 1.2
+++ evas_convert_gry_4.c 10 Jul 2008 22:53:33 -0000 1.3
@@ -1,8 +1,14 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "evas_common.h"
+#include "evas_convert_gry_4.h"
#ifdef BUILD_CONVERT_4_GRY_4
void evas_common_convert_rgba_to_4bpp_gry_4_dith (DATA32 *src, DATA8
*dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8
*pal){}
#endif
+
#ifdef BUILD_CONVERT_4_GRY_1
void evas_common_convert_rgba_to_4bpp_gry_1_dith (DATA32 *src, DATA8
*dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8
*pal){}
#endif
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_convert_gry_8.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_convert_gry_8.c 14 Nov 2002 05:38:10 -0000 1.2
+++ evas_convert_gry_8.c 10 Jul 2008 22:53:33 -0000 1.3
@@ -1,17 +1,26 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "evas_common.h"
+#include "evas_convert_gry_8.h"
#ifdef BUILD_CONVERT_8_GRY_1
void evas_common_convert_rgba_to_8bpp_gry_256_dith (DATA32 *src, DATA8
*dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8
*pal){}
#endif
+
#ifdef BUILD_CONVERT_8_GRY_4
void evas_common_convert_rgba_to_8bpp_gry_64_dith (DATA32 *src, DATA8
*dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8
*pal){}
#endif
+
#ifdef BUILD_CONVERT_8_GRY_16
void evas_common_convert_rgba_to_8bpp_gry_16_dith (DATA32 *src, DATA8
*dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8
*pal){}
#endif
+
#ifdef BUILD_CONVERT_8_GRY_64
void evas_common_convert_rgba_to_8bpp_gry_4_dith (DATA32 *src, DATA8
*dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8
*pal){}
#endif
+
#ifdef BUILD_CONVERT_8_GRY_256
void evas_common_convert_rgba_to_8bpp_gry_1_dith (DATA32 *src, DATA8
*dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8
*pal){}
#endif
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_convert_main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- evas_convert_main.c 13 Sep 2007 14:19:30 -0000 1.9
+++ evas_convert_main.c 10 Jul 2008 22:53:33 -0000 1.10
@@ -1,4 +1,14 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "evas_common.h"
+#include "evas_convert_main.h"
+#include "evas_convert_rgb_8.h"
+#include "evas_convert_rgb_16.h"
+#include "evas_convert_rgb_24.h"
+#include "evas_convert_rgb_32.h"
+#include "evas_convert_yuv.h"
#ifdef USE_DITHER_44
const DATA8 _evas_dither_44[4][4] =
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_convert_rgb_16.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas_convert_rgb_16.c 24 Apr 2007 11:16:24 -0000 1.7
+++ evas_convert_rgb_16.c 10 Jul 2008 22:53:33 -0000 1.8
@@ -1,4 +1,9 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "evas_common.h"
+#include "evas_convert_rgb_16.h"
#ifndef BUILD_NO_DITHER_MASK
#ifdef USE_DITHER_44
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_convert_rgb_24.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas_convert_rgb_24.c 30 Sep 2006 10:18:32 -0000 1.7
+++ evas_convert_rgb_24.c 10 Jul 2008 22:53:33 -0000 1.8
@@ -1,4 +1,9 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "evas_common.h"
+#include "evas_convert_rgb_24.h"
#ifdef BUILD_CONVERT_24_RGB_888
void
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_convert_rgb_32.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- evas_convert_rgb_32.c 2 Mar 2007 14:51:16 -0000 1.6
+++ evas_convert_rgb_32.c 10 Jul 2008 22:53:33 -0000 1.7
@@ -1,4 +1,9 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "evas_common.h"
+#include "evas_convert_rgb_32.h"
#ifdef BUILD_CONVERT_32_RGB_8888
#ifdef BUILD_CONVERT_32_RGB_ROT0
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_convert_rgb_8.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- evas_convert_rgb_8.c 14 Aug 2006 13:56:18 -0000 1.7
+++ evas_convert_rgb_8.c 10 Jul 2008 22:53:33 -0000 1.8
@@ -1,4 +1,9 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "evas_common.h"
+#include "evas_convert_rgb_8.h"
#ifdef USE_DITHER_44
extern const DATA8 _evas_dither_44[4][4];
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_convert_yuv.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- evas_convert_yuv.c 30 Sep 2006 10:18:32 -0000 1.14
+++ evas_convert_yuv.c 10 Jul 2008 22:53:33 -0000 1.15
@@ -1,4 +1,9 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "evas_common.h"
+#include "evas_convert_yuv.h"
#if defined BUILD_MMX || defined BUILD_SSE
# include "evas_mmx.h"
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_draw_main.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- evas_draw_main.c 13 Nov 2007 05:58:50 -0000 1.25
+++ evas_draw_main.c 10 Jul 2008 22:53:33 -0000 1.26
@@ -1,4 +1,9 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "evas_common.h"
+#include "evas_convert_main.h"
EAPI Cutout_Rects*
evas_common_draw_context_cutouts_new(void)
@@ -37,7 +42,7 @@
rect->w = w;
rect->h = h;
rects->active++;
-
+
return rect;
}
@@ -48,9 +53,9 @@
if ((index >= 0) && (index < rects->active))
{
Cutout_Rect* rect;
-
+
rect = rects->rects + index;
- memmove(rect, rect + 1,
+ memmove(rect, rect + 1,
sizeof(Cutout_Rect) * (rects->active - index - 1));
rects->active--;
}
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_gradient_main.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- evas_gradient_main.c 3 Jun 2008 09:09:35 -0000 1.18
+++ evas_gradient_main.c 10 Jul 2008 22:53:33 -0000 1.19
@@ -1,5 +1,12 @@
-#include "evas_common.h"
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include <math.h>
+
+#include "evas_common.h"
+#include "evas_convert_main.h"
+#include "evas_convert_color.h"
static void _get_word(char *in, char *key);
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_image_main.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- evas_image_main.c 3 Jun 2008 09:09:35 -0000 1.67
+++ evas_image_main.c 10 Jul 2008 22:53:33 -0000 1.68
@@ -8,6 +8,7 @@
#include "evas_common.h"
#include "evas_private.h"
+#include "evas_convert_yuv.h"
#ifdef HAVE_VALGRIND
# include <memcheck.h>
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_scale_span.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- evas_scale_span.c 14 Aug 2007 12:49:10 -0000 1.2
+++ evas_scale_span.c 10 Jul 2008 22:53:33 -0000 1.3
@@ -1,4 +1,9 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include "evas_common.h"
+#include "evas_convert_color.h"
static void
evas_common_scale_rgba_span_(DATA32 *src, DATA8 *mask, int src_len, DATA32
mul_col, DATA32 *dst, int dst_len, int dir)
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
