Merge spacing changes from VirtualGL
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.1.x@738 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
@@ -13,7 +13,8 @@
|
||||
* wxWindows Library License for more details.
|
||||
*/
|
||||
|
||||
#if (defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)) && defined(_WIN32) && defined(DLLDEFINE)
|
||||
#if (defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)) \
|
||||
&& defined(_WIN32) && defined(DLLDEFINE)
|
||||
#define DLLEXPORT __declspec(dllexport)
|
||||
#else
|
||||
#define DLLEXPORT
|
||||
@@ -21,6 +22,7 @@
|
||||
|
||||
#define DLLCALL
|
||||
|
||||
|
||||
/* Subsampling */
|
||||
#define NUMSUBOPT 4
|
||||
|
||||
@@ -28,6 +30,7 @@ enum {TJ_444=0, TJ_422, TJ_420, TJ_GRAYSCALE};
|
||||
#define TJ_411 TJ_420 /* for backward compatibility with VirtualGL <= 2.1.x,
|
||||
TurboVNC <= 0.6, and TurboJPEG/IPP */
|
||||
|
||||
|
||||
/* Flags */
|
||||
#define TJ_BGR 1
|
||||
/* The components of each pixel in the source/destination bitmap are stored
|
||||
@@ -56,6 +59,7 @@ enum {TJ_444=0, TJ_422, TJ_420, TJ_GRAYSCALE};
|
||||
#define TJ_YUV 512
|
||||
/* Nothing to see here. Pay no attention to the man behind the curtain. */
|
||||
|
||||
|
||||
typedef void* tjhandle;
|
||||
|
||||
#define TJPAD(p) (((p)+3)&(~3))
|
||||
@@ -63,6 +67,7 @@ typedef void* tjhandle;
|
||||
#define max(a,b) ((a)>(b)?(a):(b))
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
@@ -336,6 +341,7 @@ DLLEXPORT int DLLCALL tjDestroy(tjhandle h);
|
||||
*/
|
||||
DLLEXPORT char* DLLCALL tjGetErrorStr(void);
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user