← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/blender/imbuf/intern/dds/Stream.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/imbuf/intern/dds/Stream.h
35
35
        unsigned char *mem; // location in memory
36
36
        unsigned int size;  // size
37
37
        unsigned int pos;   // current position
38
 
        Stream(unsigned char *m, unsigned int s) : mem(m), size(s), pos(0) {};
 
38
        Stream(unsigned char *m, unsigned int s) : mem(m), size(s), pos(0) {}
39
39
        unsigned int seek(unsigned int p);
40
40
};
41
41
 
45
45
unsigned int mem_read(Stream & mem, unsigned char & i);
46
46
unsigned int mem_read(Stream & mem, unsigned char *i, unsigned int cnt);
47
47
 
48
 
#endif // __STREAM_H__
49
 
 
 
48
#endif  /* __STREAM_H__ */