← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/blender/imbuf/intern/cineon/logImageCore.h

  • 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/cineon/logImageCore.h
34
34
extern "C" {
35
35
#endif
36
36
 
37
 
 
 
37
#include "BLO_sys_types.h" // for intptr_t support
 
38
#undef ntohl
 
39
#undef htonl
38
40
typedef int (GetRowFn)(LogImageFile* logImage, unsigned short* row, int lineNum);
39
41
typedef int (SetRowFn)(LogImageFile* logImage, const unsigned short* row, int lineNum);
40
42
typedef void (CloseFn)(LogImageFile* logImage);
80
82
        CloseFn* close;
81
83
        
82
84
        unsigned char *membuffer;
83
 
        unsigned long membuffersize;
 
85
        uintptr_t membuffersize;
84
86
        unsigned char *memcursor;
85
87
};
86
88