From 1ee7337679a4e55294238e740c63812c1ccb4877 Mon Sep 17 00:00:00 2001
From: yoya <yoya@7c90b180-03d5-4157-b861-58a559ae9d1e>
Date: Thu, 7 Apr 2011 12:47:00 +0000
Subject: [PATCH] =?utf8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0=E3=83=A1?=
 =?utf8?q?=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=81=AE=E5=89=8A=E9=99=A4?=
 =?utf8?q?=20=E3=82=A4=E3=83=B3=E3=83=87=E3=83=B3=E3=83=88=E3=81=AE?=
 =?utf8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/swfed/trunk@543 7c90b180-03d5-4157-b861-58a559ae9d1e
---
 src/swf_tag_shape.c | 86 ++++++++++++++++++++++++++---------------------------
 1 file changed, 42 insertions(+), 44 deletions(-)

diff --git a/src/swf_tag_shape.c b/src/swf_tag_shape.c
index 963a09a..48ade1a 100644
--- a/src/swf_tag_shape.c
+++ b/src/swf_tag_shape.c
@@ -210,44 +210,44 @@ swf_tag_shape_bitmap_get_refcid_list(swf_tag_t *tag, int *cid_list_num) {
     }
     while (1) {
         for (i = 0 ; i < styles->fill_styles.count ; i++) {
-	    swf_fill_style_t *fill_style;
-	    fill_style = &(styles->fill_styles.fill_style[i]);
-	    if (fill_style == NULL) {
-              fprintf(stderr, "swf_tag_shape_bitmap_get_refcid: fill_style == NULL i=%d\n", i);
-	        free(cid_list);
-		return NULL; // Illegal!!!
-	    }
-	    switch (fill_style->type) {
+            swf_fill_style_t *fill_style;
+            fill_style = &(styles->fill_styles.fill_style[i]);
+            if (fill_style == NULL) {
+                fprintf(stderr, "swf_tag_shape_bitmap_get_refcid: fill_style == NULL i=%d\n", i);
+                free(cid_list);
+                return NULL; // Illegal!!!
+            }
+            switch (fill_style->type) {
               case 0x40: // tilled  bitmap fill with smoothed edges
               case 0x41: // clipped bitmap fill with smoothed edges
               case 0x42: // tilled  bitmap fill with hard edges
               case 0x43: // clipped bitmap fill with hard edges
-		if (fill_style->bitmap.bitmap_ref != 0xffff) {
-	          if (cid_list_alloc <= *cid_list_num) {
-		    cid_list_alloc *= 2;
-		    realloc(cid_list, cid_list_alloc);
-		  }
-		  cid_list[*cid_list_num] = fill_style->bitmap.bitmap_ref;
-		  *cid_list_num  = (*cid_list_num)  + 1;
-		}
-		break;
+                if (fill_style->bitmap.bitmap_ref != 0xffff) {
+                    if (cid_list_alloc <= *cid_list_num) {
+                        cid_list_alloc *= 2;
+                        realloc(cid_list, cid_list_alloc);
+                    }
+                    cid_list[*cid_list_num] = fill_style->bitmap.bitmap_ref;
+                    *cid_list_num  = (*cid_list_num) + 1;
+                }
+                break;
               default:
-		break;
-	    }
-	}
-	// new style を探す
-    shape_records = _swf_tag_shape_search_new_style_in_shape_records(shape_records);
-
-	if (shape_records) {
-	    shape_records = shape_records->next; // next
-	} else {
-	    break; // finish
-	}
+                break;
+            }
+        }
+        // new style を探す
+        shape_records = _swf_tag_shape_search_new_style_in_shape_records(shape_records);
+        
+        if (shape_records) {
+            shape_records = shape_records->next; // next
+        } else {
+            break; // finish
+        }
     }
-
+    
     if (*cid_list_num == 0) {
         free(cid_list);
-	return NULL;
+        return NULL;
     }
     return cid_list; // not found
 }
@@ -279,7 +279,7 @@ int swf_tag_shape_bitmap_replace_refcid_list(swf_tag_t *tag, int from_cid, int t
     } else {
         swf_tag_shape = (swf_tag_shape_detail_t *) tag->detail;
     }
-
+    
     if (tag->code == 46) { // DefineMorphShape
         morph_shape_check = 1;
         styles = &(swf_tag_shape->morph_shape_with_style.styles);
@@ -303,19 +303,17 @@ int swf_tag_shape_bitmap_replace_refcid_list(swf_tag_t *tag, int from_cid, int t
               case 0x41: // clipped bitmap fill with smoothed edges
               case 0x42: // tilled  bitmap fill with hard edges
               case 0x43: // clipped bitmap fill with hard edges
-fprintf(stderr, "0x40-43 fill_style->bitmap.bitmap_ref=%d\n", 
-        fill_style->bitmap.bitmap_ref);
-                  if (fill_style->bitmap.bitmap_ref == from_cid) {
-                      fill_style->bitmap.bitmap_ref = to_cid;
-                      if (tag->data) {
-                          // 内容が変わったので元データは削除
-                          free(tag->data);
-                          tag->data = NULL;
-                      }
-                      return 0; // success!
-                  }
-                  break;
-            default:
+                if (fill_style->bitmap.bitmap_ref == from_cid) {
+                    fill_style->bitmap.bitmap_ref = to_cid;
+                    if (tag->data) {
+                        // 内容が変わったので元データは削除
+                        free(tag->data);
+                        tag->data = NULL;
+                    }
+                    return 0; // success!
+                }
+                break;
+              default:
                 break;
             }
         }
-- 
2.11.0