SWF Editor for PHP

Fork

[Swfed-svn] swfed-svn [411] swf_tag_create_input_detail を呼ぶコードの refine

svnno****@sourc***** svnno****@sourc*****
2011年 3月 10日 (木) 23:07:24 JST

• 前の記事 [Swfed-svn] swfed-svn [410] *. c から extern を削除
• 次の記事 [Swfed-svn] swfed-svn [412] - 関数の戻り値が無いのを修正
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 411
          http://sourceforge.jp/projects/swfed/svn/view?view=rev&revision=411
Author:   yoya
Date:     2011-03-10 23:07:24 +0900 (Thu, 10 Mar 2011)

Log Message:
-----------
swf_tag_create_input_detail を呼ぶコードの refine

Modified Paths:
--------------
    trunk/src/swf_tag.c


-------------- next part --------------
Modified: trunk/src/swf_tag.c
===================================================================
--- trunk/src/swf_tag.c	2011-03-10 13:50:32 UTC (rev 410)
+++ trunk/src/swf_tag.c	2011-03-10 14:07:24 UTC (rev 411)
@@ -237,8 +237,9 @@
     }
     printf("\n");
     if (tag_info && tag_info->detail_handler) {
-        if (tag->detail == NULL) {
-            swf_tag_create_input_detail(tag, swf);
+        if (swf_tag_create_input_detail(tag, swf) == NULL) {
+            fprintf(stderr, "swf_tag_print: swf_tag_create_input_detail failed\n");
+            return ;
         }
         swf_tag_detail_handler_t * detail_handler = tag_info->detail_handler();
         if (detail_handler->print) {
@@ -367,10 +368,11 @@
     }
     if (isPlaceTag(tag->tag)) { // PlaceObject, PlaceObject2
         swf_tag_place_detail_t *swf_tag_place;
-        if (! tag->detail) {
-            swf_tag_create_input_detail(tag, NULL);
+        swf_tag_place = swf_tag_create_input_detail(tag, NULL);
+        if (swf_tag_place == NULL) {
+            fprintf(stderr, "swf_tag_get_refcid: swf_tag_place swf_tag_create_input_detail failed\n");
+            return -1;
         }
-        swf_tag_place = tag->detail;
         return swf_tag_place->character_id;
     }
     return -1; // no cid tag
@@ -378,18 +380,17 @@
 
 int
 swf_tag_replace_refcid(swf_tag_t *tag, int cid) {
-//    fprintf(stderr, "XXX: swf_tag_replace_refcid(tag(code=%d), cid(%d))\n", tag->tag, cid);
     if (tag == NULL) {
         fprintf(stderr, "swf_tag_replace_refcid: tag == NULL\n");
         return 1; // failure
     }
     if (isPlaceTag(tag->tag)) { // PlaceObject, PlaceObject2
         swf_tag_place_detail_t *swf_tag_place;
-        if (! tag->detail) {
-            swf_tag_create_input_detail(tag, NULL);
+        swf_tag_place = swf_tag_create_input_detail(tag, NULL);
+        if (swf_tag_place == NULL) {
+            fprintf(stderr, "swf_tag_replace_refcid: swf_tag_place swf_tag_create_input_detail failed\n");
+            return 1; // failure
         }
-//        fprintf(stderr, "XXX: swf_tag_create_input_detail(tag, NULL)\n");
-        swf_tag_place = tag->detail;
         swf_tag_place->character_id = cid;
     }
     if (tag->data) {
@@ -413,10 +414,10 @@
         fprintf(stderr, "swf_tag_get_bitmap_size: width == NULL or height == NULL\n");
         return 1;
     }
-    if (tag->detail == NULL) {
-        swf_tag_create_input_detail(tag, NULL);
+    if (swf_tag_create_input_detail(tag, NULL) == NULL) {
+        fprintf(stderr, "swf_tag_get_bitmap_size: swf_tag_create_input_detail failed\n");
+        return 1;
     }
-
     if (isBitsJPEGTag(tag->tag)) {
         swf_tag_jpeg_detail_t *swf_tag_jpeg = (swf_tag_jpeg_detail_t *) tag->detail;
         ret = jpeg_size(swf_tag_jpeg->jpeg_data, swf_tag_jpeg->jpeg_data_len,
@@ -449,11 +450,8 @@
     if ((tag->tag != 6) && (tag->tag != 21) && (tag->tag != 35)) {
         return NULL;
     }
-    if (! tag->detail) {
-        swf_tag_create_input_detail(tag, NULL);
-    }
-    if (! tag->detail) {
-        fprintf(stderr, "swf_tag_get_jpeg_data: Can't create tag\n");
+    if (swf_tag_create_input_detail(tag, NULL) == NULL) {
+        fprintf(stderr, "swf_tag_get_jpeg_data: swf_tag_create_input_detail failed\n");
         return NULL;
     }
     if (tag_jpegtables) {
@@ -483,11 +481,8 @@
     if (swf_tag_get_cid(tag) != image_id) {
         return NULL;
     }
-    if (! tag->detail) {
-        swf_tag_create_input_detail(tag, NULL);
-    }
-    if (! tag->detail) {
-        fprintf(stderr, "swf_tag_get_alpha_data: Can't create tag\n");
+    if (swf_tag_create_input_detail(tag, NULL) == NULL) {
+        fprintf(stderr, "swf_tag_get_alpha_data: swf_tag_create_input_detail failed\n");
         return NULL;
     }
     return swf_tag_jpeg_get_alpha_data(tag->detail, length, image_id);
@@ -568,11 +563,8 @@
     if ((tag->tag != 20) && (tag->tag != 36)) {
         return NULL;
     }
-    if (! tag->detail) {
-        swf_tag_create_input_detail(tag, NULL);
-    }
-    if (! tag->detail) {
-        fprintf(stderr, "swf_tag_get_png_data: Can't create tag\n");
+    if (swf_tag_create_input_detail(tag, NULL) == NULL) {
+        fprintf(stderr, "swf_tag_get_png_data: swf_tag_create_input_detail failed\n");
         return NULL;
     }
     return swf_tag_lossless_get_png_data(tag->detail, length, image_id, tag);
@@ -711,10 +703,10 @@
         return NULL;
     }
     if (! tag->detail) {
-        swf_tag_create_input_detail(tag, NULL);
+        
     }
-    if (! tag->detail) {
-        fprintf(stderr, "swf_tag_get_sound_data: Can't create tag detail\n");
+    if (swf_tag_create_input_detail(tag, NULL) == NULL) {
+        fprintf(stderr, "swf_tag_get_sound_data: swf_tag_create_input_detail failed\n");
         return NULL;
     }
     return swf_tag_sound_get_sound_data(tag->detail, length, sound_id);
@@ -739,11 +731,8 @@
     if (swf_tag_get_cid(tag) != sound_id) {
         return 1;
     }
-    if (! tag->detail) {
-        swf_tag_create_input_detail(tag, NULL);
-    }
-    if (! tag->detail) {
-        fprintf(stderr, "swf_tag_replace_melog_data: Can't create tag\n");
+    if (swf_tag_create_input_detail(tag, NULL) == NULL) {
+        fprintf(stderr, "swf_tag_replace_melog_data: swf_tag_create_input_detail failed\n");
         return 1;
     }
     result= swf_tag_sound_replace_melo_data(tag->detail, sound_id,
@@ -772,11 +761,8 @@
     if (tag->tag != 37) { // DefineEditText
         return NULL;
     }
-    if (! tag->detail) {
-        swf_tag_create_input_detail(tag, swf);
-    }
-    if (! tag->detail) {
-        fprintf(stderr, "Can't create tag\n");
+    if (swf_tag_create_input_detail(tag, swf) == NULL) {
+        fprintf(stderr, "swf_tag_get_edit_string: swf_tag_create_input_detail failed\n");
         return NULL;
     }
     return swf_tag_edit_get_string(tag->detail,
@@ -801,12 +787,8 @@
     if (tag->tag != 37) { // DefineEditText
         return 1;
     }
-    
-    if (! tag->detail) {
-        swf_tag_create_input_detail(tag, swf);
-    }
-    if (! tag->detail) {
-        fprintf(stderr, "swf_tag_replace_edit_string: Can't create tag\n");
+    if (swf_tag_create_input_detail(tag, swf) == NULL) {
+        fprintf(stderr, "swf_tag_replace_edit_string: swf_tag_create_input_detail failed\n");
         return 1;
     }
     result = swf_tag_edit_replace_string(tag->detail,
@@ -839,11 +821,8 @@
     if (swf_tag_get_cid(tag) != shape_id) {
         return 1;
     }
-    if (! tag->detail) {
-        swf_tag_create_input_detail(tag, swf);
-    }
-    if (! tag->detail) {
-        fprintf(stderr, "swf_tag_apply_shape_matrix_factor: Can't create tag\n");
+    if (swf_tag_create_input_detail(tag, swf)) {
+        fprintf(stderr, "swf_tag_apply_shape_matrix_factor: swf_tag_create_input_detail failed\n");
         return 1;
     }
     result = swf_tag_shape_apply_matrix_factor(tag->detail, shape_id,
@@ -876,11 +855,8 @@
     if (swf_tag_get_cid(tag) != shape_id) {
         return 1;
     }
-    if (! tag->detail) {
-        swf_tag_create_input_detail(tag, swf);
-    }
-    if (! tag->detail) {
-        fprintf(stderr, "swf_tag_apply_shape_rect_factor: Can't create tag\n");
+    if (swf_tag_create_input_detail(tag, swf) == NULL) {
+        fprintf(stderr, "swf_tag_apply_shape_rect_factor: swf_tag_create_input_detail failed\n");
         return 1;
     }
     result = swf_tag_shape_apply_rect_factor(tag->detail, shape_id,
@@ -910,11 +886,8 @@
     if (swf_tag_get_cid(tag) != shape_id) {
         return 1;
     }
-    if (! tag->detail) {
-        swf_tag_create_input_detail(tag, swf);
-    }
-    if (! tag->detail) {
-        fprintf(stderr, "swf_tag_apply_shape_rect_factor: Can't create tag\n");
+    if (swf_tag_create_input_detail(tag, swf) == NULL) {
+        fprintf(stderr, "swf_tag_apply_shape_rect_factor: swf_tag_create_input_detail failed\n");
         return 1;
     }
     result = swf_tag_shape_apply_type_tilled(tag->detail, shape_id);
@@ -959,8 +932,9 @@
         fprintf(stderr, "swf_tag_put_action_setvariables: kv == NULL\n");
         return 1;
     }
-    if (! tag->detail) {
-        swf_tag_create_input_detail(tag, swf);
+    if (swf_tag_create_input_detail(tag, swf) == NULL) {
+        fprintf(stderr, "swf_tag_put_action_setvariables: swf_tag_create_input_detail failed\n");
+        return 1;
     }
     ret = swf_tag_action_put_setvaribles(tag, kv);
     if (ret) {

• 前の記事 [Swfed-svn] swfed-svn [410] *. c から extern を削除
• 次の記事 [Swfed-svn] swfed-svn [412] - 関数の戻り値が無いのを修正
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]