diff options
| author | Tom Gall <tom.gall@linaro.org> | 2012-01-05 16:37:52 -0600 |
|---|---|---|
| committer | Tom Gall <tom.gall@linaro.org> | 2012-01-05 16:37:52 -0600 |
| commit | 5e3f9c106ab397e7a25d934ae56256abed68dc5b (patch) | |
| tree | 44accdb042753c17664857108fef9acf03dae790 | |
| parent | 54a77cc2b47d47f58ae64e0ec422d66a7635b1df (diff) | |
Fix another merge error from the git rebaselinaro-android
| -rw-r--r-- | jpeglib.h | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -228,7 +228,6 @@ typedef enum { JCS_EXT_BGRX, /* blue/green/red/x */ JCS_EXT_XBGR, /* x/blue/green/red */ JCS_EXT_XRGB, /* x/red/green/blue */ -<<<<<<< HEAD /* When out_color_space it set to JCS_EXT_RGBX, JCS_EXT_BGRX, JCS_EXT_XBGR, or JCS_EXT_XRGB during decompression, the X byte is undefined, and in order to ensure the best performance, @@ -239,13 +238,11 @@ typedef enum { JCS_EXT_RGBA, /* red/green/blue/alpha */ JCS_EXT_BGRA, /* blue/green/red/alpha */ JCS_EXT_ABGR, /* alpha/blue/green/red */ - JCS_EXT_ARGB /* alpha/red/green/blue */ -======= + JCS_EXT_ARGB, /* alpha/red/green/blue */ #ifdef ANDROID_RGB JCS_RGBA_8888, /* red/green/blue/alpha */ JCS_RGB_565 /* red/green/blue in 565 format */ #endif ->>>>>>> first cut at port of Android extentions } J_COLOR_SPACE; /* DCT/IDCT algorithm options. */ |