Attachment #429406 for bug #578744

View | Details | Raw Unified | Return to bug 578744
Collapse All | Expand All




#include "libmng_memory.h"
#include "libmng_pixels.h"
#include "libmng_jpeg.h"
#include <stdbool.h>

#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
#pragma option -A                      /* force ANSI-C */

boolean mng_fill_input_buffer (j_decompress_ptr cinfo)
#endif
{
  return false;                        /* force IJG routine to return to caller */
}
#endif /* MNG_INCLUDE_JNG_READ */


#ifdef MNG_SUPPORT_TRACE
      MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_READ_HEADER)
#endif
      if (jpeg_read_header (pData->pJPEGdinfo, true) != JPEG_SUSPENDED)
      {                                /* indicate the header's oke */
        pData->bJPEGhasheader = MNG_TRUE;
                                       /* let's do some sanity checks ! */

      /* set parameters for decompression */

      if (pData->bJPEGprogressive)     /* progressive display ? */
        pData->pJPEGdinfo->buffered_image = true;

      /* jpeg_start_decompress(...); */
#ifdef MNG_SUPPORT_TRACE
      MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_START_DECOMPRESS)
#endif
      if (jpeg_start_decompress (pData->pJPEGdinfo) == true)
                                       /* indicate it started */
        pData->bJPEGdecostarted = MNG_TRUE;


#ifdef MNG_SUPPORT_TRACE
      MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_FINISH_DECOMPRESS)
#endif
      if (jpeg_finish_decompress (pData->pJPEGdinfo) == true)
      {                                /* indicate it's done */
        pData->bJPEGhasheader   = MNG_FALSE;
        pData->bJPEGdecostarted = MNG_FALSE;

#ifdef MNG_SUPPORT_TRACE
      MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_READ_HEADER)
#endif
      if (jpeg_read_header (pData->pJPEGdinfo2, true) != JPEG_SUSPENDED)
      {                                /* indicate the header's oke */
        pData->bJPEGhasheader2 = MNG_TRUE;
                                       /* let's do some sanity checks ! */

      /* set parameters for decompression */

      if (pData->bJPEGprogressive2)    /* progressive display ? */
        pData->pJPEGdinfo2->buffered_image = true;

      /* jpeg_start_decompress(...); */
#ifdef MNG_SUPPORT_TRACE
      MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_START_DECOMPRESS)
#endif
      if (jpeg_start_decompress (pData->pJPEGdinfo2) == true)
                                       /* indicate it started */
        pData->bJPEGdecostarted2 = MNG_TRUE;


#ifdef MNG_SUPPORT_TRACE
      MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_FINISH_DECOMPRESS)
#endif
      if (jpeg_finish_decompress (pData->pJPEGdinfo2) == true)
      {                                /* indicate it's done */
        pData->bJPEGhasheader2   = MNG_FALSE;
        pData->bJPEGdecostarted2 = MNG_FALSE;

Return to bug 578744

Lines 66-71 Link Here

(-)a/libmng_jpeg.c (-9 / +10 lines)
66	#include "libmng_memory.h"	66	#include "libmng_memory.h"
67	#include "libmng_pixels.h"	67	#include "libmng_pixels.h"
68	#include "libmng_jpeg.h"	68	#include "libmng_jpeg.h"
		69	#include <stdbool.h>
69		70
70	#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)	71	#if defined(__BORLANDC__) && defined(MNG_STRICT_ANSI)
71	#pragma option -A /* force ANSI-C */	72	#pragma option -A /* force ANSI-C */
Lines 105-111 Link Here
105	boolean mng_fill_input_buffer (j_decompress_ptr cinfo)	106	boolean mng_fill_input_buffer (j_decompress_ptr cinfo)
106	#endif	107	#endif
107	{	108	{
108	return FALSE; /* force IJG routine to return to caller */	109	return false; /* force IJG routine to return to caller */
109	}	110	}
110	#endif /* MNG_INCLUDE_JNG_READ */	111	#endif /* MNG_INCLUDE_JNG_READ */
111		112
Lines 533-539 Link Here
533	#ifdef MNG_SUPPORT_TRACE	534	#ifdef MNG_SUPPORT_TRACE
534	MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_READ_HEADER)	535	MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_READ_HEADER)
535	#endif	536	#endif
536	if (jpeg_read_header (pData->pJPEGdinfo, TRUE) != JPEG_SUSPENDED)	537	if (jpeg_read_header (pData->pJPEGdinfo, true) != JPEG_SUSPENDED)
537	{ /* indicate the header's oke */	538	{ /* indicate the header's oke */
538	pData->bJPEGhasheader = MNG_TRUE;	539	pData->bJPEGhasheader = MNG_TRUE;
539	/* let's do some sanity checks ! */	540	/* let's do some sanity checks ! */
Lines 577-589 Link Here
577	/* set parameters for decompression */	578	/* set parameters for decompression */
578		579
579	if (pData->bJPEGprogressive) /* progressive display ? */	580	if (pData->bJPEGprogressive) /* progressive display ? */
580	pData->pJPEGdinfo->buffered_image = TRUE;	581	pData->pJPEGdinfo->buffered_image = true;
581		582
582	/* jpeg_start_decompress(...); */	583	/* jpeg_start_decompress(...); */
583	#ifdef MNG_SUPPORT_TRACE	584	#ifdef MNG_SUPPORT_TRACE
584	MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_START_DECOMPRESS)	585	MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_START_DECOMPRESS)
585	#endif	586	#endif
586	if (jpeg_start_decompress (pData->pJPEGdinfo) == TRUE)	587	if (jpeg_start_decompress (pData->pJPEGdinfo) == true)
587	/* indicate it started */	588	/* indicate it started */
588	pData->bJPEGdecostarted = MNG_TRUE;	589	pData->bJPEGdecostarted = MNG_TRUE;
589		590
Lines 680-686 Link Here
680	#ifdef MNG_SUPPORT_TRACE	681	#ifdef MNG_SUPPORT_TRACE
681	MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_FINISH_DECOMPRESS)	682	MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_FINISH_DECOMPRESS)
682	#endif	683	#endif
683	if (jpeg_finish_decompress (pData->pJPEGdinfo) == TRUE)	684	if (jpeg_finish_decompress (pData->pJPEGdinfo) == true)
684	{ /* indicate it's done */	685	{ /* indicate it's done */
685	pData->bJPEGhasheader = MNG_FALSE;	686	pData->bJPEGhasheader = MNG_FALSE;
686	pData->bJPEGdecostarted = MNG_FALSE;	687	pData->bJPEGdecostarted = MNG_FALSE;
Lines 887-893 Link Here
887	#ifdef MNG_SUPPORT_TRACE	888	#ifdef MNG_SUPPORT_TRACE
888	MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_READ_HEADER)	889	MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_READ_HEADER)
889	#endif	890	#endif
890	if (jpeg_read_header (pData->pJPEGdinfo2, TRUE) != JPEG_SUSPENDED)	891	if (jpeg_read_header (pData->pJPEGdinfo2, true) != JPEG_SUSPENDED)
891	{ /* indicate the header's oke */	892	{ /* indicate the header's oke */
892	pData->bJPEGhasheader2 = MNG_TRUE;	893	pData->bJPEGhasheader2 = MNG_TRUE;
893	/* let's do some sanity checks ! */	894	/* let's do some sanity checks ! */
Lines 922-934 Link Here
922	/* set parameters for decompression */	923	/* set parameters for decompression */
923		924
924	if (pData->bJPEGprogressive2) /* progressive display ? */	925	if (pData->bJPEGprogressive2) /* progressive display ? */
925	pData->pJPEGdinfo2->buffered_image = TRUE;	926	pData->pJPEGdinfo2->buffered_image = true;
926		927
927	/* jpeg_start_decompress(...); */	928	/* jpeg_start_decompress(...); */
928	#ifdef MNG_SUPPORT_TRACE	929	#ifdef MNG_SUPPORT_TRACE
929	MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_START_DECOMPRESS)	930	MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_START_DECOMPRESS)
930	#endif	931	#endif
931	if (jpeg_start_decompress (pData->pJPEGdinfo2) == TRUE)	932	if (jpeg_start_decompress (pData->pJPEGdinfo2) == true)
932	/* indicate it started */	933	/* indicate it started */
933	pData->bJPEGdecostarted2 = MNG_TRUE;	934	pData->bJPEGdecostarted2 = MNG_TRUE;
934		935
Lines 1017-1023 Link Here
1017	#ifdef MNG_SUPPORT_TRACE	1018	#ifdef MNG_SUPPORT_TRACE
1018	MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_FINISH_DECOMPRESS)	1019	MNG_TRACE (pData, MNG_FN_JPEG_DECOMPRESSDATA, MNG_LC_JPEG_FINISH_DECOMPRESS)
1019	#endif	1020	#endif
1020	if (jpeg_finish_decompress (pData->pJPEGdinfo2) == TRUE)	1021	if (jpeg_finish_decompress (pData->pJPEGdinfo2) == true)
1021	{ /* indicate it's done */	1022	{ /* indicate it's done */
1022	pData->bJPEGhasheader2 = MNG_FALSE;	1023	pData->bJPEGhasheader2 = MNG_FALSE;
1023	pData->bJPEGdecostarted2 = MNG_FALSE;	1024	pData->bJPEGdecostarted2 = MNG_FALSE;