← Back to branch summary

~ubuntu-branches/ubuntu/maverick/blender/maverick

« back to all changes in this revision

Viewing changes to source/blender/imbuf/intern/rectop.c

  • Committer: Bazaar Package Importer
  • Author(s): Khashayar Naderehvandi, Khashayar Naderehvandi, Alessio Treglia
  • Date: 2009-01-22 16:53:59 UTC
  • mfrom: (14.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20090122165359-v0996tn7fbit64ni
Tags: 2.48a+dfsg-1ubuntu1
https://launchpad.net/bugs/320045
[ Khashayar Naderehvandi ]
* Merge from debian experimental (LP: #320045), Ubuntu remaining changes:
  - Add patch correcting header file locations.
  - Add libvorbis-dev and libgsm1-dev to Build-Depends.
  - Use avcodec_decode_audio2() in source/blender/src/hddaudio.c

[ Alessio Treglia ]
* Add missing previous changelog entries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/imbuf/intern/rectop.c
26
26
 * ***** END GPL LICENSE BLOCK *****
27
27
 * allocimbuf.c
28
28
 *
29
 
 * $Id: rectop.c 14444 2008-04-16 22:40:48Z hos $
 
29
 * $Id: rectop.c 16632 2008-09-20 13:02:06Z ton $
30
30
 */
31
31
 
32
32
#include "BLI_blenlib.h"
37
37
#include "IMB_imbuf.h"
38
38
 
39
39
#include "IMB_allocimbuf.h"
 
40
#include "BKE_utildefines.h"
40
41
 
41
42
/* blend modes */
42
43
 
514
515
        }       
515
516
}
516
517
 
517
 
/* maybe we should use BKE_utildefines.h */
518
 
#define FTOCHAR(val) (val<=0.0f ? 0: (val>=1.0f ? 255: (char)(255.99f*val)))
519
 
#define CLAMP(a, b, c)          if((a)<(b)) (a)=(b); else if((a)>(c)) (a)=(c)
520
 
#define SWAP(type, a, b)        { type sw_ap; sw_ap=(a); (a)=(b); (b)=sw_ap; }
521
518
 
522
519
void buf_rectfill_area(unsigned char *rect, float *rectf, int width, int height, float *col, int x1, int y1, int x2, int y2)
523
520
{