svnno****@sourc*****
svnno****@sourc*****
2009年 6月 5日 (金) 23:40:02 JST
Revision: 145 http://svn.sourceforge.jp/view?root=swfed&view=rev&rev=145 Author: yoya Date: 2009-06-05 23:40:02 +0900 (Fri, 05 Jun 2009) Log Message: ----------- warning の対処。型がおかしいとか未使用のパラメータとか。 Modified Paths: -------------- trunk/src/swf_fill_style.c trunk/src/swf_fill_style_array.c trunk/src/swf_fill_style_bitmap.c trunk/src/swf_fill_style_gradient.c trunk/src/swf_fill_style_solid.c trunk/src/swf_gradient.c trunk/src/swf_line_style.c trunk/src/swf_line_style_array.c trunk/src/swf_matrix.c trunk/src/swf_morph_shape_with_style.c trunk/src/swf_shape_record.c trunk/src/swf_shape_record_end.c trunk/src/swf_shape_record_setup.c trunk/src/swf_shape_with_style.c trunk/src/swf_shape_with_style.h trunk/src/swf_styles.c trunk/src/swf_styles_count.c trunk/src/swf_tag_shape.c trunk/src/swf_tag_sprite.c -------------- next part -------------- Modified: trunk/src/swf_fill_style.c =================================================================== --- trunk/src/swf_fill_style.c 2009-06-05 14:26:48 UTC (rev 144) +++ trunk/src/swf_fill_style.c 2009-06-05 14:40:02 UTC (rev 145) @@ -78,4 +78,5 @@ int swf_fill_style_delete(swf_fill_style_t *fill_style) { swf_fill_style_gradient_delete(&(fill_style->gradient)); + return 0; } Modified: trunk/src/swf_fill_style_array.c =================================================================== --- trunk/src/swf_fill_style_array.c 2009-06-05 14:26:48 UTC (rev 144) +++ trunk/src/swf_fill_style_array.c 2009-06-05 14:40:02 UTC (rev 145) @@ -35,6 +35,7 @@ for (i = 0 ; i < fill_style_array->count ; i++) { swf_fill_style_build(bs, &(fill_style_array->fill_style[i]), tag); } + return 0; } int @@ -57,4 +58,5 @@ swf_fill_style_delete(&(fill_style_array->fill_style[i])); } free(fill_style_array->fill_style); + return 0; } Modified: trunk/src/swf_fill_style_bitmap.c =================================================================== --- trunk/src/swf_fill_style_bitmap.c 2009-06-05 14:26:48 UTC (rev 144) +++ trunk/src/swf_fill_style_bitmap.c 2009-06-05 14:40:02 UTC (rev 145) @@ -2,6 +2,7 @@ #include "bitstream.h" #include "swf_fill_style_bitmap.h" +int swf_fill_style_bitmap_parse(bitstream_t *bs, swf_fill_style_bitmap_t *fill_style_bitmap, swf_tag_t *tag) { Modified: trunk/src/swf_fill_style_gradient.c =================================================================== --- trunk/src/swf_fill_style_gradient.c 2009-06-05 14:26:48 UTC (rev 144) +++ trunk/src/swf_fill_style_gradient.c 2009-06-05 14:40:02 UTC (rev 145) @@ -2,6 +2,7 @@ #include "bitstream.h" #include "swf_fill_style_gradient.h" +int swf_fill_style_gradient_parse(bitstream_t *bs, swf_fill_style_gradient_t *fill_style_gradient, swf_tag_t* tag) { @@ -47,4 +48,5 @@ int swf_fill_style_gradient_delete(swf_fill_style_gradient_t *fill_style_gradient) { swf_gradient_delete(&(fill_style_gradient->gradient)); + return 0; } Modified: trunk/src/swf_fill_style_solid.c =================================================================== --- trunk/src/swf_fill_style_solid.c 2009-06-05 14:26:48 UTC (rev 144) +++ trunk/src/swf_fill_style_solid.c 2009-06-05 14:40:02 UTC (rev 145) @@ -2,6 +2,7 @@ #include "bitstream.h" #include "swf_fill_style_solid.h" +int swf_fill_style_solid_parse(bitstream_t *bs, swf_fill_style_solid_t *fill_style_solid, swf_tag_t *tag) { Modified: trunk/src/swf_gradient.c =================================================================== --- trunk/src/swf_gradient.c 2009-06-05 14:26:48 UTC (rev 144) +++ trunk/src/swf_gradient.c 2009-06-05 14:40:02 UTC (rev 145) @@ -72,4 +72,5 @@ int swf_gradient_delete(swf_gradient_t *gradient) { free(gradient->gradient_record); + return 0; } Modified: trunk/src/swf_line_style.c =================================================================== --- trunk/src/swf_line_style.c 2009-06-05 14:26:48 UTC (rev 144) +++ trunk/src/swf_line_style.c 2009-06-05 14:40:02 UTC (rev 145) @@ -2,6 +2,7 @@ #include "bitstream.h" #include "swf_line_style.h" +int swf_line_style_parse(bitstream_t *bs, swf_line_style_t *line_style, swf_tag_t *tag) { if (tag->tag == 46) { // DefineMorphShape @@ -90,6 +91,6 @@ int swf_line_style_print(swf_line_style_t *line_style, int indent_depth, swf_tag_t *tag) { - ; + printf("swf_line_style_print: not implemented yet\n"); return 0; } Modified: trunk/src/swf_line_style_array.c =================================================================== --- trunk/src/swf_line_style_array.c 2009-06-05 14:26:48 UTC (rev 144) +++ trunk/src/swf_line_style_array.c 2009-06-05 14:40:02 UTC (rev 145) @@ -33,6 +33,7 @@ for (i = 0 ; i < shape_with_style->count ; i++) { swf_line_style_build(bs, &(shape_with_style->line_style[i]), tag); } + return 0; } int @@ -50,4 +51,5 @@ int swf_line_style_array_delete(swf_line_style_array_t *line_style_array) { free(line_style_array->line_style); + return 0; } Modified: trunk/src/swf_matrix.c =================================================================== --- trunk/src/swf_matrix.c 2009-06-05 14:26:48 UTC (rev 144) +++ trunk/src/swf_matrix.c 2009-06-05 14:40:02 UTC (rev 145) @@ -68,7 +68,7 @@ printf("has_scale=%d\n", matrix->has_scale); if (matrix->has_scale) { print_indent(indent_depth); - printf("scale_(x,y)=(%d,%d)\n", + printf("scale_(x,y)=(%lu,%lu)\n", matrix->scale_x, matrix->scale_y); } print_indent(indent_depth); Modified: trunk/src/swf_morph_shape_with_style.c =================================================================== --- trunk/src/swf_morph_shape_with_style.c 2009-06-05 14:26:48 UTC (rev 144) +++ trunk/src/swf_morph_shape_with_style.c 2009-06-05 14:40:02 UTC (rev 145) @@ -2,6 +2,7 @@ #include "bitstream.h" #include "swf_morph_shape_with_style.h" +int swf_morph_shape_with_style_parse(bitstream_t *bs, swf_morph_shape_with_style_t *morph_shape_with_style, swf_tag_t *tag) { @@ -48,4 +49,5 @@ int swf_morph_shape_with_style_delete(swf_morph_shape_with_style_t *morph_shape_with_style) { swf_styles_delete(&(morph_shape_with_style->styles)); + return 0; } Modified: trunk/src/swf_shape_record.c =================================================================== --- trunk/src/swf_shape_record.c 2009-06-05 14:26:48 UTC (rev 144) +++ trunk/src/swf_shape_record.c 2009-06-05 14:40:02 UTC (rev 145) @@ -2,6 +2,7 @@ #include "bitstream.h" #include "swf_shape_record.h" +int swf_shape_record_parse(bitstream_t *bs, swf_shape_record_t *shape_record, swf_tag_t *tag, swf_styles_count_t *count) { int first_bit, next_5bits; @@ -80,4 +81,5 @@ free(current); current = next; } + return 0; } Modified: trunk/src/swf_shape_record_end.c =================================================================== --- trunk/src/swf_shape_record_end.c 2009-06-05 14:26:48 UTC (rev 144) +++ trunk/src/swf_shape_record_end.c 2009-06-05 14:40:02 UTC (rev 145) @@ -2,6 +2,7 @@ #include "bitstream.h" #include "swf_shape_record_end.h" +int swf_shape_record_end_parse(bitstream_t *bs, swf_shape_record_end_t *shape_record_end) { shape_record_end->shape_record_type = bitstream_getbit(bs); Modified: trunk/src/swf_shape_record_setup.c =================================================================== --- trunk/src/swf_shape_record_setup.c 2009-06-05 14:26:48 UTC (rev 144) +++ trunk/src/swf_shape_record_setup.c 2009-06-05 14:40:02 UTC (rev 145) @@ -2,6 +2,7 @@ #include "bitstream.h" #include "swf_shape_record_setup.h" +int swf_shape_record_setup_parse(bitstream_t *bs, swf_shape_record_setup_t *shape_record_setup, swf_tag_t *tag, swf_styles_count_t *count) { Modified: trunk/src/swf_shape_with_style.c =================================================================== --- trunk/src/swf_shape_with_style.c 2009-06-05 14:26:48 UTC (rev 144) +++ trunk/src/swf_shape_with_style.c 2009-06-05 14:40:02 UTC (rev 145) @@ -2,7 +2,7 @@ #include "bitstream.h" #include "swf_shape_with_style.h" - +int swf_shape_with_style_parse(bitstream_t *bs, swf_shape_with_style_t *shape_with_style, swf_tag_t *tag) { Modified: trunk/src/swf_shape_with_style.h =================================================================== --- trunk/src/swf_shape_with_style.h 2009-06-05 14:26:48 UTC (rev 144) +++ trunk/src/swf_shape_with_style.h 2009-06-05 14:40:02 UTC (rev 145) @@ -13,7 +13,7 @@ typedef struct swf_shape_with_style_ { swf_styles_t styles; - swf_shape_record_t *shape_records; + swf_shape_record_t shape_records; } swf_shape_with_style_t; extern int swf_shape_with_style_parse(bitstream_t *bs, Modified: trunk/src/swf_styles.c =================================================================== --- trunk/src/swf_styles.c 2009-06-05 14:26:48 UTC (rev 144) +++ trunk/src/swf_styles.c 2009-06-05 14:40:02 UTC (rev 145) @@ -35,4 +35,5 @@ swf_styles_delete(swf_styles_t *styles) { swf_fill_style_array_delete(&(styles->fill_styles)); swf_line_style_array_delete(&(styles->line_styles)); + return 0; } Modified: trunk/src/swf_styles_count.c =================================================================== --- trunk/src/swf_styles_count.c 2009-06-05 14:26:48 UTC (rev 144) +++ trunk/src/swf_styles_count.c 2009-06-05 14:40:02 UTC (rev 145) @@ -2,6 +2,7 @@ #include "bitstream.h" #include "swf_styles_count.h" +int swf_styles_count_parse(bitstream_t *bs, swf_styles_count_t *styles_count) { styles_count->fill_bits_count = bitstream_getbits(bs, 4); styles_count->line_bits_count = bitstream_getbits(bs, 4); Modified: trunk/src/swf_tag_shape.c =================================================================== --- trunk/src/swf_tag_shape.c 2009-06-05 14:26:48 UTC (rev 144) +++ trunk/src/swf_tag_shape.c 2009-06-05 14:40:02 UTC (rev 145) @@ -40,7 +40,7 @@ unsigned char *data = tag->data; unsigned long length = tag->length; bitstream_t *bs; - swf_tag_t **_tag; + (void) swf; if (swf_tag_shape == NULL) { fprintf(stderr, "ERROR: swf_tag_shape_input_detail: swf_tag_shape == NULL\n"); return 1; @@ -104,7 +104,7 @@ swf_tag_shape_detail_t *swf_tag_shape = (swf_tag_shape_detail_t *) tag->detail; bitstream_t *bs; unsigned char *data; - swf_tag_t *_tag; + (void) swf; *length = 0; bs = bitstream_open(); bitstream_putbytesLE(bs, swf_tag_shape->shape_id, 2); @@ -117,7 +117,7 @@ swf_tag_shape_print_detail(swf_tag_t *tag, struct swf_object_ *swf, int indent_depth) { swf_tag_shape_detail_t *swf_tag_shape = (swf_tag_shape_detail_t *) tag->detail; - (void) tag; + (void) swf; print_indent(indent_depth); printf("shape_id=%d\n", swf_tag_shape->shape_id); print_indent(indent_depth); Modified: trunk/src/swf_tag_sprite.c =================================================================== --- trunk/src/swf_tag_sprite.c 2009-06-05 14:26:48 UTC (rev 144) +++ trunk/src/swf_tag_sprite.c 2009-06-05 14:40:02 UTC (rev 145) @@ -41,6 +41,7 @@ unsigned long length = tag->length; bitstream_t *bs; swf_tag_t **_tag; + (void) swf; if (swf_tag_sprite == NULL) { fprintf(stderr, "ERROR: swf_tag_sprite_input_detail: swf_tag_sprite == NULL\n"); return 1;