← Back to branch summary

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

« back to all changes in this revision

Viewing changes to extern/libopenjpeg/opj_includes.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:
extern/libopenjpeg/opj_includes.h
1
1
/*
2
 
 * Copyright (c) 2005, Herv� Drolon, FreeImage Team
 
2
 * Copyright (c) 2005, Herve Drolon, FreeImage Team
3
3
 * All rights reserved.
4
4
 *
5
5
 * Redistribution and use in source and binary forms, with or without
65
65
*/
66
66
#ifndef INLINE
67
67
        #if defined(_MSC_VER)
68
 
                #define INLINE __inline
 
68
                #define INLINE __forceinline
69
69
        #elif defined(__GNUC__)
70
70
                #define INLINE __inline__
71
71
        #elif defined(__MWERKS__)
86
86
        #endif
87
87
#endif
88
88
 
89
 
/* MSVC does not have lrintf */
90
 
#ifdef _MSC_VER
 
89
/* MSVC and Borland C do not have lrintf */
 
90
#if defined(_MSC_VER) || defined(__BORLANDC__)
 
91
static INLINE long lrintf(float f){
91
92
#ifdef _M_X64
92
 
#include <emmintrin.h>
93
 
static INLINE long lrintf(float f) {
94
 
        return _mm_cvtss_si32(_mm_load_ss(&f));
95
 
} 
 
93
    return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f));
96
94
#else
97
 
static INLINE long lrintf(float f){
98
 
        int i;
99
 
 
100
 
        _asm{
101
 
                fld f
102
 
                fistp i
103
 
        };
104
 
 
105
 
        return i;
 
95
    int i;
 
96
 
 
97
    _asm{
 
98
        fld f
 
99
        fistp i
 
100
    };
 
101
 
 
102
    return i;
 
103
#endif
106
104
}
107
105
#endif
108
 
#endif
109
106
 
110
107
#include "j2k_lib.h"
111
108
#include "opj_malloc.h"
112
109
#include "event.h"
 
110
#include "bio.h"
113
111
#include "cio.h"
114
112
 
115
113
#include "image.h"
130
128
#include "int.h"
131
129
#include "fix.h"
132
130
 
 
131
#include "cidx_manager.h"
 
132
#include "indexbox_manager.h"
 
133
 
133
134
/* JPWL>> */
134
135
#ifdef USE_JPWL
135
 
#include "../jpwl/jpwl.h"
 
136
#include "./jpwl/jpwl.h"
136
137
#endif /* USE_JPWL */
137
138
/* <<JPWL */
138
139