From f610d61fcc38b36a8a29879e5c053015164242f8 Mon Sep 17 00:00:00 2001 From: DRC Date: Fri, 26 Apr 2013 10:33:29 +0000 Subject: [PATCH] Extend the TurboJPEG C API to support generating YUV images with arbitrary padding and to support image scaling when decompressing to YUV git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@962 632fc199-4ca6-4c93-a231-07263d6284db --- CMakeLists.txt | 2 + ChangeLog.txt | 9 ++ Makefile.am | 1 + doc/html/annotated.html | 4 +- doc/html/classes.html | 4 +- doc/html/functions.html | 4 +- doc/html/functions_vars.html | 4 +- doc/html/group___turbo_j_p_e_g.html | 73 ++++++++++++----- doc/html/index.html | 4 +- doc/html/modules.html | 4 +- doc/html/structtjregion.html | 4 +- doc/html/structtjscalingfactor.html | 4 +- doc/html/structtjtransform.html | 4 +- doxygen.config | 2 +- tjunittest.c | 48 ++++++----- turbojpeg-mapfile | 8 ++ turbojpeg-mapfile.jni | 8 ++ turbojpeg.c | 122 +++++++++++++++++++--------- turbojpeg.h | 86 ++++++++++++++------ 19 files changed, 272 insertions(+), 123 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b1e135f..ffffebb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -320,6 +320,7 @@ endif() add_test(tjunittest tjunittest) add_test(tjunittest-alloc tjunittest -alloc) add_test(tjunittest-yuv tjunittest -yuv) +add_test(tjunittest-yuv-nopad tjunittest -yuv -noyuvpad) add_test(cjpeg-int sharedlib/cjpeg -dct int -outfile testoutint.jpg ${CMAKE_SOURCE_DIR}/testimages/testorig.ppm) add_test(cjpeg-int-cmp ${CMAKE_COMMAND} -DMD5=${MD5_JPEG_INT} -DFILE=testoutint.jpg -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake) add_test(cjpeg-fast sharedlib/cjpeg -dct fast -opt -outfile testoutfst.jpg ${CMAKE_SOURCE_DIR}/testimages/testorig.ppm) @@ -375,6 +376,7 @@ add_test(jpegtran-crop-cmp ${CMAKE_COMMAND} -DMD5=${MD5_JPEG_CROP} -DFILE=testou add_test(tjunittest-static tjunittest-static) add_test(tjunittest-static-alloc tjunittest-static -alloc) add_test(tjunittest-static-yuv tjunittest-static -yuv) +add_test(tjunittest-static-yuv-nopad tjunittest-static -yuv -noyuvpad) add_test(cjpeg-static-int cjpeg-static -dct int -outfile testoutint.jpg ${CMAKE_SOURCE_DIR}/testimages/testorig.ppm) add_test(cjpeg-static-int-cmp ${CMAKE_COMMAND} -DMD5=${MD5_JPEG_INT} -DFILE=testoutint.jpg -P ${CMAKE_SOURCE_DIR}/cmakescripts/md5cmp.cmake) add_test(cjpeg-static-fast cjpeg-static -dct fast -opt -outfile testoutfst.jpg ${CMAKE_SOURCE_DIR}/testimages/testorig.ppm) diff --git a/ChangeLog.txt b/ChangeLog.txt index 780cc9e..c859656 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,12 @@ +1.4 pre-beta +============ + +[1] The TurboJPEG API can now be used to generate YUV images with an arbitrary +line padding (previously, it only supported 4-byte padding, which was +compatible with X Video.) Also, the decompress-to-YUV function has been +extended to support image scaling. + + 1.3.0 ===== diff --git a/Makefile.am b/Makefile.am index ade5034..67ac7c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -205,6 +205,7 @@ endif ./tjunittest ./tjunittest -alloc ./tjunittest -yuv + ./tjunittest -yuv -noyuvpad endif ./cjpeg -dct int -outfile testoutint.jpg $(srcdir)/testimages/testorig.ppm md5/md5cmp $(MD5_JPEG_INT) testoutint.jpg diff --git a/doc/html/annotated.html b/doc/html/annotated.html index 6ad64d9..2ab025b 100644 --- a/doc/html/annotated.html +++ b/doc/html/annotated.html @@ -19,7 +19,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
TurboJPEG 1.2.1
+
TurboJPEG 1.4
@@ -81,7 +81,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -