[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34147] trunk/blender/source/blender/ blenkernel: another error in commit r34143, was using the define's 'BLEN' & 'DER_' however the latter is incorrect since DER- is used for 64bit blend files.

[Campbell Barton]

Revision: 34147
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34147
Author:   campbellbarton
Date:     2011-01-07 09:47:05 +0000 (Fri, 07 Jan 2011)
Log Message:
-----------
another error in commit r34143, was using the define's 'BLEN' & 'DER_' however the latter is incorrect since DER- is used for 64bit blend files.
removed the define.

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34143

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_utildefines.h
    trunk/blender/source/blender/blenkernel/intern/exotic.c

Modified: trunk/blender/source/blender/blenkernel/BKE_utildefines.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_utildefines.h	2011-01-07 08:59:00 UTC (rev 34146)
+++ trunk/blender/source/blender/blenkernel/BKE_utildefines.h	2011-01-07 09:47:05 UTC (rev 34147)
@@ -204,8 +204,6 @@
 #define ID_NEW(a)		if( (a) && (a)->id.newid ) (a)= (void *)(a)->id.newid
 
 #define BLEN MAKE_ID('B','L','E','N')
-#define DER_ MAKE_ID('D','E','R','_')
-#define V100 MAKE_ID('V','1','0','0')
 
 #define DATA MAKE_ID('D','A','T','A')
 #define GLOB MAKE_ID('G','L','O','B')

Modified: trunk/blender/source/blender/blenkernel/intern/exotic.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/exotic.c	2011-01-07 08:59:00 UTC (rev 34146)
+++ trunk/blender/source/blender/blenkernel/intern/exotic.c	2011-01-07 09:47:05 UTC (rev 34147)
@@ -458,7 +458,7 @@
 {
 	int len;
 	gzFile gzfile;
-	int head[2];
+	char header[7];
 	int retval;
 
 	// make sure we're not trying to read a directory....
@@ -474,10 +474,9 @@
 			retval= BKE_READ_EXOTIC_FAIL_OPEN;
 		}
 		else {
-			len= gzread(gzfile, head, sizeof(head));
+			len= gzread(gzfile, header, sizeof(header));
 			gzclose(gzfile);
-
-			if (len == sizeof(head) && (head[0] == BLEN && head[1] == DER_)) {
+			if (len == sizeof(header) && strncmp(header, "BLENDER", 7) == 0) {
 				retval= BKE_READ_EXOTIC_OK_BLEND;
 			}
 			else {