From: Mike McCormack <mj.mccormack@samsung.com>
Date: Thu, 3 Nov 2011 04:30:25 +0000 (+0900)
Subject: Remove unnecessary differences from upstream
X-Git-Tag: 2.0_alpha~192
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a4b7374ec26c85b7b5f4bbe00934183b5b474ff5;p=framework%2Fuifw%2Fevas.git

Remove unnecessary differences from upstream
---

diff --git a/src/modules/loaders/gif/evas_image_load_gif.c b/src/modules/loaders/gif/evas_image_load_gif.c
index 23efcf0..e93c498 100644
--- a/src/modules/loaders/gif/evas_image_load_gif.c
+++ b/src/modules/loaders/gif/evas_image_load_gif.c
@@ -188,19 +188,28 @@ _evas_image_load_frame_image_des_info(GifFileType *gif, Image_Entry_Frame *frame
 static Eina_Bool
 _evas_image_load_frame_image_data(Image_Entry *ie, GifFileType *gif, Image_Entry_Frame *frame, int *error)
 {
-   int                 w, h, x, y;
+   int                 w;
+   int                 h;
+   int                 x;
+   int                 y;
    int                 i, j;
    int                 bg;
-   int                 r, g, b;
+   int                 r;
+   int                 g;
+   int                 b;
    int                 alpha;
-   double              per, per_inc;
+   double              per;
+   double              per_inc;
    ColorMapObject     *cmap;
    GifRowType         *rows = NULL;
    GifPixelType       *tmp = NULL; /*for skip gif line */
    int                 intoffset[] = { 0, 4, 2, 1 };
    int                 intjump[] = { 8, 8, 4, 2 };
    size_t              siz;
-   int                 cache_w, cache_h, cur_w, cur_h;
+   int                 cache_w;
+   int                 cache_h;
+   int                 cur_w;
+   int                 cur_h;
    int                 disposal = 0;
    int                 bg_val = 0;
    DATA32             *ptr;
@@ -293,7 +302,7 @@ _evas_image_load_frame_image_data(Image_Entry *ie, GifFileType *gif, Image_Entry
                {
                   *error = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
                   goto error;
-               }
+              }
              if (scale_ratio > 1)
                {
                   /* we use down sample method for scale down, so skip other line */
@@ -566,7 +575,7 @@ _evas_image_load_frame(Image_Entry *ie, GifFileType *gif, Image_Entry_Frame *fra
    gif_frame = (Gif_Frame *) frame->info;
 
    if (type > LOAD_FRAME_DATA_INFO) return EINA_FALSE;
-
+   
    do
      {
         if (DGifGetRecordType(gif, &rec) == GIF_ERROR) return EINA_FALSE;