← 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/dds_api.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/dds_api.h
32
32
extern "C" {
33
33
#endif
34
34
 
 
35
#include "../../IMB_imbuf.h"
 
36
 
35
37
int           imb_save_dds(struct ImBuf *ibuf, const char *name, int flags);
36
38
int           imb_is_a_dds(unsigned char *mem); /* use only first 32 bytes of mem */
37
 
struct ImBuf *imb_load_dds(unsigned char *mem, size_t size, int flags);
 
39
struct ImBuf *imb_load_dds(unsigned char *mem, size_t size, int flags, char colorspace[IM_MAX_SPACE]);
38
40
 
39
41
#ifdef __cplusplus
40
42
}