|
|
9bb91f9e57
|
Fix so that rgba targa files view correctly in gimp:
Submitted to bf-committers by Chris Want
Kent
Index: targa.c
===================================================================
RCS file: /cvs01/blender/source/blender/imbuf/intern/targa.c,v
retrieving revision 1.4
diff -u -r1.4 targa.c
--- targa.c 2002/12/20 01:29:14 1.4
+++ targa.c 2002/12/21 09:50:24
@@ -289,6 +289,12 @@
if (flags & IB_ttob) buf[17] ^= 0x20;
+ /* Don't forget to indicate that your 32 bit
+ * targa uses 8 bits for the alpha channel! */
+ if (ibuf->depth==32) {
+ buf[17] |= 0x08;
+ }
+
if (write(file, buf, 18) != 18) return (0);
if (ibuf->cmap){
for (i = 0 ; i<ibuf->maxcol ; i++){
|
2002-12-21 09:52:03 +00:00 |
|
|
|
cf13c60fa4
|
Two more variables that were not initalized.
cvs diff included below.
Kent
--
mein@cs.umn.edu
Index: png_encode.c
===================================================================
RCS file: /cvs01/blender/source/blender/imbuf/intern/png_encode.c,v
retrieving revision 1.3
diff -u -r1.3 png_encode.c
--- png_encode.c 2002/11/25 12:02:00 1.3
+++ png_encode.c 2002/12/20 01:28:18
@@ -91,7 +91,7 @@
unsigned char *pixels = 0;
unsigned char *from, *to;
png_bytepp row_pointers = 0;
- int i, bytesperpixel, color_type;
+ int i, bytesperpixel, color_type = PNG_COLOR_TYPE_GRAY;
FILE *fp = 0;
Index: targa.c
===================================================================
RCS file: /cvs01/blender/source/blender/imbuf/intern/targa.c,v
retrieving revision 1.3
diff -u -r1.3 targa.c
--- targa.c 2002/11/25 12:02:00 1.3
+++ targa.c 2002/12/20 01:28:20
@@ -247,7 +247,7 @@
char buf[20];
FILE *fildes;
int i;
- short ok;
+ short ok = 0;
|
2002-12-20 01:29:14 +00:00 |
|
