diff options
| author | Bernard Xiong <[email protected]> | 2014-07-19 06:46:39 +0800 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2014-07-19 06:46:39 +0800 |
| commit | 350b1080eafb565875f82bfe5da9173fa7f0f149 (patch) | |
| tree | a044f04e1d200c2421a74e840ab6da143c431b55 /components/external | |
| parent | 61712bbd13b7c820307f0570d49f1bc0fc6b857a (diff) | |
| parent | 50e7ae7e875c28cdc65baf9c0ec7893a59211a23 (diff) | |
Merge pull request #303 from BernardXiong/stable-v1.2.xv1.2.2
Merge 2.0.0 modification to prepare v1.2.2 release.
Diffstat (limited to 'components/external')
| -rw-r--r-- | components/external/libpng/pngconf.h | 2 | ||||
| -rw-r--r-- | components/external/tjpgd1a/SConscript | 2 | ||||
| -rw-r--r-- | components/external/tjpgd1a/tjpgd.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/components/external/libpng/pngconf.h b/components/external/libpng/pngconf.h index 047376302d..bb0a189f9d 100644 --- a/components/external/libpng/pngconf.h +++ b/components/external/libpng/pngconf.h @@ -23,6 +23,8 @@ #include <rtthread.h> #define PNG_MAX_MALLOC_64K #define PNG_NO_STDIO +#define PNG_NO_ERROR_NUMBERS +#define PNG_ABORT() do { rt_kprintf("libpng abort.\n"); } while (0) #ifndef RT_USING_NEWLIB #define PNG_NO_WRITE_SUPPORTED diff --git a/components/external/tjpgd1a/SConscript b/components/external/tjpgd1a/SConscript index d5db35385f..37448fcc3b 100644 --- a/components/external/tjpgd1a/SConscript +++ b/components/external/tjpgd1a/SConscript @@ -8,7 +8,7 @@ tjpgd.c CPPPATH = [RTT_ROOT + '/components/external/tjpgd1a'] -group = DefineGroup('tjpgd', src, depend = ['RTGUI_IMAGE_TJPGD'], CPPPATH = CPPPATH) +group = DefineGroup('RTGUI', src, depend = ['RT_USING_RTGUI', 'RTGUI_IMAGE_TJPGD'], CPPPATH = CPPPATH) Return('group') diff --git a/components/external/tjpgd1a/tjpgd.c b/components/external/tjpgd1a/tjpgd.c index 9c69989ced..4203336c51 100644 --- a/components/external/tjpgd1a/tjpgd.c +++ b/components/external/tjpgd1a/tjpgd.c @@ -525,7 +525,7 @@ JRESULT mcu_load ( } while (++i < 64); /* Next AC element */ if (JD_USE_SCALE && jd->scale == 3) - *bp = (*tmp / 256) + 128; /* If scale ratio is 1/8, IDCT can be ommited and only DC element is used */ + *bp = (BYTE)((*tmp / 256) + 128); /* If scale ratio is 1/8, IDCT can be ommited and only DC element is used */ else block_idct(tmp, bp); /* Apply IDCT and store the block to the MCU buffer */ |