evas/common - code clean up
authorChunEon Park <hermet@hermet.pe.kr>
Sat, 8 Feb 2014 07:26:01 +0000 (16:26 +0900)
committerChunEon Park <hermet@hermet.pe.kr>
Sat, 8 Feb 2014 07:26:01 +0000 (16:26 +0900)
removed unncessary backet depth in.

src/lib/evas/common/evas_blend_main.c
src/lib/evas/common/evas_map_image_core.c

index 6d3e0d8..b0221b1 100644 (file)
@@ -149,6 +149,7 @@ evas_common_gfx_func_composite_pixel_span_get(RGBA_Image *src, RGBA_Image *dst,
         if (op == _EVAS_RENDER_BLEND) op = _EVAS_RENDER_COPY;
         else if (op == _EVAS_RENDER_BLEND_REL) op = _EVAS_RENDER_COPY_REL;
      }
+
    comp = evas_gfx_compositor_get(op);
    if (comp)
        func = comp->composite_pixel_span_get(src, dst, pixels);
index 7e44c4b..8899162 100644 (file)
              DATA32 c1, c2; // col
 #endif
              Line *line;
-             
 #ifdef SCALE_USING_MMX
              pxor_r2r(mm0, mm0);
              MOV_A2R(ALPHA_255, mm5)
 #endif
-               
              line = &(spans[y - ystart]);
              for (i = 0; i < 2; i++)
                {
                   Span *span;
-                  
                   span = &(line->span[i]);
-                  if (span->x1 >= 0)
-                    {
-                       long long tl;
-                       
-                       x = span->x1;
-                       w = (span->x2 - x);
-                       if (w <= 0) continue;
-                       dv = (span->o2 - span->o1);
-                       if (dv <= 0) continue;
-                       
-                       ww = w;
-                       u = span->u[0] << FPI;
-                       if (u < 0) u = 0;
-                       else if (u > swp) u = swp;
-                       v = span->v[0] << FPI;
-                       if (v < 0) v = 0;
-                       else if (v > shp) v = shp;
-                       ue = span->u[1] << FPI;
-                       if (ue < 0) ue = 0;
-                       else if (ue > swp) ue = swp;
-                       ve = span->v[1] << FPI;
-                       if (ve < 0) ve = 0;
-                       else if (ve > shp) ve = shp;
-                       ud = (ue - u) / w;
-                       vd = (ve - v) / w;
-                       tl = (long long)ud * (w << FP);
-                       tl = tl / dv;
-                       ud = tl;
-                       u -= (ud * (span->o1 - (span->x1 << FP))) / FP1;
-                       
-                       tl = (long long)vd * (w << FP);
-                       tl = tl / dv;
-                       vd = tl;
-                       v -= (vd * (span->o1 - (span->x1 << FP))) / FP1;
+                  if (span->x1 < 0) break;
 
-                       if (ud < 0) u += ud;
-                       if (vd < 0) v += vd;
-                       if (u < 0) u = 0;
-                       else if (u >= swp) u = swp - 1;
-                       if (v < 0) v = 0;
-                       else if (v >= shp) v = shp - 1;
+                  long long tl;
+                  x = span->x1;
+                  w = (span->x2 - x);
+                  if (w <= 0) continue;
+                  dv = (span->o2 - span->o1);
+                  if (dv <= 0) continue;
 
-                       if (direct)
-                         d = dst->image.data + (y * dst->cache_entry.w) + x;
-                       else
-                         d = buf;
+                  ww = w;
+                  u = span->u[0] << FPI;
+                  if (u < 0) u = 0;
+                  else if (u > swp) u = swp;
+                  v = span->v[0] << FPI;
+                  if (v < 0) v = 0;
+                  else if (v > shp) v = shp;
+                  ue = span->u[1] << FPI;
+                  if (ue < 0) ue = 0;
+                  else if (ue > swp) ue = swp;
+                  ve = span->v[1] << FPI;
+                  if (ve < 0) ve = 0;
+                  else if (ve > shp) ve = shp;
+                  ud = (ue - u) / w;
+                  vd = (ve - v) / w;
+                  tl = (long long)ud * (w << FP);
+                  tl = tl / dv;
+                  ud = tl;
+                  u -= (ud * (span->o1 - (span->x1 << FP))) / FP1;
+
+                  tl = (long long)vd * (w << FP);
+                  tl = tl / dv;
+                  vd = tl;
+                  v -= (vd * (span->o1 - (span->x1 << FP))) / FP1;
 
+                  if (ud < 0) u += ud;
+                  if (vd < 0) v += vd;
+                  if (u < 0) u = 0;
+                  else if (u >= swp) u = swp - 1;
+                  if (v < 0) v = 0;
+                  else if (v >= shp) v = shp - 1;
+
+                  if (direct)
+                    d = dst->image.data + (y * dst->cache_entry.w) + x;
+                  else
+                    d = buf;
 #define SMOOTH 1
 #ifdef COLMUL
-                       c1 = span->col[0]; // col
-                       c2 = span->col[1]; // col
-                       cv = 0; // col
-                       cd = (255 << 16) / w; // col
+                  c1 = span->col[0]; // col
+                  c2 = span->col[1]; // col
+                  cv = 0; // col
+                  cd = (255 << 16) / w; // col
                        
-                       if (c1 == c2)
+                  if (c1 == c2)
+                    {
+                       if (c1 == 0xffffffff)
                          {
-                            if (c1 == 0xffffffff)
-                              {
 #endif
 #define COLSAME 1
 #include "evas_map_image_loop.c"
 #undef COLSAME
 #ifdef COLMUL
-                              }
-                            else if ((c1 == 0x0000ff) && (!src->cache_entry.flags.alpha))
-                              {
-                                 // all black line
+                         }
+                       else if ((c1 == 0x0000ff) && (!src->cache_entry.flags.alpha))
+                         {
+                            // all black line
 # define COLBLACK 1
 # define COLSAME 1
 # include "evas_map_image_loop.c"
 # undef COLSAME
 # undef COLBLACK
-                              }
-                            else if (c1 == 0x000000)
-                              {
-                                 // skip span
-                              }
-                            else
-                              {
-                                 // generic loop
-# define COLSAME 1
-# include "evas_map_image_loop.c"
-# undef COLSAME
-                              }
                          }
-                       else
+                       else if (c1 == 0x000000)
                          {
-# include "evas_map_image_loop.c"
+                            // skip span
                          }
-#endif                         
-                       if (!direct)
+                       else
                          {
-                            d = dst->image.data;
-                            d += (y * dst->cache_entry.w) + x;
-                            func(buf, NULL, mul_col, d, w);
+                            // generic loop
+# define COLSAME 1
+# include "evas_map_image_loop.c"
+# undef COLSAME
                          }
                     }
-                  else break;
+                  else
+                    {
+# include "evas_map_image_loop.c"
+                    }
+#endif
+                  if (!direct)
+                    {
+                       d = dst->image.data;
+                       d += (y * dst->cache_entry.w) + x;
+                       func(buf, NULL, mul_col, d, w);
+                    }
                }
           }
      }
              DATA32 c1, c2; // col
 #endif
              Line *line;
-             
              line = &(spans[y - ystart]);
              for (i = 0; i < 2; i++)
                {
                   Span *span;
-                  
                   span = &(line->span[i]);
-                  if (span->x1 >= 0)
-                    {
-                       x = span->x1;
-                       w = (span->x2 - x);
-                       
-                       if (w <= 0) continue;
-                       ww = w;
-                       u = span->u[0] << FPI;
-                       if (u < 0) u = 0;
-                       else if (u > swp) u = swp;
-                       v = span->v[0] << FPI;
-                       if (v < 0) v = 0;
-                       else if (v > shp) v = shp;
-                       ue = span->u[1] << FPI;
-                       if (ue < 0) ue = 0;
-                       else if (ue > swp) ue = swp;
-                       ve = span->v[1] << FPI;
-                       if (ve < 0) ve = 0;
-                       else if (ve > shp) ve = shp;
-                       ud = (ue - u) / w;
-                       vd = (ve - v) / w;
-                       if (direct)
-                         d = dst->image.data + (y * dst->cache_entry.w) + x;
-                       else
-                         d = buf;
+                  if (span->x1 < 0) break;
 
-                       if (ud < 0) u += ud;
-                       if (vd < 0) v += vd;
-                       if (u < 0) u = 0;
-                       else if (u >= swp) u = swp - 1;
-                       if (v < 0) v = 0;
-                       else if (v >= shp) v = shp - 1;
+                  x = span->x1;
+                  w = (span->x2 - x);
 
+                  if (w <= 0) continue;
+                  ww = w;
+                  u = span->u[0] << FPI;
+                  if (u < 0) u = 0;
+                  else if (u > swp) u = swp;
+                  v = span->v[0] << FPI;
+                  if (v < 0) v = 0;
+                  else if (v > shp) v = shp;
+                  ue = span->u[1] << FPI;
+                  if (ue < 0) ue = 0;
+                  else if (ue > swp) ue = swp;
+                  ve = span->v[1] << FPI;
+                  if (ve < 0) ve = 0;
+                  else if (ve > shp) ve = shp;
+                  ud = (ue - u) / w;
+                  vd = (ve - v) / w;
+                  if (direct)
+                    d = dst->image.data + (y * dst->cache_entry.w) + x;
+                  else
+                    d = buf;
+                  if (ud < 0) u += ud;
+                  if (vd < 0) v += vd;
+                  if (u < 0) u = 0;
+                  else if (u >= swp) u = swp - 1;
+                  if (v < 0) v = 0;
+                  else if (v >= shp) v = shp - 1;
 #undef SMOOTH
 #ifdef COLMUL
-                       c1 = span->col[0]; // col
-                       c2 = span->col[1]; // col
-                       cv = 0; // col
-                       cd = (255 << 16) / w; // col
+                  c1 = span->col[0]; // col
+                  c2 = span->col[1]; // col
+                  cv = 0; // col
+                  cd = (255 << 16) / w; // col
 
-                       if (c1 == c2)
+                  if (c1 == c2)
+                    {
+                       if (c1 == 0xffffffff)
                          {
-                            if (c1 == 0xffffffff)
-                              {
 #endif
 #define COLSAME 1
 #include "evas_map_image_loop.c"
 #undef COLSAME
 #ifdef COLMUL
-                              }
-                            else if ((c1 == 0x0000ff) && (!src->cache_entry.flags.alpha))
-                              {
-                                 // all black line
+                         }
+                       else if ((c1 == 0x0000ff) && (!src->cache_entry.flags.alpha))
+                         {
+                            // all black line
 # define COLBLACK 1
 # define COLSAME 1
 # include "evas_map_image_loop.c"
 # undef COLSAME
 # undef COLBLACK
-                              }
-                            else if (c1 == 0x000000)
-                              {
-                                 // skip span
-                              }
-                            else
-                              {
-                                 // generic loop
-# define COLSAME 1
-# include "evas_map_image_loop.c"
-# undef COLSAME
-                              }
+                         }
+                       else if (c1 == 0x000000)
+                         {
+                            // skip span
                          }
                        else
                          {
                             // generic loop
+# define COLSAME 1
 # include "evas_map_image_loop.c"
+# undef COLSAME
                          }
-#endif                       
-                       if (!direct)
-                         {
-                            d = dst->image.data;
-                            d += (y * dst->cache_entry.w) + x;
-                            func(buf, NULL, mul_col, d, w);
-                         }
                     }
-                  else break;
+                  else
+                    {
+                       // generic loop
+# include "evas_map_image_loop.c"
+                    }
+#endif
+                  if (!direct)
+                    {
+                       d = dst->image.data;
+                       d += (y * dst->cache_entry.w) + x;
+                       func(buf, NULL, mul_col, d, w);
+                    }
                }
           }
      }