From 30fd1ab523393216a66a7debb7e42ec39e40a242 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 21 Nov 2011 20:47:19 +0000
Subject: replace ImBuf.depth with ImBuf.planes to match ImageFormatData.planes
 & to avoid confusion with ImageFormatData.depth

---
 source/blender/blenkernel/intern/bmfont.c    |  2 +-
 source/blender/blenkernel/intern/image.c     | 10 +++++-----
 source/blender/blenkernel/intern/movieclip.c |  4 ++--
 source/blender/blenkernel/intern/scene.c     |  2 +-
 source/blender/blenkernel/intern/sequencer.c |  6 +++---
 source/blender/blenkernel/intern/tracking.c  |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'source/blender/blenkernel')

diff --git a/source/blender/blenkernel/intern/bmfont.c b/source/blender/blenkernel/intern/bmfont.c
index f1e6de9a0c4..0211dcdf42c 100644
--- a/source/blender/blenkernel/intern/bmfont.c
+++ b/source/blender/blenkernel/intern/bmfont.c
@@ -159,7 +159,7 @@ void readBitmapFontVersion0(ImBuf * ibuf, unsigned char * rect, int step)
 		ibuf->userdata = bmfont;
 		ibuf->userflags |= IB_BITMAPFONT;
 
-		if (ibuf->depth < 32) {
+		if (ibuf->planes < 32) {
 			// we're going to fake alpha here:
 			calcAlpha(ibuf);
 		}
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 6a4cb049be7..c99396e6939 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -601,7 +601,7 @@ void BKE_image_memorypack(Image *ima)
 	}
 	
 	ibuf->ftype= PNG;
-	ibuf->depth= 32;
+	ibuf->planes= R_IMF_PLANES_RGBA;
 	
 	IMB_saveiff(ibuf, ibuf->name, IB_rect | IB_mem);
 	if(ibuf->encodedbuffer==NULL) {
@@ -1535,7 +1535,7 @@ int BKE_write_ibuf(ImBuf *ibuf, const char *name, ImageFormatData *imf)
 		/* R_JPEG90, etc. default we save jpegs */
 		if(quality < 10) quality= 90;
 		ibuf->ftype= JPG|quality;
-		if(ibuf->depth==32) ibuf->depth= 24;	/* unsupported feature only confuses other s/w */
+		if(ibuf->planes==32) ibuf->planes= 24;	/* unsupported feature only confuses other s/w */
 	}
 	
 	BLI_make_existing_file(name);
@@ -2487,13 +2487,13 @@ int BKE_image_has_alpha(struct Image *image)
 {
 	ImBuf *ibuf;
 	void *lock;
-	int depth;
+	int planes;
 	
 	ibuf= BKE_image_acquire_ibuf(image, NULL, &lock);
-	depth = (ibuf?ibuf->depth:0);
+	planes = (ibuf?ibuf->planes:0);
 	BKE_image_release_ibuf(image, lock);
 
-	if (depth == 32)
+	if (planes == 32)
 		return 1;
 	else
 		return 0;
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c
index 540d757f0c9..12a2fe28bc8 100644
--- a/source/blender/blenkernel/intern/movieclip.c
+++ b/source/blender/blenkernel/intern/movieclip.c
@@ -913,8 +913,8 @@ static void movieclip_build_proxy_ibuf(MovieClip *clip, ImBuf *ibuf, int cfra, i
 	scaleibuf->ftype= JPG | quality;
 
 	/* unsupported feature only confuses other s/w */
-	if(scaleibuf->depth==32)
-		scaleibuf->depth= 24;
+	if(scaleibuf->planes==32)
+		scaleibuf->planes= 24;
 
 	BLI_lock_thread(LOCK_MOVIECLIP);
 
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 68e5ebeed4f..ea0593aba66 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -348,7 +348,7 @@ Scene *add_scene(const char *name)
 	sce->r.filtertype= R_FILTER_MITCH;
 	sce->r.size= 50;
 
-	sce->r.im_format.planes= R_PLANES24;
+	sce->r.im_format.planes= R_IMF_PLANES_RGB;
 	sce->r.im_format.imtype= R_PNG;
 	sce->r.im_format.quality= 90;
 
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 5d35867d9c3..880bdbfaa96 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1327,8 +1327,8 @@ static void seq_proxy_build_frame(SeqRenderData context,
 	ibuf->ftype= JPG | quality;
 
 	/* unsupported feature only confuses other s/w */
-	if(ibuf->depth==32)
-		ibuf->depth= 24;
+	if(ibuf->planes==32)
+		ibuf->planes= 24;
 
 	BLI_make_existing_file(name);
 	
@@ -1729,7 +1729,7 @@ static ImBuf * input_preprocess(
 	}
 
 	if(seq->flag & SEQ_MAKE_PREMUL) {
-		if(ibuf->depth == 32 && ibuf->zbuf == NULL) {
+		if(ibuf->planes == 32 && ibuf->zbuf == NULL) {
 			IMB_premultiply_alpha(ibuf);
 		}
 	}
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c
index 0c395931212..474b00e626b 100644
--- a/source/blender/blenkernel/intern/tracking.c
+++ b/source/blender/blenkernel/intern/tracking.c
@@ -2022,7 +2022,7 @@ static ImBuf* stabilize_alloc_ibuf(ImBuf *cacheibuf, ImBuf *srcibuf, int fill)
 		}
 	}
 	else {
-		cacheibuf= IMB_allocImBuf(srcibuf->x, srcibuf->y, srcibuf->depth, flags);
+		cacheibuf= IMB_allocImBuf(srcibuf->x, srcibuf->y, srcibuf->planes, flags);
 		cacheibuf->profile= srcibuf->profile;
 	}
 
-- 
cgit v1.2.3