[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18870] trunk/blender/extern/libredcode: = = REDCODE ==

[Peter Schlaile]

Revision: 18870
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18870
Author:   schlaile
Date:     2009-02-08 20:13:29 +0100 (Sun, 08 Feb 2009)

Log Message:
-----------
== REDCODE ==

Fixed 64bit issues. sizeof(unsigned long) = 8 on 64 bit machines, 
shame on me...

Modified Paths:
--------------
    trunk/blender/extern/libredcode/format.c
    trunk/blender/extern/libredcode/format.h

Modified: trunk/blender/extern/libredcode/format.c
===================================================================
--- trunk/blender/extern/libredcode/format.c    2009-02-08 17:31:03 UTC (rev 
18869)
+++ trunk/blender/extern/libredcode/format.c    2009-02-08 19:13:29 UTC (rev 
18870)
@@ -4,38 +4,38 @@
 #include "format.h"
 
 struct red_reob {
-       unsigned long len;
-       unsigned long head;
+       unsigned int len;
+       unsigned int head;
 
-       unsigned long rdvo;
-       unsigned long rdvs;
-       unsigned long rdao;
-       unsigned long rdas;
+       unsigned int rdvo;
+       unsigned int rdvs;
+       unsigned int rdao;
+       unsigned int rdas;
 
-       unsigned long unknown1;
-       unsigned long unknown2;
-       unsigned long totlen;
+       unsigned int unknown1;
+       unsigned int unknown2;
+       unsigned int totlen;
        
-       unsigned long avgv;
-       unsigned long avgs;
+       unsigned int avgv;
+       unsigned int avgs;
 
-       unsigned long unknown3;
-       unsigned long unknown4;
-       unsigned long unknown5;
+       unsigned int unknown3;
+       unsigned int unknown4;
+       unsigned int unknown5;
 };
 
 struct redcode_handle {
        FILE * fp;
        struct red_reob * reob;
-        unsigned long * rdvo;
-       unsigned long * rdvs;
-       unsigned long * rdao;
-       unsigned long * rdas;
+        unsigned int * rdvo;
+       unsigned int * rdvs;
+       unsigned int * rdao;
+       unsigned int * rdas;
        long cfra;
        long length;
 };
 
-unsigned long read_be32(unsigned long val)
+unsigned int read_be32(unsigned int val)
 {
        unsigned char * v = (unsigned char*) & val;
  
@@ -44,7 +44,7 @@
 
 static unsigned char* read_packet(FILE * fp, char * expect)
 {
-       unsigned long len;
+       unsigned int len;
        char head[5];
        unsigned char * rv;
 
@@ -70,9 +70,9 @@
        return rv;
 }
 
-static unsigned long * read_index_packet(FILE * fp, char * expect)
+static unsigned int * read_index_packet(FILE * fp, char * expect)
 {
-       unsigned long * rv = (unsigned long*) read_packet(fp, expect);
+       unsigned int * rv = (unsigned int*) read_packet(fp, expect);
        int i;
 
        if (!rv) {
@@ -92,14 +92,14 @@
        return (struct red_reob *) read_index_packet(fp, "REOB");
 }
 
-static unsigned long * read_index(FILE * fp, unsigned long i, char * expect)
+static unsigned int * read_index(FILE * fp, unsigned int i, char * expect)
 {
        fseek(fp, i, SEEK_SET);
        
-       return (unsigned long*) read_index_packet(fp, expect);
+       return (unsigned int*) read_index_packet(fp, expect);
 }
 
-static unsigned char * read_data(FILE * fp, unsigned long i, char * expect)
+static unsigned char * read_data(FILE * fp, unsigned int i, char * expect)
 {
        fseek(fp, i, SEEK_SET);
        
@@ -190,7 +190,7 @@
        rv = (struct redcode_frame*) calloc(1, sizeof(struct redcode_frame));
 
        rv->offset = 12+8;
-       rv->length = *(unsigned long*)data - rv->offset;
+       rv->length = *(unsigned int*)data - rv->offset;
        rv->data = data;
 
        return rv;
@@ -213,7 +213,7 @@
        rv = (struct redcode_frame*) calloc(1, sizeof(struct redcode_frame));
 
        rv->offset = 24+8;
-       rv->length = *(unsigned long*)data - rv->offset;
+       rv->length = *(unsigned int*)data - rv->offset;
        rv->data = data;
 
        return rv;

Modified: trunk/blender/extern/libredcode/format.h
===================================================================
--- trunk/blender/extern/libredcode/format.h    2009-02-08 17:31:03 UTC (rev 
18869)
+++ trunk/blender/extern/libredcode/format.h    2009-02-08 19:13:29 UTC (rev 
18870)
@@ -3,8 +3,8 @@
 
 struct redcode_handle;
 struct redcode_frame {
-       unsigned long length;
-       unsigned long offset;
+       unsigned int length;
+       unsigned int offset;
        unsigned char * data;
 };
 


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs