← Back to branch summary

~ubuntu-branches/ubuntu/saucy/blender/saucy-proposed

« back to all changes in this revision

Viewing changes to extern/libopenjpeg/cio.c

  • 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:
extern/libopenjpeg/cio.c
126
126
/*
127
127
 * Write a byte.
128
128
 */
129
 
bool cio_byteout(opj_cio_t *cio, unsigned char v) {
 
129
opj_bool cio_byteout(opj_cio_t *cio, unsigned char v) {
130
130
        if (cio->bp >= cio->end) {
131
131
                opj_event_msg(cio->cinfo, EVT_ERROR, "write error\n");
132
 
                return false;
 
132
                return OPJ_FALSE;
133
133
        }
134
134
        *cio->bp++ = v;
135
 
        return true;
 
135
        return OPJ_TRUE;
136
136
}
137
137
 
138
138
/*
152
152
 * v : value to write
153
153
 * n : number of bytes to write
154
154
 */
155
 
unsigned int cio_write(opj_cio_t *cio, unsigned int v, int n) {
 
155
unsigned int cio_write(opj_cio_t *cio, unsigned long long int v, int n) {
156
156
        int i;
157
157
        for (i = n - 1; i >= 0; i--) {
158
158
                if( !cio_byteout(cio, (unsigned char) ((v >> (i << 3)) & 0xff)) )