[Bf-blender-cvs] [f12ab4e196f] blender-v2.79a-release: Cleanup: SGI format, remove unused struct members

Campbell Barton noreply at git.blender.org
Fri Jan 12 11:14:35 CET 2018


Commit: f12ab4e196f67fb125afc4f38e1a43a3b4b5db96
Author: Campbell Barton
Date:   Sun Sep 17 17:55:04 2017 +1000
Branches: blender-v2.79a-release
https://developer.blender.org/rBf12ab4e196f67fb125afc4f38e1a43a3b4b5db96

Cleanup: SGI format, remove unused struct members

===================================================================

M	source/blender/imbuf/intern/iris.c

===================================================================

diff --git a/source/blender/imbuf/intern/iris.c b/source/blender/imbuf/intern/iris.c
index f492821a479..6c0849358a5 100644
--- a/source/blender/imbuf/intern/iris.c
+++ b/source/blender/imbuf/intern/iris.c
@@ -56,28 +56,16 @@ typedef struct {
 	ushort  zsize;
 	uint    min;
 	uint    max;
-	uint    wastebytes;
+	uchar   _pad1[4];
 	char    name[80];
 	uint    colormap;
-
-	int     file;       /* stuff used in core only */
-	ushort  flags;
-	short   dorev;
-	short   x;
-	short   y;
-	short   z;
-	short   cnt;
-	ushort *ptr;
-	ushort *base;
-	ushort *tmpbuf;
-	uint    offset;
-	uint    rleend;         /* for rle images */
-	uint      *rowstart;    /* for rle images */
-	const int *rowsize;     /* for rle images */
+	uchar   _pad2[404];
 } IMAGE;
 
 #define HEADER_SIZE 512
 
+BLI_STATIC_ASSERT(sizeof(IMAGE) == HEADER_SIZE, "Invalid header size");
+
 #define RINTLUM (79)
 #define GINTLUM (156)
 #define BINTLUM (21)



More information about the Bf-blender-cvs mailing list