From: DRC <dcommander@users.sourceforge.net>
Date: Mon, 10 Mar 2014 20:14:53 +0000 (+0000)
Subject: For now, punt on trying to support fancy upsampling in tjDecodeYUV().  Fancy upsampli... 
X-Git-Tag: 1.3.90~142
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d9f758e5251e129431b03cdab1160710d4b3fb8;p=libjpeg-turbo

For now, punt on trying to support fancy upsampling in tjDecodeYUV().  Fancy upsampling requires context rows and other refinements, which are difficult to implement correctly with the algorithm we're using.  Longer-term, supporting fancy upsampling would probably require using the main buffer that libjpeg allocates.


git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1145 632fc199-4ca6-4c93-a231-07263d6284db
---

diff --git a/turbojpeg.c b/turbojpeg.c
index 41c8aac..5aee2e8 100644
--- a/turbojpeg.c
+++ b/turbojpeg.c
@@ -1293,7 +1293,7 @@ DLLEXPORT int DLLCALL tjDecodeYUV(tjhandle handle, unsigned char *srcBuf,
 	int i, retval=0;  JSAMPROW *row_pointer=NULL;
 	JSAMPLE *_tmpbuf[MAX_COMPONENTS];
 	JSAMPROW *tmpbuf[MAX_COMPONENTS], *inbuf[MAX_COMPONENTS];
-	int row, pw, ph, cw[MAX_COMPONENTS], ch[MAX_COMPONENTS], useMerged=0;
+	int row, pw, ph, cw[MAX_COMPONENTS], ch[MAX_COMPONENTS];
 	JSAMPLE *ptr=srcBuf;
 	unsigned long yuvsize=0;
 	jpeg_component_info *compptr;
@@ -1364,14 +1364,8 @@ DLLEXPORT int DLLCALL tjDecodeYUV(tjhandle handle, unsigned char *srcBuf,
 	{
 		retval=-1;  goto bailout;
 	}
-	if(flags&TJFLAG_FASTUPSAMPLE)
-	{
-		dinfo->do_fancy_upsampling=FALSE;
-		if((subsamp==TJSAMP_422 || subsamp==TJSAMP_420) && pixelFormat!=TJPF_GRAY)
-			useMerged=1;
-	}
+	dinfo->do_fancy_upsampling=FALSE;
 	jinit_master_decompress(dinfo);
-	if(!useMerged) (*dinfo->cconvert->start_pass)(dinfo);
 	(*dinfo->upsample->start_pass)(dinfo);
 
 	pw=PAD(width, dinfo->max_h_samp_factor);