Remove \r from end of line.

No functional changes here.

diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c
index f273959..c217173 100644 (file)
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -2866,87 +2866,87 @@ eng_image_max_size_get(void *data, int *maxw, int *maxh)
    if (maxh) *maxh = re->win->gl_context->shared->info.max_texture_size;
 }
 
-static Eina_Bool\r
-eng_pixel_alpha_get(void *image, int x, int y, DATA8 *alpha, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h)\r
-{\r
-   Evas_GL_Image *im = image;\r
-   int px, py, dx, dy, sx, sy, src_w, src_h;\r
-   double scale_w, scale_h;\r
-\r
-   if (!im) return EINA_FALSE;\r
-\r
-   if ((dst_region_x > x) || (x >= (dst_region_x + dst_region_w)) ||\r
-       (dst_region_y > y) || (y >= (dst_region_y + dst_region_h)))\r
-     {\r
-        *alpha = 0;\r
-        return EINA_FALSE;\r
-     }\r
-\r
-   src_w = im->im->cache_entry.w;\r
-   src_h = im->im->cache_entry.h;\r
-   if ((src_w == 0) || (src_h == 0))\r
-     {\r
-        *alpha = 0;\r
-        return EINA_TRUE;\r
-     }\r
-\r
-   EINA_SAFETY_ON_TRUE_GOTO(src_region_x < 0, error_oob);\r
-   EINA_SAFETY_ON_TRUE_GOTO(src_region_y < 0, error_oob);\r
-   EINA_SAFETY_ON_TRUE_GOTO(src_region_x + src_region_w > src_w, error_oob);\r
-   EINA_SAFETY_ON_TRUE_GOTO(src_region_y + src_region_h > src_h, error_oob);\r
-\r
-   scale_w = (double)dst_region_w / (double)src_region_w;\r
-   scale_h = (double)dst_region_h / (double)src_region_h;\r
-\r
-   /* point at destination */\r
-   dx = x - dst_region_x;\r
-   dy = y - dst_region_y;\r
-\r
-   /* point at source */\r
-   sx = dx / scale_w;\r
-   sy = dy / scale_h;\r
-\r
-   /* pixel point (translated) */\r
-   px = src_region_x + sx;\r
-   py = src_region_y + sy;\r
-   EINA_SAFETY_ON_TRUE_GOTO(px >= src_w, error_oob);\r
-   EINA_SAFETY_ON_TRUE_GOTO(py >= src_h, error_oob);\r
-\r
-   switch (im->im->cache_entry.space)\r
-     {\r
-     case EVAS_COLORSPACE_ARGB8888:\r
-       {\r
-          DATA32 *pixel;\r
-\r
-          evas_cache_image_load_data(&im->im->cache_entry);\r
-          if (!im->im->cache_entry.flags.loaded)\r
-            {\r
-               ERR("im %p has no pixels loaded yet", im);\r
-               return EINA_FALSE;\r
-            }\r
-\r
-          pixel = im->im->image.data;\r
-          pixel += ((py * src_w) + px);\r
-          *alpha = ((*pixel) >> 24) & 0xff;\r
-       }\r
-       break;\r
-\r
-     default:\r
-        ERR("Colorspace %d not supported.", im->im->cache_entry.space);\r
-        *alpha = 0;\r
-     }\r
-\r
-   return EINA_TRUE;\r
-\r
- error_oob:\r
-   ERR("Invalid region src=(%d, %d, %d, %d), dst=(%d, %d, %d, %d), image=%dx%d",\r
-       src_region_x, src_region_y, src_region_w, src_region_h,\r
-       dst_region_x, dst_region_y, dst_region_w, dst_region_h,\r
-       src_w, src_h);\r
-   *alpha = 0;\r
-   return EINA_TRUE;\r
-}\r
-\r
+static Eina_Bool
+eng_pixel_alpha_get(void *image, int x, int y, DATA8 *alpha, int src_region_x, int src_region_y, int src_region_w, int src_region_h, int dst_region_x, int dst_region_y, int dst_region_w, int dst_region_h)
+{
+   Evas_GL_Image *im = image;
+   int px, py, dx, dy, sx, sy, src_w, src_h;
+   double scale_w, scale_h;
+
+   if (!im) return EINA_FALSE;
+
+   if ((dst_region_x > x) || (x >= (dst_region_x + dst_region_w)) ||
+       (dst_region_y > y) || (y >= (dst_region_y + dst_region_h)))
+     {
+        *alpha = 0;
+        return EINA_FALSE;
+     }
+
+   src_w = im->im->cache_entry.w;
+   src_h = im->im->cache_entry.h;
+   if ((src_w == 0) || (src_h == 0))
+     {
+        *alpha = 0;
+        return EINA_TRUE;
+     }
+
+   EINA_SAFETY_ON_TRUE_GOTO(src_region_x < 0, error_oob);
+   EINA_SAFETY_ON_TRUE_GOTO(src_region_y < 0, error_oob);
+   EINA_SAFETY_ON_TRUE_GOTO(src_region_x + src_region_w > src_w, error_oob);
+   EINA_SAFETY_ON_TRUE_GOTO(src_region_y + src_region_h > src_h, error_oob);
+
+   scale_w = (double)dst_region_w / (double)src_region_w;
+   scale_h = (double)dst_region_h / (double)src_region_h;
+
+   /* point at destination */
+   dx = x - dst_region_x;
+   dy = y - dst_region_y;
+
+   /* point at source */
+   sx = dx / scale_w;
+   sy = dy / scale_h;
+
+   /* pixel point (translated) */
+   px = src_region_x + sx;
+   py = src_region_y + sy;
+   EINA_SAFETY_ON_TRUE_GOTO(px >= src_w, error_oob);
+   EINA_SAFETY_ON_TRUE_GOTO(py >= src_h, error_oob);
+
+   switch (im->im->cache_entry.space)
+     {
+     case EVAS_COLORSPACE_ARGB8888:
+       {
+          DATA32 *pixel;
+
+          evas_cache_image_load_data(&im->im->cache_entry);
+          if (!im->im->cache_entry.flags.loaded)
+            {
+               ERR("im %p has no pixels loaded yet", im);
+               return EINA_FALSE;
+            }
+
+          pixel = im->im->image.data;
+          pixel += ((py * src_w) + px);
+          *alpha = ((*pixel) >> 24) & 0xff;
+       }
+       break;
+
+     default:
+        ERR("Colorspace %d not supported.", im->im->cache_entry.space);
+        *alpha = 0;
+     }
+
+   return EINA_TRUE;
+
+ error_oob:
+   ERR("Invalid region src=(%d, %d, %d, %d), dst=(%d, %d, %d, %d), image=%dx%d",
+       src_region_x, src_region_y, src_region_w, src_region_h,
+       dst_region_x, dst_region_y, dst_region_w, dst_region_h,
+       src_w, src_h);
+   *alpha = 0;
+   return EINA_TRUE;
+}
+
 static int
 module_open(Evas_Module *em)
 {
@@ -3062,8 +3062,8 @@ module_open(Evas_Module *em)
 
    ORD(image_max_size_get);
 
-   ORD(pixel_alpha_get);\r
-\r
+   ORD(pixel_alpha_get);
+
    /* now advertise out own api */
    em->functions = (void *)(&func);
    return 1;