← Back to branch summary

~ubuntu-branches/debian/experimental/gpac/experimental

« back to all changes in this revision

Viewing changes to src/scenegraph/vrml_tools.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2014-02-22 18:15:00 UTC
  • mfrom: (1.2.2) (3.1.6 sid)
  • Revision ID: package-import@ubuntu.com-20140222181500-b4phupo05gjpmopa
Tags: 0.5.0+svn5104~dfsg1-1
http://bugs.debian.org/730759
http://bugs.debian.org/730497
http://bugs.debian.org/739321
* New  upstream version 0.5.0+svn5104~dfsg1:
  - src/utils/sha1.c is relicensed under LGPLv2.1, Closes: #730759
* Don't install modules in multi-arch directories, Closes: #730497
* Add libusb-1.0.0-dev headers because libfreenect requires this
* Fix install rule
* Follow upstream soname bump
  - Drop the symbols file for now until it has been revised thourougly
* Let binaries produce the correct svn revision
* Refresh patches
* Patch and build against libav10, Closes: #739321
* Bump standards version, no changes necessary

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/scenegraph/vrml_tools.c
82
82
        field.eventType = GF_SG_EVENT_EXPOSED_FIELD;
83
83
        field.fieldType = GF_SG_VRML_MFNODE;
84
84
        field.NDTtype = -1;
85
 
        field.fieldIndex = 2;
 
85
        if ( node->sgprivate->tag == TAG_MPEG4_Transform )
 
86
                field.fieldIndex = 3;
 
87
        else
 
88
                field.fieldIndex = 2;
86
89
        field.far_ptr = & n->children;
87
90
        gf_node_event_out(node, field.fieldIndex);
88
91
        gf_node_changed(node, &field);
121
124
        field.eventType = GF_SG_EVENT_EXPOSED_FIELD;
122
125
        field.fieldType = GF_SG_VRML_MFNODE;
123
126
        field.NDTtype = -1;
124
 
        field.fieldIndex = 2;
 
127
        if ( node->sgprivate->tag == TAG_MPEG4_Transform )
 
128
                field.fieldIndex = 3;
 
129
        else
 
130
                field.fieldIndex = 2;
125
131
        field.far_ptr = & n->children;
126
132
        gf_node_event_out(node, field.fieldIndex);
127
133
        gf_node_changed(node, &field);
1265
1271
                if (((SFScript*)dest)->script_text) gf_free(((SFScript*)dest)->script_text);            
1266
1272
                ((SFScript*)dest)->script_text = NULL;
1267
1273
                if ( ((SFScript*)orig)->script_text)
1268
 
                        ((SFScript *)dest)->script_text = (u8*)gf_strdup( (char*) ((SFScript*)orig)->script_text );
 
1274
                        ((SFScript *)dest)->script_text = (char *)gf_strdup( (char*) ((SFScript*)orig)->script_text );
1269
1275
                break;
1270
1276
 
1271
1277