File gpac-0.5.0-64bit-portability.patch of Package gpac

File gpac-0.5.0-64bit-portability.patch of Package gpac (Revision 17)

Currently displaying revision 17 , Show latest

---
 applications/generators/MPEG4/main.c |    4 ++--
 applications/generators/SVG/svggen.h |   12 +++++++++++-
 applications/generators/X3D/main.c   |    4 ++--
 modules/vtt_in/vtt_dec.c             |    2 ++
 src/bifs/field_encode.c              |    1 +
 src/scene_manager/encode_isom.c      |    1 +
 6 files changed, 19 insertions(+), 5 deletions(-)

Index: gpac-0.5.2/applications/generators/MPEG4/main.c
===================================================================
--- gpac-0.5.2.orig/applications/generators/MPEG4/main.c
+++ gpac-0.5.2/applications/generators/MPEG4/main.c
@@ -1037,7 +1037,7 @@ void WriteNodeCode(GF_List *BNodes)
 			}
 			//SFString
 			else if (!strcmp(bf->familly, "SFString")) {
-				fprintf(f, "\tp->%s.buffer = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, strlen(bf->def)+1);
+				fprintf(f, "\tp->%s.buffer = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, (int)strlen(bf->def)+1);
 				fprintf(f, "\tstrcpy(p->%s.buffer, \"%s\");\n", bf->name, bf->def);
 			}
 
@@ -1208,7 +1208,7 @@ void WriteNodeCode(GF_List *BNodes)
 					store = CurrentLine;
 					CurrentLine = token;
 					GetNextToken(tok, " \"");
-					fprintf(f, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, strlen(tok)+1);
+					fprintf(f, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, (int)strlen(tok)+1);
 					fprintf(f, "\tstrcpy(p->%s.vals[%d], \"%s\");\n", bf->name, j, tok);
 					j+=1;
 					CurrentLine = store;
Index: gpac-0.5.2/applications/generators/SVG/svggen.h
===================================================================
--- gpac-0.5.2.orig/applications/generators/SVG/svggen.h
+++ gpac-0.5.2/applications/generators/SVG/svggen.h
@@ -190,6 +190,16 @@ static _atts generic_attributes[] = {
 
 FILE *BeginFile(u32 type);
 void EndFile(FILE *f, u32 type);
-
+SVGGenAttribute *findAttribute(SVGGenElement *e, char *name);
+void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine);
+u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start);
+void generate_laser_tables(GF_List *svg_elements);
+void generate_table(GF_List *elements);
+void generateSVGCode_V1(GF_List *svg_elements);
+void generateSVGCode_V2(GF_List *svg_elements);
+void generateSVGCode_V3(GF_List *svg_elements);
+void svgNameToImplementationName(xmlChar *svg_name, char implementation_name[50]);
+u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start);
+void generate_laser_tables_da(GF_List *atts);
 
 #endif // _SVGGEN_H_
Index: gpac-0.5.2/applications/generators/X3D/main.c
===================================================================
--- gpac-0.5.2.orig/applications/generators/X3D/main.c
+++ gpac-0.5.2/applications/generators/X3D/main.c
@@ -566,7 +566,7 @@ void WriteNodeCode(GF_List *BNodes, FILE
 			}
 			//SFString
 			else if (!strcmp(bf->familly, "SFString")) {
-				fprintf(vrml_code, "\tp->%s.buffer = (char*) gf_malloc(sizeof(char) * %d);\n", bf->name, strlen(bf->def)+1);
+				fprintf(vrml_code, "\tp->%s.buffer = (char*) gf_malloc(sizeof(char) * %d);\n", bf->name, (int)strlen(bf->def)+1);
 				fprintf(vrml_code, "\tstrcpy(p->%s.buffer, \"%s\");\n", bf->name, bf->def);
 			}
 
@@ -808,7 +808,7 @@ void WriteNodeCode(GF_List *BNodes, FILE
 					store = CurrentLine;
 					CurrentLine = token;
 					GetNextToken(tok, " \"");
-					fprintf(vrml_code, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, strlen(tok)+1);
+					fprintf(vrml_code, "\tp->%s.vals[%d] = (char*)gf_malloc(sizeof(char) * %d);\n", bf->name, j, (int)strlen(tok)+1);
 					fprintf(vrml_code, "\tstrcpy(p->%s.vals[%d], \"%s\");\n", bf->name, j, tok);
 					j+=1;
 					CurrentLine = store;
Index: gpac-0.5.2/modules/vtt_in/vtt_dec.c
===================================================================
--- gpac-0.5.2.orig/modules/vtt_in/vtt_dec.c
+++ gpac-0.5.2/modules/vtt_in/vtt_dec.c
@@ -126,6 +126,7 @@ static GF_Err VTT_ProcessData(GF_SceneDe
 		/* TODO: try to parse a cue from the given string */
 		break;
 
+#ifdef GPAC_HAS_SPIDERMONKEY
 	case GPAC_OTI_SCENE_VTT_MP4:
 	{
 		char start[100], end[100];
@@ -144,6 +145,7 @@ static GF_Err VTT_ProcessData(GF_SceneDe
 		gf_list_del(cues);
 	}
 	break;
+#endif
 
 	default:
 		return GF_BAD_PARAM;
Index: gpac-0.5.2/src/bifs/field_encode.c
===================================================================
--- gpac-0.5.2.orig/src/bifs/field_encode.c
+++ gpac-0.5.2/src/bifs/field_encode.c
@@ -27,6 +27,7 @@
 
 #include <gpac/internal/bifs_dev.h>
 #include <gpac/internal/bifs_tables.h>
+#include <gpac/network.h>
 #include "quant.h"
 #include "script.h"
 
Index: gpac-0.5.2/src/scene_manager/encode_isom.c
===================================================================
--- gpac-0.5.2.orig/src/scene_manager/encode_isom.c
+++ gpac-0.5.2/src/scene_manager/encode_isom.c
@@ -27,6 +27,7 @@
 #include <gpac/constants.h>
 #include <gpac/media_tools.h>
 #include <gpac/bifs.h>
+#include <gpac/network.h>
 #ifndef GPAC_DISABLE_LASER
 #include <gpac/laser.h>
 #include <gpac/nodes_svg.h>