Evas filters: Fix compilation after merge from master
authorJean-Philippe Andre <jp.andre@samsung.com>
Mon, 30 Dec 2013 06:43:52 +0000 (15:43 +0900)
committerJean-Philippe Andre <jp.andre@samsung.com>
Fri, 7 Feb 2014 08:33:16 +0000 (17:33 +0900)
- CRIT becomes CRI

src/lib/evas/canvas/evas_object_textblock.c
src/lib/evas/filters/evas_filter.c
src/lib/evas/filters/evas_filter_blur.c
src/lib/evas/filters/evas_filter_bump.c
src/lib/evas/filters/evas_filter_curve.c
src/lib/evas/filters/evas_filter_displace.c
src/lib/evas/filters/evas_filter_parser.c

index 6ea6cb5..7868ccc 100644 (file)
@@ -384,6 +384,7 @@ struct _Evas_Object_Textblock_Item
    size_t                               visual_pos;
 #endif
    Evas_Textblock_Item_Type             type;
+
    Evas_Coord                           adv, x, w, h;
    Evas_Coord                           yoff;
    Eina_Bool                            merge : 1; /* Indicates whether this
@@ -6311,6 +6312,7 @@ static void
 _markup_get_text_append(Eina_Strbuf *txt, const Eina_Unicode *text)
 {
    char *base = eina_unicode_unicode_to_utf8(text, NULL);
+
    if (!base) return;
 
    _markup_get_text_utf8_append(txt, base);
@@ -10708,6 +10710,7 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
 
    ENFN->context_color_set(output, context, 0, 0, 0, 0);
    ca = cr = cg = cb = 0;
+
 #define ITEM_WALK() \
    EINA_INLIST_FOREACH(start, par) \
      { \
@@ -10907,7 +10910,6 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
 
         /* Draw background */
         DRAW_FORMAT(backing, 0, ln->h);
-
      }
    ITEM_WALK_END();
 
@@ -10922,6 +10924,7 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
         int shad_dst, shad_sz, dx, dy, haveshad;
         Evas_Object_Textblock_Text_Item *ti;
         Evas_Coord yoff;
+
         ti = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(itr) : NULL;
         if (!ti) continue;
 
@@ -11031,6 +11034,7 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
      {
         Evas_Object_Textblock_Text_Item *ti;
         Evas_Coord yoff;
+
         ti = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(itr) : NULL;
         if (!ti) continue;
 
@@ -11063,6 +11067,7 @@ evas_object_textblock_render(Evas_Object *eo_obj EINA_UNUSED,
      {
         Evas_Object_Textblock_Text_Item *ti;
         Evas_Coord yoff;
+
         ti = (itr->type == EVAS_TEXTBLOCK_ITEM_TEXT) ? _ITEM_TEXT(itr) : NULL;
         if (!ti) continue;
 
index a66a5a0..fa19f00 100644 (file)
@@ -603,7 +603,7 @@ evas_filter_command_blur_add(Evas_Filter_Context *ctx, void *drawctx,
         break;
       case EVAS_FILTER_BLUR_MOTION:
       default:
-        CRIT("Not implemented yet!");
+        CRI("Not implemented yet!");
         goto fail;
      }
 
@@ -1021,8 +1021,8 @@ evas_filter_command_bump_map_add(Evas_Filter_Context *ctx,
      }
 
    // FIXME: Must ensure in != out
-   if (in == out) CRIT("Not acceptable");
-   if (bumpmap == out) CRIT("Not acceptable");
+   if (in == out) CRI("Not acceptable");
+   if (bumpmap == out) CRI("Not acceptable");
 
    cmd = _command_new(ctx, EVAS_FILTER_MODE_BUMP, in, bumpmap, out);
    if (!cmd) goto end;
@@ -1207,7 +1207,7 @@ _filter_command_run(Evas_Filter_Command *cmd)
    // FIXME: Must call engine function, not CPU directly.
 
    if (strncmp(cmd->ctx->evas->engine.module->definition->name, "software", 8))
-     CRIT("Only the software engine is supported for now.");
+     CRI("Only the software engine is supported for now.");
 
    switch (cmd->mode)
      {
@@ -1233,7 +1233,7 @@ _filter_command_run(Evas_Filter_Command *cmd)
         func = evas_filter_bump_map_cpu_func_get(cmd);
         break;
       default:
-        CRIT("Invalid filter mode.");
+        CRI("Invalid filter mode.");
         break;
      }
 
@@ -1241,7 +1241,7 @@ _filter_command_run(Evas_Filter_Command *cmd)
 
    if (!func)
      {
-        CRIT("No function to process this filter!");
+        CRI("No function to process this filter!");
         return EINA_FALSE;
      }
 
index 14b2246..bd294de 100644 (file)
@@ -747,7 +747,7 @@ evas_filter_blur_cpu_func_get(Evas_Filter_Command *cmd)
              else if (cmd->blur.dy)
                return _box_blur_vert_apply_alpha;
           }
-        CRIT("Unsupported operation: mixing RGBA and Alpha surfaces.");
+        CRI("Unsupported operation: mixing RGBA and Alpha surfaces.");
         return NULL;
       case EVAS_FILTER_BLUR_GAUSSIAN:
         if (!cmd->input->alpha_only && !cmd->output->alpha_only)
@@ -764,10 +764,10 @@ evas_filter_blur_cpu_func_get(Evas_Filter_Command *cmd)
              else if (cmd->blur.dy)
                return _gaussian_blur_vert_apply_alpha;
           }
-        CRIT("Unsupported operation: mixing RGBA and Alpha surfaces.");
+        CRI("Unsupported operation: mixing RGBA and Alpha surfaces.");
         return NULL;
       default:
-        CRIT("Not implemented yet!");
+        CRI("Not implemented yet!");
         return NULL;
      }
 }
index 2d8884a..1d2a042 100644 (file)
@@ -419,6 +419,6 @@ _bump_map_cpu_rgba_rgba(Evas_Filter_Command *cmd)
 {
    (void) cmd;
 
-   CRIT("Not implemented yet.");
+   CRI("Not implemented yet.");
    return EINA_FALSE;
 }
index a31c333..2f5df07 100644 (file)
@@ -120,6 +120,6 @@ evas_filter_curve_cpu_func_get(Evas_Filter_Command *cmd)
    if (cmd->input->alpha_only && cmd->output->alpha_only)
      return _filter_curve_cpu_alpha;
 
-   CRIT("Incompatible image formats");
+   CRI("Incompatible image formats");
    return NULL;
 }
index c7a8624..1a52bb9 100644 (file)
@@ -348,7 +348,7 @@ evas_filter_displace_cpu_func_get(Evas_Filter_Command *cmd)
 
    if (cmd->input->alpha_only != cmd->output->alpha_only)
      {
-        CRIT("Invalid color formats");
+        CRI("Invalid color formats");
         return NULL;
      }
 
index 9417540..eab00b5 100644 (file)
@@ -729,7 +729,7 @@ _blur_padding_update(Evas_Filter_Program *pgm, Evas_Filter_Instruction *instr,
 
    if (typestr && !strcasecmp(typestr, "motion"))
      {
-        CRIT("Motion blur not implemented yet!");
+        CRI("Motion blur not implemented yet!");
         /*
         instr->pad.l = (rx < 0) ? (-rx) : 0;
         instr->pad.r = (rx > 0) ? (rx) : 0;
@@ -829,7 +829,7 @@ _curve_instruction_prepare(Evas_Filter_Instruction *instr)
    */
 
    //instr->type = EVAS_FILTER_MODE_CURVE;
-   CRIT("Not implemented yet");
+   CRI("Not implemented yet");
    return EINA_FALSE;
 }
 
@@ -1514,11 +1514,11 @@ _command_from_instruction(Evas_Filter_Context *ctx, Evas_Filter_Program *pgm,
         break;
 #endif
       case EVAS_FILTER_MODE_CURVE:
-        CRIT("Not implemented yet");
+        CRI("Not implemented yet");
         return -1;
       case EVAS_FILTER_MODE_BUFFER:
       default:
-        CRIT("Invalid instruction type: %d", instr->type);
+        CRI("Invalid instruction type: %d", instr->type);
         return -1;
      }