svnno****@sourc*****
svnno****@sourc*****
2009年 6月 21日 (日) 22:14:18 JST
ForkRevision: 164
http://sourceforge.jp/projects/swfed/svn/view?view=rev&revision=164
Author: yoya
Date: 2009-06-21 22:14:17 +0900 (Sun, 21 Jun 2009)
Log Message:
-----------
誤って union 定義にしたものを struct に修正
Modified Paths:
--------------
trunk/src/swf_fill_style.h
trunk/src/swf_fill_style_gradient.h
trunk/src/swf_fill_style_solid.h
trunk/src/swf_gradient.h
trunk/src/swf_gradient_record.h
trunk/src/swf_line_style.h
trunk/src/swf_shape_record_edge.h
trunk/src/swf_shape_record_end.h
trunk/src/swf_shape_record_setup.h
-------------- next part --------------
Modified: trunk/src/swf_fill_style.h
===================================================================
--- trunk/src/swf_fill_style.h 2009-06-19 14:29:00 UTC (rev 163)
+++ trunk/src/swf_fill_style.h 2009-06-21 13:14:17 UTC (rev 164)
@@ -12,7 +12,7 @@
#include "swf_fill_style_gradient.h"
#include "swf_fill_style_bitmap.h"
-typedef union swf_fill_style_ {
+typedef struct swf_fill_style_ {
unsigned char type;
swf_fill_style_solid_t solid;
swf_fill_style_gradient_t gradient;
Modified: trunk/src/swf_fill_style_gradient.h
===================================================================
--- trunk/src/swf_fill_style_gradient.h 2009-06-19 14:29:00 UTC (rev 163)
+++ trunk/src/swf_fill_style_gradient.h 2009-06-21 13:14:17 UTC (rev 164)
@@ -11,7 +11,7 @@
#include "swf_matrix.h"
#include "swf_gradient.h"
-typedef union swf_fill_style_gradient_ {
+typedef struct swf_fill_style_gradient_ {
unsigned char type;
swf_matrix_t gradient_matrix;
swf_matrix_t gradient_matrix_morph; // DefineMorphShape, DefineMorphShape2
Modified: trunk/src/swf_fill_style_solid.h
===================================================================
--- trunk/src/swf_fill_style_solid.h 2009-06-19 14:29:00 UTC (rev 163)
+++ trunk/src/swf_fill_style_solid.h 2009-06-21 13:14:17 UTC (rev 164)
@@ -11,7 +11,7 @@
#include "swf_rgb.h"
#include "swf_tag.h"
-typedef union swf_fill_style_solid_ {
+typedef struct swf_fill_style_solid_ {
unsigned char type;
swf_rgba_t rgba; // DefineMorphShape, DefineMorphShape2, DefineShape3
swf_rgba_t rgba_morph; // DefineMorphShape, DefineMorphShape2
Modified: trunk/src/swf_gradient.h
===================================================================
--- trunk/src/swf_gradient.h 2009-06-19 14:29:00 UTC (rev 163)
+++ trunk/src/swf_gradient.h 2009-06-21 13:14:17 UTC (rev 164)
@@ -10,7 +10,7 @@
#include "swf_tag.h"
#include "swf_gradient_record.h"
-typedef union swf_gradient_ {
+typedef struct swf_gradient_ {
unsigned char spread_mode : 2; // DefineShape4
unsigned char interpolation_mode : 2; // DefineShape4
unsigned char pad : 4; // other tag
Modified: trunk/src/swf_gradient_record.h
===================================================================
--- trunk/src/swf_gradient_record.h 2009-06-19 14:29:00 UTC (rev 163)
+++ trunk/src/swf_gradient_record.h 2009-06-21 13:14:17 UTC (rev 164)
@@ -11,7 +11,7 @@
#include "swf_rgba.h"
#include "swf_rgb.h"
-typedef union swf_gradient_record_ {
+typedef struct swf_gradient_record_ {
unsigned char position;
swf_rgba_t rgba; // DefineMorphShape, DefineMorphShape2, DefineShape3, DefineShape4
unsigned char position_morph; // DefineMorphShape, DefineMorphShape2
Modified: trunk/src/swf_line_style.h
===================================================================
--- trunk/src/swf_line_style.h 2009-06-19 14:29:00 UTC (rev 163)
+++ trunk/src/swf_line_style.h 2009-06-21 13:14:17 UTC (rev 164)
@@ -12,7 +12,7 @@
#include "swf_fill_style.h"
#include "swf_rgb.h"
-typedef union swf_line_style_ {
+typedef struct swf_line_style_ {
swf_rgba_t rgba;
swf_rgba_t rgba_morph; // + DefineMorphShape2
// DefineShape4, DefinePhophShape2
@@ -30,7 +30,6 @@
unsigned short /* fixed */ miter_limit_factor; // join_style == 2
swf_fill_style_t fill_style; // has_fill == true
swf_rgb_t rgb;
-
} swf_line_style_t;
extern int swf_line_style_parse(bitstream_t *bs,
Modified: trunk/src/swf_shape_record_edge.h
===================================================================
--- trunk/src/swf_shape_record_edge.h 2009-06-19 14:29:00 UTC (rev 163)
+++ trunk/src/swf_shape_record_edge.h 2009-06-21 13:14:17 UTC (rev 164)
@@ -9,7 +9,7 @@
#include "swf_styles.h"
-typedef union swf_shape_record_edge_ {
+typedef struct swf_shape_record_edge_ {
unsigned shape_record_type : 1;
unsigned shape_edge_type : 1;
unsigned shape_coord_size : 4;
Modified: trunk/src/swf_shape_record_end.h
===================================================================
--- trunk/src/swf_shape_record_end.h 2009-06-19 14:29:00 UTC (rev 163)
+++ trunk/src/swf_shape_record_end.h 2009-06-21 13:14:17 UTC (rev 164)
@@ -7,7 +7,7 @@
#ifndef __SWF_SHAPE_RECORD_END_H__
#define __SWF_SHAPE_RECORD_END_H__
-typedef union swf_shape_record_end_ {
+typedef struct swf_shape_record_end_ {
unsigned shape_record_type : 1;
unsigned end_of_shape : 5;
} swf_shape_record_end_t;
Modified: trunk/src/swf_shape_record_setup.h
===================================================================
--- trunk/src/swf_shape_record_setup.h 2009-06-19 14:29:00 UTC (rev 163)
+++ trunk/src/swf_shape_record_setup.h 2009-06-21 13:14:17 UTC (rev 164)
@@ -9,7 +9,7 @@
#include "swf_styles.h"
-typedef union swf_shape_record_setup_ {
+typedef struct swf_shape_record_setup_ {
unsigned shape_record_type : 1;
unsigned shape_reserved : 1; // always zero, DefineShape
unsigned shape_has_new_styles : 1;