Commit Graph

1546 Commits

Author SHA1 Message Date
3bbc65a5f4 This is a pretty lame commit but here it is:
I just fixed indentation (replaced spaces with tabs where needed) and removed
#include config.h stuff from the above files.

Kent
2005-01-03 19:53:04 +00:00
8cf7f44047 Eeek! last minute error.
Commit of dec 9... still uses fopen(name, "ab") instead of "wb"
Caused targa and bmp files to write wrong on save-over, appended instead.
2004-12-21 18:49:31 +00:00
bdffe196af This fixes bug #1990
It moves targa, bmp, iris and png loading so that were not opening
2 file handles for each file, and made them like the jpeg stuff.

Also cleaned up some minor other stuff.

Kent
2004-12-09 13:09:11 +00:00
fe3166e140 removed a debug printf. (excuse to check cvs permissions) 2004-12-08 15:11:38 +00:00
934a11e9ff ok my last little tweak for today ;)
I cleaned up the code a little did a couple of these:
if (blah > stuff - wah)  blah = stuff - wah;

changed to....
tmp = stuff - wah;
if (blah > tmp) blah = tmp;

and combined multiple if statements

Kent
2004-08-31 14:23:29 +00:00
e525578f4d Some small clean ups again...
I added ifdef's around a var declaration since the code using
it had them...  Also initalized two vars that were questionable if they
could reach a state where they weren't assigned.

Kent
2004-08-31 13:10:45 +00:00
0bbcff693c Added the bmp include forgot to do that when I added the write support.
(fixes a warning about the imb_savebmp undefined...)

Kent
2004-08-30 18:43:00 +00:00
519fb27ad5 Removed 'static' declaration from addzbufImBuf(). This is an exported
function, static is for local functions...
Reason was it gave loads of warnings in compiling.
2004-07-26 21:20:42 +00:00
b07c5f2096 Bunch of small fixes for warnings and whatnot....
intern/SoundSystem/intern/SND_AudioDevice.cpp
   Initalized a var that could fall through with no value.

source/blender/readblenfile/intern/BLO_readblenfile.c
source/blender/src/space.c
intern/SoundSystem/intern/SND_Scene.cpp
source/gameengine/Converter/BL_MeshDeformer.cpp
        removed unused var's

intern/SoundSystem/openal/pthread_cancel.cpp
        fixed a nested /*

source/blender/imbuf/IMB_imbuf.h
        added static to the type returned for addzbufImBuf

source/blender/imbuf/intern/IMB_bmp.h
        had a wrong prototype

source/blender/src/view.c
        added newline at end of file.

source/blender/src/sequence.c
        removed unused var
        added #include <stdlib.h>  to avoid:
                 warning: implicit declaration of function `abs'
        initalized a var that could have been used without being set.

Kent
2004-07-16 14:45:06 +00:00
7ff5c16a02 This fix is thanks to: hangman4 (Thomas Power)
Basically needed a fflush on the file after all of the writing.
This closes out 1080

Kent
2004-06-09 19:49:43 +00:00
57fc443fe4 Fixed part of write a bmp file, its still truncating the image slightly
however this fixes another problem.  (Basically  the offset wasn't
being computed correctly.
This is for bug: 1080

Kent
2004-06-09 19:27:48 +00:00
137e82f0e6 Added iris zsize=2 support. Provided by Melchior Franz.
Kent
2004-03-30 14:33:02 +00:00
9ed4436058 Updated the Sun ifdef's basically I standardized them so they
were all the same and make sure all platforms see them.

Kent
2004-03-06 19:32:33 +00:00
d4fc04f76a - increased max targa size to 8192x8192
was done before by Phase in tuho1, and no error found...
2004-01-22 12:59:46 +00:00
4a8f52f619 Converted the Userpreference buttons to zr's new ButBit calls.
Also added USER_*  to each define located in DNA_userdef.h.
2004-01-13 14:50:45 +00:00
e3080c9580 Added support for outputting bmp's
The padding is slightly messed up, so it produces somewhat trunkcated images
however it works.  I'll try and fix it later but I have to go home now.
Its atleast usable at this stage.

I moved bmp_decode.c to bmp.c and cleaned it up a little bit.

Kent
2004-01-09 22:04:08 +00:00
da566a1102 Fixed error messages for saving jpeg files so its quite again.
(before I simplified it to return the result of the call to
imb_savejpeg turns out that makes it a little more verbose)

Kent
2003-12-09 19:25:30 +00:00
24624501a4 This looks like a lot but its a few small changes.
Summary: standardized imageformat functions(make function names similar, and
parameters in same order where relavant), small code cleanups, and
added a description of how to add an image format to blender.

Kent

Specifics:
merged png_decode.c and png_encode.c to png.c and cleaned function calls.

fixed some spacing in IMB_imbuf_types.h

casting cleanups:
        intern/amiga.c
        intern/ham.c
        intern/iris.c

Modified switch statements to have a default type to insure values are set:
        intern/antialias.c

Initalization of some vars and make types similar.
        intern/bitplanes.c

cleaned function calls, and changed if else to if's with return:
        intern/jpeg.c

added {}'s in multidemensional arrays.
        intern/matrix.h

Made a little cleaner to read, and matched above changes.
        intern/readimage.c
        intern/writeimage.c
2003-12-04 18:18:05 +00:00
241906b588 - fixed matrix conversion to make rgb -> bw images.
somehow this was mixed up, or forgotten to fix when endian issues were
  solved in the past (1998)...
  To check: red color should be 30% grey, blue 10%. This was switched,
  making B&W images look unnatural.
2003-12-03 16:13:58 +00:00
ae17f63be8 - changed a couple of shorts to ints, to allow images larger than
8192 pixels.
  I dont have a lot of mem here though, so others should test too!
2003-10-02 10:05:57 +00:00
c38faa3c1f fixed a warning by adding a newline to end of file.
Kent
2003-07-17 13:47:58 +00:00
Casey Corn
17ca22de62 Rolled back comments. According to new guidelines, no .c files
should contain doxygen comments.
2003-06-18 03:48:55 +00:00
Casey Corn
8909176b7d Added more docs, mostly header stuff, but some real docs in
IMB_imbuf_types.h and amiga.c
2003-05-30 01:50:46 +00:00
Casey Corn
d5a2c705e5 Documentation commit. 2003-05-26 05:24:53 +00:00
723b84c79c fun with quicktime:
#include <QuickTime/Movies.h> instead of #include <Movies.h> on OS X to
avoid having to specify the full path to the QT headers in the Makefiles

#undef NDEBUG on OS X to avoid errors about ID being declared twice

enable support for QuickTime in the original Makefiles on OS X
2003-05-02 13:36:56 +00:00
c31b578d77 Added IMB_gamwarp and IMB_interlace (and the interlace and gamwarp wrappers
for the plugins)

Kent
2003-04-30 18:38:50 +00:00
71ffa47752 Add includedir for quicktime 2003-04-28 11:01:44 +00:00
706ccc0401 Added Quicktime support for OSX and Windows.
This code allows you to load Quicktime images and movies as textures
and render animations to Quicktime movies.
Note that the selected output codec is *not* saved in the blendfile.

To enable Quicktime functionality you need the SDK from Apple:
OSX: ftp://ftp.apple.com/developer/Development_Kits/QT6SDK_Mac.hqx
Win: ftp://ftp.apple.com/developer/Development_Kits/QT6SDK_Win.hqx
Add the \QTDevWin\CIncludes and \QTDevWin\Libraries directories
from this SDK to your build environment.

Enable the WITH_QUICKTIME compile flag in the following directories:
bf\blender\source\blender\imbuf
bf\blender\source\blender\src
bf\blender\source\blender\render
bf\blender\source\creator
2003-04-28 02:15:46 +00:00
af45ac2703 translated comments for imbuf c files 2003-04-27 09:59:36 +00:00
0841582d0b disabled loading of bmp files :( 2003-02-09 12:47:43 +00:00
b133cb7c8b minor (2.26 release) cleanup 2003-02-04 12:30:52 +00:00
9475bf9e29 Modified checks for defined __FreeBSD__ to also include defined (__OpenBSD__)
From: http://www.blender.org/modules.php?op=modload&name=phpBB2&file=viewtopic&t=840

Kent
2003-01-30 18:51:05 +00:00
744913e654 fixed error message, bmp header wasn't included 2003-01-29 12:18:25 +00:00
10a8183b7e added loading of bmp images. (bmp code was already present in blender) 2003-01-29 11:29:06 +00:00
f1c4f705a1 Removed the config.h thing from the .h's in the source dir.
So we should be all set now :)

Kent
--
mein@cs.umn.edu
2002-12-27 13:11:01 +00:00
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
14819414e9 Ok since no one cares about this I put a 5 second fix on it and won't
worry about it anymore :)

(initalized it to 0 and then later return 0 if its still 0 before doing
the work)

Kent
--
mein@cs.umn.edu
2002-12-20 01:14:46 +00:00
734e358eb4 Fixed two uninitalized vars:
Kent

 /cvs01/blender/source/blender/imbuf/intern/iris.c,v
retrieving revision 1.3
diff -u -r1.3 iris.c
--- iris.c      2002/11/25 12:02:00     1.3
+++ iris.c      2002/12/19 22:12:53
@@ -212,7 +212,7 @@
 /*  unsigned int *tab; */
 /*  int len; */
 {
-       int r;
+       int r = 0;

        while(len) {
                r = putlong(outf,*tab++);
@@ -548,7 +548,7 @@
 {
        FILE *outf;
        IMAGE *image;
-       int tablen, y, z, pos, len;
+       int tablen, y, z, pos, len = 0;
        int *starttab, *lengthtab;
        unsigned char *rlebuf;
2002-12-19 22:13:37 +00:00
f8ef881474 I initalized mask to 0 in IMB_converttocmap
This may not be correct but at least now its predictable.

Kent
2002-12-19 21:26:34 +00:00
cd4a60f536 sgefants patch to remove the License Key stuff.
(I noticed its not completely gone yet from the blender/source dir)
But its a big step in the right direction if it doesn't enable
all of the functionatlity already...

(Using cscope for LICENSE_KEY_VALID still turns up some stuff)

Kent
--
mein@cs.umn.edu
2002-12-06 19:48:37 +00:00
d0e346d544 updated .c files to include:
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

Just need to finish cpp files now :)

Kent
--
mein@cs.umn.edu
2002-11-25 12:02:15 +00:00
b9a19f1ea7 Did all of the .h's in source
(adding)
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif

also the Makefile.in's were from previous patch adding
the system depend stuff to configure.ac

Kent
--
mein@cs.umn.edu
2002-11-25 11:16:17 +00:00
01bff70383 fixed spacing in the headers to get rid of some warnings and some other
little minor spacing issues.
2002-10-30 02:07:20 +00:00
d063311b08 Fixed defined __sparc to also check for __sparc__ (thanks to Ferris) 2002-10-29 21:55:52 +00:00
Hans Lambermont
12315f4d0e Initial revision 2002-10-12 11:37:38 +00:00